Commit Graph

259 Commits

Author SHA1 Message Date
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
5b9378c317 Merge branch 'ui' into tessallation 2014-05-15 15:19:02 +02:00
d83c87db1d
cam now moves with height.
- cam still has NaN-Issues
2014-05-15 15:10:10 +02:00
b7be183c25 Merge branch 'Mapping' into tessallation 2014-05-15 13:41:19 +02:00
cc3efb9ec5
merged 2014-05-15 13:40:47 +02:00
Jonas Betzendahl
8e2d46c7ef Fixed the hell out of that snow! 2014-05-15 12:06:18 +02:00
Jonas Betzendahl
eb3ee975e8 Restructured Node constructors. Ripples are getting worse! (╯°□°)╯︵ ┻━┻ 2014-05-15 12:01:30 +02:00
Jonas Betzendahl
67428146ca added height function 2014-05-15 10:44:54 +02:00
87946cb501
modified camara-height-limit to reflect later game better 2014-05-14 20:13:40 +02:00
db0631eb4b
forgot file 2014-05-14 20:04:06 +02:00
tpajenka
45fe3f8493 revising preliminary inflexible button handling callback 2014-05-14 13:19:00 +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
4d31866256 Merge branch 'tessallation' into iqm 2014-05-13 14:11:25 +02:00
1bfec031e2
fixed import 2014-05-13 14:11:02 +02:00
527d620da6 Merge branch 'Mapping' into tessallation 2014-05-13 13:04:26 +02:00
f598d72e9a
changed num mountains and height 2014-05-13 13:03:28 +02:00
ddd55ef004 Merge remote-tracking branch 'origin/Mapping' into tessallation 2014-05-13 12:53:09 +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
dba5c9d809
removed debug-print 2014-05-12 11:30:29 +02:00
ffc0281ab4
frame-limiter now works correctly, scaling up/down should be smoother 2014-05-11 21:12:53 +02:00
d1adff31d5
removed some print-foo 2014-05-11 12:38:39 +02:00
91e6435c9a Merge branch 'tessallation' 2014-05-11 10:53:45 +02:00
8dea8d1ed9
refined shaders
- grid is now visible
- grid-points are different colored
- tesselated triangles wont get "gridded".
2014-05-11 10:52:45 +02:00
a492b0aa93 Merge branch 'tessallation' 2014-05-10 20:23:06 +02:00
a57cada945
changed SDL to qualified import 2014-05-10 20:22:49 +02:00
ddd7013db4 Merge branch 'tessallation' 2014-05-10 17:36:13 +02:00
e4fec7c3de forgot change, fixed compiling 2014-05-10 17:35:56 +02:00
5e72dbedd0 Merge branch 'tessallation' 2014-05-10 17:35:42 +02:00
bd7870a76e
forgot change 2014-05-10 17:33:33 +02:00
502e3efdf3 Merge branch 'iqm' 2014-05-10 11:34:18 +02:00
6dcdb2eda2 Merge branch 'ui' 2014-05-10 11:19:31 +02:00
tpajenka
5f29ce7610 mouse events use local widget coordinates 2014-05-09 00:17:31 +02:00
tpajenka
75edc11a1e fixed some HLint messages 2014-05-08 23:38:47 +02:00
tpajenka
992c8fd041 purpose dependent widget states and widget actions are now stored inside HashMaps 2014-05-08 23:36:53 +02:00
Jonas Betzendahl
6fe3e3305a Merge branch 'Mapping' 2014-05-08 15:19:33 +02:00
adb2c5d373
noise entfernt 2014-05-07 10:28:44 +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
376375008c
tessellation-factor is now adaptive
- tessellation gets reduced in distance
- tess-factor is now adaptive
2014-05-07 09:51:35 +02:00
ea09cd1a97 Merge remote-tracking branch 'origin/ui' 2014-05-06 11:31:12 +02:00
c37a49a948
added missing hsSDL2-stuff to dependencies. 2014-05-05 08:19:07 +02:00
f7cc34b3a0
first try at adaptive performance 2014-05-05 08:11:33 +02:00
tpajenka
e292633ce4 widget coordinates are now local (offset based on parent component) 2014-05-03 22:40:49 +02:00
tpajenka
aba45d5ca7 Merge branch 'master' into ui 2014-05-03 15:28:25 +02:00
tpajenka
ad0e569537 renamed modules after restructuring UI data 2014-05-03 15:22:20 +02:00
tpajenka
ca51c23650 restructured GUI widgets' data representation from class type/instance-based
to function-based
advantage: single constructor for any widget type, no branching necessary
2014-05-03 15:21:58 +02:00