tpajenka
5be37f6453
moved user event handling into UI/Callbacks.hs
2014-05-01 20:31:15 +02:00
tpajenka
106f50c08d
Merge branch 'master' into ui
...
Conflicts:
src/Types.hs
2014-04-26 20:02:01 +02:00
tpajenka
2d80c92384
finished storing ui widgets into a HashMap and referencing them by UIId.
...
Additionally, widgets functions now use the Pioneers monad.
Branch is compiling again and works.
2014-04-26 19:16:53 +02:00
bd701dde65
Merge branch 'tessallation' of pwning.de:/pioneers into tessallation
2014-04-26 13:56:58 +02:00
782c30a6d5
Merge branch 'iqm' into tessallation
...
Conflicts:
Pioneers.cabal
src/Map/StaticMaps.hs
2014-04-25 21:25:16 +02:00
64d542adf3
more parsing ... -.-
2014-04-25 21:21:19 +02:00
f76da4b5f6
moved generation of GLMapState
...
GLMapState now get generated inside the renderer and takes the
map-data as argument
GLMapState got extended by (up to now) uninitialized and unused textures.
2014-04-24 14:21:25 +02:00
a1389ba524
prepared overview-texture
2014-04-22 16:25:29 +02:00
45e2f3578c
moved draw-method into render and cleaned up imports
2014-04-21 20:25:47 +02:00
06bd9c4214
changed camera to new model
2014-04-21 19:46:24 +02:00
d0ce4dcf6a
fixed compiler warnings.
...
most of them .. not all are my modules.
2014-04-15 17:03:54 +02:00
413c74c0a7
minor stuff
2014-04-15 08:59:53 +02:00
b0e78033e5
rewrote Parser
...
now uses Parser a in Combination with StateT Int64 a yielding
type CParser a = StateT Int64 Parser a
So now the parser Counts how many Bytes get read. This can be
used by the get-function to get the currently read bytes.
2014-04-15 06:43:49 +02:00
40e3b6ed4d
started iqm-parser
...
- can parse header
- can parse initial texts
- can parse mesh-structure
- cannot parse everything else.
2014-04-09 20:04:06 +02:00
a642c78c32
fixed indentation
2014-04-09 17:45:13 +02:00
5ec9db8534
changed x-lens to _x-lens and cabal-info
2014-04-07 17:32:13 +02:00
d59e13e64f
minor
...
- made map more fance
- changed draw-dist, camera start-pos & max cam distance from plane
2014-04-05 23:27:52 +02:00
38d807b9b1
Merge remote-tracking branch 'origin/Mapping' into tessallation
...
Conflicts:
Pioneers.cabal
2014-04-05 23:12:33 +02:00
26903deb19
we can haz GUI?
...
we can.
2014-04-05 23:09:57 +02:00
4811b65a0a
Hud is now transparent pink.
2014-04-05 22:02:48 +02:00
189f9f84fa
Textures work now.
...
Scene gets rendered and alpha-overlayed with HUD-Texture.
fixes #472 @2h
2014-04-05 15:53:49 +02:00
39341bf0f9
removed non-working renderer again.
2014-04-04 11:18:42 +02:00
ba84ede01d
HUD-Texture renders.
...
HUD-Texture renders and the whole screen is black.
Still TODO:
- Will have to sort out alpha
- Clean up
refs #472 @5h
2014-04-04 11:15:00 +02:00
8e0450a712
works now again and we have a renderer
2014-03-26 18:48:59 +01:00
9cd0eacd31
still WIP.
2014-03-24 23:26:02 +01:00
c1e074934e
WIP-Commit. DOES NOT WORK.
2014-03-24 08:21:30 +01:00
fd38727c65
Merge remote-tracking branch 'origin/ui' into tessallation
2014-03-17 19:02:51 +01:00
9aad31d9ec
before merging with ui
2014-03-17 19:02:29 +01:00
5fc86af233
Changed OpenGL-Lvl to 3.30 with Tessellation-Ext
...
- figured out how to enable extensions
refs #471 @1h
2014-03-17 17:04:30 +01:00
e6c6442c85
Merge branch 'tessallation' into mapmerge
...
Conflicts:
src/Main.hs
src/Map/Graphics.hs
2014-03-05 15:02:30 +01:00
5a70a22da6
converted to lenses
2014-03-05 14:42:26 +01:00
tpajenka
be0da410a0
started creating a GUI overlay image
2014-03-05 13:27:48 +01:00
517f2eb0b6
removed SDL-ttf as it breaks for now
2014-02-28 14:44:58 +01:00
d5310478c0
converted Types to Labels
...
- Types is converted to Lebles (monomorphic lenses)
- Main initializes type now
- All other stuff in Main still calls old syntax.
refs #467 @3h
2014-02-23 13:32:20 +01:00
Jonas Betzendahl
be6bdf4522
Forgot some files
2014-02-10 22:00:18 +01:00
tpajenka
a7861e9f7b
Merge branch 'tessallation' of pwning.de:pioneers into tessallation
2014-02-07 17:08:23 +01:00
tpajenka
47e49660cf
changed window position
2014-02-07 17:08:17 +01:00
1126cfc25a
moved types to types
...
- moved types to types
- added callback
- included sdl-ttf
2014-02-05 16:33:32 +01:00
2d97d4e8ca
added performance-compile-options
...
- added various GHC-Option to perform a better compile
- Using LLVM to optimize further
2014-02-04 14:15:15 +01:00
02c02454fd
cleaned up
...
- removed unused imports
- removed unneccessary $
- removed unneccessary ()
- changed variables hiding functions
2014-02-04 14:11:16 +01:00
0d887354d5
added resize-handler, made event-code not as wide
2014-02-04 13:58:12 +01:00
5f313c4495
Window shows fps-count + proc-tex-shader
...
- added fps to window-name
- hsSDL2 needs update (as i changed functions in there which got merged)
- wrote simplistic procedural texture shader
2014-01-22 14:04:18 +01:00
080776b25c
keyboard-controls for tessellation
2014-01-21 16:44:42 +01:00
3b8d3f8f9e
tessellationgit status
2014-01-21 16:18:48 +01:00
33b06a787d
works again like the prototype
2014-01-20 23:18:07 +01:00
6264e526ef
window now closes on escape & quit-button
2014-01-20 20:04:21 +01:00
60346766fd
Forgot to init the GL-Context -.-
2014-01-20 19:43:28 +01:00
ce055339ec
should work - but GL crashes internally somewhere with unlimited allocation of memory
2014-01-20 19:28:02 +01:00
0c1bdad465
window opens .. and crashes! :p
...
No Events handled yet -.-...
2014-01-20 16:11:34 +01:00
c01c776e94
sdl2 (raw) not used due to clash with SDL2 (hsSDL2), packet-dependencies removed until further problems reoccour
2014-01-20 15:03:20 +01:00
