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
744 Commits 62 Branches 10 Tags
460e346dddfd62b326dd7c50ecfd384716228267
Commit Graph

744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 fce0715c5a Cleared potential error in MediaImpl: resources were freed before setting play state to false. 2015-07-17 13:38:23 -06:00
Tats 7862010142 Allow remove of columns in rows in meshes. 2015-07-15 12:54:44 -06:00
Tats e2e3c4a415 Use trick to allow middle-button dragging of the canvas 2015-07-15 12:53:02 -06:00
Tats 9a6c38fa4b Added new render hints for aliasing 2015-07-15 12:52:37 -06:00
Tats b28c1475b0 Removed mouse-management events completely from ShapeGraphicsItem 2015-07-15 12:52:17 -06:00
Tats a970bbc660 - Manage properly the picking up of vertices and shapes 
- Fix bug: in source canvas we could change mappings by clicking on shape
 2015-07-15 12:50:24 -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 d4facecb90 Disable scrollbars in output window. 2015-07-13 17:07:14 -06:00
Tats 3303e07056 Added support for scrolling in source+destination canvases by mid-button clicking. 2015-07-13 16:45:03 -06:00
Tats 8f13597451 Created a special class for output gl canvas to prevent some events (like zooming) to happen. 2015-07-13 16:44:41 -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 bd1d14d38a Increased range of zoom levels. 2015-07-13 13:26:16 -06:00
Tats acca6059f6 Implemented invariant control points and lines wrt zoom level. 2015-07-13 13:25:18 -06:00
Tats 461c4562ff Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 
Conflicts:
	Mapper.cpp
 2015-07-11 20:25:12 -06:00
Tats 344f375c53 Fixed perspective-correct textures (not optimized). 2015-07-11 20:24:06 -06:00
Tats 6db5aca879 Fixed perspective-correct textures (not optimized). 2015-07-11 20:12:29 -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 57fe2607a9 Renamed shapeChanged(Shape*) for shapeChanged(MShape*). 2015-07-06 21:26:20 -06:00
Tats 017e8bdc7b Fixed bug: scenes were not updated properly resulting in no automatic video frame update. 2015-07-06 21:24:06 -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 dc1d144cf1 Commented out faulty lines that broke the video output under Linux (issue #124) 2015-07-06 20:02:28 -06:00
Tats b6b3863eb2 Minor documentation added. 2015-07-06 17:57:08 -06:00
Tats d1b1d00e10 Integrated ellipse texture mapping. 2015-07-06 17:53:37 -06:00
Tats 28d353d99a Bug fix: meshes did not handle well vertex displacement (adjusted tolerance when constraining a vertex to a polygon). 
Signed-off-by: Tats <info@sofianaudry.com>
 2015-07-06 16:59:29 -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 082bf2d009 Removed rubberband selection (for now). 2015-07-03 21:51:58 -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 93edb4e41a Bug fix: tried to addItem() twice on outputwindow scene. 2015-07-03 19:04:52 -06:00
Tats 9ba817847f Bugfix: Infinite call loop created by shared scene in destination and outputwindow canvases and the updateCanvas() slot. 2015-07-03 19:01:51 -06:00
Tats f0c4bb1fa9 Allow display of controls only in currently selected mapping. 2015-07-03 17:21:11 -06:00
Tats 36c2c2b539 Implemented MainWindow singleton pattern. 2015-07-03 17:20:42 -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
Bay Dam 6577add891 Merge pull request #121 from baydam/feature-context-menu 
Add context menu for duplicate, delete and rename mapping
 2015-05-02 11:54:56 +00:00
baydam 36b89fa60a Bug #99 fix and improvements 2015-04-02 17:11:58 +00:00