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

95 Commits

Author SHA1 Message Date
Jasper
8072fd1cbb Merge branch 'master' of github.com:Faerbit/swp 
Conflicts:
	level.cc
 2014-12-15 19:13:25 +01:00
Jasper
9fd8ae5cd8 Tried to adjust box. 2014-12-15 19:11:28 +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
Steffen Fündgens
acdf1b3285 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 13:08:47 +01:00
Steffen Fündgens
f681987358 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
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
bf6d4d69a9 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
07d11e2bd1 Added skeleton for trigger loading. Added comments to identify closing brackets. 2014-12-12 18:02:31 +01:00
Steffen Fündgens
330abfcccb 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
8a7f7da0a8 Implemented loading of physical objects. Compositions.xml holds mostly Dummy-Values for those. 2014-12-12 16:52:05 +01:00
Steffen Fündgens
45d4b944c4 Merge branch 'master' of github.com:Faerbit/swp 2014-12-12 16:25:18 +01:00
Steffen Fündgens
b0c371f610 Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml. 2014-12-12 16:24:47 +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
sfroitzheim
db9b90d089 Fixed wrong texture name 2014-12-12 15:09:51 +01:00
sfroitzheim
291a0f1899 Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
Steffen Fündgens
ae0d44c96a changed error checking syntax to make code more compact 2014-12-08 15:48:46 +01:00
Steffen Fündgens
5f16738c39 Added loading of lights, adjusted Compositions.xml and Level0.png to test it. 2014-12-08 15:19:50 +01:00
Steffen Fündgens
3f594ed21f 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
db1092be44 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
dbaa4f639f Implemented more of the loading from xml 2014-12-05 17:14:43 +01:00
Steffen Fündgens
3339ac208e Changed model and texture names to not start with capital letters. 2014-12-05 16:36:31 +01:00
sfroitzheim
cb825a6588 Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 14:51:23 +01:00
sfroitzheim
f83bb7ec7d Fixed some display bugs with the column. 2014-12-05 14:49:23 +01:00
Steffen Fündgens
097e1acfbc Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 14:45:57 +01:00
Steffen Fündgens
4d1fbc6045 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +01:00
sfroitzheim
de47c1bdd6 Changed Columntexture to something better. 2014-12-05 14:39:08 +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
09fc76d26b Changing directional light vector to match origin of the sun on the skysphere texture. 2014-12-04 12:19:39 +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
5aaf8f5d9f Changed how windows focus is handled. 2014-11-25 16:01:13 +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
Jasper
704df860f8 Put Box In Level 2014-11-21 16:22:36 +01:00
Jasper
2c512acc13 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
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
Faerbit
777bce286d Changing a few lighting paramters for testing. 2014-11-19 00:59:48 +01:00
Faerbit
d2d5c18090 Removing angular(Velocity) from object class as it is not needed there. 2014-11-18 19:57:58 +01:00
Faerbit
0e3dc33b80 Resized large textures to one third of their size. 2014-11-18 19:39:44 +01:00
Faerbit
e0c8820bd0 Reexported objects and enabled smooth shading. 2014-11-17 22:03:28 +01:00
sfroitzheim
463181d484 Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-17 18:31:48 +01:00
sfroitzheim
4b6d6f1a6d Changing marble model. 2014-11-17 18:31:22 +01:00