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
48082c87d9
fixed shader for windows
2014-04-22 18:06:09 +02:00
7575521e4d
texture on HUD is now drawn correctly
2014-04-22 16:35:17 +02:00
ae304ddc5c
Blending is now much sharper and cleaner..
2014-04-22 10:51:10 +02:00
e2da50b6d9
defined camera in abstract sense
2014-04-21 19:21:13 +02:00
3de372f83f
added fog.
2014-04-21 15:55:22 +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
c1e074934e
WIP-Commit. DOES NOT WORK.
2014-03-24 08:21:30 +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
tpajenka
5da90f83c6
corrected tessEval.shader
2014-02-07 17:15:17 +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
8b7d2d6c1a
forgot shaders -.-
2014-01-21 16:19:07 +01:00
3b8d3f8f9e
tessellationgit status
2014-01-21 16:18:48 +01:00
e59a4cd545
removed test-garbage in shader
2014-01-20 19:44:26 +01:00
18c36491f8
Forgot to init the GL-Context -.-
2014-01-20 19:42:49 +01:00
2193a0e7fd
added normals to shader
2014-01-06 21:13:58 +01:00
a1968ca31a
doh! fragment-shader war rot zu testzwecken -.-
2014-01-05 19:13:27 +01:00
2b2108ab87
merged .. but colors broken..
2014-01-05 19:09:01 +01:00
602b20eb6c
it works...
2014-01-04 16:55:59 +01:00
fd4d2a0d14
TRIANGLEEEEESS!!!!11!!
...
finally.
2014-01-04 14:09:42 +01:00
tpajenka
33b1ec5534
flickering triangle (rendering cube)
2014-01-04 02:53:12 +01:00
7db4bff2e4
moooaaarrr work on triangles ... still nothing
2014-01-04 02:45:13 +01:00
7d201cf216
shaders now compile and link correctly
...
- map still invisible
- frustum defined
- shaders fixed
- attrib-link to shaders fixed
- lookat now generates a frustum-projected look-at matrix
- smaller test-map for debug
2014-01-03 17:46:41 +01:00
e5193fc7c5
Migrated to OpenGL3.x - compiles but renders nothing
...
- added simple shader
- rewrote map to cater BufferArray
- completele rewrote Main
- Split off stuff into Render-Module
- cleaned up .cabal-file to bare minimum
- created RenderObjects for the purpose of moving rendering there
2014-01-03 03:01:54 +01:00
2ff7534ede
wrote some render-functions and shaders
...
- rudimentary vertex and fragment-shader in shaders/..
- created new Render-Module (unfinished and untested)
2014-01-02 03:35:38 +01:00
