Changeset 9996 for code/branches

Timestamp:

Mar 9, 2014, 10:34:08 PM (11 years ago)

Author:

noep

Message:

Fixed the method outputting the projectile's CollisionBox instead of the one of the Pawn it collides into.

Location:

code/branches/modularships

Files:

• data/levels/emptyLevel.oxw (modified) (2 diffs)
• src/orxonox/Scene.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/modularships/data/levels/emptyLevel.oxw

@@ -49 +49 @@
     </MovableEntity>
     
-    <Pawn health=30 position="0,-50,0" direction="0,-1,0" collisionType=dynamic mass=1000 name=box radarname = "Box 4" >
+    <Pawn health=30 position="0,-100,0" direction="0,0,0" collisionType=dynamic mass=1000 name=box radarname = "Box 4" >
         <attached>
             <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
@@ -55 +55 @@
         <collisionShapes>
             <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+            <BoxCollisionShape position="0,-15,0" halfExtents="15,15,15" />
         </collisionShapes>
     </Pawn>

code/branches/modularships/src/orxonox/Scene.cc

@@ -373 +373 @@
         bool modified = false;
         if (object0->isCollisionCallbackActive())
-            modified |= object0->customCollidesAgainst(object1, cs0, cp);
+            modified |= object0->customCollidesAgainst(object1, cs1, cp);
         if (object1->isCollisionCallbackActive())
-            modified |= object1->customCollidesAgainst(object0, cs1, cp);
+            modified |= object1->customCollidesAgainst(object0, cs0, cp);
 
         return modified;

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

@@ -280 +280 @@
             damage *= originator->getDamageMultiplier();
 
-        orxout() << "damage(): Custom collision detected on CS: " << cs << endl;
+        orxout() << "damage(): Custom collision detected on " << this->getRadarName() << ", CS: " << cs << endl;
 
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))