eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-04 06:29:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
243 Commits 60 Branches 10 Tags
8652e9555e28338bbcf278d2d0499efcb2157299
Commit Graph

36 Commits

Author SHA1 Message Date
Alexandre Quessy
8652e9555e get rid of warnings 2014-03-14 11:47:58 -04:00
Tats
bdfa20ecda Implemented method drawControls() for EllipseColorMapper. 2014-03-02 21:13:39 -05:00
Tats
880b23cb8a Add control center. 2014-03-02 17:54:18 -05:00
Tats
b6bab4357f Inversion of rotation small change in _setPointOfEllipseAtAngle() method. 2014-03-02 17:36:27 -05:00
Tats
4bbe4df115 Added methods to directly access the horizontal / vertical radius of an ellipse. 2014-03-02 17:35:54 -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
72be4f2599 Created a setGlTexPoint() to facilitate projection of textures on vertex. 2014-03-02 17:01:55 -05:00
Tats
b0f9a8ca5b Draws ellipse control points in a better, uniform way. 2014-02-09 02:39:51 -05:00
Tats
02fe8650c5 Fixed small error in the way color ellipses were drawn (wrong coordinates). 2014-02-09 01:36:23 -05:00
Tats
9938793ddd Adapted ellipse code to latest changes (Point -> QPointF). 2014-02-09 01:21:22 -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
195c426991 Removed the Point class and replace all instances by QPointF. 2014-02-09 01:02:13 -05:00
Tats
ac555b7b10 Added basic support for color ellipses 2014-02-08 23:44:56 -05:00
Tats
18f6160507 Mapper frees memory of its property browser 2014-01-23 23:23:57 -05:00
Tats
0ff52de66a Major reconfiguration of the GL canvases and the Mapper interface to allow for the use of a QPainter and for integrating ColorPaint mappings 2014-01-22 15:01:00 -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
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
9962c56ba7 Removed remaining dynamic cast type checking in *GLCanvas (for drawing shape contours) 2013-12-16 01:37:54 -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
6b864b64ed Removed some debugging code 2013-12-15 23:12:44 -05:00
Tats
7d9d899a37 Fixed small casting error 2013-12-12 21:37:18 -05:00
Tats
88bc2dd745 Mesh properties allows one to add columns and rows 2013-12-11 00:10:04 -05:00
Tats
b808c982f8 Implemented support for meshes: allows for adding columns and rows to meshes 2013-12-10 22:27:06 -05:00
Tats
2afee94e0e Minor fix: wrong cast types 2013-12-10 22:26:04 -05:00
Alexandre Quessy
dce8f0b35d Saves an XML file. 2013-12-09 15:20:33 -05:00
Tats
0e1658c9c3 Replace property browser by tree browser in TextureMapper 2013-12-08 14:55:58 -05:00
Tats
e206ce6108 Code refactoring to add output shape to property editor 2013-12-08 14:45:41 -05:00
Tats
ee46177b1a Fix: initialize input quad properly 2013-12-08 12:08:37 -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
0015e237c9 Added support for triangles 2013-11-30 23:55:25 -05:00
Alexandre Quessy
944ede8587 Add typedefs for std::tr1::shared_ptr<*> 2013-11-26 22:25:11 -05:00
Alexandre Quessy
ed1056527d Always draw OpenGL shapes' vertices in a counterclockwise order 2013-11-26 22:08:02 -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
3964f7b7d1 Fix: textures were upside down 2013-11-24 11:02:11 -05:00