eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-01 04:59:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,095 Commits 60 Branches 10 Tags
mac-bundle
Commit Graph

64 Commits

Author SHA1 Message Date
baydam
b375367811 Integrate all code inside a namespace 2016-03-16 18:05:47 +00:00
Bay Dam
c708fc24e4 Preparing for Windows operating system 2016-03-16 11:08:49 +01:00
baydam
df5cf42fdc Revert: circular dependencies of header files on Windows 2016-03-08 17:44:35 +00:00
Bay Dam
41264505eb Fix circular dependencies of header files on Windows 2016-03-08 17:57:47 +01:00
Tats
1146a6408e Merge branch 'develop' into feature/qt-properties 
# Conflicts:
#	Mapping.h
#	OscInterface.cpp
#	ProjectReader.cpp
#	ProjectWriter.cpp
#	Shape.h
#	main.cpp
 2016-02-15 13:16:04 -05:00
baydam
21c91295d1 Display lock/mute/solo options in the context menu 2016-02-11 21:24:08 +00:00
Tats
8dc7177ae9 Read/write of texture mappings for triangle and ellipses works. 2016-01-28 21:52:47 -05:00
Tats
608f2b6cf5 Started management of QProperties-supported read/write for mappings and shapes. 2016-01-21 21:57:38 -05:00
Tats
c656f8246a Split the shapes in different files and made them all QObjects with QProperties. 2016-01-21 16:18:19 -05:00
Tats
60ca853956 Cleanup in Shape.h. 2015-12-28 15:28:32 -06:00
Tats
4d71dc575e Integrated support for shape translation in undo commands. 2015-07-19 22:08:59 -06:00
Tats
f9a98f0f09 Allow undo/redo of vertex move. 2015-07-18 12:55:28 -06:00
Tats
aef4f2d8d8 Changed tr1 shared_ptr for QSharedPointers and QWeakPointers. 2015-07-17 13:41:55 -06:00
Tats
7862010142 Allow remove of columns in rows in meshes. 2015-07-15 12:54:44 -06:00
Tats
e8870db92a Replaced Shape by MShape to avoid name conflicts. 2014-10-31 17:03:18 -04:00
Tats
ca78874387 Cosmetic changes 2014-05-03 13:17:00 -04:00
Tats
0711e236f6 Implemented constraining of vertices in polygons (esp. meshes) to avoid line crossing problems. Working at 99%. 2014-05-03 13:16:47 -04:00
Tats
f5d375442a Improved the style of the control rendering. 2014-05-03 00:26:02 -04:00
Tats
eded602ef9 Fixed bug: texture meshes points were not loaded in the right order 2014-04-04 00:54:17 -04:00
Alexandre Quessy
a7608e5413 mv Math.h Maths.h, caused problems on Mac 2014-03-30 11:50:04 -04:00
Tats
f2a7e93b36 Prevents quad / polygon vertices to cross a segment (ie. makes sure they stay simple polygons). 2014-03-19 22:35:22 -04:00
Tats
441664e6f0 Added a Polygon shape and corresponding mappers (just used as a superclass of Quad and Triangle for now). 2014-03-19 22:34:34 -04:00
Tats
8256ace2e1 Added sanity check for ellipses (makes sure the points are ok). 2014-03-02 22:29:36 -05:00
Tats
d0e697d77a Remove unused center control point for color ellipses. 2014-03-02 21:07:11 -05:00
Tats
755b7cfa94 Use QTransform to manage point remapping when moving vertices. 2014-03-02 20:49:59 -05:00
Tats
964a968b36 Added center control point (basic functionality, just "stays inside" the ellipse for now but not working 100%) 2014-03-02 17:43:44 -05:00
Tats
e72a1a3c77 Override of includesPoint() methods in Ellipse. 2014-03-02 17:37:49 -05:00
Tats
dea2781100 Modification of includePoint() method to work with qreal instead of int (also overloaded for QPointF). 2014-03-02 17:37:10 -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
8964876b0a Ellipse overrides setVertex() in order to limit placement of vertices correctly. 2014-02-09 02:39:29 -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
3692565d94 Comment cleanup in Shape 2014-01-22 14:59:54 -05:00
Tats
3de61fc6dc Some accessor functions in the Mesh class 2014-01-22 14:59:45 -05:00
Tats
478e5681a7 Added a toPolygon() method to Shape 2014-01-22 14:59:18 -05:00
Tats
f7cdb15754 Added a method that returns an enclosing polygon based on a shape. 2014-01-22 13:30:39 -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
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
586751cfab some progress in facade 2014-01-05 17:27:24 -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
245a74c5c9 Transferred implementations of Shape methods to .cpp file 2013-12-12 21:38:13 -05:00
Tats
88bc2dd745 Mesh properties allows one to add columns and rows 2013-12-11 00:10:04 -05:00