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,260 Commits 60 Branches 10 Tags
0.5
Commit Graph

38 Commits

Author SHA1 Message Date
Tats
557227ac89 Explicitely wrote namespace in file instead of using MM_*_NAMESPACE (related to #278). 2016-11-29 00:21:25 -05:00
Tats
065a561df6 Create meshes instead of quads for color mappings (closes #150). 2016-05-12 15:19:41 +00:00
baydam
b375367811 Integrate all code inside a namespace 2016-03-16 18:05:47 +00:00
Alexandre Quessy
aec2dba6b8 use qDebug for logging 2016-03-05 19:36:05 -05:00
Tats
2429728e49 Removed drawControls*() methods in Utils.h which are not used anymore. 2016-03-05 18:16:49 -05: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
baydam
156e74acd5 Fix:#183 "Display logging output in a console and able to show and hide" 2016-01-21 21:54:34 +00: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
6843ecd882 Integrated view items for selecing and dragging shapes in the QGraphicsView; not completely tied to model yet. 2014-10-31 17:05:32 -04:00
Tats
e8870db92a Replaced Shape by MShape to avoid name conflicts. 2014-10-31 17:03:18 -04:00
Tats
07e1b26436 Allows individual selection of a vertex to be shown on screen. 2014-10-23 13:40:01 +00:00
Alexandre Quessy
2a66de38ff add --osc-port option 2014-10-17 13:57:13 -04:00
Alexandre Quessy
a0cea41fc5 Add --reset-settings option 2014-10-17 13:12:07 -04:00
Tats
ad67794978 Removed reversal of data (prevented by changing the way we select texture coordinates). 2014-05-03 19:27:40 -04:00
Tats
f5d375442a Improved the style of the control rendering. 2014-05-03 00:26:02 -04:00
Tats
0295d50779 Removed unused.h 2014-04-26 12:38:11 +01:00
Alexandre Quessy
e91496b96a Merge branch 'spike-video-drone' into gst-osx 2014-04-25 20:52:49 -04:00
Tats
4e4483c56c Replaced UNUSED(x) by Q_UNUSED(x). 2014-04-10 01:07:24 -04:00
Alexandre Quessy
8652e9555e get rid of warnings 2014-03-14 11:47:58 -04:00
Alexandre Quessy
dfed5c10be get rid of warnings 2014-03-05 23:13:13 -05:00
Tats
d0e697d77a Remove unused center control point for color ellipses. 2014-03-02 21:07:11 -05:00
Tats
72be4f2599 Created a setGlTexPoint() to facilitate projection of textures on vertex. 2014-03-02 17:01:55 -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
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
9a9ba71eff Integrated color paint / mapping to the main window 2014-01-22 15:01:28 -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
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