Stefan Dresselhaus
|
c9ef745a72
|
Merge branch 'master' into iqm
|
2014-08-08 20:23:05 +02:00 |
|
Stefan Dresselhaus
|
c1605fb400
|
updated README.
|
2014-08-08 20:22:43 +02:00 |
|
Stefan Dresselhaus
|
1bc65c8ea7
|
added triangles to IQM-Parsing
- Models should now use the right "drawElements"-Method
- still no sign of our box-model
|
2014-08-08 20:13:31 +02:00 |
|
Stefan Dresselhaus
|
138d16016b
|
tried lot of stuff.. nothing worked.
|
2014-07-08 15:32:14 +02:00 |
|
Stefan Dresselhaus
|
aedb5b5337
|
Merge remote-tracking branch 'origin/ui' into iqm
|
2014-07-07 15:23:13 +02:00 |
|
Stefan Dresselhaus
|
81131de915
|
changed to wireframe-rendering
|
2014-07-07 15:22:57 +02:00 |
|
tpajenka
|
ae1f1d6815
|
ui: generalized viewport to access camera object via lens
|
2014-06-20 16:27:11 +02:00 |
|
tpajenka
|
41e75dcdeb
|
upper bound of 0.001s for frame diff time (Main.hs), added second viewport widget to GUI (currently just an empty shell)
|
2014-06-20 00:19:02 +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 |
|
Stefan Dresselhaus
|
b095907d9b
|
tried with WriterT, undid most of it; compiles
|
2014-06-17 16:37:49 +02:00 |
|
Stefan Dresselhaus
|
13b814fa0a
|
TessallationFactor now gets updated correcty
|
2014-06-17 15:41:17 +02:00 |
|
Stefan Dresselhaus
|
5578bb401a
|
tessallation-factor will now change max once every 5 sec
|
2014-06-15 03:42:58 +02:00 |
|
Stefan Dresselhaus
|
e512149461
|
Merge branch 'ui' into iqm
Conflicts:
src/UI/UIBase.hs
|
2014-06-15 03:29:03 +02:00 |
|
Stefan Dresselhaus
|
3cd3ba55f9
|
disabled culling
|
2014-06-11 00:07:06 +02:00 |
|
Stefan Dresselhaus
|
32f1043d7c
|
minor cleanup
|
2014-06-10 23:37:05 +02:00 |
|
Stefan Dresselhaus
|
1e9c6a24fd
|
minor
- fixed imports
- cleaned debug-info. now not binary anymore, but readable
|
2014-06-10 23:15:59 +02:00 |
|
Stefan Dresselhaus
|
4bbf80ecab
|
not changing to Data.Vector and staying on C-Array
- added Print-Function for Float-C-Arrays
|
2014-06-10 22:59:48 +02:00 |
|
Stefan Dresselhaus
|
d8747c0bd3
|
minor cleanup
|
2014-06-02 08:11:44 +02:00 |
|
Stefan Dresselhaus
|
ac832268ca
|
iqm now gets read in more correctly
before only the first vertex/normal/.. was read in.
|
2014-06-01 23:22:12 +02:00 |
|
Stefan Dresselhaus
|
eaeae7d4e2
|
cleanup & debug-output
|
2014-06-01 23:13:28 +02:00 |
|
Stefan Dresselhaus
|
fc72fd8095
|
corrected compile-mistakes due to indentation
|
2014-06-01 23:05:39 +02:00 |
|
Stefan Dresselhaus
|
6bb915c25c
|
added sample box-model with all files
|
2014-06-01 23:02:15 +02:00 |
|
Stefan Dresselhaus
|
3db6d6f9eb
|
live-Coding
|
2014-05-30 15:28:09 +02:00 |
|
Stefan Dresselhaus
|
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
|
03d99c5fcc
|
bugfix mouse motion handler: handler has been invoked with wrong coordinates, motion handler is now also called while leaving while still mouse-active
|
2014-05-21 14:03:28 +02:00 |
|
tpajenka
|
8a84e7ba95
|
press/release handlers receive boolean as parameter to indicate if the click is inside widget
|
2014-05-21 11:51:40 +02:00 |
|
tpajenka
|
e72e8c9333
|
more strictness to Types.hs: UIState
|
2014-05-20 20:38:02 +02:00 |
|
tpajenka
|
74fc3af201
|
haddock
|
2014-05-20 20:34:05 +02:00 |
|
Stefan Dresselhaus
|
91ad0f5e38
|
hlint
|
2014-05-20 11:09:04 +02:00 |
|
Stefan Dresselhaus
|
c2dc6e28f1
|
cleaned up
|
2014-05-20 11:01:37 +02:00 |
|
Stefan Dresselhaus
|
9c33af543c
|
fixed bits & pieces here and there
refs #482 @20m
refs #470 @15m
|
2014-05-20 08:57:42 +02:00 |
|
Stefan Dresselhaus
|
cea71238f1
|
played a bit with shaders .. won't render.
|
2014-05-20 00:12:16 +02:00 |
|
Stefan Dresselhaus
|
7c8c7cac98
|
a bit refactoring to get the imperative stuff shorter
refs #482 @2h
|
2014-05-20 00:06:53 +02:00 |
|
Stefan Dresselhaus
|
1cded31ecc
|
works now again - still renders nothing.
|
2014-05-19 22:29:16 +02:00 |
|
Stefan Dresselhaus
|
fe73c3a6b0
|
removed dysfunctional code
|
2014-05-19 21:45:09 +02:00 |
|
Stefan Dresselhaus
|
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 |
|
Stefan Dresselhaus
|
3dc26c45eb
|
Merge branch 'tessallation' into iqm
|
2014-05-19 19:59:43 +02:00 |
|
Stefan Dresselhaus
|
f6e52d732c
|
haddock & small fix
- some haddock in renderer
- small fix in gamestate-handling function
|
2014-05-18 07:30:19 +02:00 |
|
Stefan Dresselhaus
|
bb75883f7d
|
Merge branch 'master' into tessallation
|
2014-05-18 07:27:54 +02:00 |
|
Stefan Dresselhaus
|
ef549eac4d
|
fixed haddock for UI
|
2014-05-18 00:14:19 +02:00 |
|
Stefan Dresselhaus
|
aa6a5c060f
|
added some helper-functions for handling gamestate
|
2014-05-17 23:19:34 +02:00 |
|
Stefan Dresselhaus
|
481a386e0e
|
Merge branch 'master' into iqm
Conflicts:
src/Render/Types.hs
|
2014-05-17 12:59:35 +02:00 |
|
Stefan Dresselhaus
|
35364b50aa
|
Merge branch 'STM'
|
2014-05-17 12:58:23 +02:00 |
|
Stefan Dresselhaus
|
230e31bf63
|
changed TMVar to TVar
- compiles & runs again
|
2014-05-17 12:57:49 +02:00 |
|
Stefan Dresselhaus
|
0d65a485d5
|
changed constant in Map.Map
|
2014-05-17 11:40:23 +02:00 |
|
Stefan Dresselhaus
|
27d7873595
|
reworked Types to support STM
- deadlocks somewhere...
|
2014-05-16 22:05:27 +02:00 |
|