fd958cecf2
Merge branch 'master' of github.com:libremapping/libremapping
...
Conflicts:
Common.cpp
Common.h
DestinationGLCanvas.cpp
SourceGLCanvas.cpp
main.cpp
2013-11-29 12:09:49 -05:00
97379366e3
Merge remote-tracking branch 'vliaskov/try-to-catch-key'
...
Conflicts:
prototypes/wx-01-simple/main.cpp
2013-11-29 11:49:48 -05:00
0e73f157f8
Document with Doxygen
2013-11-27 01:33:04 -05:00
9d1db533fa
add a note
2013-11-26 22:33:10 -05:00
944ede8587
Add typedefs for std::tr1::shared_ptr<*>
2013-11-26 22:25:11 -05:00
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
ed1056527d
Always draw OpenGL shapes' vertices in a counterclockwise order
2013-11-26 22:08:02 -05:00
b6bcd27706
update README
2013-11-26 22:04:39 -05:00
9d36bc4922
Use GL_CLAMP, not GL_REPEAT (and other changes)
...
And also:
* Use glVertex2f, not glVertex3f
* Opening curly brackets on a new line
* spaces between most operators
* avoir some very long lines, or indentations
2013-11-26 21:46:08 -05:00
c70af60c89
git ignore more files
2013-11-26 21:31:58 -05:00
11616282b0
Allows selection of the source: changes the source in the canvases
2013-11-26 13:38:36 -05:00
89f8ba130b
Automatically added pre-loaded source images to list view
2013-11-25 23:43:59 -05:00
0ff60f6108
- Added an empty QListView in the layout, with two splitters
...
- Also created a class for the main window
2013-11-25 23:16:32 -05:00
ddf7659678
added GLU dependency
2013-11-25 22:10:18 -05:00
e5e81ec875
Remove autotools packaging files
2013-11-24 14:01:29 -05:00
3964f7b7d1
Fix: textures were upside down
2013-11-24 11:02:11 -05:00
3addaf0728
Changed build to work with Qt4
2013-11-24 10:39:16 -05:00
485dc54a00
Merge branch 'master' of github.com:libremapping/libremapping
...
Conflicts:
MapperGLCanvas.cpp
2013-11-24 10:35:35 -05:00
3889b68ad3
Merge branch 'qt-port'
...
Conflicts:
MapperGLCanvas.cpp
2013-11-24 10:34:36 -05:00
54c199f8fd
Correct management of source<->destionation interaction using signals/slots
2013-11-24 09:27:28 -05:00
4310f297d1
Done: reproduced the wxwidgets prototype in Qt
2013-11-23 23:16:04 -05:00
17b197e019
Merge branch 'master' of github.com:libremapping/libremapping
2013-11-23 19:50:27 -05:00
724c1fc67d
add shm proto
2013-11-23 19:50:20 -05:00
b57d8b3c02
Fix flicker
2013-11-23 19:31:40 -05:00
fbeddb0def
Fix: move lines (focus by clicking)
2013-11-23 17:43:12 -05:00
5c1ec14662
Basic switch from wxWidget to Qt (not working yet)
2013-11-23 17:37:59 -05:00
42e839b179
Fix filcker
2013-11-23 15:23:11 -05:00
8737821e05
add HACKING - coding style
2013-11-23 15:18:30 -05:00
3bd232468e
Merge branch 'master' of github.com:libremapping/libremapping
2013-11-23 14:19:29 -05:00
a3e01d6a3b
Merge branch 'master' of github.com:libremapping/libremapping
2013-11-23 14:18:32 -05:00
4e0fd5463e
Adding missing test image
2013-11-23 14:18:09 -05:00
34d71f4052
update AUTHORS
2013-11-23 14:16:01 -05:00
b346486032
update README
2013-11-23 14:15:38 -05:00
243ce15d75
Merge branch 'master' of github.com:libremapping/libremapping
2013-11-23 14:07:49 -05:00
69edb5bd31
add example.png in wx-02-input-output
2013-11-23 14:07:30 -05:00
00f56d0134
Merge branch 'master' of github.com:libremapping/libremapping
2013-11-16 12:28:05 +01:00
2be974744c
Destination displays all input images
2013-11-16 11:55:58 +01:00
06ecc20f83
Multi-source harcoded: switch between mappings
2013-11-16 11:41:39 +01:00
32924471e0
Copy wx-02-input-output to root
2013-11-15 16:12:22 +01:00
2ad95c398c
Fixed inverted key up/down
2013-11-15 15:57:00 +01:00
33e80d59fd
Added some ignores for compressed files
2013-11-15 15:15:26 +01:00
4c72d3a75c
Centering of quads and textures by default
2013-11-15 15:15:07 +01:00
8296e57f40
Changed to pixel coordinates
2013-11-15 15:14:50 +01:00
b4f3edd137
Merge branch 'master' of github.com:libremapping/libremapping
2013-11-15 13:45:05 +01:00
43366d1d24
rename polyline to add "03" prefix
2013-11-15 13:44:49 +01:00
36a4b90d91
Add spacer
2013-11-15 13:18:42 +01:00
4f1c7b10a7
Merge branch 'master' of github.com:libremapping/libremapping
2013-11-15 12:08:21 +01:00
dbd1c07c67
Refresh destination canvas on source canvas change
2013-11-15 12:08:09 +01:00
6fdb413b7a
Fixed color of wireframe in source canvas
2013-11-15 11:50:15 +01:00
3e5552eb08
Included two gl canvas with texture sharing and basic projection
2013-11-15 11:41:54 +01:00
Tats