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

141 Commits

Author SHA1 Message Date
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
Faerbit
3b769c220e Resized large textures to one third of their size. 2014-11-18 19:39:44 +01:00
Faerbit
1e0157aa2a Reexported objects and enabled smooth shading. 2014-11-17 22:03:28 +01:00
sfroitzheim
a8e255e94d 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
Fabian Klemp
173a188467 Changing sand texture to a seamless sand texture. 2014-11-17 18:18:57 +01:00
Fabian Klemp
5966de6701 Removing update of the light at the center of the marble. 2014-11-17 18:18:15 +01:00
Fabian Klemp
e34e1ad04d Removing light at the center of the marble. 2014-11-17 18:16:27 +01:00
Fabian Klemp
c87d62cae9 Added directional lighting. 2014-11-17 17:51:15 +01:00
Fabian Klemp
048ab1ceaf Merge branch 'master' of github.com:Faerbit/swp 2014-11-17 16:31:04 +01:00
Fabian Klemp
64f030765f Changing a few spawning values. 2014-11-17 16:31:01 +01:00
Jasper
6c32a0c35a getting the sizes juuuuuuuust right 2014-11-17 16:28:31 +01:00
Jasper
362b4f0230 ich bin dumb 2014-11-17 16:14:01 +01:00
Jasper
678c6cf85f merged level.cc 2014-11-17 16:11:39 +01:00
Jasper
1e7c7989de further improving physics and interaction 2014-11-17 16:07:40 +01:00
Fabian Klemp
682a25a7ee Adding column and block ruins. 2014-11-17 15:29:38 +01:00
Fabian Klemp
ba5df84895 Added light in the middle of the marble. 2014-11-17 15:19:36 +01:00
Fabian Klemp
8d082e203b Basic Marble Model with Textures added. 2014-11-17 14:38:35 +01:00
Fabian Klemp
1b876b4c35 Adding torch. 2014-11-17 14:23:23 +01:00
Jasper
2558311844 fixed conflict 2014-11-17 13:17:28 +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
Steffen Fündgens
c0a730f58a Merge branch 'terrain-test' 
Conflicts:
	level.cc
	terrain.cc
 2014-11-17 12:56:10 +01:00
Steffen Fündgens
b27e7062f3 Changing a few position parameters. 2014-11-17 12:50:05 +01:00
Steffen Fündgens
51359d065f Merge branch 'master' of github.com:Faerbit/swp 2014-11-17 11:25:49 +01:00
Faerbit
3485299717 Changing getCamera to pointers. 2014-11-15 14:54:44 +01:00
Faerbit
53ca8caf56 Adding simple test sphere. 2014-11-15 14:19:34 +01:00
Faerbit
5ca77ae3cc Constructed a simple quad for debugging terrain generation. 2014-11-15 13:46:20 +01:00
Faerbit
3625cd31d7 Stop x rotation at the top and at the bottom to prevent flipping. 2014-11-14 22:55:29 +01:00
Faerbit
a5e5087ebd Changed default camera angle. Slowed camera movement. 2014-11-14 21:38:26 +01:00
Fabian Klemp
176f7e8176 Merge branch 'master' of github.com:Faerbit/swp 2014-11-14 18:33:52 +01:00
Fabian Klemp
04234b1f1c Made mouse control camera. (Stupid init of camera...) 2014-11-14 18:33:42 +01:00
Fabian Klemp
93363d1391 Changed constructor call of camera. 2014-11-14 18:32:16 +01:00
Steffen Fündgens
4ef7a2597b added a normal and texture coordinate to the terrain, rendering moved to level 2014-11-14 17:36:30 +01:00
Faerbit
4231866d40 Adapting graphics to new camera model. 2014-11-13 18:17:58 +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
Steffen Fündgens
8eec5fa49e debuged the load function in terrain.cc loading and rendering kind of works (no texture) 2014-11-11 12:22:47 +01:00
Faerbit
c38629823d Removed own Shader wrapper, because it does nothing useful. 2014-11-08 02:45:32 +01:00
Faerbit
34d925cdfe Moving material paramters from graphics to material class. 2014-11-08 01:44:24 +01:00
Faerbit
21b144a72b Changing all occurences from texture to material. 2014-11-08 01:17:23 +01:00
Faerbit
fdf0201f4d Changing a few lighting parameters. 2014-11-08 01:15:09 +01:00
Steffen Fündgens
acf537e026 tried to call the load functions, no success this far 2014-11-07 16:55:56 +01:00
Steffen Fündgens
33b6e10b32 added skeletal constructor to physics.hh 2014-11-07 16:44:12 +01:00
Faerbit
ae949e814f Changed lighting parameters to make the scene more interesting. 2014-11-04 00:46:49 +01:00
Fabian Klemp
769514af88 Got phong shading working. 2014-10-31 12:56:09 +01:00
Faerbit
c505553439 First attempt at Phong shading. Build broken. 2014-10-31 10:38:57 +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