lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-14 00:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected two errors in the tablet management:

Browse Source 
- when paint starts, the Zbuffer is initialized correctly
- Wacom-compatible pen tip & eraser are correctly mapped to foreground and background color
This commit is contained in:
Marco Callieri mcallieri 2011-02-09 16:28:14 +00:00
parent 1619df3cb0
commit fb58e95fa1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fgt/editpaint/editpaint.cpp
View File

@ -135,7 +135,12 @@ void EditPaintPlugin::mouseReleaseEvent(QMouseEvent * event, MeshModel &, GLArea
void EditPaintPlugin::tabletEvent(QTabletEvent * event, MeshModel & , GLArea * gla)
{
event->accept();
pushInputEvent(event->type(), event->pos(), event->modifiers(), event->pressure(), latest_event.button, gla);
// if event is down, clean zbuff
if(event->type() == QEvent::TabletPress)
if (zbuffer != NULL) delete zbuffer; zbuffer = NULL;
pushInputEvent(event->type(), event->pos(), event->modifiers(), event->pressure(), (event->pointerType() == QTabletEvent::Eraser)? Qt::RightButton : Qt::LeftButton, gla);
gla->update();
}
@ -241,9 +246,12 @@ void EditPaintPlugin::Decorate(MeshModel &m, GLArea * gla)
case COLOR_PAINT:
{
painted_vertices.clear();
QColor newcol = (latest_event.button == Qt::LeftButton) ?
paintbox->getForegroundColor() :
paintbox->getBackgroundColor();
QColor newcol;
if(latest_event.button == Qt::LeftButton)
newcol = paintbox->getForegroundColor();
else
newcol = paintbox->getBackgroundColor();
color[0] = newcol.red(); color[1] = newcol.green();
color[2] = newcol.blue(); color[3] = newcol.alpha();
paintbox->getUndoStack()->beginMacro("Color Paint");