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

Timestamp:

Dec 10, 2008, 1:38:17 PM (17 years ago)

Author:

rgrieder

Message:

Trying to synchronise phyiscs over the network.

• Removed derivation of CollisionShape from WorldEntity (BaseObject instead).

File:

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

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

@@ -46 +46 @@
         this->sphereShape_ = new btSphereShape(1.0f);
         this->collisionShape_ = this->sphereShape_;
+
+        this->registerVariables();
     }
 
@@ -52 +54 @@
         if (this->isInitialized())
             delete this->collisionShape_;
+    }
+
+    void SphereCollisionShape::registerVariables()
+    {
+        REGISTERDATA(this->radius_, network::direction::toclient, new network::NetworkCallback<SphereCollisionShape>(this, &SphereCollisionShape::radiusChanged));
     }
 
@@ -61 +68 @@
     }
 
-    btVector3 SphereCollisionShape::getTotalScaling()
+    void SphereCollisionShape::setRadius(float radius)
     {
-        return omni_cast<btVector3>(this->node_->getScale()) * this->radius_;
+        // TODO: Think about where this could be referenced already.
+        this->radius_ = radius;
+        delete this->sphereShape_;
+        this->sphereShape_ = new btSphereShape(radius);
     }
 }