Changeset 6295

Timestamp:

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

Author:

wirthmi

Message:

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

Location:

code/branches/presentation2/src

Files:

• modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• orxonox/controllers/Controller.h (modified) (1 diff)
• orxonox/controllers/NewHumanController.cc (modified) (2 diffs)
• orxonox/controllers/NewHumanController.h (modified) (1 diff)
• orxonox/worldentities/MovableEntity.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc

@@ -129 +129 @@
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
-                victim->damage(dmg, this->owner_);
+                victim->hit(this->owner_, contactPoint, dmg);
         }
         return false;

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

@@ -203 +203 @@
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
-                victim->damage(dmg, this->owner_);
+                victim->hit(this->owner_, contactPoint, dmg);
 //             this->destroy();
         }

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();

code/branches/presentation2/src/orxonox/worldentities/MovableEntity.cc

@@ -79 +79 @@
             if (victim)
             {
-                victim->damage(this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length());
+                float damage = this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length();
+                victim->hit(0, contactPoint, damage);
             }
         }

code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -38 +38 @@
 #include "PawnManager.h"
 #include "infos/PlayerInfo.h"
+#include "controllers/Controller.h"
 #include "gametypes/Gametype.h"
 #include "graphics/ParticleSpawner.h"
@@ -176 +177 @@
     }
 
+    void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
+    {
+        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
+        {
+            this->damage(damage, originator);
+
+            if ( this->getController() )
+                this->getController()->hit(originator, contactpoint, damage);
+
+            // play hit effect
+        }
+    }
+
     void Pawn::kill()
     {

code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h

@@ -75 +75 @@
                 { return this->lastHitOriginator_; }
 
-            virtual void damage(float damage, Pawn* originator = 0);
             virtual void hit(Pawn* originator, const Vector3& force, float damage);
+            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
             virtual void kill();
 
@@ -131 +131 @@
             virtual void spawneffect();
 
+            virtual void damage(float damage, Pawn* originator = 0);
+
             bool bAlive_;