tpajenka
ae1f1d6815
ui: generalized viewport to access camera object via lens
2014-06-20 16:27:11 +02:00
tpajenka
702ea19253
camera is recalculated on mouse action instead of at every frame
2014-06-19 22:24:58 +02:00
tpajenka
8605440539
moved GLMapState: _renderedMapTexture to State: _mapTexture
2014-06-19 17:02:49 +02:00
b095907d9b
tried with WriterT, undid most of it; compiles
2014-06-17 16:37:49 +02:00
5578bb401a
tessallation-factor will now change max once every 5 sec
2014-06-15 03:42:58 +02:00
e512149461
Merge branch 'ui' into iqm
...
Conflicts:
src/UI/UIBase.hs
2014-06-15 03:29:03 +02:00
b3323ef054
live-Coding
2014-05-30 15:26:12 +02:00
tpajenka
c7ea247b70
introducing window resize event, main viewport resizing to actual window size
2014-05-24 13:47:47 +02:00
tpajenka
9761e7c6c2
Merge branch 'master' into ui
...
Conflicts:
src/UI/Callbacks.hs
caused by using TMVar for camera state
2014-05-21 14:57:39 +02:00
tpajenka
9523e733c6
new UI-Widget type: Viewport, removed old hacked code (except mouse wheel) to handle camera movement and using viewport instead
2014-05-21 14:10:47 +02:00
tpajenka
e72e8c9333
more strictness to Types.hs: UIState
2014-05-20 20:38:02 +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
f6e52d732c
haddock & small fix
...
- some haddock in renderer
- small fix in gamestate-handling function
2014-05-18 07:30:19 +02:00
aa6a5c060f
added some helper-functions for handling gamestate
2014-05-17 23:19:34 +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
tpajenka
c17852d8e1
Merge branch 'master' into ui
2014-05-15 21:47:15 +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
tpajenka
45fe3f8493
revising preliminary inflexible button handling callback
2014-05-14 13:19: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
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
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
1f6551cf08
WIP DOES NOT WORK
2014-05-02 16:15:58 +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
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
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
ca831692d2
Merge remote-tracking branch 'origin/master' into Mapping
2014-04-23 14:00:17 +02:00
Jonas Betzendahl
313992efaf
Merged Types with PioneerTypes
2014-04-23 12:11:45 +02:00
a1389ba524
prepared overview-texture
2014-04-22 16:25:29 +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
5ec9db8534
changed x-lens to _x-lens and cabal-info
2014-04-07 17:32:13 +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
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
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
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
jbetzend
1c1bd66d30
Removed Data.Label from code and dependencies.
2014-03-05 15:09:05 +01:00
5a70a22da6
converted to lenses
2014-03-05 14:42:26 +01:00
82e9b4d826
Merge branch 'tessallation' into lens
...
Conflicts:
Pioneers.cabal
src/Main.hs
src/Types.hs
2014-02-28 14:47:04 +01:00
