Changeset 2514 for code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc

Timestamp:

Dec 21, 2008, 2:44:00 PM (17 years ago)

Author:

rgrieder

Message:

Resolved four issues with the collision shapes:

• NetworkCallback will of course not call functions virtually
• CompoundCollisionShapes with a WorldEntity parent don't have to attach themselves when synchronised
• Just in case: When changing a CollisionShape, the old gets destroyed AFTER everything has been updated
• CompoundCollisionShapes with a WorldEntity parent now update both the WE and the CompoundCollisionShape when something changes

Other changes

• Also replaced some redundant code while at it (updating the shapes was done individually)
• Like in WE, the CompoundCollisionShape deletes all its children when being destroyed itself. This requires in WE that the children get detached before the CompoundCollisionShape gets deleted.

File:

• code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc (modified) (3 diffs)

code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc

@@ -46 +46 @@
         this->radius_ = 1.0f;
         this->height_ = 1.0f;
-        updateCone();
+        updateShape();
 
         this->registerVariables();
@@ -59 +59 @@
     void ConeCollisionShape::registerVariables()
     {
-        registerVariable(this->radius_, variableDirection::toclient, new NetworkCallback<ConeCollisionShape>(this, &ConeCollisionShape::updateCone));
-        registerVariable(this->height_, variableDirection::toclient, new NetworkCallback<ConeCollisionShape>(this, &ConeCollisionShape::updateCone));
+        registerVariable(this->radius_, variableDirection::toclient, new NetworkCallback<CollisionShape>(this, &CollisionShape::updateShape));
+        registerVariable(this->height_, variableDirection::toclient, new NetworkCallback<CollisionShape>(this, &CollisionShape::updateShape));
     }
 
@@ -71 +71 @@
     }
 
-    void ConeCollisionShape::updateCone()
+    btCollisionShape* ConeCollisionShape::createNewShape() const
     {
-        if (this->collisionShape_)
-            delete this->collisionShape_;
-        this->collisionShape_ = new btConeShape(this->radius_, this->height_);
-        this->updateParent();
+        return  new btConeShape(this->radius_, this->height_);
     }
 }