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

141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6104e7349b changed cabal-version back to 1.16 2014-04-14 19:48:40 +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
5077bfd793 changed cabal-info 2014-04-09 17:42:07 +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
tpajenka
2de621d73f forgot to commit a file (GUI data structure experiments) 2014-03-09 13:51:44 +01:00
tpajenka
d4b4f706b6 GUI data structure experiments 2014-03-09 13:46:49 +01:00
jbetzend
3760d77cbb Merge branch 'Mapping' of pwning.de:pioneers into Mapping 2014-03-05 17:52:05 +01:00
jbetzend
e2c0863d65 Added function to convert PlayMap to GraphicsMap 2014-03-05 17:51:13 +01:00
Stefan Dresselhaus
c388e38cc0 binary is symlink again 2014-03-05 15:20:45 +01:00
Stefan Dresselhaus
7b8201374b binary is symlink again 2014-03-05 15:20:16 +01:00
jbetzend
23f75f7ff1 Merge branch 'tessallation' into Mapping 2014-03-05 15:10:17 +01:00
jbetzend
1c1bd66d30 Removed Data.Label from code and dependencies. 2014-03-05 15:09:05 +01:00
Stefan Dresselhaus
e6c6442c85 Merge branch 'tessallation' into mapmerge 
Conflicts:
	src/Main.hs
	src/Map/Graphics.hs
 2014-03-05 15:02:30 +01:00
Stefan Dresselhaus
5a70a22da6 converted to lenses 2014-03-05 14:42:26 +01:00
tpajenka
be0da410a0 started creating a GUI overlay image 2014-03-05 13:27:48 +01:00
tpajenka
734cabb759 system dependant ghc-options 2014-03-04 14:31:00 +01:00
tpajenka
ddb99e3592 removed llvm dependency 2014-02-28 14:56:00 +01:00
Stefan Dresselhaus
82e9b4d826 Merge branch 'tessallation' into lens 
Conflicts:
	Pioneers.cabal
	src/Main.hs
	src/Types.hs
 2014-02-28 14:47:04 +01:00
Stefan Dresselhaus
517f2eb0b6 removed SDL-ttf as it breaks for now 2014-02-28 14:44:58 +01:00
Stefan Dresselhaus
d5310478c0 converted Types to Labels 
- Types is converted to Lebles (monomorphic lenses)
- Main initializes type now
- All other stuff in Main still calls old syntax.

refs #467 @3h
 2014-02-23 13:32:20 +01:00
Jonas Betzendahl
d3e450c7b0 Added first map prototype (unstripyfied), added show instances (for dev), this and that 2014-02-11 12:56:24 +01:00
Jonas Betzendahl
be6bdf4522 Forgot some files 2014-02-10 22:00:18 +01:00
Jonas Betzendahl
3a8d9d2fa2 Fixed Master 2014-02-10 21:13:54 +01:00
Stefan Dresselhaus
99f7e1593a corrected deps - may break now forever 2014-02-10 16:41:17 +01:00