Commit Graph

106 Commits

Author SHA1 Message Date
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
8e0450a712 works now again and we have a renderer 2014-03-26 18:48:59 +01: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
fd38727c65 Merge remote-tracking branch 'origin/ui' into tessallation 2014-03-17 19:02:51 +01:00
9aad31d9ec before merging with ui 2014-03-17 19:02:29 +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
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
7b8201374b binary is symlink again 2014-03-05 15:20:16 +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
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
82e9b4d826 Merge branch 'tessallation' into lens
Conflicts:
	Pioneers.cabal
	src/Main.hs
	src/Types.hs
2014-02-28 14:47:04 +01:00
517f2eb0b6 removed SDL-ttf as it breaks for now 2014-02-28 14:44:58 +01:00
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
99f7e1593a corrected deps - may break now forever 2014-02-10 16:41:17 +01:00
e846e13ea7 corrected dependencies 2014-02-10 16:33:52 +01:00
17301f0635 Merge branch 'tessallation' of pwning.de:/pioneers into tessallation 2014-02-10 16:26:51 +01:00
cc6dfb28a7 minor clean 2014-02-10 16:26:03 +01:00
tpajenka
5da90f83c6 corrected tessEval.shader 2014-02-07 17:15:17 +01:00
tpajenka
a7861e9f7b Merge branch 'tessallation' of pwning.de:pioneers into tessallation 2014-02-07 17:08:23 +01:00
tpajenka
47e49660cf changed window position 2014-02-07 17:08:17 +01:00
95a7a5b9f1 forgot files -.- 2014-02-05 21:06:19 +01:00
1126cfc25a moved types to types
- moved types to types
- added callback
- included sdl-ttf
2014-02-05 16:33:32 +01:00
2d97d4e8ca added performance-compile-options
- added various GHC-Option to perform a better compile
- Using LLVM to optimize further
2014-02-04 14:15:15 +01:00
02c02454fd cleaned up
- removed unused imports
- removed unneccessary $
- removed unneccessary ()
- changed variables hiding functions
2014-02-04 14:11:16 +01:00
0d887354d5 added resize-handler, made event-code not as wide 2014-02-04 13:58:12 +01:00
a038139677 forget ni-switch.. 2014-01-22 15:38:25 +01:00
84e8403209 meh .. travis -.- 2014-01-22 15:36:20 +01:00
fe675019ef formatting in yml 2014-01-22 15:33:27 +01:00
a272e583bb travis-changes 2014-01-22 15:28:29 +01:00
98fd45214e added travis.yml 2014-01-22 15:16:08 +01:00
5f313c4495 Window shows fps-count + proc-tex-shader
- added fps to window-name
- hsSDL2 needs update (as i changed functions in there which got merged)
- wrote simplistic procedural texture shader
2014-01-22 14:04:18 +01:00
080776b25c keyboard-controls for tessellation 2014-01-21 16:44:42 +01:00
8b7d2d6c1a forgot shaders -.- 2014-01-21 16:19:07 +01:00
3b8d3f8f9e tessellationgit status 2014-01-21 16:18:48 +01:00
d37409a54e ubuntu wont ship dialog by default.. 2014-01-21 02:22:13 +01:00
83be3c417d formatting in getDeps.sh 2014-01-21 02:20:31 +01:00
490a9b855b changed deps again.. 2014-01-21 02:18:52 +01:00
ebfaa37304 changed deps again.. 2014-01-21 02:15:43 +01:00
1b78a30bd2 clarified COMPILING 2014-01-21 01:10:39 +01:00
1490b25f1f reentered the code for installing libsdl2-2.0.1 as we use functions of it 2014-01-21 01:08:17 +01:00
be89567d4e minor fix in COMPILING 2014-01-21 00:07:50 +01:00
33b06a787d works again like the prototype 2014-01-20 23:18:07 +01:00
83c487c65d updated compiling 2014-01-20 20:12:36 +01:00
6264e526ef window now closes on escape & quit-button 2014-01-20 20:04:21 +01:00
e59a4cd545 removed test-garbage in shader 2014-01-20 19:44:26 +01:00