eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 4809b447d7 Merge branch 'gst-osx' of github.com:mapmapteam/mapmap into gst-osx Alexandre Quessy 2014-04-26 06:28:29 -04:00
  • e2b7f9b982 Compilation fixes Tats 2014-04-26 11:27:59 +01:00
  • f870641aab remove useless flags in .pro file for os x Alexandre Quessy 2014-04-26 06:21:58 -04:00
  • 322da96ed2 more fixes for gst on os x Alexandre Quessy 2014-04-25 22:02:49 -04:00
  • 0e3ba9ee14 Added pkgconfig in .pro file (includes gstreamer in prevision of future dev.) Tats 2014-04-26 02:17:49 +01:00
  • d2f43049a6 fixes to the packaging for gst for os x Alexandre Quessy 2014-04-25 21:08:40 -04:00
  • e91496b96a Merge branch 'spike-video-drone' into gst-osx Alexandre Quessy 2014-04-25 20:52:49 -04:00
  • f731d6459e link against gst on mac Alexandre Quessy 2014-04-25 20:24:00 -04:00
  • f9ac582804 Loop movie spike-video-drone Tats 2014-04-26 01:02:06 +01:00
  • 6e58f94a48 Simple "hack" with a QTimer to time the video Tats 2014-04-26 01:01:44 +01:00
  • ada827de41 Replaced images by videos + implemented hack on update() / runVideo() to quickly test gstreamer (works!) Tats 2014-04-26 00:07:25 +01:00
  • ed3f476d6b Brutal port of Drone code to try to make video work using gstreamer 0.10 using appsink video Tats 2014-04-25 23:38:46 +01:00
  • 4d3694fe28 Added an option to toggle the display of shape control points Tats 2014-04-10 18:27:40 -04:00
  • a02bb298c3 Forgot to remove unused.h from .pro file Tats 2014-04-10 18:27:09 -04:00
  • 695c351400 Removed useless comment Tats 2014-04-10 17:39:48 -04:00
  • 419834b0ee Removed MainWindow singleton, replacing it with much more appropriate member pointers in custom widgets Tats 2014-04-10 17:39:37 -04:00
  • 4e4483c56c Replaced UNUSED(x) by Q_UNUSED(x). Tats 2014-04-10 01:07:24 -04:00
  • d0f5241fa2 git ignore .app Alexandre Quessy 2014-04-09 19:30:17 -04:00
  • ad7bc89f28 thank you La Francophonie Alexandre Quessy 2014-04-09 19:29:46 -04:00
  • ab0ccb7e49 Mac OS X: build using Qt 5 Alexandre Quessy 2014-04-09 19:28:11 -04:00
  • 93afd7f2df git ignore more files for Mac OS X Alexandre Quessy 2014-04-04 10:27:06 -04:00
  • 14d1768fe4 more to do Alexandre Quessy 2014-04-04 10:26:05 -04:00
  • b02cdc5f35 Merge branch 'master' of github.com:mapmapteam/mapmap Tats 2014-04-04 00:58:06 -04:00
  • 6c1227f4d1 much more to do Alexandre Quessy 2014-04-04 00:55:31 -04:00
  • 3c7407901a Merge branch 'master' of github.com:mapmapteam/mapmap Tats 2014-04-04 00:55:05 -04:00
  • eded602ef9 Fixed bug: texture meshes points were not loaded in the right order Tats 2014-04-04 00:54:17 -04:00
  • 069e5a5e6f update INSTALL with infos for Mac OS X Alexandre Quessy 2014-04-04 00:36:35 -04:00
  • 74efb0dada fix crash on Mac OS X Alexandre Quessy 2014-04-04 00:29:41 -04:00
  • cfb88e6863 Fixes for when we don't have liblo on mac os x Alexandre Quessy 2014-04-03 23:30:51 -04:00
  • 0f3af44953 Merge branch 'master' of github.com:mapmapteam/mapmap multi-image-loop-texture Tats 2014-03-31 15:16:14 -04:00
  • 003469dbab Fixed Maxime's name Tats 2014-03-31 15:16:06 -04:00
  • a7608e5413 mv Math.h Maths.h, caused problems on Mac Alexandre Quessy 2014-03-30 11:50:04 -04:00
  • 56147e265b Merge branch 'master' of github.com:mapmapteam/mapmap Alexandre Quessy 2014-03-22 16:08:04 -04:00
  • c54432694e fix build.sh for some proto Alexandre Quessy 2014-03-22 15:53:37 -04:00
  • edc5f90a79 Merge branch 'master' of github.com:mapmapteam/mapmap Tats 2014-03-22 02:03:25 -04:00
  • 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