Changeset 10189 for code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc

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/AbstractRadiusHeightCollisionShape.cc (copied) (copied from code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc) (6 diffs)

code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc

@@ -23 +23 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Fabian 'x3n' Landau
  *
  */
 
 /**
-    @file ConeCollisionShape.cc
-    @brief Implementation of the ConeCollisionShape class.
+    @file AbstractRadiusHeightCollisionShape.cc
+    @brief Implementation of the AbstractRadiusHeightCollisionShape class.
 */
 
-#include "ConeCollisionShape.h"
-
-#include <BulletCollision/CollisionShapes/btConeShape.h>
+#include "AbstractRadiusHeightCollisionShape.h"
 
 #include "core/CoreIncludes.h"
@@ -42 +40 @@
 namespace orxonox
 {
-    RegisterClass(ConeCollisionShape);
+    RegisterAbstractClass(AbstractRadiusHeightCollisionShape).inheritsFrom(Class(CollisionShape));
 
     /**
@@ -48 +46 @@
         Constructor. Registers and initializes the object.
     */
-    ConeCollisionShape::ConeCollisionShape(Context* context) : CollisionShape(context)
+    AbstractRadiusHeightCollisionShape::AbstractRadiusHeightCollisionShape(Context* context) : CollisionShape(context)
     {
-        RegisterObject(ConeCollisionShape);
+        RegisterObject(AbstractRadiusHeightCollisionShape);
 
         this->radius_ = 1.0f;
         this->height_ = 1.0f;
-        updateShape();
 
         this->registerVariables();
     }
 
-    ConeCollisionShape::~ConeCollisionShape()
-    {
-        if (this->isInitialized())
-            delete this->collisionShape_;
-    }
-
-    void ConeCollisionShape::registerVariables()
+    void AbstractRadiusHeightCollisionShape::registerVariables()
     {
         registerVariable(this->radius_, VariableDirection::ToClient, new NetworkCallback<CollisionShape>(this, &CollisionShape::updateShape));
@@ -71 +62 @@
     }
 
-    void ConeCollisionShape::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void AbstractRadiusHeightCollisionShape::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(ConeCollisionShape, XMLPort, xmlelement, mode);
+        SUPER(AbstractRadiusHeightCollisionShape, XMLPort, xmlelement, mode);
 
-        XMLPortParam(ConeCollisionShape, "radius", setRadius, getRadius, xmlelement, mode);
-        XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);
+        XMLPortParam(AbstractRadiusHeightCollisionShape, "radius", setRadius, getRadius, xmlelement, mode);
+        XMLPortParam(AbstractRadiusHeightCollisionShape, "height", setHeight, getHeight, xmlelement, mode);
     }
 
     /**
     @brief
-        Is called when the scale of the ConeCollisionShape has changed.
+        Is called when the scale of the AbstractRadiusHeightCollisionShape has changed.
     */
-    void ConeCollisionShape::changedScale()
+    void AbstractRadiusHeightCollisionShape::changedScale()
     {
         CollisionShape::changedScale();
@@ -92 +83 @@
         if(!this->hasUniformScaling())
         {
-            orxout(internal_error) << "ConeCollisionShape: Non-uniform scaling is not yet supported." << endl;
+            orxout(internal_error) << "AbstractRadiusHeightCollisionShape: Non-uniform scaling is not yet supported." << endl;
             return;
         }
@@ -100 +91 @@
         this->updateShape();
     }
-
-    /**
-    @brief
-        Creates a new internal collision shape for the ConeCollisionShape.
-    @return
-        Returns a pointer to the newly created btConeShape.
-    */
-    btCollisionShape* ConeCollisionShape::createNewShape() const
-    {
-        return new btConeShape(this->radius_, this->height_);
-    }
 }