Commit Graph

10 Commits

Author SHA1 Message Date
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
Vasilis Liaskovitis
5852cde869 Shape: Convert Point to QObject / QPointF
Also add one Q_PROPERTY for each coordinate (x and y) of a Point. This will
enable the controller to set and get these properties.

Since QObjects cannot be copied, we also need to change the Shape class to have
a vector of pointers to Points, instead of actual Point structs.
2013-12-24 13:50:20 +02:00
Tats
6595d9911a Replaced Quads by Meshes 2013-12-10 22:37:45 -05:00
Tats
b808c982f8 Implemented support for meshes: allows for adding columns and rows to meshes 2013-12-10 22:27:06 -05:00
Alexandre Quessy
dce8f0b35d Saves an XML file. 2013-12-09 15:20:33 -05:00
Tats
0015e237c9 Added support for triangles 2013-11-30 23:55:25 -05:00
Tats
fab560760e Added quad creation to shapeList (not working yet) 2013-11-30 20:39:45 -05:00
Alexandre Quessy
0e73f157f8 Document with Doxygen 2013-11-27 01:33:04 -05:00
Alexandre Quessy
83404dac47 Add Util::map_[float|int].
Change Util for a namespace, not a class with static methods.
2013-11-26 22:13:46 -05:00
Tats
3964f7b7d1 Fix: textures were upside down 2013-11-24 11:02:11 -05:00