Changeset 10189 for code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.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/ConeCollisionShape.cc (modified) (4 diffs)

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

@@ -37 +37 @@
 
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
 
@@ -48 +47 @@
         Constructor. Registers and initializes the object.
     */
-    ConeCollisionShape::ConeCollisionShape(Context* context) : CollisionShape(context)
+    ConeCollisionShape::ConeCollisionShape(Context* context) : AbstractRadiusHeightCollisionShape(context)
     {
         RegisterObject(ConeCollisionShape);
 
-        this->radius_ = 1.0f;
-        this->height_ = 1.0f;
         updateShape();
-
-        this->registerVariables();
     }
 
@@ -63 +58 @@
         if (this->isInitialized())
             delete this->collisionShape_;
-    }
-
-    void ConeCollisionShape::registerVariables()
-    {
-        registerVariable(this->radius_, VariableDirection::ToClient, new NetworkCallback<CollisionShape>(this, &CollisionShape::updateShape));
-        registerVariable(this->height_, VariableDirection::ToClient, new NetworkCallback<CollisionShape>(this, &CollisionShape::updateShape));
-    }
-
-    void ConeCollisionShape::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(ConeCollisionShape, XMLPort, xmlelement, mode);
-
-        XMLPortParam(ConeCollisionShape, "radius", setRadius, getRadius, xmlelement, mode);
-        XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);
-    }
-
-    /**
-    @brief
-        Is called when the scale of the ConeCollisionShape has changed.
-    */
-    void ConeCollisionShape::changedScale()
-    {
-        CollisionShape::changedScale();
-
-        // Resize the internal collision shape
-        // TODO: Assuming setLocalScaling works.
-        //this->collisionShape_->setLocalScaling(multi_cast<btVector3>(this->getScale3D()));
-        if(!this->hasUniformScaling())
-        {
-            orxout(internal_error) << "ConeCollisionShape: Non-uniform scaling is not yet supported." << endl;
-            return;
-        }
-
-        this->radius_ *= this->getScale();
-        this->height_ *= this->getScale();
-        this->updateShape();
     }
 
@@ -109 +68 @@
     btCollisionShape* ConeCollisionShape::createNewShape() const
     {
-        return new btConeShape(this->radius_, this->height_);
+        return new btConeShape(this->getRadius(), this->getHeight());
     }
 }