Commit Graph

16 Commits

Author SHA1 Message Date
Tats 3517b7a71d Generalized the use of Mapper from within DestinationGLCanvas 2013-12-08 11:53:49 -05:00
Tats 4a80c0a328 Merge branch 'sticky-vertices' of github.com:vliaskov/libremapping into develop
Conflicts:
	Shape.h
	SourceGLCanvas.cpp
2013-12-06 18:06:28 -05:00
Vasilis Liaskovitis b3340e2633 GLCanvas: Implement sticky vertex movement
If the vertex of the current Shape is being moved, it may be useful to "glue" it
to a vertex of another shape, if the 2 vertices are close together. This patch
implements this. THe sticky-sensitivity is controlled by the dist_stick
variable, which is currently hardcoded but could be made configurable e.g.
through the GUI.

The patch also uses a new pure virtual method called getShapeFromMappingId(),
which is implemented by Source / Dest Canvas subclasses. getCurrentShape() is
now using this function, so it is now a non-virtual function in MapperGLCanvas.
2013-12-05 23:48:16 +02: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 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 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 5bcefdcf16 Added import of image files (from File menu and toolbar) 2013-11-30 13:15:07 -05:00
Tats fd958cecf2 Merge branch 'master' of github.com:libremapping/libremapping
Conflicts:
	Common.cpp
	Common.h
	DestinationGLCanvas.cpp
	SourceGLCanvas.cpp
	main.cpp
2013-11-29 12:09:49 -05:00
Alexandre Quessy 9d36bc4922 Use GL_CLAMP, not GL_REPEAT (and other changes)
And also:
* Use glVertex2f, not glVertex3f
* Opening curly brackets on a new line
* spaces between most operators
* avoir some very long lines, or indentations
2013-11-26 21:46:08 -05:00
Tats 0ff60f6108 - Added an empty QListView in the layout, with two splitters
- Also created a class for the main window
2013-11-25 23:16:32 -05:00
Tats 54c199f8fd Correct management of source<->destionation interaction using signals/slots 2013-11-24 09:27:28 -05:00
Tats 5c1ec14662 Basic switch from wxWidget to Qt (not working yet) 2013-11-23 17:37:59 -05:00
Tats 2be974744c Destination displays all input images 2013-11-16 11:55:58 +01:00
Tats 32924471e0 Copy wx-02-input-output to root 2013-11-15 16:12:22 +01:00