Commit Graph

394 Commits

Author SHA1 Message Date
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
Faerbit
be1abf584f Removing useless includes. 2014-12-01 17:40:06 +01:00
Steffen Fündgens
315d5aec04 implemented all methods of the converter class, needs testing 2014-12-01 14:09:55 +01:00
Faerbit
ed889ebd76 Reexporting Block.obj, because normals were missing. 2014-12-01 13:55:47 +01:00
Faerbit
777d33699e Removing backup blender files. 2014-12-01 13:54:10 +01:00
Faerbit
02641d7f1c Adding OBJ-file load messages for easier debugging. 2014-12-01 13:53:01 +01:00
Faerbit
c96d081e3d Do not build GLFW examples and tests. 2014-12-01 13:16:04 +01:00
Faerbit
e1d14c1884 Removing useless includes. 2014-12-01 12:58:04 +01:00
Faerbit
117e3715b4 Updating glfw to version 3.0.4. 2014-12-01 12:53:19 +01:00
Faerbit
27080179e4 Revert "Updating glfw." Code was not ready for release.
This reverts commit 81234ca22a.
2014-12-01 12:44:08 +01:00
Faerbit
043205455f Moving application class to it's own file. 2014-12-01 12:41:19 +01:00
Faerbit
4daf4c8ccf Let member function use it own class and not the global variable. 2014-12-01 12:33:00 +01:00
Faerbit
81234ca22a Updating glfw. 2014-12-01 12:32:04 +01:00
Faerbit
8317188314 Removing big textures as they are not needed. 2014-11-29 02:06:46 +01:00
Faerbit
139945614b Merge branch 'master' of github.com:Faerbit/swp 2014-11-29 01:37:38 +01:00
Faerbit
f3f870c2d1 Removing useless files. 2014-11-29 01:36:59 +01:00
Jasper
edb17a9e67 Merge branch 'master' of github.com:Faerbit/swp 2014-11-28 17:07:54 +01:00
Steffen Fündgens
9f1a931b0b added example Compositions.xml, implemented most of newComposition() method 2014-11-28 17:05:49 +01:00
Jasper
91de258030 Reduced memory usage of trianglemesh 2014-11-28 17:01:56 +01:00
Faerbit
c5abdba83e Added skydome blender file. 2014-11-28 16:49:28 +01:00
Faerbit
869e1ed415 Moved Blenderfiles out of Levels because of packaging. 2014-11-28 16:47:35 +01:00