Changeset 2403 for code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.cc

Timestamp:

Dec 10, 2008, 11:33:58 PM (17 years ago)

Author:

rgrieder

Message:

• Fixed issues with CollisionShape loading, handling and synchronisation.
• Added eol-style native to PlaneCollisionShape
• Unified treatment of configuring btCollisionShapes when parameters change

File:

• code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.cc (modified) (3 diffs)

code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.cc

@@ -44 +44 @@
         RegisterObject(SphereCollisionShape);
 
-        this->sphereShape_ = new btSphereShape(1.0f);
-        this->collisionShape_ = this->sphereShape_;
+        this->radius_ = 1.0f;
+        updateSphere();
 
         this->registerVariables();
@@ -58 +58 @@
     void SphereCollisionShape::registerVariables()
     {
-        REGISTERDATA(this->radius_, network::direction::toclient, new network::NetworkCallback<SphereCollisionShape>(this, &SphereCollisionShape::radiusChanged));
+        REGISTERDATA(this->radius_, network::direction::toclient, new network::NetworkCallback<SphereCollisionShape>(this, &SphereCollisionShape::updateSphere));
     }
 
@@ -68 +68 @@
     }
 
-    void SphereCollisionShape::setRadius(float radius)
+    void SphereCollisionShape::updateSphere()
     {
-        // TODO: Think about where this could be referenced already.
-        this->radius_ = radius;
-        delete this->sphereShape_;
-        this->sphereShape_ = new btSphereShape(radius);
+        if (this->collisionShape_)
+            delete this->collisionShape_;
+        this->collisionShape_ = new btSphereShape(this->radius_);
     }
 }