1f6551cf08
WIP DOES NOT WORK
2014-05-02 16:15:58 +02:00
tpajenka
5be37f6453
moved user event handling into UI/Callbacks.hs
2014-05-01 20:31:15 +02:00
tpajenka
a3fe5a1d8b
compiler warning and HLint remarks
2014-05-01 19:25:04 +02:00
Jonas Betzendahl
683b72a413
Refactoring & more cosmetics
2014-04-29 01:05:05 +02:00
Jonas Betzendahl
6c4e63f085
cosmetics
2014-04-29 00:18:38 +02:00
Jonas Betzendahl
853c11b4df
Merge branch 'testing' into Mapping
2014-04-28 23:36:41 +02:00
Jonas Betzendahl
49518e3006
Merge branch 'testing' into Mapping
2014-04-28 23:35:14 +02:00
Jonas Betzendahl
07dac9aad1
Added first test suite for Mapping
2014-04-28 16:34:13 +02:00
Jonas Betzendahl
777c868de0
Fixed shadowing in aplAll
2014-04-28 10:37:31 +02:00
Jonas Betzendahl
f5f1f760cd
Added first test suite with first test (questionable .cabal though)
2014-04-27 23:49:15 +02:00
tpajenka
106f50c08d
Merge branch 'master' into ui
...
Conflicts:
src/Types.hs
2014-04-26 20:02:01 +02:00
tpajenka
d5eb4f93a3
removed unnecessary language extension
2014-04-26 19:58:20 +02:00
tpajenka
2d80c92384
finished storing ui widgets into a HashMap and referencing them by UIId.
...
Additionally, widgets functions now use the Pioneers monad.
Branch is compiling again and works.
2014-04-26 19:16:53 +02:00
5898df3682
Merge branch 'iqm' into tessallation
2014-04-26 17:16:47 +02:00
5223c34da2
100% Haddock
2014-04-26 17:12:19 +02:00
2e22e77d75
memory gets allocated and written.
...
No garantuee for correctness....
2014-04-26 16:52:32 +02:00
bd701dde65
Merge branch 'tessallation' of pwning.de:/pioneers into tessallation
2014-04-26 13:56:58 +02:00
a81418bf40
iqm does not work .. :(
2014-04-26 00:15:36 +02:00
e6a56b8409
more iqm - not tested, but typechecks and builds.
2014-04-25 23:58:20 +02:00
0af848996a
Merge remote-tracking branch 'origin/Mapping' into iqm
2014-04-25 21:26:54 +02:00
782c30a6d5
Merge branch 'iqm' into tessallation
...
Conflicts:
Pioneers.cabal
src/Map/StaticMaps.hs
2014-04-25 21:25:16 +02:00
64d542adf3
more parsing ... -.-
2014-04-25 21:21:19 +02:00
Jonas Betzendahl
60fd217233
hlint all around
2014-04-25 15:58:25 +02:00
tpajenka
6879201c53
worked on storing widgets in HashMap and referencing via Id
...
incorporated Pioneers monad into ui operations
!!still WIP, does not compile (TODO: UIOperations, Callbacks, Main?,
Types?)!!
2014-04-24 23:42:05 +02:00
dc4fc1238b
Merge remote-tracking branch 'origin/Mapping' into tessallation
2014-04-24 14:26:29 +02:00
Jonas Betzendahl
a727131f13
Forgot Combinator module
2014-04-24 14:24:20 +02:00
2ecf4fe5c4
Merge remote-tracking branch 'origin/Mapping' into tessallation
2014-04-24 14:22:27 +02:00
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
a1389ba524
prepared overview-texture
2014-04-22 16:25:29 +02:00
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
8d9cc3384d
forgot file
2014-04-22 01:27:01 +02:00
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
45e2f3578c
moved draw-method into render and cleaned up imports
2014-04-21 20:25:47 +02:00
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
3de372f83f
added fog.
2014-04-21 15:55:22 +02:00
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
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
dc0ed4770a
haddock for iqm (so far) complete
2014-04-16 13:45:14 +02:00
ae5ea60d65
added more haddock
2014-04-16 13:31:03 +02:00
f7dea8e964
haddock now works as well..
2014-04-15 17:28:38 +02:00
d0ce4dcf6a
fixed compiler warnings.
...
most of them .. not all are my modules.
2014-04-15 17:03:54 +02:00
413c74c0a7
minor stuff
2014-04-15 08:59:53 +02:00
7b54ec9006
improved Parser and added documentation
2014-04-15 07:17:45 +02:00
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
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
a642c78c32
fixed indentation
2014-04-09 17:45:13 +02:00
5ec9db8534
changed x-lens to _x-lens and cabal-info
2014-04-07 17:32:13 +02:00
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
38d807b9b1
Merge remote-tracking branch 'origin/Mapping' into tessallation
...
Conflicts:
Pioneers.cabal
2014-04-05 23:12:33 +02:00
26903deb19
we can haz GUI?
...
we can.
2014-04-05 23:09:57 +02:00
a24b562a88
Merge branch 'ui' into tessallation
2014-04-05 22:03:47 +02:00
4811b65a0a
Hud is now transparent pink.
2014-04-05 22:02:48 +02:00
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
39341bf0f9
removed non-working renderer again.
2014-04-04 11:18:42 +02:00
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
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
jbetzend
e2c0863d65
Added function to convert PlayMap to GraphicsMap
2014-03-05 17:51:13 +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
e6c6442c85
Merge branch 'tessallation' into mapmerge
...
Conflicts:
src/Main.hs
src/Map/Graphics.hs
2014-03-05 15:02:30 +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
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
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
Jonas Betzendahl
c76e03126b
moar minor changes
2014-02-10 16:25:56 +01:00
Jonas Betzendahl
542e2810b3
Small changes in graphics
2014-02-10 16:25:07 +01:00
Jonas Betzendahl
58a598da8e
Added Creation and StaticMaps modules
2014-02-09 20:18:03 +01:00
Jonas Betzendahl
2b2417f37d
Added basic types for Main and Map.
2014-02-08 12:01:40 +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
a2c1effb48
all gl-stuff is now Core3.1-compatible
2014-01-03 23:25:59 +01:00
a2214082ca
minor stuff .. STILL NO TRIANGLE -.-
2014-01-03 23:19:39 +01:00
2fc28adfd1
Triiiiangleeeeesss!!!! *narf*
2014-01-03 22:31:01 +01:00
590d720b2a
removed coodinates as they were deprecated
2014-01-03 20:06:45 +01:00
7d201cf216
shaders now compile and link correctly
...
- map still invisible
- frustum defined
- shaders fixed
- attrib-link to shaders fixed
- lookat now generates a frustum-projected look-at matrix
- smaller test-map for debug
2014-01-03 17:46:41 +01:00
e5193fc7c5
Migrated to OpenGL3.x - compiles but renders nothing
...
- added simple shader
- rewrote map to cater BufferArray
- completele rewrote Main
- Split off stuff into Render-Module
- cleaned up .cabal-file to bare minimum
- created RenderObjects for the purpose of moving rendering there
2014-01-03 03:01:54 +01:00
306381c4ed
little cleanup
...
- some formatting
- changed y/z-Coords on Map (y is height now, map is in x/z-plane)
2014-01-02 13:02:01 +01:00
2ff7534ede
wrote some render-functions and shaders
...
- rudimentary vertex and fragment-shader in shaders/..
- created new Render-Module (unfinished and untested)
2014-01-02 03:35:38 +01:00
673a0f786a
rewriting to OpenGL4.3
...
- rewrote Map to generate Triangles for glBindBuffer
- Coordinates is not longer used AFTER the change but generates
Data until change is complete
- Size of Map in VRAM is sizeof(float)*(vert)*9 with vert = 2nm - n - m + 1
* 3 float coordinats
* 3 float color
* 3 float normal
yielding about 13.5mb VRAM for 500x500-Map
2014-01-02 03:05:35 +01:00
35f1a09d13
No shadows anymore - but shadow-map is correct
2014-01-01 21:58:43 +01:00
448bb7ac73
Shadows!!! But awful looking...
2014-01-01 21:26:54 +01:00
7110d9404b
Scene renders better now
...
- Enabled BackCulling
- Wrote shadow-mapping-functions
- temp. changed to flat-shading for better distinction
- defined Tiles CCW for BackCulling
2014-01-01 20:32:35 +01:00
e1cad5786e
removed debug-output
2013-12-29 18:32:10 +01:00
f3b218c44e
Movement works now.
...
- Movement works. Keys are read out by KeyCode
thus independent from Keyboard-Layout
On a normal quertz-layout they map like so:
* e, s, d, f for movement
* r, w for rotation
* space/caps for up/down
2013-12-29 18:18:18 +01:00
55a873022b
fixed map
...
- map is now displayed correctly
- camera is adjusted
- created ProgramState as TVar for concurrent reading/writing
2013-12-29 14:39:01 +01:00
14ce8c5986
added light properly to scene
2013-12-29 06:12:25 +01:00
65934809d5
added primitive map-render
...
- added primitive map-template
- window now renders correctly
- height-calculation is still a bit off
2013-12-29 06:03:32 +01:00
