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
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
a57cada945
changed SDL to qualified import
2014-05-10 20:22:49 +02:00
e4fec7c3de
forgot change, fixed compiling
2014-05-10 17:35:56 +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
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
91fbbb7350
started to render iqm - nothing visible now.
2014-05-03 15:17:51 +02:00
8147aa8200
Merge branch 'master' into tessallation
2014-05-03 14:34:46 +02:00
2150e8d7af
reworked compiling. Now ships with build.sh
2014-05-02 18:00:33 +02:00
23eb808fa6
changed getDeps.sh for Ubuntu 14.04
2014-05-02 16:51:27 +02:00
1f6551cf08
WIP DOES NOT WORK
2014-05-02 16:15:58 +02:00
tpajenka
f35f3895f5
Merge branch 'master' into ui
2014-05-01 20:31:58 +02:00
tpajenka
5be37f6453
moved user event handling into UI/Callbacks.hs
2014-05-01 20:31:15 +02:00
tpajenka
a3fe5a1d8b
compiler warning and HLint remarks
2014-05-01 19:25:04 +02:00
Jonas Betzendahl
b3c25a1326
Fixed Pioneers.cabal (hopefully)
2014-04-27 22:29:20 +02:00
c4b5e69fcf
added dependencies forgotten in readme
2014-04-26 21:33:28 +02:00
3829cde59c
readme .. hopefully the last time
2014-04-26 20:48:56 +02:00
8db4004a8f
readmeeeee
2014-04-26 20:47:36 +02:00
tpajenka
106f50c08d
Merge branch 'master' into ui
...
Conflicts:
src/Types.hs
2014-04-26 20:02:01 +02:00
tpajenka
d5eb4f93a3
removed unnecessary language extension
2014-04-26 19:58:20 +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
bd582ac84b
even more readme..
2014-04-26 17:44:41 +02:00
93018173f6
readme
2014-04-26 17:42:35 +02:00
8a3597f754
moooaaar Readme
2014-04-26 17:40:08 +02:00
160c6e3ae8
rewrote readme, enhanced .gitignore
2014-04-26 17:33:17 +02:00
5898df3682
Merge branch 'iqm' into tessallation
2014-04-26 17:16:47 +02:00
5223c34da2
100% Haddock
2014-04-26 17:12:19 +02:00
2e22e77d75
memory gets allocated and written.
...
No garantuee for correctness....
2014-04-26 16:52:32 +02:00
bd701dde65
Merge branch 'tessallation' of pwning.de:/pioneers into tessallation
2014-04-26 13:56:58 +02:00
a81418bf40
iqm does not work .. :(
2014-04-26 00:15:36 +02:00
e6a56b8409
more iqm - not tested, but typechecks and builds.
2014-04-25 23:58:20 +02:00
0af848996a
Merge remote-tracking branch 'origin/Mapping' into iqm
2014-04-25 21:26:54 +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
Jonas Betzendahl
60fd217233
hlint all around
2014-04-25 15:58:25 +02:00
tpajenka
6879201c53
worked on storing widgets in HashMap and referencing via Id
...
incorporated Pioneers monad into ui operations
!!still WIP, does not compile (TODO: UIOperations, Callbacks, Main?,
Types?)!!
2014-04-24 23:42:05 +02:00
dc4fc1238b
Merge remote-tracking branch 'origin/Mapping' into tessallation
2014-04-24 14:26:29 +02:00
Jonas Betzendahl
a727131f13
Forgot Combinator module
2014-04-24 14:24:20 +02:00
2ecf4fe5c4
Merge remote-tracking branch 'origin/Mapping' into tessallation
2014-04-24 14:22:27 +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
Jonas Betzendahl
0a7a882f8f
Now generates a different unique map each time.
2014-04-24 12:44:58 +02:00
Jonas Betzendahl
2b435b7cb2
Added first primitive groundwork for map generation combinators. This is gonna be fun! :o)
2014-04-24 02:45:55 +02:00
