Commit Graph

729 Commits

Author SHA1 Message Date
Steffen
096cf12df0 Changed the switch object, its graphics and physics should work now(untested). Objects without physics also do not need damping values anymore. 2015-02-07 19:34:40 +01:00
Steffen
d132cdd233 Made None an available physicsType for objects without physics. 2015-02-07 19:23:27 +01:00
Steffen
7647c5f1c0 objectData now has a new value called renderable, if it is false the object will not get rendered. 2015-02-07 19:09:49 +01:00
Steffen Fündgens
21d94a420f Merged physics.cc. 2015-02-06 18:04:20 +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
Jasper
44153cd554 Merge branch 'master' of github.com:Faerbit/swp 2015-02-06 17:32:30 +01:00
Jasper
c4bed4c506 addede max camera speed 2015-02-06 17:31:52 +01:00
sfroitzheim
a669c83943 Finally fixed wall and gate physics plus made some heightmap modifications 2015-02-06 16:31:21 +01:00
Jasper
017c96bd55 got the marble to no longer jitter all over the place 2015-02-06 16:26:22 +01:00
Steffen Fündgens
a14d3420d5 Implemented loading of config.xml, the loaded values are not used yet. 2015-02-06 13:37:42 +01:00
Steffen Fündgens
ea58f2fbce Added config.xml, not using it yet. 2015-02-06 13:06:42 +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
Steffen Fündgens
5c2491557b Added terrain parameters to the xml. 2015-02-06 12:37:00 +01:00
Faerbit
ed10994ebc Added non-linearization to get rid of fragments. 2015-02-05 13:19:51 +01:00
Faerbit
7c8d149e3a Increased precision of depth textures. 2015-02-04 23:10:51 +01:00
Faerbit
ac19eac671 Additional cleanup. 2015-02-04 23:08:23 +01:00
Faerbit
8babafadfd Reintroducing broken assert, because it's important. 2015-02-04 22:55:34 +01:00
Faerbit
10082466cf Did a little bit of cleanup. 2015-02-04 22:54:40 +01:00
Faerbit
7e8b0d4c58 Moved loading functionality to loader class. 2015-02-04 17:16:06 +01:00
Faerbit
2e90ac57d8 Got Point Light Shadows working. YEEHAW! 2015-02-04 14:27:41 +01:00
Steffen Fündgens
bb1cf8dea7 Added a comment and changed dampning values that were randomly 1. 2015-02-03 13:21:52 +01:00
Steffen Fündgens
c4b01beaa8 Adjusted a composition, found out that all TriMeshs fall through the heightmap. 2015-02-03 13:10:14 +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
Faerbit
b3e0d5ca47 Changed how depth values are written. Works even less than before. 2015-02-02 19:58:16 +01:00
Steffen Fündgens
5c1a342cdb Added status prints to the converter. 2015-02-02 13:37:58 +01:00
Steffen Fündgens
35a13886c3 Added and tested physics boxes for the switchOuter. Graphical object to match them is missing. 2015-02-02 13:20:20 +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
Steffen Fündgens
2eaf2f7a58 Removed unnecessary rotation from a lightsource. 2015-02-02 12:40:25 +01:00
Faerbit
75464e6819 Merge branch 'debug-shadows' of github.com:Faerbit/swp into debug-shadows 2015-01-31 20:02:28 +01:00
Faerbit
b8dc153f10 Tried correcting an error. Unsure if it will work. 2015-01-31 20:02:23 +01:00
Jasper
1989cb6b13 Merge branch 'master' of github.com:Faerbit/swp 2015-01-30 17:33:41 +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
Fabian Klemp
2ddd753575 Additional debug stuff. 2015-01-30 15:47:07 +01:00
sfroitzheim
642caa85f6 Added some new walls and changed some physics properties (still not working properly) 2015-01-30 15:28:09 +01:00
Fabian Klemp
60372cf1a1 Only sample shadows from the first light source. 2015-01-30 15:11:00 +01:00
sfroitzheim
4883b753c0 Added new ground tiles for a ruins area to the data 2015-01-30 14:15:07 +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
ae5d31e04c fixed size ratios of objects 2015-01-29 13:39:37 +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
Faerbit
a3e6da2ada Now mirroring the cube face on their own again. 2015-01-28 17:26:02 +01:00
sfroitzheim
e0d9058aef Fixed some problems with the new bridge (wasn't able to roll onto it) and changed some heightmap heights 2015-01-28 15:49:38 +01:00
sfroitzheim
190df8b936 Added a model for a gate and added it to the scene with some additional level improvements 2015-01-28 15:19:35 +01:00
Steffen Fündgens
ec8767c14c Deleted a torch that had a duplicate ID and let the converter recreate it. Shadows look weirder now. This might be good for debugging the shadows. 2015-01-27 12:25:16 +01:00
Steffen Fündgens
d6ed98b992 Fixed a bug i created in my previous commit. Made output in case of errors more informative. 2015-01-27 12:21:30 +01:00
Steffen Fündgens
ba0677adde Improved user interaction and a little code rework. 2015-01-27 11:50:51 +01:00
Faerbit
114632b015 Small parameter changes. 2015-01-27 11:14:00 +01:00
Faerbit
377372d1c6 Fixed saving of depthbuffer. 2015-01-26 23:11:04 +01:00
Faerbit
7f13e89935 Implemented saving depthbuffer face to png. Doesn't work right now. 2015-01-26 21:48:44 +01:00