Commit Graph

35 Commits

Author SHA1 Message Date
Steffen Fündgens
d55bb3465c Reenabled zooming with the mouse wheel. 2015-02-13 15:20:32 +01:00
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
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
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
d1a3c3ac3d readding button -> box 2015-01-23 12:05:43 +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
c2634543dc added collision masks and button creator 2015-01-19 14:01:05 +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
Jasper
00716b63bd Composition scales addapted
Physics added trimeshshapes
2014-12-15 16:02:04 +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
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
669e9e0334 Removing global variables from physics, because they are not needed. 2014-11-25 13:38:28 +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
1e7c7989de further improving physics and interaction 2014-11-17 16:07:40 +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
Steffen Fündgens
33b6e10b32 added skeletal constructor to physics.hh 2014-11-07 16:44:12 +01:00
Faerbit
663ecbbe7d Fixing include guards. 2014-10-20 18:48:20 +02:00
Faerbit
5d3936c7f9 Adding physics.hh (Currently empty...) 2014-10-20 18:39:16 +02:00