Commit Graph

53 Commits

Author SHA1 Message Date
Alexandre Quessy f7bfeb415d Use major.minor.micro for version number. 2014-03-21 22:34:20 -04:00
Tats ff1d98e1a8 Created a method addPaintId similar to the addMappingId to reuse some code. 2014-03-18 23:26:17 -04:00
Tats 7425d65832 Methods removeCurrent*() reset uids to NULL_UID. 2014-03-18 23:02:10 -04:00
Tats 540ae8a983 Allow the seamless removal of both paint and mappings. 2014-03-16 19:31:20 -04:00
Tats 7c52f13f16 Major cleanup in MainWindow 2014-03-16 15:47:14 -04:00
Tats 338a32af60 Cleanup of comments 2014-03-16 01:12:43 -04:00
Tats 20c603b995 Implement working mapping removal 2014-03-16 01:12:32 -04:00
Tats 3910302f80 Replaced STL vectors and maps by Qt-style 2014-03-16 01:11:38 -04:00
Tats 392869f56f Manage appropriate layout and resizing of output GL canvas 2014-03-15 23:37:54 -04:00
Tats 81e519d366 Added an output GL window that reproduces the destination (refresh still not working).
Window can be toggled on/off.
2014-03-15 23:01:37 -04:00
Tats 07c6293dc7 Load and save of ellipses. 2014-03-02 22:29:10 -05:00
Tats 0b027f29f3 Implemented basic support for texture ellipse (works, default center point, no drawing of control points). 2014-03-02 17:02:52 -05:00
Tats 1dbb174d86 Merge branch 'develop' into ellipseshape
Conflicts:
	Shape.h
2014-02-09 01:20:54 -05:00
Tats e36cb1a991 Replace std::vector and std::map by QVector and QMap (not everywhere yet). 2014-02-09 01:02:54 -05:00
Tats ac555b7b10 Added basic support for color ellipses 2014-02-08 23:44:56 -05:00
Tats 34156f4129 Fixed problem: clearProject() was throwing a bad_alloc() 2014-01-23 23:24:49 -05:00
Tats e91fe5d862 Statesaving of color paints / mappings 2014-01-23 22:01:21 -05:00
Tats 9a9ba71eff Integrated color paint / mapping to the main window 2014-01-22 15:01:28 -05:00
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 2fb214060b Reading and writing of triangle mappings 2014-01-11 21:56:18 -05:00
Tats 8c7f5b16c1 Implement CRUD method createImagePaint in MainWindow and use it 2014-01-11 18:56:28 -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
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 f4bef80559 main window owns the facade. 2014-01-05 17:10:13 -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
Tats 176a1831ae Adjust bottom splitter elements min. widths 2013-12-08 14:55:39 -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 26866dc9ab Add map of mappers (forgot to include it in earlier commit) 2013-12-08 11:56:02 -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 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 b988a9a814 Increased min. width/height fo canvases and set them to 16:9 2013-12-05 00:16:04 -05:00
Tats 30b9f0f09b Renamed sourceSplitter for resourceSplitter 2013-12-05 00:15:39 -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 4107b38a87 Manages resizing correctly (with preferred stretching of the canvases rather than the source list) 2013-11-30 16:22:23 -05:00
Tats 8d2d7749d8 Set minimum size for canvases 2013-11-30 16:21:53 -05:00
Tats 9ee929a260 Add icons to imported image sources 2013-11-30 15:32:30 -05:00
Tats 5bcefdcf16 Added import of image files (from File menu and toolbar) 2013-11-30 13:15:07 -05:00