Commit Graph

92 Commits

Author SHA1 Message Date
Tats
b28c1475b0 Removed mouse-management events completely from ShapeGraphicsItem 2015-07-15 12:52:17 -06:00
Tats
775cf739c6 - Moved the control of shapes outside of the scene items
- Introduced a specialized range of classes to deal with the drawing of controls
2015-07-14 13:24:36 -06:00
Tats
1074516b21 Bug fix: weird bleeds when selected zone out of texture due to deprecated use of GL_CLAMP. 2015-07-13 13:36:52 -06:00
Tats
da02407485 Bugfix: control vertices not showing up in source canvas. 2015-07-13 13:36:20 -06:00
Tats
acca6059f6 Implemented invariant control points and lines wrt zoom level. 2015-07-13 13:25:18 -06:00
Tats
344f375c53 Fixed perspective-correct textures (not optimized). 2015-07-11 20:24:06 -06:00
Tats
c15f1025b9 Collapse input and output shape in property browser. 2015-07-11 18:14:31 -06:00
Tats
549c30fcd9 Re-enabled toggle of sticky vertices. 2015-07-11 16:30:30 -06:00
Tats
64bbd94f9a Re-enable toggle of display controls. 2015-07-11 16:29:06 -06:00
Tats
978b4ae7ae Added paint opacity. 2015-07-11 12:52:07 -06:00
Tats
0dd88cb68c Added mapping-level opacity setting. 2015-07-11 11:54:15 -06:00
Tats
cf95cab6eb Reorganized painting process in Mapper to provide common pre-painting to ellipse and polygon color mappers. 2015-07-11 11:53:23 -06:00
Tats
2ab3b137d9 Integrate sticky vertices in new QGraphicsItem framework. 2015-07-06 21:58:48 -06:00
Tats
7e85ab493c Merge branch 'spike-qgraphicsview-zoom-and-scroll' into spike-qgraphicsview-zoom-and-scroll-merge-develop
Conflicts:
	DestinationGLCanvas.cpp
	DestinationGLCanvas.h
	MainWindow.cpp
	MainWindow.h
	MapperGLCanvas.cpp
	MapperGLCanvas.h
2015-07-06 20:38:51 -06:00
Tats
d1b1d00e10 Integrated ellipse texture mapping. 2015-07-06 17:53:37 -06:00
Tats
f23ce800fc Support for mesh textures. 2015-07-06 16:58:29 -06:00
Tats
a98577de44 Generalization of the texture input drawing. 2015-07-06 16:58:01 -06:00
Tats
52ebee732f Added a method to reset (clear + recreate) all vertices. 2015-07-06 16:56:42 -06:00
Tats
b9177b9418 Fixed a number of problems related to shape selection and display in input and output. 2015-07-04 11:35:48 -06:00
Tats
b206a432a7 Prevent default actions on graphics items when mappings not visible. 2015-07-03 22:18:07 -06:00
Tats
67628915a3 Handle mapping selection change on pressing mouse on a shape. 2015-07-03 21:51:38 -06:00
Tats
522ecac194 Cosmetic change. 2015-07-03 21:51:01 -06:00
Tats
f0c4bb1fa9 Allow display of controls only in currently selected mapping. 2015-07-03 17:21:11 -06:00
Vasilis Liaskovitis
f9fce75135 Issue #123 : Enable GL_BLEND
PNGs with transparency should have it now.
2015-06-03 14:21:20 +02:00
Tats
067a84cf12 Changing the ordering of mappings now changes the order in which they are actually displayed (layers). 2014-12-28 22:29:47 -05:00
Tats
7c642e8570 Commented out remaining Mapper code from old approach. 2014-12-28 22:28:08 -05:00
Tats
a84888467b Fixed drawing of texture in input mapping. 2014-12-28 20:50:17 -05:00
Tats
2b7a6e82a5 Fixed translation and display of controls of triangle texture. 2014-12-28 19:53:36 -05:00
Tats
78294f2ef0 Fixed correct translation of color shapes. 2014-12-28 19:44:46 -05:00
Tats
b35ce293bf Sync of vertices control points retroactive (to make ellipse works) (not fully working yet). 2014-12-28 18:01:39 -05:00
Tats
31e315363e Major refactoring: moved too long methods from Mapper.h to Mapper.cpp and removed unused drawing code from Mapper classes. 2014-12-28 18:01:02 -05:00
Tats
5cf9294dc7 Only update vertex coordinates when control point is actually moved (as opposed to on any event). 2014-12-28 16:16:21 -05:00
Tats
965a26edd6 Extremely rough patch for manipulating mapping texture shapes (works only for triangles). 2014-12-28 15:58:06 -05:00
Tats
6843ecd882 Integrated view items for selecing and dragging shapes in the QGraphicsView; not completely tied to model yet. 2014-10-31 17:05:32 -04:00
Tats
e8870db92a Replaced Shape by MShape to avoid name conflicts. 2014-10-31 17:03:18 -04:00
Tats
07e1b26436 Allows individual selection of a vertex to be shown on screen. 2014-10-23 13:40:01 +00:00
Tats
7fe2a1f1a7 Bugfix #30 : Reimplemented MediaImpl removing the defective queue system and implementing a thread-safe system. Removed the memory leaks previously shown by valgrind. 2014-10-20 17:00:22 +00:00
Tats
abb62dc1f2 Integrated file choosing pop-up for images and media in property browser. 2014-10-16 20:56:02 +00:00
Tats
4a4b1f05b2 Cosmetic refactoring and variable inits 2014-06-23 18:30:49 -04:00
Tats
aa39752b98 Some cleanup / reorganization of code 2014-06-10 22:27:12 -04:00
Tats
66dc735861 Added _preDraw() and _postDraw() methods to avoid repetition of code in TextureMapper 2014-06-10 22:26:41 -04:00
Tats
20c0ca4cd1 Remove unused glPopMatrix() (had no corresponding glPushMatrix()). 2014-06-10 22:24:05 -04:00
Vasilis Liaskovitis
1aace8a578 Change the uri of existing media or color paint with double-click
When double-clicking a paint QListWidgetItem, the uri of that paint can be
altered.

A new signal is sent to ColorMapper and TextureMapper objects so that they can
update heir color and texture paints respectively. Mappings of the old paint are
transferred to the new paint.

TODO: the active mapping may be lost in some cases, needs some more testing.
2014-05-22 11:30:25 +02:00
Alexandre Quessy
7177d62f90 remove useless endl in prints 2014-05-08 16:06:31 -04:00
Tats
ca78874387 Cosmetic changes 2014-05-03 13:17:00 -04:00
Tats
2285716ed2 Fix bug and potential bugs with painters not being reset between draws. 2014-05-03 13:10:46 -04:00
Tats
f5d375442a Improved the style of the control rendering. 2014-05-03 00:26:02 -04:00
Tats
dab1928a90 Small potential error fix 2014-04-30 20:06:51 -04:00
Tats
05c1bf3a5c Major cleanup / redesign in the source canvas to make the Mapper class draw the inputs (more generic) 2014-04-30 13:21:57 -04:00
Tats
ca9ba38682 Performance improvement: copy texture bits to video card only if they have changed 2014-04-26 13:32:27 +01:00