Commit Graph

729 Commits

Author SHA1 Message Date
Steffen
b6a9e2f180 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
3e8689aae2 Made None an available physicsType for objects without physics. 2015-02-07 19:23:27 +01:00
Steffen
e39adf56ed 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
ff5bd0dae1 Merged physics.cc. 2015-02-06 18:04:20 +01:00
Steffen Fündgens
2bfad25510 Added loading from config.xml, then debuged it for more than three hours... 2015-02-06 18:00:14 +01:00
Jasper
bcc798ad79 Merge branch 'master' of github.com:Faerbit/swp 2015-02-06 17:32:30 +01:00
Jasper
644a4a3571 addede max camera speed 2015-02-06 17:31:52 +01:00
sfroitzheim
4978869f82 Finally fixed wall and gate physics plus made some heightmap modifications 2015-02-06 16:31:21 +01:00
Jasper
72e3fdea69 got the marble to no longer jitter all over the place 2015-02-06 16:26:22 +01:00
Steffen Fündgens
f29678867f Implemented loading of config.xml, the loaded values are not used yet. 2015-02-06 13:37:42 +01:00
Steffen Fündgens
bffbe8250f Added config.xml, not using it yet. 2015-02-06 13:06:42 +01:00
Steffen Fündgens
df7c5ffe3d 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
8be350c713 Added terrain parameters to the xml. 2015-02-06 12:37:00 +01:00
Faerbit
486713683d Added non-linearization to get rid of fragments. 2015-02-05 13:19:51 +01:00
Faerbit
febb1dbab3 Increased precision of depth textures. 2015-02-04 23:10:51 +01:00
Faerbit
78f4e30f8f Additional cleanup. 2015-02-04 23:08:23 +01:00
Faerbit
4f8b90f441 Reintroducing broken assert, because it's important. 2015-02-04 22:55:34 +01:00
Faerbit
f45603fe4c Did a little bit of cleanup. 2015-02-04 22:54:40 +01:00
Faerbit
d50f624004 Moved loading functionality to loader class. 2015-02-04 17:16:06 +01:00
Faerbit
1f817a7ecd Got Point Light Shadows working. YEEHAW! 2015-02-04 14:27:41 +01:00
Steffen Fündgens
ecca21754b Added a comment and changed dampning values that were randomly 1. 2015-02-03 13:21:52 +01:00
Steffen Fündgens
8f3875a1c0 Adjusted a composition, found out that all TriMeshs fall through the heightmap. 2015-02-03 13:10:14 +01:00
Steffen Fündgens
df884666b5 Scaling of the player ball is now possible. 2015-02-03 12:36:42 +01:00
Steffen Fündgens
c57d73317c 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
d82a8d96bd Changed how depth values are written. Works even less than before. 2015-02-02 19:58:16 +01:00
Steffen Fündgens
bb57eb2263 Added status prints to the converter. 2015-02-02 13:37:58 +01:00
Steffen Fündgens
a018d5f547 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
1d89537a33 Changed trigger indices to match physicObjects instead of objects, adjusted removeObject function. 2015-02-02 12:43:32 +01:00
Steffen Fündgens
dbd61cd27e Removed unnecessary rotation from a lightsource. 2015-02-02 12:40:25 +01:00
Faerbit
64b4f52fcc Merge branch 'debug-shadows' of github.com:Faerbit/swp into debug-shadows 2015-01-31 20:02:28 +01:00
Faerbit
f025b69206 Tried correcting an error. Unsure if it will work. 2015-01-31 20:02:23 +01:00
Jasper
0553b64abc Merge branch 'master' of github.com:Faerbit/swp 2015-01-30 17:33:41 +01:00
Jasper
a49f4509b1 added inital rotation to physics, had the springs fixed (was NOT my fault) 2015-01-30 17:29:48 +01:00
Fabian Klemp
9fde8009e8 Additional debug stuff. 2015-01-30 15:47:07 +01:00
sfroitzheim
3278bf5302 Added some new walls and changed some physics properties (still not working properly) 2015-01-30 15:28:09 +01:00
Fabian Klemp
6549406049 Only sample shadows from the first light source. 2015-01-30 15:11:00 +01:00
sfroitzheim
6b00c574b8 Added new ground tiles for a ruins area to the data 2015-01-30 14:15:07 +01:00
Jasper
7f87d56b0e fine tuned the camera nad added more comments to physics.cc 2015-01-30 13:32:16 +01:00
Jasper
477da05464 implimented a rough version of a physics driven camera 2015-01-29 14:10:28 +01:00
Jasper
b21b9e3636 fixed size ratios of objects 2015-01-29 13:39:37 +01:00
Jasper
ecff8b5cf7 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
f275733eeb Now mirroring the cube face on their own again. 2015-01-28 17:26:02 +01:00
sfroitzheim
fcbc228438 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
b957ba27bd 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
ccc7cbaa9c 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
0ce663a592 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
01a9126b0a Improved user interaction and a little code rework. 2015-01-27 11:50:51 +01:00
Faerbit
9c8f05e906 Small parameter changes. 2015-01-27 11:14:00 +01:00
Faerbit
cf9e3e2b39 Fixed saving of depthbuffer. 2015-01-26 23:11:04 +01:00
Faerbit
7d21978903 Implemented saving depthbuffer face to png. Doesn't work right now. 2015-01-26 21:48:44 +01:00