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

159 Commits

Author SHA1 Message Date
Steffen Fündgens
a137d2544a Triggers now adapt if the object they want to do something with gets deleted or changes its index. 2015-01-13 18:18:13 +01:00
Steffen Fündgens
72d1009007 Now passing the Lua State to the physics, so that Lua can directly access physics functions. 2015-01-13 17:50:15 +01:00
Steffen Fündgens
d936d1f269 Lua script works now, worked around the bug by saving the name as a std::string. 2015-01-13 17:21:15 +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
60d76a58de Integrated Lua into our project. Triggers are now able to call a Lua Script. Havent figured out how to let the Script do anything usefull yet. 2015-01-09 16:51:28 +01:00
Steffen Fündgens
70e2ebb605 Moved all dampning parameters (except for the camera) to Compositions.xml. 2015-01-06 13:31:53 +01:00
Steffen Fündgens
76b6be0beb Moved friction and player strength to Level.xml. 2015-01-06 13:14:30 +01:00
Steffen Fündgens
36c42123b8 Added the option to give a trigger a target composition. The position the trigger activates at is the old manually set position + the position of the target composition. 2014-12-19 16:15:29 +01:00
Steffen Fündgens
0649444687 Also increased strength of the player ball. 2014-12-19 15:21:38 +01:00
Steffen Fündgens
ba847c80f0 Moved triggers into compositions. 2014-12-16 13:46:49 +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
Faerbit
104b8b4bbc Made trigger more presentation friendly. 2014-12-15 23:36:22 +01:00
Faerbit
76053c5b2f Removing debug output. 2014-12-15 22:03:04 +01:00
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
Fabian Klemp
913ec3c05b 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