Changeset 11581 for code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h

Timestamp:

Nov 20, 2017, 4:21:26 PM (6 years ago)

Author:

remartin

Message:

Doesn-t freeze any more. Asteroids and the pickup seem to collide with things they shouldn-t.

File:

• code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h (modified) (1 diff)

code/branches/AsteroidMining_HS17/src/modules/asteroidmining/AsteroidMinable.h

@@ -56 +56 @@
             virtual void tick(float dt) override;
 
+            // Overwrite to prevet 'self-collision' of generated stuff
+            virtual void hit(Pawn* originator, const Vector3& force, const btCollisionShape* cs, float damage, float healthdamage = 0.0f, float shielddamage = 0.0f);
+            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, const btCollisionShape* cs, float damage, float healthdamage = 0.0f, float shielddamage = 0.0f);
+
+
+
             virtual void setSize(float f);
             virtual float getSize();
+
+
+