sfroitzheim
|
b5e5289511
|
Improved marbletexture and added Blenderfile
|
2014-12-12 14:58:12 +01:00 |
|
Steffen Fündgens
|
7cb146dbbb
|
Changed errorChecking in the converter.
|
2014-12-12 12:31:24 +01:00 |
|
Faerbit
|
bd1cedcc23
|
Removing stencil buffer from depthTextures.
|
2014-12-12 02:19:41 +01:00 |
|
Steffen Fündgens
|
28839b4d3a
|
changed error checking syntax to make code more compact
|
2014-12-08 15:48:46 +01:00 |
|
Steffen Fündgens
|
2790bddd11
|
Added loading of lights, adjusted Compositions.xml and Level0.png to test it.
|
2014-12-08 15:19:50 +01:00 |
|
Steffen Fündgens
|
030f2f3bdd
|
Finished loading of graphical objects, please check if my interpretation of the rotation is corect(copied from entity.cc). No physics loaded yet.
|
2014-12-08 14:54:27 +01:00 |
|
Steffen Fündgens
|
cf4cbd92fa
|
Converting unsigned ints to regular ints again, undid that while merging.
|
2014-12-08 14:24:26 +01:00 |
|
Steffen Fündgens
|
68202bdef2
|
merging
|
2014-12-08 14:19:23 +01:00 |
|
Steffen Fündgens
|
b0b43cc2ee
|
Added error checking for all XML Queries, fixed bugs and continued to implement loading from xml.
|
2014-12-08 14:10:08 +01:00 |
|
Faerbit
|
b51cc256bd
|
Reexporting column, because it had no normals.
|
2014-12-08 13:43:47 +01:00 |
|
Faerbit
|
3f90032bf0
|
Converting unsinged ints to regular ints, because tinyxml cannot query for unsigned ones and thus negates the purpose of using unsigned ones. This also causes compiler errors.
|
2014-12-08 13:33:38 +01:00 |
|
Faerbit
|
1d82412576
|
One exclamation mark is enough.
|
2014-12-08 13:28:50 +01:00 |
|
Steffen Fündgens
|
4ab04faf68
|
Implemented more of the loading from xml
|
2014-12-05 17:14:43 +01:00 |
|
Steffen Fündgens
|
f4529d1430
|
Added objectData to Compositions.xml. It contains texture data as of now.
|
2014-12-05 16:55:17 +01:00 |
|
Steffen Fündgens
|
a6c65efcee
|
Changed model and texture names to not start with capital letters.
|
2014-12-05 16:36:31 +01:00 |
|
Steffen Fündgens
|
b5deb6b9e7
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 16:19:06 +01:00 |
|
Steffen Fündgens
|
da197f063f
|
Fixed the filesytem for the converter.
|
2014-12-05 16:18:48 +01:00 |
|
sfroitzheim
|
4805a4a3ce
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-05 15:01:16 +01:00 |
|
Steffen Fündgens
|
e79128a1a5
|
Added Level0.png.
|
2014-12-05 15:00:46 +01:00 |
|
sfroitzheim
|
3268881a13
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-05 14:51:23 +01:00 |
|
sfroitzheim
|
c899c4e67e
|
Fixed some display bugs with the column.
|
2014-12-05 14:49:23 +01:00 |
|
Steffen Fündgens
|
41584ef993
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 14:45:57 +01:00 |
|
Steffen Fündgens
|
24edf1aca9
|
Implemented error checking for XML. Fixed loading of OBJ-Files.
|
2014-12-05 14:45:44 +01:00 |
|
sfroitzheim
|
73d5e5fd52
|
Added a movable Block that will be used to be pushed on switches.
|
2014-12-05 14:39:51 +01:00 |
|
sfroitzheim
|
d4168fb002
|
Changed Columntexture to something better.
|
2014-12-05 14:39:08 +01:00 |
|
Steffen Fündgens
|
5e44f9680e
|
integrating tinyxml into level, adding lights to compositions
|
2014-12-05 12:47:02 +01:00 |
|
Steffen Fündgens
|
7e7754ca64
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 12:13:45 +01:00 |
|
Faerbit
|
b9b7a6e7b4
|
Put some code in a function.
|
2014-12-05 00:57:17 +01:00 |
|
Faerbit
|
8eb0f6719a
|
Now generating Mipmaps for textures.
|
2014-12-04 18:58:16 +01:00 |
|
Faerbit
|
9e4cc5e4f7
|
Setting wrap mode of depthTextures to CLAMP_TO_EDGE to remove seams.
|
2014-12-04 17:39:35 +01:00 |
|
Faerbit
|
1c687f5759
|
Implemented cascaded shadow mapping.
|
2014-12-04 17:19:58 +01:00 |
|
Faerbit
|
0cb741dbc3
|
Implemented early bailing.
|
2014-12-04 15:08:08 +01:00 |
|
Steffen Fündgens
|
0e06ae9fd3
|
changed filePath to levelNum
|
2014-12-04 15:07:31 +01:00 |
|
Faerbit
|
e005c97439
|
Implemented poisson sampling.
|
2014-12-04 14:53:07 +01:00 |
|
Faerbit
|
b38e24c3db
|
Disable culling because it seems to give slightly worse FPS.
|
2014-12-04 14:46:39 +01:00 |
|
Faerbit
|
a8ac3c064a
|
Improving bias on slopes.
|
2014-12-04 13:26:06 +01:00 |
|
Faerbit
|
3b0881f9c1
|
Adding culling.
|
2014-12-04 13:23:25 +01:00 |
|
Faerbit
|
049819c47a
|
Changing shadow map sampler from sampler2D to sampler2Dshadow and removing now useless colour texture.
|
2014-12-04 13:21:20 +01:00 |
|
Faerbit
|
fe0535036f
|
Changing directional light vector to match origin of the sun on the skysphere texture.
|
2014-12-04 12:19:39 +01:00 |
|
Faerbit
|
588b499f93
|
Making framebuffer private again. (Was public for debugging.
|
2014-12-04 01:22:23 +01:00 |
|
Faerbit
|
f559eced68
|
Implemented basic shadows for sun light. Also fixed bug with far plane always staying the same.
|
2014-12-04 01:13:59 +01:00 |
|
Faerbit
|
08716abfe8
|
Always automatically update docker container.
|
2014-12-03 11:17:24 +01:00 |
|
Faerbit
|
7a76519edb
|
Exiting converter if no input file is given.
|
2014-12-03 11:09:37 +01:00 |
|
Steffen Fündgens
|
581e1cd111
|
adjusting converter to work with black and white image backgrounds
|
2014-12-02 13:37:31 +01:00 |
|
Steffen Fündgens
|
965c3f96f9
|
still merging...
|
2014-12-02 13:19:19 +01:00 |
|
Steffen Fündgens
|
4adc1198b8
|
Merged master and converter
|
2014-12-02 13:17:33 +01:00 |
|
Steffen Fündgens
|
b6c694b350
|
Compositions.xml makes sense now
|
2014-12-02 13:13:20 +01:00 |
|
Faerbit
|
f38ced6603
|
Moving shader management completely into graphics.
|
2014-12-01 17:49:59 +01:00 |
|
Faerbit
|
64aeae8143
|
Removing spammy comments.
|
2014-12-01 17:44:58 +01:00 |
|
Faerbit
|
8b21495faa
|
Adding namespacing.
|
2014-12-01 17:40:39 +01:00 |
|