Changeset 10007 for code/branches/modularships

Timestamp:

Mar 27, 2014, 3:49:50 PM (11 years ago)

Author:

noep

Message:

More research done on collisionshape-entity-structure, and started cleaning up the debug-output.

Location:

code/branches/modularships/src/orxonox

Files:

• ShipPart.cc (added)
• ShipPart.h (added)
• worldentities/pawns/Pawn.cc (modified) (3 diffs)
• worldentities/pawns/Pawn.h (modified) (1 diff)

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

@@ -53 +53 @@
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
+#include "graphics/Model.h"
 
 
@@ -638 +639 @@
         orxout() << "  " << this->getRadarName() << " has the following Objects attached:" << endl;
         for (int i=0; i<10; i++)
-            orxout() << " " << i << ": " << this->getAttachedObject(i) << endl;
+        {
+            if (this->getAttachedObject(i)==NULL)
+                break;
+            orxout() << " " << i << ": " << this->getAttachedObject(i);
+            if(!orxonox_cast<Model*>(this->getAttachedObject(i)))
+                orxout() << " (SE)";
+            orxout() << endl;
+        }
+
+        if (this->health_ < 800)
+            this->detach(this->getAttachedObject(2));
 
         // print child shapes of this WECS
-        // printChildShapes(ownWECS, 2, 0);
         printBtChildShapes((btCompoundShape*)(ownWECS->getCollisionShape()), 2, 0);
 
+        int temp = entityOfCollisionShape(cs);
+        if (temp==0)
+            orxout() << this->getRadarName() << " has been hit on it's main body." << endl;
+        else
+            orxout() << this->getRadarName() << " has been hit on the attached entity no. " << temp << endl;
 
         // end
-        orxout() << "  " << this->getRadarName() << ": no matching CS found." << endl;
         return -1;
-    }
-
-    void Pawn::printChildShapes(CompoundCollisionShape* cs, int indent, int subshape)
-    {
-        for (int i=0; i < cs->getNumChildShapes(); i++)
-        {
-            orxout() << "" << endl;
-        }
-        /*
-        // e.g. "  Childshape 1 (WECS 0x126dc8c0) has 2 childshapes:"
-        printSpaces(indent);  orxout() << "Childshape " << subshape << " (CS* " << cs << ") has " << cs->getNumChildShapes() << " childshapes:" << endl;
-
-        // e.g. "Box 4 is WorldEntityCollisionShape 0x126dd060"
-        printSpaces(indent);  orxout() << "Childshape " << subshape << " is btCollisionShape* " << cs->getCollisionShape() << endl;
-
-        for (int i=0; i < cs->getNumChildShapes(); i++)
-        {
-            printSpaces(indent+2);  orxout() << "- " << i << " - - -" << endl;
-            printSpaces(indent+2);  orxout() << "This Shape is a ";
-            if (orxonox_cast<WorldEntityCollisionShape*>(cs->getAttachedShape(i)))
-                orxout() << "WECS ";
-            if (orxonox_cast<CompoundCollisionShape*>(cs->getAttachedShape(i)))
-                orxout() << "CCS ";
-            if (orxonox_cast<CollisionShape*>(cs->getAttachedShape(i)))
-                orxout() << "CS ";
-            orxout() << endl;
-
-            // For each childshape, print:
-
-            // parentID of the CollisionShape
-            printSpaces(indent+2);  orxout() << "ParentID: " << cs->getAttachedShape(i)->getObjectID() << endl;
-
-            // parentID of the CollisionShape
-            printSpaces(indent+2);  orxout() << "ParentID: " << cs->getAttachedShape(i)->getParentID() << endl;
-
-            // parent of the CollisionShape
-            printSpaces(indent+2);  orxout() << "ParentCCS*: " << cs->getAttachedShape(i)->getParent() << endl;
-
-            // pointer to the btCollisionShape
-            printSpaces(indent+2);  orxout() << "btCollisionShape*: " << cs->getAttachedShape(i)->getCollisionShape() << endl;
-
-            // pointer to the CollisionShape
-            printSpaces(indent+2);  orxout() << "CollisionShape*: " << cs->getAttachedShape(i) << endl;
-
-            if (cs->getAttachedShape(i)->getCollisionShape() != NULL)
-            {
-                // pointer to the user of the btCollisionShape
-                printSpaces(indent+2);  orxout() << "bt: getUserPointer: " << cs->getAttachedShape(i)->getCollisionShape()->getUserPointer() << endl;
-
-                //
-                printSpaces(indent+2);  orxout() << "bt: isCompound: " << cs->getAttachedShape(i)->getCollisionShape()->isCompound() << endl;
-            }
-
-            // if the childshape is a CompoundCollisionShape, print its children.
-            if (orxonox_cast<CompoundCollisionShape*>(cs->getAttachedShape(i)))
-            {
-                printChildShapes((CompoundCollisionShape*)(cs->getAttachedShape(i)), indent+2, i);
-            }
-
-        }*/
     }
 
@@ -736 +690 @@
     }
 
+    int Pawn::entityOfCollisionShape(const btCollisionShape* cs)
+    {
+        btCompoundShape* ownBtCS = (btCompoundShape*)(this->getWorldEntityCollisionShape()->getCollisionShape());
+
+        return -1;
+    }
+
     void Pawn::printSpaces(int num)
     {

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

@@ -233 +233 @@
 
             virtual int isMyCollisionShape(const btCollisionShape* cs);
-            void printChildShapes(CompoundCollisionShape* cs, int indent, int subshape);
             void printBtChildShapes(btCompoundShape* cs, int indent, int subshape);
             void printSpaces(int num);
+            int entityOfCollisionShape(const btCollisionShape* cs);
 
         private: