github.com/mapmapteam/mapmap-old-branches commits

Added opacity slider for layers (OpenGL not blending properly)

5cecc9d20f7145e820f5658822dde2d7fb8cb3b6 authored about 11 years ago

Small changes to UML (cosmetic)

a03ad557ec6bd197e9739a3a999789313185df3c authored about 11 years ago

Code refactoring to add output shape to property editor

e206ce6108536040158407a6a0d0fa67adfacf08 authored about 11 years ago

Fix: initialize input quad properly

ee46177b1a49713f172f2cdf7d459286ab53880e authored about 11 years ago

Merge branch 'develop' of github.com:libremapping/libremapping into develop

b82ecfd0c5ba68375137c7c62bee272a1b1e6b44 authored about 11 years ago

Include QtPropertyBrowser build in libremapping.pro

9bb6d7bcbc26c4e27ea7b883373513005fa3fa9e authored about 11 years ago

Include QtPropertyBrowser build in libremapping.pro

bffbe2415c0e552fa6213d210ec53f7e1b70075f authored about 11 years ago

Added contributed code QtPropertyBrowser

1551f5cbc1062b958e5d9f62064c2d9392d4af01 authored about 11 years ago

Initialize MainWindow instance in main.cpp

65b956a28d1f1a6521b69061f335136da6ff7e9b authored about 11 years ago

Added basic properties widget for current selected mapper (bidirectional update of input shape vertices, though wrongly initialized)

8502ef3b376ee2e1282574666265e6d882cc6e20 authored about 11 years ago

Replaced signal quadChanged for shapeChanged

cd2639812de4bc1adcdf02c906e141c236896280 authored about 11 years ago

Add map of mappers (forgot to include it in earlier commit)

26866dc9ab39ddf0aba60282ace2c050058c3703 authored about 11 years ago

Small fix: was using mapping id instead of layer id in addLayerItem() call

f5f8b36a1d0ba8df70409bc8578fe979e7c94c15 authored about 11 years ago

Added method MainWindow::updateAll() to update the canvases

8caab2875bd5a566047875573c5a47cccc37aaa9 authored about 11 years ago

Generalized the use of Mapper from within DestinationGLCanvas

3517b7a71d049980e4138d57183756bf3c32e339 authored about 11 years ago

Adjust scalings of splitter elements

28a5521131211efb7179524ef34c60bf4d0cda7f authored about 11 years ago

Fixed seg fault on exit due to MainWindow singleton

29601443936b13fdee103ddfd9ee96ad68d27f29 authored about 11 years ago

Merge branch 'master' into develop

6b8912d03fa813ebb40e6d7148ffe8e4464c255a authored about 11 years ago

Fixed to make it work under OSX

ef05550a53ef368f0651008a69f02666fa9a021a authored about 11 years ago

Merge branch 'sticky-vertices' of github.com:vliaskov/libremapping into develop

Conflicts:
Shape.h
SourceGLCanvas.cpp

4a80c0a328f0ad258665ed0f83c2577f078244d9 authored about 11 years ago

GLCanvas: Implement sticky vertex movement

If the vertex of the current Shape is being moved, it may be useful to "glue" it
to a vertex of ...

b3340e2633b92b3bb2e744068b3b31da8b19abd3 authored about 11 years ago

Reordering of layers with drag and drop

50649d2a404c403e8e59abef8404139c760cd6ef authored about 11 years ago

Checkbox for toggling visibility of layers (+ some cleanup)

dd3189e84718edebefdfcc925cbcfc120e9c3abe authored about 11 years ago

Added Layers (model side)

71ad58787f932263a3eb570e41f76d9939472c3f authored about 11 years ago

Added unique ids to Mapping and Paint

80f2d92eabcafadf59a32c42d0fc7c31255adfa0 authored about 11 years ago

Increased min. width/height fo canvases and set them to 16:9

b988a9a814cf48ba1407766522c0213fc7e4212a authored about 11 years ago

Renamed sourceSplitter for resourceSplitter

30b9f0f09b558903d3facb82a3d00806d71c42fa authored about 11 years ago

Merge branch 'shape-drag' of github.com:vliaskov/libremapping

Conflicts:
MapperGLCanvas.h
Shape.h

3e34947a8809c6fc747cdef4c989e7cfab43e54c authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

e95d1585d177073c81eb18990dec405d60d23fb2 authored about 11 years ago

add index.html (maquette de GUI en HTML)

3181d4ffa391463f6f74f18bae452ddc6c3e4ca8 authored about 11 years ago

Move active_vertex from Shape to MapperGLCanvas

d7c09a5426e050764a85eee5f53e6d2cb3fe939d authored about 11 years ago

