eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-07 16:19:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
193 Commits 60 Branches 10 Tags
bd6fff9979ec9c9d9bc98b76b3d4eedc95047ae9
Commit Graph

58 Commits

Author SHA1 Message Date
Tats
bd6fff9979 Stub for clearProject() 2014-01-11 23:03:13 -05:00
Tats
9219cee81c Add save/load of meshes 2014-01-11 23:02:52 -05:00
Tats
11734f8d5b Actual implementation of createTriangleTextureMapping() 2014-01-11 22:01:52 -05:00
Tats
78a944e82a Check type instead of n vertices to display correct icon 2014-01-11 22:01:23 -05:00
Tats
daaceef671 Disable addTriangle/Mesh for when no paint is selected 2014-01-11 22:01:07 -05:00
Tats
8c7f5b16c1 Implement CRUD method createImagePaint in MainWindow and use it 2014-01-11 18:56:28 -05:00
Tats
d5c9a7a156 Merge branch 'translation' into statesaving 2014-01-11 16:56:06 -05:00
Tats
da0048b4ac Changed sourceList to paintList 2014-01-11 16:38:07 -05:00
Tats
c29f42c20f Removed the Layers (moved all layer stuff to Mappings) 2014-01-11 16:36:59 -05:00
Alexandre Quessy
e3029309c0 progress in translation 2014-01-08 12:51:40 -05:00
Alexandre Quessy
d9c9816ab6 rename organization for preferences saving 2014-01-05 18:37:54 -05:00
Alexandre Quessy
cfb7f6422d Merge branch 'statesaving' of github.com:libremapping/libremapping into statesaving 2014-01-05 18:26:08 -05:00
Alexandre Quessy
bf59519e4b OscInterface now calls Facade 2014-01-05 18:24:34 -05:00
Tats
0a45fdfdc3 Merge branch 'statesaving' of github.com:libremapping/libremapping into statesaving 
Conflicts:
	MainWindow.cpp
	Shape.h
 2014-01-05 18:14:08 -05:00
Tats
4639a228c6 Resolved all compilation errors from merging 2014-01-05 18:07:19 -05:00
Tats
559a7ebf90 Merge branch 'develop' into statesaving 
Conflicts:
	DestinationGLCanvas.cpp
	MainWindow.cpp
	MainWindow.h
	Mapper.h
	MappingManager.cpp
	MappingManager.h
	Paint.h
	Shape.h
	SourceGLCanvas.cpp
	Util.cpp
	libremapping.pro
	main.cpp
 2014-01-05 18:06:41 -05:00
Alexandre Quessy
123ea0e49d OSC: port concurrentqueue to Qt. Fix duplicate OSC messages 2014-01-05 17:43:33 -05:00
Alexandre Quessy
217081b779 add missing include 2014-01-05 17:36:10 -05:00
Alexandre Quessy
586751cfab some progress in facade 2014-01-05 17:27:24 -05:00
Alexandre Quessy
f4bef80559 main window owns the facade. 2014-01-05 17:10:13 -05:00
Alexandre Quessy
bae2e74fde add a bit more to facade 2014-01-05 17:03:12 -05:00
Tats
3f99dbdebf Removed dynamic cast type checking in Mapper and used subclasses of TextureMapper instead 2013-12-16 00:50:31 -05:00
Tats
f47ee7765b Merge branch 'develop' 2013-12-12 21:39:58 -05:00
Alexandre Quessy
0577bec754 fix doc 2013-12-11 08:46:24 -05:00
Tats
6595d9911a Replaced Quads by Meshes 2013-12-10 22:37:45 -05:00
Alexandre Quessy
31de8211cd Add optional OSC support 
Add OSC receiver

add BUGS

fix README

OSC: use QVariantList to send messages to the main window

show text under icons in toolbar

remove deprecated class

detect liblo and make it optional
 2013-12-10 04:55:22 -05:00
Alexandre Quessy
8c2b7fddd6 Load: 50% done. Fix shortcuts. 2013-12-09 17:33:35 -05:00
Alexandre Quessy
dce8f0b35d Saves an XML file. 2013-12-09 15:20:33 -05:00
Tats
14278e1d1f Fix save + load of splitter states 2013-12-08 14:57:39 -05:00
Tats
176a1831ae Adjust bottom splitter elements min. widths 2013-12-08 14:55:39 -05:00
Alexandre Quessy
27f838ac16 update test in the gui 2013-12-08 14:03:08 -05:00
Tats
8502ef3b37 Added basic properties widget for current selected mapper (bidirectional update of input shape vertices, though wrongly initialized) 2013-12-08 11:58:05 -05:00
Tats
cd2639812d Replaced signal quadChanged for shapeChanged 2013-12-08 11:56:55 -05:00
Tats
f5f8b36a1d Small fix: was using mapping id instead of layer id in addLayerItem() call 2013-12-08 11:55:17 -05:00
Tats
8caab2875b Added method MainWindow::updateAll() to update the canvases 2013-12-08 11:54:39 -05:00
Tats
3517b7a71d Generalized the use of Mapper from within DestinationGLCanvas 2013-12-08 11:53:49 -05:00
Tats
28a5521131 Adjust scalings of splitter elements 2013-12-07 17:41:54 -05:00
Tats
2960144393 Fixed seg fault on exit due to MainWindow singleton 2013-12-07 17:41:19 -05:00
Tats
50649d2a40 Reordering of layers with drag and drop 2013-12-05 02:16:55 -05:00
Tats
dd3189e847 Checkbox for toggling visibility of layers (+ some cleanup) 2013-12-05 01:38:03 -05:00
Tats
80f2d92eab Added unique ids to Mapping and Paint 2013-12-05 00:16:37 -05:00
Tats
30b9f0f09b Renamed sourceSplitter for resourceSplitter 2013-12-05 00:15:39 -05:00
Tats
cf95edaf6f Bug fix: When switching to a source that has no mapping attached to it, last selected mapping was still in use 2013-12-01 13:43:24 -05:00
Tats
8d0473410b Removed some of the "normal" pointers and replaced them by smart pointer to prevent memory problems 2013-12-01 00:16:33 -05:00
Tats
0015e237c9 Added support for triangles 2013-11-30 23:55:25 -05:00
Tats
8b205526fe Completed integration of one source -> many quads (everything working) 2013-11-30 21:48:01 -05:00
Tats
fab560760e Added quad creation to shapeList (not working yet) 2013-11-30 20:39:45 -05:00
Tats
73d934b4d0 Some cleanup in switching of image source 2013-11-30 19:23:35 -05:00
Tats
5a999f1983 - Put all mappings and paints in a single MappingManager class 
- Basic compiling / running program (no quads for now)
 2013-11-30 19:19:29 -05:00
Tats
282f74c083 Save splitter geometry / state 2013-11-30 16:44:50 -05:00