eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
808 Commits 62 Branches 10 Tags
3a4f80c49fddbb24ee3515d32e66d3671de2eb66
Commit Graph

100 Commits

Author SHA1 Message Date
Tats 1847881b04 Major cleanup and documenting of classes. 2015-12-02 21:29:46 -05:00
Tats 9b6f49e9cc Fixed bug #128: Crash on changing mesh dimension. 2015-07-30 19:31:31 -04:00
Tats ffe6ff76b8 Bug fix: update of control point positions in property browser goes both ways. 2015-07-18 13:12:56 -06:00
Tats e5d4463c32 Reintegrated highlighting of selected vertex. 2015-07-17 16:28:27 -06:00
Tats 460e346ddd Removed unused updatePaint signal/slots. 2015-07-17 14:26:24 -06:00
Tats c652730fd5 Integrated shared pointers in Mapper for holding property browser and graphics items. 2015-07-17 14:24:50 -06:00
Tats 7e5912b150 Replaced shared pointers by weak pointers in appropriate spots. Seems to have fixed the problem where memory was not freed because of cycling refs. 2015-07-17 13:59:25 -06:00
Tats aef4f2d8d8 Changed tr1 shared_ptr for QSharedPointers and QWeakPointers. 2015-07-17 13:41:55 -06:00
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