Implement shape drag-and-drop

A user may find it useful in some cases to drag and drop a whole shape, instead
of moving each v...

35fb1ca821a29ff72d8c9ced7794b39809b93b6a authored about 11 years ago

Bug fix: When switching to a source that has no mapping attached to it, last selected mapping was still in use

cf95edaf6fa79d68af2b25ea18ccdea0672c2ef7 authored about 11 years ago

Removed some of the "normal" pointers and replaced them by smart pointer to prevent memory problems

8d0473410b343552e7d5ddd0b6eb2da3419e645e authored about 11 years ago

Added support for triangles

0015e237c905d96fee303502429be245e1f4e0c9 authored about 11 years ago

Completed integration of one source -> many quads (everything working)

8b205526fe8e868c316c00526ff902ad60c70e64 authored about 11 years ago

Added quad creation to shapeList (not working yet)

fab560760ef721f68044aeb43a318956275a9362 authored about 11 years ago

Added icons for shape actions

4ca1f190ecb8ed8c0bae7937b318f3ba9b3b7359 authored about 11 years ago

Some cleanup in switching of image source

73d934b4d08b76babfd9d54f747e3ee43865fc9d authored about 11 years ago

- Put all mappings and paints in a single MappingManager class

- Basic compiling / running program (no quads for now)

5a999f19836820dae9f3758620341dcfda56cbdb authored about 11 years ago

Save splitter geometry / state

282f74c08349e52374c75d9290cb53e4fb5f0c69 authored about 11 years ago

Manages resizing correctly (with preferred stretching of the canvases rather than the source list)

4107b38a879c1bcec7acac75c030ac593042ef84 authored about 11 years ago

Set minimum size for canvases

8d2d7749d81174aa76cdde2c95e2d745bbafd01a authored about 11 years ago

Add icons to imported image sources

9ee929a260ecf04e2a45a56cc36d6d568c80546e authored about 11 years ago

Added import of image files (from File menu and toolbar)

5bcefdcf16c529a6810fb9db05c7c7d6196faec4 authored about 11 years ago

Added image resources (icons)

8880a18c7d08fef59849fbd42dccb3b6cd9f375d authored about 11 years ago

Added basic GUI frame: menu, toolbar, resources, status bar, etc.

7b953a74799e201305acf64adf9c67e21b1ddd2e authored about 11 years ago

Merge remote-tracking branch 'vliaskov/click-drag'

7fce243072812cc5d18efea7630af6a9acf91216 authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

Conflicts:
Common.cpp
Common.h
DestinationGLCanvas.cpp
SourceGLCanvas.cpp
main.cpp

fd958cecf28fbfd23212939b8d68f3da20a10bef authored about 11 years ago

Merge remote-tracking branch 'vliaskov/try-to-catch-key'

Conflicts:
prototypes/wx-01-simple/main.cpp

97379366e3c3c72de26597a4c065449c3195a092 authored about 11 years ago

MapperGLCanvas: Add click and drag functionality

Pressing the left-mouse button close enough to a vertex makes that vertex the
current / active o...

74894e59d1994984c0e64db4ad05dbfc33ef4763 authored about 11 years ago

Document with Doxygen

0e73f157f8deee9adf336b992861c224f69b13c9 authored about 11 years ago

add a note

9d1db533fa0e2b5bd8862cd610e315af9c07883d authored about 11 years ago

Add typedefs for std::tr1::shared_ptr<*>

944ede8587b967827a9ff9e652914aa70b46b854 authored about 11 years ago

Add Util::map_[float|int].

Change Util for a namespace, not a class with static methods.

83404dac47a6a830c4eb285a6a7b7fff54065525 authored about 11 years ago

Always draw OpenGL shapes' vertices in a counterclockwise order

ed1056527d2b78fecab1e24dfd8af890e68f35fe authored about 11 years ago

update README

b6bcd27706b7bfaa276914e8e7740eeedb32030c authored about 11 years ago

Use GL_CLAMP, not GL_REPEAT (and other changes)

And also:
* Use glVertex2f, not glVertex3f
* Opening curly brackets on a new line
* spaces betwe...

9d36bc4922571b89f51b2b636d934c62376cada8 authored about 11 years ago

git ignore more files

c70af60c89b7047b2c0edc0b30e4257a6cbc5c05 authored about 11 years ago

Allows selection of the source: changes the source in the canvases

11616282b0aab8f1f7a94433c17b83d15fa53a2d authored about 11 years ago

Automatically added pre-loaded source images to list view

89f8ba130b2ef65e6513d422d544982c4d5ed3f5 authored about 11 years ago

- Added an empty QListView in the layout, with two splitters

- Also created a class for the main window

