Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
342 Commits 3 Branches 0 Tags
1ad81d6ae5cc7d97dd663b23c2b5d1b58d68294b
Commit Graph

280 Commits

Author SHA1 Message Date
Stefan Dresselhaus
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
Jonas Betzendahl
ca831692d2 Merge remote-tracking branch 'origin/master' into Mapping 2014-04-23 14:00:17 +02:00
Jonas Betzendahl
fa9bda5e7a Added apply-by functions 2014-04-23 13:52:43 +02:00
tpajenka
a9a97f7544 started referencing ui widgets by id via hashmap, WIP, does not compile 2014-04-23 13:08:18 +02:00
Jonas Betzendahl
313992efaf Merged Types with PioneerTypes 2014-04-23 12:11:45 +02:00
jbetzend
b7fef589a9 commit 2014-04-23 11:23:24 +02:00
Stefan Dresselhaus
a1389ba524 prepared overview-texture 2014-04-22 16:25:29 +02:00
Stefan Dresselhaus
1bbf900ec4 changed map a bit 2014-04-22 11:27:07 +02:00
Jonas Betzendahl
5d36bb5156 Added stripify, TestMap now looking like it should (still not pretty, though), cleanup, docs 2014-04-22 03:00:39 +02:00
Stefan Dresselhaus
8d9cc3384d forgot file 2014-04-22 01:27:01 +02:00
Stefan Dresselhaus
89c624012f Merge remote-tracking branch 'origin/Mapping' into tessallation 
Conflicts:
	src/Map/Graphics.hs
 2014-04-22 01:17:22 +02:00
Jonas Betzendahl
673c64946b Merge with master 2014-04-22 01:09:09 +02:00
Stefan Dresselhaus
45e2f3578c moved draw-method into render and cleaned up imports 2014-04-21 20:25:47 +02:00
Stefan Dresselhaus
06bd9c4214 changed camera to new model 2014-04-21 19:46:24 +02:00
Jonas Betzendahl
e451281e40 Jiggled code enough to reduce compiler warnings 2014-04-21 19:16:24 +02:00
Stefan Dresselhaus
3de372f83f added fog. 2014-04-21 15:55:22 +02:00
Stefan Dresselhaus
85e1fe6325 Merge remote-tracking branch 'origin/Mapping' into tessallation 
Conflicts:
	src/Map/Graphics.hs
 2014-04-21 15:11:41 +02:00
jbetzend
ebae8dd593 Added Map.Maps with Neighbourfunction 2014-04-18 16:07:51 +02:00
jbetzend
ee8c91237c Took out annotation (Haddock complained) and improved path type 2014-04-18 16:07:26 +02:00
jbetzend
a2433638df docs 2014-04-18 14:28:32 +02:00
Stefan Dresselhaus
e5857e8435 changed massively in Types of IQM-Loader 
- massive Type-Change internally
- VertexArrays are now read headerwise

- IQM needs postprocessing for allocating C-Arrays of the Vertex-Objects
as they cannot be guaranteed to be collected in the first pass of reading.
(Normally they are sorted linear - but the offsets WOULD allow for them
to be anywhere in-between the sections)
 2014-04-16 21:21:08 +02:00
Stefan Dresselhaus
dc0ed4770a haddock for iqm (so far) complete 2014-04-16 13:45:14 +02:00
Stefan Dresselhaus
ae5ea60d65 added more haddock 2014-04-16 13:31:03 +02:00
Stefan Dresselhaus
f7dea8e964 haddock now works as well.. 2014-04-15 17:28:38 +02:00
Stefan Dresselhaus
d0ce4dcf6a fixed compiler warnings. 
most of them .. not all are my modules.
 2014-04-15 17:03:54 +02:00
Stefan Dresselhaus
413c74c0a7 minor stuff 2014-04-15 08:59:53 +02:00
Stefan Dresselhaus
7b54ec9006 improved Parser and added documentation 2014-04-15 07:17:45 +02:00
Stefan Dresselhaus
b0e78033e5 rewrote Parser 
now uses Parser a in Combination with StateT Int64 a yielding
type CParser a = StateT Int64 Parser a

So now the parser Counts how many Bytes get read. This can be
used by the get-function to get the currently read bytes.
 2014-04-15 06:43:49 +02:00
Stefan Dresselhaus
40e3b6ed4d started iqm-parser 
- can parse header
- can parse initial texts
- can parse mesh-structure
- cannot parse everything else.
 2014-04-09 20:04:06 +02:00
Stefan Dresselhaus
a642c78c32 fixed indentation 2014-04-09 17:45:13 +02:00
Stefan Dresselhaus
5ec9db8534 changed x-lens to _x-lens and cabal-info 2014-04-07 17:32:13 +02:00
Stefan Dresselhaus
d59e13e64f minor 
- made map more fance
- changed draw-dist, camera start-pos & max cam distance from plane
 2014-04-05 23:27:52 +02:00
Stefan Dresselhaus
38d807b9b1 Merge remote-tracking branch 'origin/Mapping' into tessallation 
Conflicts:
	Pioneers.cabal
 2014-04-05 23:12:33 +02:00
Stefan Dresselhaus
26903deb19 we can haz GUI? 
we can.
 2014-04-05 23:09:57 +02:00
Stefan Dresselhaus
a24b562a88 Merge branch 'ui' into tessallation 2014-04-05 22:03:47 +02:00
Stefan Dresselhaus
4811b65a0a Hud is now transparent pink. 2014-04-05 22:02:48 +02:00
Stefan Dresselhaus
189f9f84fa Textures work now. 
Scene gets rendered and alpha-overlayed with HUD-Texture.

fixes #472 @2h
 2014-04-05 15:53:49 +02:00
tpajenka
d8967b1b4b refined button handling 2014-04-04 15:47:16 +02:00
Stefan Dresselhaus
39341bf0f9 removed non-working renderer again. 2014-04-04 11:18:42 +02:00
Stefan Dresselhaus
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
tpajenka
1898758eb5 basic gui working... somehow (no painting yet) 2014-04-03 20:05:49 +02:00
jbetzend
4ffab54d04 Fixed bug with non-exhaustive tile matching 2014-03-28 14:05:28 +01:00
Stefan Dresselhaus
8e0450a712 works now again and we have a renderer 2014-03-26 18:48:59 +01:00
Stefan Dresselhaus
9cd0eacd31 still WIP. 2014-03-24 23:26:02 +01:00
Stefan Dresselhaus
c1e074934e WIP-Commit. DOES NOT WORK. 2014-03-24 08:21:30 +01:00
Stefan Dresselhaus
fd38727c65 Merge remote-tracking branch 'origin/ui' into tessallation 2014-03-17 19:02:51 +01:00
Stefan Dresselhaus
9aad31d9ec before merging with ui 2014-03-17 19:02:29 +01:00
Stefan Dresselhaus
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