Changeset 10189 for code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h

Timestamp:

Jan 11, 2015, 3:40:41 PM (9 years ago)

Author:

landauf

Message:

added new collision shape (cylinder)

File:

• code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) (3 diffs)

code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h

@@ -37 +37 @@
 
 #include "objects/ObjectsPrereqs.h"
-#include "collisionshapes/CollisionShape.h"
+#include "AbstractRadiusHeightCollisionShape.h"
 
 namespace orxonox
@@ -52 +52 @@
     @ingroup Collisionshapes
     */
-    class _ObjectsExport ConeCollisionShape : public CollisionShape
+    class _ObjectsExport ConeCollisionShape : public AbstractRadiusHeightCollisionShape
     {
         public:
@@ -58 +58 @@
             virtual ~ConeCollisionShape();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
-            /**
-            @brief Set the radius of the ConeCollisionShape.
-                   If the radius changes, this causes the internal collision shape to be recreated.
-            @param value The radius to be set.
-            @return Returns true if the radius has changed, false if not.
-            */
-            inline bool setRadius(float value)
-                { if(this->radius_ == value) return false; this->radius_ = value; updateShape(); return true; }
-            /**
-            @brief Get the radius of the ConeCollisionShape.
-            @return Returns the radius of the ConeCollisionShape.
-            */
-            inline float getRadius() const
-                { return radius_; }
-
-            /**
-            @brief Set the height of the ConeCollisionShape.
-                   If the height changes, this causes the internal collision shape to be recreated.
-            @param value The height to be set.
-            @return Returns true if the height has changed, false if not.
-            */
-            inline bool setHeight(float value)
-                { if(this->height_ == value) return false; this->height_ = value; updateShape(); return true; }
-            /**
-            @brief Get the height of the ConeCollisionShape.
-            @return Returns the height of the ConeCollisionShape.
-            */
-            inline float getHeight() const
-                { return this->height_; }
-
-            virtual void changedScale(); // Is called when the scale of the ConeCollisionShape has changed.
-
         private:
-            void registerVariables();
-
             btCollisionShape* createNewShape() const; // Creates a new internal collision shape for the ConeCollisionShape.
-
-            float radius_; //!< The radius of the ConeCollisionShape.
-            float height_; //!< The height of the ConeCollisionShape.
      };
 }