Changeset 10203 for code/branches/presentationFS14/src/orxonox/collisionshapes

Timestamp:

Jan 25, 2015, 11:15:24 PM (10 years ago)

Author:

landauf

Message:

removed unused code and debug output

Location:

code/branches/presentationFS14/src/orxonox/collisionshapes

Files:

• CollisionShape.h (modified) (1 diff)
• CompoundCollisionShape.cc (modified) (1 diff)
• CompoundCollisionShape.h (modified) (1 diff)

code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.h

@@ -170 +170 @@
             void notifyDetached(); // Notifies the CollisionShape of being detached from a CompoundCollisionShape.
 
-            inline unsigned int getParentID()
-                { return this->parentID_; }
-
-            inline CompoundCollisionShape* getParent()
-                { return this->parent_; }
-
         protected:
             virtual void updateParent(); // Updates the CompoundCollisionShape the CollisionShape belongs to, after the CollisionShape has changed.

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

@@ -304 +304 @@
         this->updatePublicShape();*/
     }
-
-    int CompoundCollisionShape::getNumChildShapes()
-    {
-        return this->compoundShape_->getNumChildShapes();
-    }
 }

code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.h

@@ -71 +71 @@
 
             virtual void changedScale();
-            int getNumChildShapes();
-
-            inline std::map<CollisionShape*, btCollisionShape*> getShapesMap()
-            {
-                return attachedShapes_;
-            }
 
         private: