Commit Graph

Select branches

Hide Pull Requests

0.1

0.2

0.3

0.4

0.5

0.6

add-clang-format

bugfix-file-dialog

bugfix-refactor-mediaimpl

bugfix-video-memory-leaks

check-qt-5.4

check-qt-5.4-rebased

dev

develop-rebase-fix-osx-june-2014

ecole-st-luc

feature-merge-vliaskov-shmsrcbin

feature-opengl-transparency

feature-oscpack

feature-refactor-gui-organization

feature-zoom-and-scroll

feature-zoom-and-scroll-naive-implementation

feature/camera-support

feature/group-and-multiple-select

feature/qt-properties

feature/qtmultimedia

feature/qtmultimedia-spike-videoprobe

feature/syphon

feature/transform-shape-gui

feature/video-thumbnails

fix-video-not-displaying

fix_305_merge_menus

fullscreen

gst-osx

gui-controls-refactor

mac-bundle

macOS_ApplicationIcon

macos_gstreamer_326

master

menu-toolbar-qaction-different-qicon

mike-style-integration

mire

multi-image-loop-texture

osx-fix-june-2014

output-window

play-pause-rewind

port-opengles-odroid

raspbian

rc0.5

refactor-mapper-gl

refactor-mapper-mapping-gui

release-0.3.0

release-0.6.0

remove-paints-mappings

setup/dakar-bideew-show-2016

spike-qgraphicsview-zoom-and-scroll-merge-develop

spike-refactor-scene-vs-control-points

spike-video-drone

st-luc-good

st-luc-test-3

video

#116

#121

#175

#265

#360

#362

#363

#364

#390

#391

#392

#446

#463

#478

#488

#489

#491

#495

#496

#500

#501

#502

#517

#518

#519

#526

#553

#553

#573

#573

#574

#575

#576

#577

#578

#579

#580

#581

#583

#584

#588

#588

0.1.0

0.1.1

0.2.0

0.3.0

0.3.1

0.4.0

0.5.0

0.6.0

0.6.1

0.6.2

Mono Color

• 13364f98c7 Bug fix: triangles setVertex() did nothing Tats 2014-03-22 01:53:51 -04:00
• 7f10566ede Update todo Tats 2014-03-22 01:49:56 -04:00
• f7bfeb415d Use major.minor.micro for version number. Alexandre Quessy 2014-03-21 22:34:20 -04:00
• e6ad73d527 fix build.sh for GNU/Linux Alexandre Quessy 2014-03-21 22:24:13 -04:00
• 3ad38c7775 Move wx prototypes to prototypes/wx Alexandre Quessy 2014-03-21 21:58:19 -04:00
• c496cc9d29 Revert "Removed wxWidget prototypes" Alexandre Quessy 2014-03-21 21:57:16 -04:00
• 2507489e97 Merge branch 'master' of github.com:mapmapteam/mapmap Alexandre Quessy 2014-03-21 21:53:00 -04:00
• 73f77d342d update INSTALL Alexandre Quessy 2014-03-21 16:06:22 -04:00
• e00ecddde2 Fix some env var in build.sh Alexandre Quessy 2014-03-21 09:06:43 -04:00
• 48723aa9dd Try to build it on Mac OS X 10.9.1 Alexandre Quessy 2014-03-21 01:27:59 -04:00
• f2a7e93b36 Prevents quad / polygon vertices to cross a segment (ie. makes sure they stay simple polygons). Tats 2014-03-19 22:35:22 -04:00
• 441664e6f0 Added a Polygon shape and corresponding mappers (just used as a superclass of Quad and Triangle for now). Tats 2014-03-19 22:34:34 -04:00
• 7602a77166 Allow reordering of sources in list Tats 2014-03-19 15:01:18 -04:00
• aa0dce3831 Cosmetic change. Tats 2014-03-18 23:27:06 -04:00
• 08da5d4fa6 Properly manage the windowModified() calls to let the software know something has changed. Tats 2014-03-18 23:26:58 -04:00
• ff1d98e1a8 Created a method addPaintId similar to the addMappingId to reuse some code. Tats 2014-03-18 23:26:17 -04:00
• 9c85eb17fc Bug fix: once all mappings were destroyed, current ids were not reset (removed). Tats 2014-03-18 23:03:08 -04:00
• 7425d65832 Methods removeCurrent*() reset uids to NULL_UID. Tats 2014-03-18 23:02:10 -04:00
• d511243618 Bug fix in the iteration over ids (was iterating over vector index, not item uids). Tats 2014-03-18 23:01:45 -04:00
• c58fc54e67 Small change (cosmetic / performance) Tats 2014-03-18 23:01:01 -04:00
• 2da3f4a5a1 Added dialog when deleting paint. Tats 2014-03-18 23:00:24 -04:00
• 63f59b4486 Enable/disable creation of mappings depending on whether a paint is selected. Tats 2014-03-16 19:36:36 -04:00
• 540ae8a983 Allow the seamless removal of both paint and mappings. Tats 2014-03-16 19:31:20 -04:00
• 7c52f13f16 Major cleanup in MainWindow Tats 2014-03-16 15:47:14 -04:00
• 712ec8cfbc Added some shortcuts to add shapes Tats 2014-03-16 12:36:35 -04:00
• 164023f1e9 Use CTRL-DEL instead of just DEL for deleting stuff Tats 2014-03-16 12:34:03 -04:00
• 338a32af60 Cleanup of comments remove-paints-mappings Tats 2014-03-16 01:12:43 -04:00
• 20c603b995 Implement working mapping removal Tats 2014-03-16 01:12:32 -04:00
• 3910302f80 Replaced STL vectors and maps by Qt-style Tats 2014-03-16 01:11:38 -04:00
• f0ca7124db Small comment Tats 2014-03-16 00:04:29 -04:00
• dc202e1461 Reset focus on main window Tats 2014-03-16 00:04:22 -04:00
• 3a2033a4e1 Save and restore geometry of output window Tats 2014-03-16 00:03:19 -04:00
• b313edc553 Manage close event (unchecks the menu item in main window) output-window Tats 2014-03-15 23:55:29 -04:00
• 392869f56f Manage appropriate layout and resizing of output GL canvas Tats 2014-03-15 23:37:54 -04:00
• 14f35c640c Synchronization of GL in destination and ouptut window Tats 2014-03-15 23:37:36 -04:00
• 81e519d366 Added an output GL window that reproduces the destination (refresh still not working). Window can be toggled on/off. Tats 2014-03-15 23:01:37 -04:00
• 70f6b1356e Removed wrong ProjectReader.h in SOURCES Tats 2014-03-15 23:00:49 -04:00
• 8965090dfa Merge branch 'master' into develop Tats 2014-03-15 22:21:02 -04:00
• 3fd1754776 Removed wxWidget prototypes Tats 2014-03-15 22:02:13 -04:00
• e6dfbf176d Removed wxWidget prototypes Tats 2014-03-15 22:02:13 -04:00
• c20b47aaf4 more fixes Alexandre Quessy 2014-03-14 11:54:54 -04:00
• d11bc93496 re-implement and fix osc receiver Alexandre Quessy 2014-03-14 11:51:52 -04:00
• 8652e9555e get rid of warnings Alexandre Quessy 2014-03-05 23:13:13 -05:00
• 8224a64374 re-implement and fix osc receiver Alexandre Quessy 2014-03-13 16:01:03 -04:00
• 16ce2a449f private declaration of VideoImpl Alexandre Quessy 2014-03-06 15:19:06 -05:00
• 93b55cb61a Print GStreamer version Alexandre Quessy 2014-03-05 23:43:39 -05:00
• 572ceeadd5 Link to GStreamer Alexandre Quessy 2014-03-05 23:30:30 -05:00
• dfed5c10be get rid of warnings Alexandre Quessy 2014-03-05 23:13:13 -05:00
• e49a358b45 add empty Video class Alexandre Quessy 2014-03-05 23:04:52 -05:00
• 0cf4a5086c Rename project to MapMap Alexandre Quessy 2014-03-04 11:28:40 -05:00
• fa920cd788 Move todos from HACKING to TODO. Add INSTALL. Alexandre Quessy 2014-03-04 11:22:46 -05:00
• fbc3feb6f7 Merge branch 'ellipseshape' into develop Tats 2014-03-02 22:29:53 -05:00
• 8256ace2e1 Added sanity check for ellipses (makes sure the points are ok). Tats 2014-03-02 22:29:36 -05:00
• 07c6293dc7 Load and save of ellipses. Tats 2014-03-02 22:29:10 -05:00
• 7641ea62ca Some adds to the todo list Tats 2014-03-02 21:20:22 -05:00
• bdfa20ecda Implemented method drawControls() for EllipseColorMapper. Tats 2014-03-02 21:13:39 -05:00
• f489f0b6b6 Rewrote the includesPoint() method for Ellipse using transformations. Tats 2014-03-02 21:09:48 -05:00
• f3d09731d9 Small bug fix for clippings. Tats 2014-03-02 21:08:57 -05:00
• d30168dca0 Major fix in conversions between radians and degrees. Tats 2014-03-02 21:08:37 -05:00
• d0e697d77a Remove unused center control point for color ellipses. Tats 2014-03-02 21:07:11 -05:00
• 5de7162a59 Clip center control point inside ellipse using QTransform. Tats 2014-03-02 20:50:27 -05:00
• 755b7cfa94 Use QTransform to manage point remapping when moving vertices. Tats 2014-03-02 20:49:59 -05:00
• 880b23cb8a Add control center. Tats 2014-03-02 17:54:18 -05:00
• 964a968b36 Added center control point (basic functionality, just "stays inside" the ellipse for now but not working 100%) Tats 2014-03-02 17:43:44 -05:00
• e72a1a3c77 Override of includesPoint() methods in Ellipse. Tats 2014-03-02 17:37:49 -05:00
• dea2781100 Modification of includePoint() method to work with qreal instead of int (also overloaded for QPointF). Tats 2014-03-02 17:37:10 -05:00
• b6bab4357f Inversion of rotation small change in _setPointOfEllipseAtAngle() method. Tats 2014-03-02 17:36:27 -05:00
• 4bbe4df115 Added methods to directly access the horizontal / vertical radius of an ellipse. Tats 2014-03-02 17:35:54 -05:00
• 0b027f29f3 Implemented basic support for texture ellipse (works, default center point, no drawing of control points). Tats 2014-03-02 17:02:52 -05:00
• 72be4f2599 Created a setGlTexPoint() to facilitate projection of textures on vertex. Tats 2014-03-02 17:01:55 -05:00
• dcdd67e0dd Merge branch 'ellipseshape' of github.com:libremapping/libremapping into ellipseshape Tats 2014-02-09 02:57:06 -05:00
• b0f9a8ca5b Draws ellipse control points in a better, uniform way. Tats 2014-02-09 02:39:51 -05:00
• 8964876b0a Ellipse overrides setVertex() in order to limit placement of vertices correctly. Tats 2014-02-09 02:39:29 -05:00
• 02fe8650c5 Fixed small error in the way color ellipses were drawn (wrong coordinates). Tats 2014-02-09 01:36:23 -05:00
• 9938793ddd Adapted ellipse code to latest changes (Point -> QPointF). Tats 2014-02-09 01:21:22 -05:00
• 1dbb174d86 Merge branch 'develop' into ellipseshape Tats 2014-02-09 01:20:54 -05:00
• a19714b919 Merge branch 'develop' into ellipseshape Tats 2014-02-09 01:05:48 -05:00
• 89a5ce8787 Use the containsPoint() method of polygon to test point inclusion inside shape. Tats 2014-02-09 01:03:16 -05:00
• e36cb1a991 Replace std::vector and std::map by QVector and QMap (not everywhere yet). Tats 2014-02-09 01:02:54 -05:00
• 195c426991 Removed the Point class and replace all instances by QPointF. Tats 2014-02-09 01:02:13 -05:00
• 61c20158d0 Cosmetic changes (variable and interface names). Tats 2014-02-08 23:46:50 -05:00
• 00dc18249d Fixed potential bug: DestinationGLCanvas was still interpreting all mappings as TextureMappings Tats 2014-02-08 23:46:25 -05:00
• ac555b7b10 Added basic support for color ellipses Tats 2014-02-08 23:44:56 -05:00
• 34156f4129 Fixed problem: clearProject() was throwing a bad_alloc() Tats 2014-01-23 23:24:49 -05:00
• a539023a30 Created a class MainApplication to handle notify() Tats 2014-01-23 23:24:20 -05:00
• 18f6160507 Mapper frees memory of its property browser Tats 2014-01-23 23:23:57 -05:00
• e91fe5d862 Statesaving of color paints / mappings Tats 2014-01-23 22:01:21 -05:00
• 9a9ba71eff Integrated color paint / mapping to the main window Tats 2014-01-22 15:01:28 -05:00
• 0ff52de66a Major reconfiguration of the GL canvases and the Mapper interface to allow for the use of a QPainter and for integrating ColorPaint mappings Tats 2014-01-22 15:01:00 -05:00
• 3692565d94 Comment cleanup in Shape Tats 2014-01-22 14:59:54 -05:00
• 3de61fc6dc Some accessor functions in the Mesh class Tats 2014-01-22 14:59:45 -05:00
• 478e5681a7 Added a toPolygon() method to Shape Tats 2014-01-22 14:59:18 -05:00
• f7cdb15754 Added a method that returns an enclosing polygon based on a shape. Tats 2014-01-22 13:30:39 -05:00
• e671ffe958 Added a ColorMapping class Tats 2014-01-22 13:29:06 -05:00
• c87a397844 Added a Color paint Tats 2014-01-22 13:28:42 -05:00
• b2ac8e9423 Bug fixed: clear project functionality implemented Tats 2014-01-12 04:15:04 -05:00
• c4889055bf Merge branch 'statesaving' of github.com:libremapping/libremapping into statesaving Tats 2014-01-11 23:03:22 -05:00
• bd6fff9979 Stub for clearProject() Tats 2014-01-11 23:03:13 -05:00
• 9219cee81c Add save/load of meshes Tats 2014-01-11 23:02:52 -05:00
• 34a5f6e36c Fixed bug: wrong shape were selected when the mappings were reordered Tats 2014-01-11 23:02:05 -05:00