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

136 Commits

Author SHA1 Message Date
Steffen Fündgens
e91d045a37 Code rework. Basically cleaned up a mess of tabs and whitespaces. 2015-02-13 13:46:41 +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
Steffen Fündgens
320c1cb152 Moved loading of the terrain to the loader, now also reading parameters for it from xml. 2015-02-06 12:51:53 +01:00
Faerbit
7e8b0d4c58 Moved loading functionality to loader class. 2015-02-04 17:16:06 +01:00
Steffen Fündgens
e7ff009482 Scaling of the player ball is now possible. 2015-02-03 12:36:42 +01:00
Steffen Fündgens
9ffe3cd886 Added scaling to the physic of Box and Button. Adjusted the objectData for block.obj perfectly. 2015-02-03 12:29:35 +01:00
Steffen Fündgens
08e5492b4f Changed trigger indices to match physicObjects instead of objects, adjusted removeObject function. 2015-02-02 12:43:32 +01:00
Jasper
5e2d2d4e57 added inital rotation to physics, had the springs fixed (was NOT my fault) 2015-01-30 17:29:48 +01:00
Jasper
198dc0614f fine tuned the camera nad added more comments to physics.cc 2015-01-30 13:32:16 +01:00
Jasper
9c6cd7c59d implimented a rough version of a physics driven camera 2015-01-29 14:10:28 +01:00
Jasper
8620e16681 added a scaling factor to triangle meshes to compensate for diffrent scaling (somehow from bullet, idk) and started adding comments to physics.cc 2015-01-29 13:15:45 +01:00
Steffen Fündgens
9088bb4561 Rotate parameter for physics.add should now be false if the object has a positionConstraint. 2015-01-23 16:51:09 +01:00
Steffen Fündgens
5a860f68c3 Added more exits after errors. 2015-01-23 16:02:10 +01:00
Jasper
4c1860429a prepare for peoples 2015-01-23 13:31:19 +01:00
Jasper
1687a56f87 Merge branch 'master' of github.com:Faerbit/swp 2015-01-23 12:06:26 +01:00
Faerbit
d41149e29e Made progress on point light shadows. Not quite sure what is happening. 2015-01-22 21:21:09 +01:00
Jasper
099e0c17c7 Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 18:30:12 +01:00
Jasper
650d505e4e Added physics type button. 2015-01-19 18:30:07 +01:00
Steffen Fündgens
cf836b151a Mirrored rendering of pointlight shadows, so that they are at the correct positions now, but occlude everything. -- Fabian 2015-01-19 18:22:25 +01:00
Jasper
25bd4ba64e prepared camera, level and physics for the new camera 2015-01-19 16:51:35 +01:00
Jasper
8306f7ff19 prepareing modified camera in physics 2015-01-19 16:30:11 +01:00
Steffen Fündgens
4c71dbfbea Added rotation in Compompositions.xml. 2015-01-19 15:55:03 +01:00
Steffen
75440f919f Added the option to define initial position constraints in the Level.xml file. 2015-01-17 14:07:12 +01:00
Steffen
3e78b4f4bb Created a moveObject function in the Level class. 2015-01-17 13:30:33 +01:00
Steffen
aca199cd1b Removed the lua state from the physics. 2015-01-17 13:11:43 +01:00
Steffen
a128c947b1 Added ignoreHeightmap option to compositions in Compositions.xml. 2015-01-17 12:24:54 +01:00
sfroitzheim
073000d097 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
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