Commit Graph

52 Commits

Author SHA1 Message Date
Faerbit
f3cbfe6133 Gave the skydome it's own class which contains the nightTexture and changed the loader and the level XML. 2015-03-04 21:28:46 +01:00
Steffen Fündgens
deb70240d1 Added 'Safepoints' to the resetPlayer script. 2015-03-04 18:10:49 +01:00
Fabian Klemp
95fef2448e Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 16:08:11 +01:00
Fabian Klemp
1ec7f05eca Gave skydome it's own shader. 2015-03-04 16:08:03 +01:00
Steffen Fündgens
47bd2d29df Added a trigger that resets the player when his z value is below 15. 2015-03-04 15:52:28 +01:00
Steffen Fündgens
1ad25ef8cb Ignored first two seconds of triggering to give switches time to position themselves. 2015-03-02 14:28:19 +01:00
Faerbit
a2d0133acd Removing flame class and integrate it into light class because it was unpractical. 2015-02-24 12:56:40 +01:00
Steffen Fündgens
aa1287cdaa Added vector of flames to the level. 2015-02-17 12:41:15 +01:00
Steffen Fündgens
9e987fdbdf Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 17:14:38 +01:00
Steffen Fündgens
60543a301e Added resetPlayer function to the level. 2015-02-13 17:14:29 +01:00
Jasper
dc628f3fc8 added debug Camear (keys L and K to switch) 2015-02-13 15:46:00 +01:00
Steffen Fündgens
2bfad25510 Added loading from config.xml, then debuged it for more than three hours... 2015-02-06 18:00:14 +01:00
Faerbit
d50f624004 Moved loading functionality to loader class. 2015-02-04 17:16:06 +01:00
Steffen
698d917d4c Created a moveObject function in the Level class. 2015-01-17 13:30:33 +01:00
Steffen Fündgens
76b8b3bc03 Moved triggering to lua, got a strange bug with the const char* holding the name of the lua script. 2015-01-13 13:52:22 +01:00
Steffen Fündgens
3560957d67 Moved friction and player strength to Level.xml. 2015-01-06 13:14:30 +01:00
Fabian Klemp
1ebccbf325 Moved trigger functions to trigger class. 2014-12-16 12:40:30 +01:00
Fabian Klemp
64f3518dc3 Fixed triggers. Now deletes a truly random object. 2014-12-16 12:19:48 +01:00
Steffen Fündgens
b26d904023 Implemented simple triggers. 2014-12-15 18:43:10 +01:00
Steffen Fündgens
0a2d0c2f75 Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
Faerbit
51ddcffaf0 Moved calculation of shadowMVP to the CPU side. 2014-12-15 12:41:30 +01:00
Faerbit
d8da75e9fb Moving MVP calculation to the CPU side. 2014-12-15 11:45:31 +01:00
Faerbit
17b8445a2f Made getLights return a pointer to avoid copying around large amounts of light data every frame. 2014-12-15 01:12:51 +01:00
Steffen Fündgens
80f90175eb Changed fogColor to fogColour. Moved some global Parameters to the xml. 2014-12-12 15:41:17 +01:00
Steffen Fündgens
3fd4c4d156 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +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
8a686dc9a3 changed filePath to levelNum 2014-12-04 15:07:31 +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
Jasper
f8357164ef 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
08bfbdd839 You can render objects with multiple shaders now. 2014-11-28 00:17:56 +01:00
Faerbit
bedf58b27a Changing vector of objects to vector of pointer of objects for clearer construnction. 2014-11-23 00:59:54 +01:00
Faerbit
b5ecd8698d Replacing skybox attribute with skydome. 2014-11-23 00:57:16 +01:00
Faerbit
641f94b715 Changed skybox to skydome. 2014-11-22 00:39:58 +01:00
Faerbit
235cde0d74 Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
94271dd9dd Implemented simple fog. 2014-11-19 01:58:48 +01:00
Faerbit
e997566b30 Added getCameraPosition to Level because it is used very often. 2014-11-19 01:57:38 +01:00
Fabian Klemp
c87d62cae9 Added directional lighting. 2014-11-17 17:51:15 +01:00
Jasper
e579fe1d75 added wasd recognition, prepared roll forward to accept vec3 pos instead of mat3 rot 2014-11-17 13:12:51 +01:00
Jasper
cac4672c7c Implimented a basic version of Physics into level with a ball colliding with a static plain. 2014-11-17 12:57:16 +01:00
Faerbit
3485299717 Changing getCamera to pointers. 2014-11-15 14:54:44 +01:00
Fabian Klemp
04234b1f1c Made mouse control camera. (Stupid init of camera...) 2014-11-14 18:33:42 +01:00
Faerbit
1050e6072f Adapted level to new camera implementation. 2014-11-13 17:19:56 +01:00
Faerbit
2ddf01ede2 Removing hard coded values from graphics and moving it into the properties of object and model. 2014-11-13 01:22:33 +01:00
Faerbit
16f4890458 Added a update function to the level which rotates the bunny. 2014-11-13 00:40:28 +01:00
Faerbit
c38629823d Removed own Shader wrapper, because it does nothing useful. 2014-11-08 02:45:32 +01:00
Faerbit
21b144a72b Changing all occurences from texture to material. 2014-11-08 01:17:23 +01:00
Faerbit
8f6ab075b5 Implemented two getters. 2014-10-30 23:59:03 +01:00
Faerbit
5c4b125e4d Restructured some elements from the graphis into the level. Now using a vector for all objects. 2014-10-30 23:54:19 +01:00
Faerbit
5adc9ae0cc Added Terrain to Level. 2014-10-20 19:07:45 +02:00
Faerbit
663ecbbe7d Fixing include guards. 2014-10-20 18:48:20 +02:00