Changeset 10003 for code/branches/modularships

Timestamp:

Mar 20, 2014, 3:46:06 PM (11 years ago)

Author:

noep

Message:

A Pawn being hit now prints it's Collisionshape-Structure, as well as the WorldEntity every on of those CollisionShapes belongs to.

Location:

code/branches/modularships

Files:

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

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

@@ -63 +63 @@
                 </collisionShapes> 
             </StaticEntity>
+            <StaticEntity position="0,-180,0" direction="0,0,0" collisionType=static mass=100 friction=0.01 >
+                <attached> 
+                    <Model position="0,0,0" mesh="crate.mesh" scale3D="6,6,6" />
+                    <Model position="0,-60,0" mesh="cube.mesh" scale3D="30,30,30" /> 
+                </attached> 
+                <collisionShapes> 
+                    <BoxCollisionShape position="0,0,0" halfExtents="30,30,30" /> 
+                    <BoxCollisionShape position="0,-60,0" halfExtents="30,30,30" /> 
+                </collisionShapes> 
+            </StaticEntity>
         </attached>
         <collisionShapes>

code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -39 +39 @@
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
+
+#include "collisionshapes/WorldEntityCollisionShape.h"
 
 namespace orxonox
@@ -118 +120 @@
             this->updatePublicShape();
         }
+
+        // If the shape to be attached is not a CompoundCollisionShape (thus an actual physical shape) & this is a WorldEntity's CollisionShape,
+        // set it's userPointer to the WorldEntity this CompoundCollisionShape belongs to.
+        if (!orxonox_cast<CompoundCollisionShape*>(shape) && orxonox_cast<WorldEntityCollisionShape*>(this))
+            shape->getCollisionShape()->setUserPointer(orxonox_cast<WorldEntityCollisionShape*>(this)->getWorldEntityOwner());
     }
 

code/branches/modularships/src/orxonox/worldentities/WorldEntity.cc

@@ -46 +46 @@
 #include "Scene.h"
 #include "collisionshapes/WorldEntityCollisionShape.h"
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
 
 namespace orxonox

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

@@ -630 +630 @@
         // e.g. "Box 4 is WorldEntityCollisionShape 0x126dd060"
         orxout() << "  " << this->getRadarName() << " is WorldEntityCollisionShape* " << ownWECS << endl;
-        // e.g. "Box 4 is btCollisionShape 0x126dd060"
-        orxout() << "  " << this->getRadarName() << " is btCollisionShape* " << ownWECS->getCollisionShape() << endl;
+        // e.g. "Box 4 is WorldEntity 0x126dd060"
+        orxout() << "  " << this->getRadarName() << " is WorldEntity* " << this << endl;
         // e.g. "Box 4 is objectID 943"
         orxout() << "  " << this->getRadarName() << " is objectID " << this->getObjectID() << endl;
+
+        // List all attached Objects
+        orxout() << "  " << this->getRadarName() << " has the following Objects attached:" << endl;
+        for (int i=0; i<10; i++)
+            orxout() << " " << i << ": " << this->getAttachedObject(i) << endl;
 
         // print child shapes of this WECS
         // printChildShapes(ownWECS, 2, 0);
         printBtChildShapes((btCompoundShape*)(ownWECS->getCollisionShape()), 2, 0);
-        // printChildShapeMap(ownWECS->getShapesMap());
 
 
@@ -715 +719 @@
             printSpaces(indent+2);  orxout() << "- " << i << " - - -" << endl;
 
-            // For each childshape, print:
-
-            // pointer to the btCollisionShape
-            printSpaces(indent+2);  orxout() << "btCollisionShape*: " << cs->getChildShape(i) << endl;
+            // For each childshape, print: (as long as it's not another CompoundCollisionShape)
+            if (!orxonox_cast<btCompoundShape*>(cs->getChildShape(i)))
+            {
+                // pointer to the btCollisionShape
+                printSpaces(indent+2);  orxout() << "btCollisionShape*: " << cs->getChildShape(i) << endl;
+
+                // pointer to the btCollisionShape
+                printSpaces(indent+2);  orxout() << "m_userPointer*: " << cs->getChildShape(i)->getUserPointer() << endl;
+            }
 
             // if the childshape is a CompoundCollisionShape, print its children.
             if (cs->getChildShape(i)->isCompound())
-            {
-                printSpaces(indent+2);  orxout() << "This shape is compound." << endl;
                 printBtChildShapes((btCompoundShape*)(cs->getChildShape(i)), indent+2, i);
-            }
-
-        }
-    }
-
-    void Pawn::printChildShapeMap(std::map<CollisionShape*, btCollisionShape*> map)
-    {
-        orxout() << endl;
+
+        }
     }
 

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

@@ -236 +236 @@
             void printBtChildShapes(btCompoundShape* cs, int indent, int subshape);
             void printSpaces(int num);
-            void printChildShapeMap(std::map<CollisionShape*, btCollisionShape*> map);
 
         private: