BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Broken

Browse Source
This commit is contained in:
ViktorLjung
2014-05-26 01:03:25 +02:00
parent dff888f82d
commit 9a984dbb10
7 changed files with 142 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Components/Physics.h
+2 -1
View File
@@ -11,7 +11,7 @@ struct Physics : Component
Physics()
: Mass(1.f), Static(false), Phantom(false), CalculateCenterOfMass(true), CenterOfMass(glm::vec3(0)), InitialLinearVelocity(glm::vec3(0)), InitialAngularVelocity(glm::vec3(0)),
LinearDamping(0.f), AngularDamping(0.05f), GravityFactor(1.f), Friction(0.5f), Restitution(0.4f), MaxLinearVelocity(200.f), MaxAngularVelocity(200.f),
CollisionLayer(0), CollisionSystemGroup(0), CollisionSubSystemId(0), CollisionSubSystemDontCollideWith(0){}
CollisionLayer(0), CollisionSystemGroup(0), CollisionSubSystemId(0), CollisionSubSystemDontCollideWith(0), CollisionEvent(false){}
float Mass;
bool Static;
@@ -34,6 +34,7 @@ struct Physics : Component
int CollisionSubSystemId;
int CollisionSubSystemDontCollideWith;
bool CollisionEvent;
virtual Physics* Clone() const override { return new Physics(*this); }
};