Changeset 6295 for code/branches/presentation2/src/orxonox/controllers

Timestamp:

Dec 9, 2009, 4:54:20 PM (16 years ago)

Author:

wirthmi

Message:

Changed a function call when hit from damage() to hit(). Pass through to controller

Location:

code/branches/presentation2/src/orxonox/controllers

Files:

• Controller.h (modified) (1 diff)
• NewHumanController.cc (modified) (2 diffs)
• NewHumanController.h (modified) (1 diff)

code/branches/presentation2/src/orxonox/controllers/Controller.h

@@ -50 +50 @@
                 { return this->player_; }
 
+            virtual inline void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
+
             inline ControllableEntity* getControllableEntity() const
                 { return this->controllableEntity_; }

code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

@@ -44 +44 @@
 #include "sound/SoundManager.h"
 #include "Scene.h"
+#include "tools/BulletConversions.h"
+#include "bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
 
 namespace orxonox
@@ -246 +248 @@
             HumanController::localController_s->getControllableEntity()->fire(firemode);
 
+    }
+
+    void NewHumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {
+        Vector3 posA = multi_cast<Vector3>(contactpoint.getPositionWorldOnA());
+        //Vector3 posB = multi_cast<Vector3>(contactpoint.getPositionWorldOnB());
+        //posA and posB are almost identical
+
+        Vector3 relativeHit = this->getControllableEntity()->getWorldOrientation() * (posA - this->getControllableEntity()->getPosition());
+
+        COUT(0) << relativeHit << endl;
+        //COUT(0) << "Damage: " << damage << " Point A: " << posA << " Point B: " << posB << endl;
     }
 

code/branches/presentation2/src/orxonox/controllers/NewHumanController.h

@@ -56 +56 @@
             virtual void doFire(unsigned int firemode);
 
+            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
+
             static void unfire();
             virtual void doUnfire();