|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
|
|
3b8d3f8f9e
|
tessellationgit status
|
2014-01-21 16:18:48 +01:00 |
|
|
|
33b06a787d
|
works again like the prototype
|
2014-01-20 23:18:07 +01:00 |
|
|
|
6264e526ef
|
window now closes on escape & quit-button
|
2014-01-20 20:04:21 +01:00 |
|
|
|
60346766fd
|
Forgot to init the GL-Context -.-
|
2014-01-20 19:43:28 +01:00 |
|
|
|
ce055339ec
|
should work - but GL crashes internally somewhere with unlimited allocation of memory
|
2014-01-20 19:28:02 +01:00 |
|
|
|
0c1bdad465
|
window opens .. and crashes! :p
No Events handled yet -.-...
|
2014-01-20 16:11:34 +01:00 |
|
|
|
c01c776e94
|
sdl2 (raw) not used due to clash with SDL2 (hsSDL2), packet-dependencies removed until further problems reoccour
|
2014-01-20 15:03:20 +01:00 |
|
|
|
e56d995958
|
deleted main, wrote script for non-cabal-dependencies
|
2014-01-20 14:12:02 +01:00 |
|
|
|
2193a0e7fd
|
added normals to shader
|
2014-01-06 21:13:58 +01:00 |
|
|
|
db4d55b811
|
changed map a bit for testing
|
2014-01-05 23:26:59 +01:00 |
|
|
|
0c4ac0a2b2
|
map now has normals..
|
2014-01-05 22:37:56 +01:00 |
|
|
|
22fe07e0f3
|
viewport scales with window now
|
2014-01-05 21:26:47 +01:00 |
|
|
|
61ed20c865
|
bigger map
|
2014-01-05 21:09:34 +01:00 |
|
|
|
8622881a13
|
Misc movement
- Scrollwheel now zooms in/out
- Arrow-Keys now move map correctly
- removed most Debug-Output
|
2014-01-05 20:23:22 +01:00 |
|
|
|
a1968ca31a
|
doh! fragment-shader war rot zu testzwecken -.-
|
2014-01-05 19:13:27 +01:00 |
|
|
|
2b2108ab87
|
merged .. but colors broken..
|
2014-01-05 19:09:01 +01:00 |
|
jbrinkro
|
df1fdc60d3
|
finish my work and be thankful! rotation works in special angles so u cant look under the map
|
2014-01-05 03:38:31 +01:00 |
|
tpajenka
|
ee9a8c455a
|
Misc: lookAt corrected (previous: transformation standard camera -> local
camera, now: transformation local camera -> standard camera)
|
2014-01-05 02:20:49 +01:00 |
|
|
|
df9b37429c
|
cameraaaaaaa -.-
|
2014-01-04 23:47:07 +01:00 |
|
|
|
6cc9177082
|
wiered camera
|
2014-01-04 17:57:30 +01:00 |
|
|
|
602b20eb6c
|
it works...
|
2014-01-04 16:55:59 +01:00 |
|
|
|
cde5231e6a
|
whole map..
|
2014-01-04 14:20:26 +01:00 |
|
|
|
f23b4e38fd
|
color!!!
|
2014-01-04 14:16:10 +01:00 |
|
|
|
fd4d2a0d14
|
TRIANGLEEEEESS!!!!11!!
finally.
|
2014-01-04 14:09:42 +01:00 |
|
|
|
47de89ca39
|
here a triangle works -.-
|
2014-01-04 03:14:44 +01:00 |
|
|
|
42e7bd65ac
|
new projection
|
2014-01-04 03:10:06 +01:00 |
|
tpajenka
|
33b1ec5534
|
flickering triangle (rendering cube)
|
2014-01-04 02:53:12 +01:00 |
|
|
|
7db4bff2e4
|
moooaaarrr work on triangles ... still nothing
|
2014-01-04 02:45:13 +01:00 |
|
