Steffen Fündgens
|
ff16297a63
|
Added error checking for all XML Queries, fixed bugs and continued to implement loading from xml.
|
2014-12-08 14:10:08 +01:00 |
|
Steffen Fündgens
|
8d8ab3a6b6
|
Implemented more of the loading from xml
|
2014-12-05 17:14:43 +01:00 |
|
Steffen Fündgens
|
ab3f644ad3
|
Added objectData to Compositions.xml. It contains texture data as of now.
|
2014-12-05 16:55:17 +01:00 |
|
Steffen Fündgens
|
1e82b32032
|
Changed model and texture names to not start with capital letters.
|
2014-12-05 16:36:31 +01:00 |
|
Steffen Fündgens
|
0bf148373a
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 16:19:06 +01:00 |
|
Steffen Fündgens
|
13f8800785
|
Fixed the filesytem for the converter.
|
2014-12-05 16:18:48 +01:00 |
|
sfroitzheim
|
4db241acb1
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-05 15:01:16 +01:00 |
|
Steffen Fündgens
|
4c3f597822
|
Added Level0.png.
|
2014-12-05 15:00:46 +01:00 |
|
sfroitzheim
|
e15d3763fa
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-05 14:51:23 +01:00 |
|
sfroitzheim
|
04f27bc965
|
Fixed some display bugs with the column.
|
2014-12-05 14:49:23 +01:00 |
|
Steffen Fündgens
|
5156ea0f9b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 14:45:57 +01:00 |
|
Steffen Fündgens
|
3fd4c4d156
|
Implemented error checking for XML. Fixed loading of OBJ-Files.
|
2014-12-05 14:45:44 +01:00 |
|
sfroitzheim
|
16c855d211
|
Added a movable Block that will be used to be pushed on switches.
|
2014-12-05 14:39:51 +01:00 |
|
sfroitzheim
|
cdb115d626
|
Changed Columntexture to something better.
|
2014-12-05 14:39:08 +01:00 |
|
Steffen Fündgens
|
56c2655b34
|
integrating tinyxml into level, adding lights to compositions
|
2014-12-05 12:47:02 +01:00 |
|
Steffen Fündgens
|
513b474d81
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-05 12:13:45 +01:00 |
|
Faerbit
|
11b99dfe82
|
Put some code in a function.
|
2014-12-05 00:57:17 +01:00 |
|
Faerbit
|
5120c896a5
|
Now generating Mipmaps for textures.
|
2014-12-04 18:58:16 +01:00 |
|
Faerbit
|
5398edf8e6
|
Setting wrap mode of depthTextures to CLAMP_TO_EDGE to remove seams.
|
2014-12-04 17:39:35 +01:00 |
|
Faerbit
|
867b1e4a60
|
Implemented cascaded shadow mapping.
|
2014-12-04 17:19:58 +01:00 |
|
Faerbit
|
88a841f84a
|
Implemented early bailing.
|
2014-12-04 15:08:08 +01:00 |
|
Steffen Fündgens
|
8a686dc9a3
|
changed filePath to levelNum
|
2014-12-04 15:07:31 +01:00 |
|
Faerbit
|
5abc7bf3af
|
Implemented poisson sampling.
|
2014-12-04 14:53:07 +01:00 |
|
Faerbit
|
d4c0c038d4
|
Disable culling because it seems to give slightly worse FPS.
|
2014-12-04 14:46:39 +01:00 |
|
Faerbit
|
80a751f1b5
|
Improving bias on slopes.
|
2014-12-04 13:26:06 +01:00 |
|
Faerbit
|
566c8e7d38
|
Adding culling.
|
2014-12-04 13:23:25 +01:00 |
|
Faerbit
|
c88ea7cee8
|
Changing shadow map sampler from sampler2D to sampler2Dshadow and removing now useless colour texture.
|
2014-12-04 13:21:20 +01:00 |
|
Faerbit
|
2339a48201
|
Changing directional light vector to match origin of the sun on the skysphere texture.
|
2014-12-04 12:19:39 +01:00 |
|
Faerbit
|
c695325376
|
Making framebuffer private again. (Was public for debugging.
|
2014-12-04 01:22:23 +01:00 |
|
Faerbit
|
d8edfd2ea9
|
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
|
efc81e3b7c
|
Always automatically update docker container.
|
2014-12-03 11:17:24 +01:00 |
|
Faerbit
|
6400c0ccc7
|
Exiting converter if no input file is given.
|
2014-12-03 11:09:37 +01:00 |
|
Steffen Fündgens
|
8fe985a41b
|
adjusting converter to work with black and white image backgrounds
|
2014-12-02 13:37:31 +01:00 |
|
Steffen Fündgens
|
7f07b532eb
|
still merging...
|
2014-12-02 13:19:19 +01:00 |
|
Steffen Fündgens
|
10529b5a89
|
Merged master and converter
|
2014-12-02 13:17:33 +01:00 |
|
Steffen Fündgens
|
b36cbb9230
|
Compositions.xml makes sense now
|
2014-12-02 13:13:20 +01:00 |
|
Faerbit
|
a42c64b535
|
Moving shader management completely into graphics.
|
2014-12-01 17:49:59 +01:00 |
|
Faerbit
|
e94dbb7fe8
|
Removing spammy comments.
|
2014-12-01 17:44:58 +01:00 |
|
Faerbit
|
deacb8169d
|
Adding namespacing.
|
2014-12-01 17:40:39 +01:00 |
|
Faerbit
|
3e23b99506
|
Removing useless includes.
|
2014-12-01 17:40:06 +01:00 |
|
Steffen Fündgens
|
74c05cb7ed
|
implemented all methods of the converter class, needs testing
|
2014-12-01 14:09:55 +01:00 |
|
Faerbit
|
0f94babcc2
|
Reexporting Block.obj, because normals were missing.
|
2014-12-01 13:55:47 +01:00 |
|
Faerbit
|
f53bff1d07
|
Removing backup blender files.
|
2014-12-01 13:54:10 +01:00 |
|
Faerbit
|
786a0add2c
|
Adding OBJ-file load messages for easier debugging.
|
2014-12-01 13:53:01 +01:00 |
|
Faerbit
|
12b52c9918
|
Do not build GLFW examples and tests.
|
2014-12-01 13:16:04 +01:00 |
|
Faerbit
|
fec80d3e61
|
Removing useless includes.
|
2014-12-01 12:58:04 +01:00 |
|
Faerbit
|
880c27d1e4
|
Updating glfw to version 3.0.4.
|
2014-12-01 12:53:19 +01:00 |
|
Faerbit
|
fed18e241d
|
Revert "Updating glfw." Code was not ready for release.
This reverts commit 81234ca22a.
|
2014-12-01 12:44:08 +01:00 |
|
Faerbit
|
ced962f403
|
Moving application class to it's own file.
|
2014-12-01 12:41:19 +01:00 |
|
Faerbit
|
765471ca99
|
Let member function use it own class and not the global variable.
|
2014-12-01 12:33:00 +01:00 |
|