Commit Graph

50 Commits

Author SHA1 Message Date
Steffen Fündgens
1585195779 Reduced camera mass so the camera can practically not move objects anymore. Fixed the scaling of forces on the camera with the (no more inverted) mass. 2015-02-13 13:00:47 +01:00
Steffen Fündgens
6ee8af58e3 Made it possible again to move the camera upwards. 2015-02-13 12:47:34 +01:00
Steffen Fündgens
d02a7fa02f Changed position constraints to be less bouncy. 2015-02-13 12:15:54 +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
c4bed4c506 addede max camera speed 2015-02-06 17:31:52 +01:00
Jasper
017c96bd55 got the marble to no longer jitter all over the place 2015-02-06 16:26:22 +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
Jasper
4c1860429a prepare for peoples 2015-01-23 13:31:19 +01:00
Jasper
47b386296a constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
d1a3c3ac3d readding button -> box 2015-01-23 12:05:43 +01:00
Jasper
65a826f2af some quick updates for the camera before working on buttons 2015-01-19 17:12:58 +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
Jasper
bcdbb2534c small changes to trimesh scaling 2015-01-19 15:33:44 +01:00
Jasper
2edbb196c2 added trimesh back to collision 2015-01-19 15:24:44 +01:00
Jasper
7cb3e3d620 fixed small bug with balls 2015-01-19 14:57:20 +01:00
Jasper
c2634543dc added collision masks and button creator 2015-01-19 14:01:05 +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
Jasper
913e862a88 Added position Constraint structure, an add/remove function for them, and added their handeling to the update function 2015-01-16 16:17:26 +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
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
20b0c66a17 Tweaked ball physics. 2014-12-19 15:20:49 +01:00
Steffen Fündgens
7d3d7927fe Fixed bug with created too many faces. 2014-12-19 15:20:05 +01:00
Jasper
00716b63bd Composition scales addapted
Physics added trimeshshapes
2014-12-15 16:02:04 +01:00
Jasper
76307f751f Reduced memory usage of trianglemesh 2014-11-28 17:01:56 +01:00
Jasper
3fcd677dd5 Added basic Triangle Mesh, pending reading out of .obj and then testing. 2014-11-28 16:46:35 +01:00
Jasper
13e08945df Added a constraint for distances, as such a constraint did not exist in bullet.Why, IDK. 2014-11-28 13:52:03 +01:00
Faerbit
669e9e0334 Removing global variables from physics, because they are not needed. 2014-11-25 13:38:28 +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
Jasper
f063b7ef8b added box in physics 2014-11-21 12:50:11 +01:00
Jasper
dfd6b3789a Normalized body movement (still has float strength to change magnitude) 2014-11-21 12:31:29 +01:00
Jasper
00182a509c fixed terrain offset 2014-11-17 18:54:19 +01:00
Jasper
6c32a0c35a getting the sizes juuuuuuuust right 2014-11-17 16:28:31 +01:00
Jasper
1e7c7989de further improving physics and interaction 2014-11-17 16:07:40 +01:00
Jasper
288d509316 Changed rollForward to accept vector going from camera to bball 2014-11-17 13:21:27 +01:00
Jasper
24a812ed07 spelling fix 2014-11-17 13:14:48 +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
Jasper
3eb406efd1 Added addPlayer analog to addSphere and added a check to make sure incice stay synchronized (possibly dangerous but needs to be tested) 2014-11-14 16:23:14 +01:00
Jasper
6c0c973305 added Roll forward methode, needs testing to be sure. 2014-11-14 15:48:50 +01:00
Jasper
d5198ff4f5 Added getRotation in physics to give rotation of object back as 4x4Matrix 2014-11-14 15:15:29 +01:00
Jasper
ba8be9e10d aaah 2014-11-14 14:23:10 +01:00
Jasper
58cc753aec terrain added 2014-11-14 14:17:04 +01:00