Commit Graph

46 Commits

Author SHA1 Message Date
Faerbit
97a315661f Removing flame class and integrate it into light class because it was unpractical. 2015-02-24 12:56:40 +01:00
Steffen Fündgens
f92c7bf6c3 Added vector of flames to the level. 2015-02-17 12:41:15 +01:00
Steffen Fündgens
1492a312ed Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 17:14:38 +01:00
Steffen Fündgens
265c0b2ce5 Added resetPlayer function to the level. 2015-02-13 17:14:29 +01:00
Jasper
75792a5723 added debug Camear (keys L and K to switch) 2015-02-13 15:46:00 +01:00
Steffen Fündgens
d2cf4f0003 Added loading from config.xml, then debuged it for more than three hours... 2015-02-06 18:00:14 +01:00
Faerbit
7e8b0d4c58 Moved loading functionality to loader class. 2015-02-04 17:16:06 +01:00
Steffen
3e78b4f4bb Created a moveObject function in the Level class. 2015-01-17 13:30:33 +01:00
Steffen Fündgens
fe58023458 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
76b6be0beb Moved friction and player strength to Level.xml. 2015-01-06 13:14:30 +01:00
Fabian Klemp
bf46f117b6 Moved trigger functions to trigger class. 2014-12-16 12:40:30 +01:00
Fabian Klemp
be4a61e65b Fixed triggers. Now deletes a truly random object. 2014-12-16 12:19:48 +01:00
Steffen Fündgens
adde6fd162 Implemented simple triggers. 2014-12-15 18:43:10 +01:00
Steffen Fündgens
a393fb688d Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
Faerbit
36f7217288 Moved calculation of shadowMVP to the CPU side. 2014-12-15 12:41:30 +01:00
Faerbit
50c4b16367 Moving MVP calculation to the CPU side. 2014-12-15 11:45:31 +01:00
Faerbit
e9a47db962 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
9764bc9d0b Changed fogColor to fogColour. Moved some global Parameters to the xml. 2014-12-12 15:41:17 +01:00
Steffen Fündgens
4d1fbc6045 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +01:00
Steffen Fündgens
086e13ac8e integrating tinyxml into level, adding lights to compositions 2014-12-05 12:47:02 +01:00
Steffen Fündgens
f218a141fa changed filePath to levelNum 2014-12-04 15:07:31 +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
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
565351f7d2 Changing vector of objects to vector of pointer of objects for clearer construnction. 2014-11-23 00:59:54 +01:00
Faerbit
4fb383976b Replacing skybox attribute with skydome. 2014-11-23 00:57:16 +01:00
Faerbit
22c9a7a936 Changed skybox to skydome. 2014-11-22 00:39:58 +01:00
Faerbit
c7518a7f8e Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
9367026ef0 Implemented simple fog. 2014-11-19 01:58:48 +01:00
Faerbit
ba77cd68ac 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
Faerbit
eefe7e78c9 Fixing minor bugs. 2014-10-20 18:44:23 +02:00
Faerbit
08e44a14f6 Adding level.hh 2014-10-20 18:38:29 +02:00