0ff60f61085fd2ca85468f291b686ddd640af7ac authored about 11 years ago

added GLU dependency

ddf7659678418206a336c47537a3abd0de6bb61b authored about 11 years ago

Remove autotools packaging files

e5e81ec8759ba71a971f42b7c341ffa47ad58b63 authored about 11 years ago

Fix: textures were upside down

3964f7b7d1838b883e5dff4adbc8d127307d0a2c authored about 11 years ago

Changed build to work with Qt4

3addaf07287499eadb28eb7e03af3b9220578e1d authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

Conflicts:
MapperGLCanvas.cpp

485dc54a0039f46daae92aadb0d0095b7939458d authored about 11 years ago

Merge branch 'qt-port'

Conflicts:
MapperGLCanvas.cpp

3889b68ad35a805f0f9dc1f5c95c586e4f54f674 authored about 11 years ago

Correct management of source<->destionation interaction using signals/slots

54c199f8fddfeda622857a63ab014b7b35420cb5 authored about 11 years ago

Done: reproduced the wxwidgets prototype in Qt

4310f297d1c988c62690439f296881223e64c745 authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

17b197e01951ff3286302136ead46a5ca825f6ff authored about 11 years ago

add shm proto

724c1fc67d01cf804004af03e417caab3fa7cff7 authored about 11 years ago

Fix flicker

b57d8b3c02ab671059d8dd7bf7f7990075355f05 authored about 11 years ago

Fix: move lines (focus by clicking)

fbeddb0defaa32ffc6878418b4251523ad45f031 authored about 11 years ago

Basic switch from wxWidget to Qt (not working yet)

5c1ec14662d4ded2ea6e614f5d84dc8e61b0ac6c authored about 11 years ago

Fix filcker

42e839b179cad8caedc093c2b2d627ecda79f1a8 authored about 11 years ago

add HACKING - coding style

8737821e05ca5d27f595302032426c4db0ae99c8 authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

3bd232468ec0ff6c47d5380eb921bbac4635d9af authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

a3e01d6a3b9aed6fc08bc83c92f101fbd6b729c6 authored about 11 years ago

Adding missing test image

4e0fd5463e9d9782c5e7489e234c18619534ee9b authored about 11 years ago

update AUTHORS

34d71f405240281a84b8286ae8ee3c2522d6f01a authored about 11 years ago

update README

b3464860321473cace51c71096bd5531ac7d89bf authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

243ce15d7509576b31a0c916ec4bddf98311986c authored about 11 years ago

add example.png in wx-02-input-output

69edb5bd313ee23d254221060260182e85263b9f authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

00f56d01345e3186e96b4418a4998ab0381ba1f4 authored about 11 years ago

Destination displays all input images

2be974744c2e189f72c655e9a3fc8d7425fa10b4 authored about 11 years ago

Multi-source harcoded: switch between mappings

06ecc20f839ef4572de50b390ef65e6d67a3cca0 authored about 11 years ago

Copy wx-02-input-output to root

32924471e088d79ee4ca842f225d87497b19db42 authored about 11 years ago

Fixed inverted key up/down

2ad95c398cb6791a899bd0161720e9f1e42f89cf authored about 11 years ago

Added some ignores for compressed files

33e80d59fd6fcdc9503fd7d6a556737390025f83 authored about 11 years ago

Centering of quads and textures by default

4c72d3a75c930803560818f84e68d60ae621ad6f authored about 11 years ago

Changed to pixel coordinates

8296e57f40a2c089452c52f0e3cbeaa3151a459e authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

b4f3edd1374c82daaa97ef2d1c39d502f51d4a1e authored about 11 years ago

rename polyline to add "03" prefix

43366d1d24f31f330b43f4322719d899d33671c5 authored about 11 years ago

Add spacer

36a4b90d912741ac00fb5339b9817b9841824ac8 authored about 11 years ago

Merge branch 'master' of github.com:libremapping/libremapping

4f1c7b10a7e9d708207375ef3ec3609b8949a69e authored about 11 years ago

Refresh destination canvas on source canvas change

dbd1c07c679e2ad06fb0e4eed7b09b2f6fb24156 authored about 11 years ago

Fixed color of wireframe in source canvas

6fdb413b7adc62bd34bde635e2df7fe54daa9549 authored about 11 years ago

Included two gl canvas with texture sharing and basic projection

3e5552eb0804f6535837a5da1ea002be84cecdc5 authored about 11 years ago

handle key down events: tab toggles shape style

472018b17db4c19f49e7f4bcf8dda270a6731f81 authored about 11 years ago

Ecosyste.ms: OpenCollective

github.com/mapmapteam/mapmap-old-branches