eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-18 13:39:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
729 Commits 60 Branches 10 Tags
da02407485abfd3a6bf54bc53f2330aaf5e6e92e
Commit Graph

729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
baydam
8300c10599 Add context menu for duplicate, delete and rename mapping 2015-03-30 20:54:15 +00:00
baydam
a39fa73118 Resolved conflict about last merge 2015-03-03 11:52:44 +00:00
baydam
8842064af9 Merge branch 'feature-undo-commands' into 'develop' 2015-03-02 10:40:49 +00:00
Alexandre Quessy
1dce1ebc57 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2015-02-15 18:46:32 -05:00
Alexandre Quessy
35855907a8 update Qt version on OS X 2015-02-15 18:45:53 -05:00
Tats
e22075d6ad Base working integration of destination and output window (with crosshair working in fullscreen). 2015-02-15 17:46:54 -05:00
Vasilis Liaskovitis
d1f63b8501 Fix issue #114: Audio playback of the video files played 
We now create an audio pipeline with a volume gstreamer element. The "volume"
property of the element has a range of 0.0 - 1.0 and is 0.0 by default (i.e.
effectively muted input). The property can be seen and changed in the paint
property browser (in %)
 2015-02-09 21:49:44 +01:00
baydam
6a3545ff47 Segmentation fault fixed 2015-01-29 20:39:49 +00:00
Bay Dam
e0a3c35877 Update INSTALL 
Update Gstreamer libav plugins
 2015-01-29 14:48:56 +00:00
baydam
4bd5e456e0 Fixed bug #99 about exiting fullscreen 2015-01-24 13:43:09 +00:00
baydam
584f71e997 Fixed bug #99 about exiting fullscreen 2015-01-23 22:36:25 +00:00
baydam
1a5497d245 Disable Test signal when add Shapes 2015-01-23 21:02:29 +00:00
baydam
c79e873fd3 Clear UndoStack when select a new file or project 2015-01-23 20:45:12 +00:00
baydam
4d6caf2cfb Optimization of Undo Command 2015-01-23 20:36:30 +00:00
baydam
f335127369 Can restore last position of moved shapes 2015-01-21 12:47:17 +00:00