eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-14 19:49:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
253 Commits 60 Branches 10 Tags
output-window
Commit Graph

45 Commits

Author SHA1 Message Date
Tats
3fd1754776 Removed wxWidget prototypes 2014-03-15 22:05:51 -04: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
Tats
f47ee7765b Merge branch 'develop' 2013-12-12 21:39:58 -05:00
Alexandre Quessy
3842c1b013 add controller.h prototype 2013-12-10 14:38:26 -05:00
Alexandre Quessy
7bd6768918 add a prototype of properties 2013-12-09 13:59:19 -05:00
Alexandre Quessy
3181d4ffa3 add index.html (maquette de GUI en HTML) 2013-12-03 03:31:31 -05:00
Tats
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
Alexandre Quessy
724c1fc67d add shm proto 2013-11-23 19:50:20 -05:00
Alexandre Quessy
243ce15d75 Merge branch 'master' of github.com:libremapping/libremapping 2013-11-23 14:07:49 -05:00
Alexandre Quessy
69edb5bd31 add example.png in wx-02-input-output 2013-11-23 14:07:30 -05:00
Tats
00f56d0134 Merge branch 'master' of github.com:libremapping/libremapping 2013-11-16 12:28:05 +01:00
Tats
2ad95c398c Fixed inverted key up/down 2013-11-15 15:57:00 +01:00
Tats
4c72d3a75c Centering of quads and textures by default 2013-11-15 15:15:07 +01:00
Tats
8296e57f40 Changed to pixel coordinates 2013-11-15 15:14:50 +01:00
Alexandre Quessy
b4f3edd137 Merge branch 'master' of github.com:libremapping/libremapping 2013-11-15 13:45:05 +01:00
Alexandre Quessy
43366d1d24 rename polyline to add "03" prefix 2013-11-15 13:44:49 +01:00
Tats
36a4b90d91 Add spacer 2013-11-15 13:18:42 +01:00
Tats
4f1c7b10a7 Merge branch 'master' of github.com:libremapping/libremapping 2013-11-15 12:08:21 +01:00
Tats
dbd1c07c67 Refresh destination canvas on source canvas change 2013-11-15 12:08:09 +01:00
Tats
6fdb413b7a Fixed color of wireframe in source canvas 2013-11-15 11:50:15 +01:00
Tats
3e5552eb08 Included two gl canvas with texture sharing and basic projection 2013-11-15 11:41:54 +01:00
Alexandre Quessy
472018b17d handle key down events: tab toggles shape style 2013-11-15 10:27:27 +01:00
Tats
4146740aa7 Merge branch 'master' of github.com:libremapping/libremapping 
Conflicts:
	.gitignore
 2013-11-15 10:05:43 +01:00
Tats
370462983b New prototype involving splitting in two GL canvas and basic MVC architecture 2013-11-15 07:31:58 +01:00
Alexandre Quessy
9f0736a6a8 fill when mouse leaves 2013-11-15 02:29:19 +01:00
Alexandre Quessy
2bd81d9736 add marquee + fill 2013-11-15 02:19:32 +01:00
Alexandre Quessy
0a5ddd03ea many polylines 2013-11-15 01:52:54 +01:00
Alexandre Quessy
27e50b6581 draw line up to mouse 2013-11-15 01:24:34 +01:00
Alexandre Quessy
0869988fd8 right click: remove last point 2013-11-15 01:21:00 +01:00
Alexandre Quessy
66844ae53b reindent 2013-11-15 01:12:24 +01:00
Alexandre Quessy
8aac8241eb add wx-polyline proto 2013-11-14 16:20:17 +01:00
Tats
5f2e13a4ab Fixed issue with flickering borders 2013-11-13 12:24:32 +01:00
Tats
ab978fceb3 Placed the source and destination in different corners for the sake of demonstration 2013-11-13 06:42:32 +01:00
Tats
34e8a91d4f Added missing glClearColor(0,0,0,0); 2013-11-13 06:35:05 +01:00
Tats
e0a2d6e78e Added some line strips to see where the projection quads are 2013-11-13 06:34:43 +01:00
Tats
9059d19c5a Working control of source -> destination texture 2013-11-13 06:34:17 +01:00
Tats
c7c67be2c2 Fixed problem where the key events were not catched due to focus not being reset (see http://wxwidgets.10942.n7.nabble.com/wxGLCanvas-Key-events-broken-with-2-8-td25420.html) 2013-11-13 05:39:46 +01:00
Alexandre Quessy
b83f5ad261 trying to catch key events in the app 2013-11-13 02:39:51 +01:00
Tats
697e253ae4 Merge branch 'master' of github.com:libremapping/libremapping 
Conflicts:
	prototypes/wx-01-simple/build.sh
 2013-11-13 02:03:54 +01:00
Tats
6b33088185 Added lib glut and GL 2013-11-13 02:02:17 +01:00
Alexandre Quessy
515d58fc42 port (almost ok) old glfw proto to wx 2013-11-13 01:58:33 +01:00
Alexandre Quessy
1db0e6a1af add proto wx-01-simple 2013-11-13 00:23:07 +01:00
Alexandre Quessy
26ae4e750a Add prototype with glfw 2013-09-18 15:50:29 -04:00
Alexandre Quessy
4a74a1ec21 add a gtkglext prototype 2013-09-18 15:14:26 -04:00
Alexandre Quessy
d801ba33eb Add a prototype using SDL 2013-09-18 15:14:21 -04:00