91ad0f5e38
hlint
2014-05-20 11:09:04 +02:00
c2dc6e28f1
cleaned up
2014-05-20 11:01:37 +02:00
9c33af543c
fixed bits & pieces here and there
...
refs #482 @20m
refs #470 @15m
2014-05-20 08:57:42 +02:00
7c8c7cac98
a bit refactoring to get the imperative stuff shorter
...
refs #482 @2h
2014-05-20 00:06:53 +02:00
1cded31ecc
works now again - still renders nothing.
2014-05-19 22:29:16 +02:00
fe73c3a6b0
removed dysfunctional code
2014-05-19 21:45:09 +02:00
324d7037bf
changed much render-code.
...
- mapobjects and map get intitialized different
- added mapobjects-data to Types
refs #482 @3h
2014-05-19 21:42:58 +02:00
3dc26c45eb
Merge branch 'tessallation' into iqm
2014-05-19 19:59:43 +02:00
f6e52d732c
haddock & small fix
...
- some haddock in renderer
- small fix in gamestate-handling function
2014-05-18 07:30:19 +02:00
481a386e0e
Merge branch 'master' into iqm
...
Conflicts:
src/Render/Types.hs
2014-05-17 12:59:35 +02:00
230e31bf63
changed TMVar to TVar
...
- compiles & runs again
2014-05-17 12:57:49 +02:00
27d7873595
reworked Types to support STM
...
- deadlocks somewhere...
2014-05-16 22:05:27 +02:00
2944d36703
changed camera-height
2014-05-16 19:06:05 +02:00
Jonas Betzendahl
5b2537188f
(\_/)
...
=(^.^)=
(")_(") bunny approves this commit!
(rewrote the whole damn camera-height-function.
Should be better now.)
2014-05-16 17:26:40 +02:00
da3a334121
iqm still does not render, starts again.
2014-05-16 09:10:09 +02:00
ee5eb95a2e
builds, but does not work.
...
pattern-match-failure.
2014-05-15 21:57:15 +02:00
e37832371c
WIP, does not compile.
2014-05-15 21:18:28 +02:00
a3f0043591
WIP, does not compile.
2014-05-15 21:16:43 +02:00
d83c87db1d
cam now moves with height.
...
- cam still has NaN-Issues
2014-05-15 15:10:10 +02:00
b5a4d03f8c
array-objects get initialized
...
- initialized array-objects
- still need to be rendered and collected to a VertexBufferObject
refs #482 @2h
2014-05-13 15:04:20 +02:00
1bfec031e2
fixed import
2014-05-13 14:11:02 +02:00
13fbb9b816
minor fixture
2014-05-13 12:52:00 +02:00
dd12f7b136
seperated shaders
...
- shadowmap now uses own shader
- not used only defined
- changed a bit in tyes. needs refinement
- new indices need to be read out and used.
refs #495 @3h
2014-05-13 11:25:06 +02:00
8bd8db922e
added shadow-map
...
- added shadow-map
- compiles and smap gets initialized/generated
- generation ist stil incorrect (cam, light-dir, ...)
2014-05-13 10:40:35 +02:00
e4fec7c3de
forgot change, fixed compiling
2014-05-10 17:35:56 +02:00
a91aad5daa
better noise-function
2014-05-07 10:12:18 +02:00
7dd79f095c
Merge branch 'iqm' into tessallation
...
Conflicts:
src/Render/Render.hs
src/Types.hs
2014-05-07 09:58:43 +02:00
91fbbb7350
started to render iqm - nothing visible now.
2014-05-03 15:17:51 +02:00
1f6551cf08
WIP DOES NOT WORK
2014-05-02 16:15:58 +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
8d9cc3384d
forgot file
2014-04-22 01:27:01 +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
3de372f83f
added fog.
2014-04-21 15:55:22 +02:00
f7dea8e964
haddock now works as well..
2014-04-15 17:28:38 +02:00
d0ce4dcf6a
fixed compiler warnings.
...
most of them .. not all are my modules.
2014-04-15 17:03:54 +02:00
26903deb19
we can haz GUI?
...
we can.
2014-04-05 23:09:57 +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
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
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
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
0c1bdad465
window opens .. and crashes! :p
...
No Events handled yet -.-...
2014-01-20 16:11:34 +01:00
2193a0e7fd
added normals to shader
2014-01-06 21:13:58 +01:00
8622881a13
Misc movement
...
- Scrollwheel now zooms in/out
- Arrow-Keys now move map correctly
- removed most Debug-Output
2014-01-05 20:23:22 +01:00
2b2108ab87
merged .. but colors broken..
2014-01-05 19:09:01 +01:00
