faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity
428 Commits 16 Branches 6 Tags 174 MiB
1ebccbf325
Commit Graph

99 Commits

Author SHA1 Message Date
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
Faerbit
0d57bf65ef Made trigger more presentation friendly. 2014-12-15 23:36:22 +01:00
Faerbit
5ca7626ec0 Removing debug output. 2014-12-15 22:03:04 +01:00
Jasper
33173a4db4 Merge branch 'master' of github.com:Faerbit/swp 
Conflicts:
	level.cc
 2014-12-15 19:13:25 +01:00
Jasper
7bfc171459 Tried to adjust box. 2014-12-15 19:11:28 +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
Steffen Fündgens
6563396dc0 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 13:08:47 +01:00
Steffen Fündgens
0a54807ceb Moved mass from objectType to singular objects. Now loading physics from xml, but with a dummy-box instead of meshes. 2014-12-15 13:08:35 +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
c7e9cc3b07 Debugging. Had to comment out the loading of physics because it crashed the programm. 2014-12-12 18:38:12 +01:00
Steffen Fündgens
80e2b72a5d Added skeleton for trigger loading. Added comments to identify closing brackets. 2014-12-12 18:02:31 +01:00
Steffen Fündgens
f00a5d58a7 Added indexing of the created objects for use in triggers. Added some comments to the loading. 2014-12-12 17:47:33 +01:00
Steffen Fündgens
f43f866fc4 Implemented loading of physical objects. Compositions.xml holds mostly Dummy-Values for those. 2014-12-12 16:52:05 +01:00
Steffen Fündgens
c8a9ae2eb9 Merge branch 'master' of github.com:Faerbit/swp 2014-12-12 16:25:18 +01:00
Steffen Fündgens
8bba52d35d Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml. 2014-12-12 16:24:47 +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
sfroitzheim
5151a864df Fixed wrong texture name 2014-12-12 15:09:51 +01:00
sfroitzheim
4e336fbca4 Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
Steffen Fündgens
e99ad8bab5 changed error checking syntax to make code more compact 2014-12-08 15:48:46 +01:00
Steffen Fündgens
d2afede893 Added loading of lights, adjusted Compositions.xml and Level0.png to test it. 2014-12-08 15:19:50 +01:00
Steffen Fündgens
82dfbff2fb Finished loading of graphical objects, please check if my interpretation of the rotation is corect(copied from entity.cc). No physics loaded yet. 2014-12-08 14:54:27 +01:00
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
1e82b32032 Changed model and texture names to not start with capital letters. 2014-12-05 16:36:31 +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
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
8a686dc9a3 changed filePath to levelNum 2014-12-04 15:07:31 +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
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
bd09ce82c4 Changed how windows focus is handled. 2014-11-25 16:01:13 +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
Jasper
263b7ace4b Put Box In Level 2014-11-21 16:22:36 +01:00
Jasper
a7a75bfaad Modified adders in physics to no longer accept float x,y,z but entity/object instead. 2014-11-21 12:56:30 +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
Faerbit
327284155b Changing a few lighting paramters for testing. 2014-11-19 00:59:48 +01:00
Faerbit
9d4bef5929 Removing angular(Velocity) from object class as it is not needed there. 2014-11-18 19:57:58 +01:00