Commit Graph

383 Commits

Author SHA1 Message Date
Faerbit
a54752a905 Implemented early bailing. 2014-12-04 15:08:08 +01:00
Steffen Fündgens
f218a141fa changed filePath to levelNum 2014-12-04 15:07:31 +01:00
Faerbit
8c427003cd Implemented poisson sampling. 2014-12-04 14:53:07 +01:00
Faerbit
41d8e23c60 Disable culling because it seems to give slightly worse FPS. 2014-12-04 14:46:39 +01:00
Faerbit
1ab7783d41 Improving bias on slopes. 2014-12-04 13:26:06 +01:00
Faerbit
ed960eff53 Adding culling. 2014-12-04 13:23:25 +01:00
Faerbit
aa764cfa39 Changing shadow map sampler from sampler2D to sampler2Dshadow and removing now useless colour texture. 2014-12-04 13:21:20 +01:00
Faerbit
09fc76d26b Changing directional light vector to match origin of the sun on the skysphere texture. 2014-12-04 12:19:39 +01:00
Faerbit
947e9376fb Making framebuffer private again. (Was public for debugging. 2014-12-04 01:22:23 +01:00
Faerbit
27c2248117 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
fca69b547b Always automatically update docker container. 2014-12-03 11:17:24 +01:00
Faerbit
af8f85c3c4 Exiting converter if no input file is given. 2014-12-03 11:09:37 +01:00
Steffen Fündgens
98e78b915e adjusting converter to work with black and white image backgrounds 2014-12-02 13:37:31 +01:00
Steffen Fündgens
a8457d9399 still merging... 2014-12-02 13:19:19 +01:00
Steffen Fündgens
2a9bfbf5da Merged master and converter 2014-12-02 13:17:33 +01:00
Steffen Fündgens
37c1006431 Compositions.xml makes sense now 2014-12-02 13:13:20 +01:00
Faerbit
eb90142e81 Moving shader management completely into graphics. 2014-12-01 17:49:59 +01:00
Faerbit
b49f93afd4 Removing spammy comments. 2014-12-01 17:44:58 +01:00
Faerbit
ef8fbb7296 Adding namespacing. 2014-12-01 17:40:39 +01:00
Faerbit
2d7165da66 Removing useless includes. 2014-12-01 17:40:06 +01:00
Steffen Fündgens
9f4071cef7 implemented all methods of the converter class, needs testing 2014-12-01 14:09:55 +01:00
Faerbit
85215a1a95 Reexporting Block.obj, because normals were missing. 2014-12-01 13:55:47 +01:00
Faerbit
c09b056e84 Removing backup blender files. 2014-12-01 13:54:10 +01:00
Faerbit
272532bb1f Adding OBJ-file load messages for easier debugging. 2014-12-01 13:53:01 +01:00
Faerbit
f0d904a9ff Do not build GLFW examples and tests. 2014-12-01 13:16:04 +01:00
Faerbit
259e6c88f2 Removing useless includes. 2014-12-01 12:58:04 +01:00
Faerbit
cd8bfc77cc Updating glfw to version 3.0.4. 2014-12-01 12:53:19 +01:00
Faerbit
756102138d Revert "Updating glfw." Code was not ready for release.
This reverts commit 81234ca22a.
2014-12-01 12:44:08 +01:00
Faerbit
0333e3c074 Moving application class to it's own file. 2014-12-01 12:41:19 +01:00
Faerbit
63d3c468f3 Let member function use it own class and not the global variable. 2014-12-01 12:33:00 +01:00
Faerbit
21db09af94 Updating glfw. 2014-12-01 12:32:04 +01:00
Faerbit
0865c356be Removing big textures as they are not needed. 2014-11-29 02:06:46 +01:00
Faerbit
e15b9f2f54 Merge branch 'master' of github.com:Faerbit/swp 2014-11-29 01:37:38 +01:00
Faerbit
220b72f85b Removing useless files. 2014-11-29 01:36:59 +01:00
Jasper
1ae3a4c8ae Merge branch 'master' of github.com:Faerbit/swp 2014-11-28 17:07:54 +01:00
Steffen Fündgens
f6bdf5dc32 added example Compositions.xml, implemented most of newComposition() method 2014-11-28 17:05:49 +01:00
Jasper
76307f751f Reduced memory usage of trianglemesh 2014-11-28 17:01:56 +01:00
Faerbit
b1d54533e0 Added skydome blender file. 2014-11-28 16:49:28 +01:00
Faerbit
cc9f2a3916 Moved Blenderfiles out of Levels because of packaging. 2014-11-28 16:47:35 +01:00
Jasper
17c1d38d7e Merge branch 'master' of github.com:Faerbit/swp 2014-11-28 16:46:44 +01:00
Jasper
3fcd677dd5 Added basic Triangle Mesh, pending reading out of .obj and then testing. 2014-11-28 16:46:35 +01:00
sfroitzheim
808a7a0569 Added switch models and textures in 2 seperate parts (switchInner is the movable object - size may needs to be changed in the future) 2014-11-28 16:38:55 +01:00
sfroitzheim
263e9e72af Added all blender files (except marble, as I don't have the newest and smoothed version) 2014-11-28 16:31:50 +01:00
sfroitzheim
348d624564 Fixed origin of block. 2014-11-28 15:28:03 +01:00
Jasper
13e08945df Added a constraint for distances, as such a constraint did not exist in bullet.Why, IDK. 2014-11-28 13:52:03 +01:00
Jasper
742a1848ea Multiple objects now working, for exact implimentation check level.cc and comment in physics.hh. Additionally multiple comments have been added to physics.hh to support the use of these functions 2014-11-28 12:06:17 +01:00
Faerbit
8af201fd2f You can render objects with multiple shaders now. 2014-11-28 00:17:56 +01:00
Faerbit
79fd16ad8d Adding run.sh script 2014-11-27 23:58:33 +01:00
Faerbit
4f4dec9725 Changing paramter order. 2014-11-27 22:02:25 +01:00
Faerbit
232d807aeb Specifying upload path. 2014-11-27 21:53:22 +01:00