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
8300c10599
Add context menu for duplicate, delete and rename mapping
2015-03-30 20:54:15 +00:00
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
96b55099de
In MappingManager::reorderMapping added some extra check to make sure we're sending an appropriate QVector<uid> (no repetition in the uids).
2014-10-16 18:24:55 +00:00
2f75e4d2ca
Adjustment to MappingManager::getVisibleLayers() so that solo-ed layers that are not-visible don't show.
2014-10-16 18:22:42 +00:00
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
c58fc54e67
Small change (cosmetic / performance)
2014-03-18 23:01:01 -04:00
540ae8a983
Allow the seamless removal of both paint and mappings.
2014-03-16 19:31:20 -04:00
20c603b995
Implement working mapping removal
2014-03-16 01:12:32 -04:00
3910302f80
Replaced STL vectors and maps by Qt-style
2014-03-16 01:11:38 -04:00
b2ac8e9423
Bug fixed: clear project functionality implemented
2014-01-12 04:15:04 -05:00
dbab46565c
Use UID allocators for Paint and Mapping
2014-01-11 18:55:26 -05:00
c29f42c20f
Removed the Layers (moved all layer stuff to Mappings)
2014-01-11 16:36:59 -05:00
4639a228c6
Resolved all compilation errors from merging
2014-01-05 18:07:19 -05:00
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
8c2b7fddd6
Load: 50% done. Fix shortcuts.
2013-12-09 17:33:35 -05:00
b0763be6a0
paint have ids
2013-12-09 16:06:01 -05:00
dce8f0b35d
Saves an XML file.
2013-12-09 15:20:33 -05:00
50649d2a40
Reordering of layers with drag and drop
2013-12-05 02:16:55 -05:00
dd3189e847
Checkbox for toggling visibility of layers (+ some cleanup)
2013-12-05 01:38:03 -05:00
71ad58787f
Added Layers (model side)
2013-12-05 00:51:33 -05:00
80f2d92eab
Added unique ids to Mapping and Paint
2013-12-05 00:16:37 -05:00
8b205526fe
Completed integration of one source -> many quads (everything working)
2013-11-30 21:48:01 -05:00
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