Changeset 2403 for code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/PlaneCollisionShape.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/PlaneCollisionShape.cc (modified) (3 diffs, 1 prop)

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

@@ -42 +42 @@
         RegisterObject(PlaneCollisionShape);
 
-        this->planeShape_ = new btStaticPlaneShape(btVector3(1, 1, 1), 0);
-        this->collisionShape_ = this->planeShape_;
-        this->planeNormal_ = Vector3(1, 1, 1);
-        this->planeOffset_ = 0.0f;
+        this->normal_ = Vector3(0, 1, 0);
+        this->offset_ = 0.0f;
+        updatePlane();
+
+        this->registerVariables();
     }
 
@@ -51 +52 @@
     {
         if (this->isInitialized())
-            delete this->planeShape_;
+            delete this->collisionShape_;
     }
 
     void PlaneCollisionShape::registerVariables()
     {
-        REGISTERDATA(this->planeNormal_, network::direction::toclient, new network::NetworkCallback<PlaneCollisionShape>(this, &PlaneCollisionShape::planeNormalChanged));
-        REGISTERDATA(this->planeOffset_, network::direction::toclient, new network::NetworkCallback<PlaneCollisionShape>(this, &PlaneCollisionShape::planeOffsetChanged));
+        REGISTERDATA(this->normal_, network::direction::toclient, new network::NetworkCallback<PlaneCollisionShape>(this, &PlaneCollisionShape::updatePlane));
+        REGISTERDATA(this->offset_, network::direction::toclient, new network::NetworkCallback<PlaneCollisionShape>(this, &PlaneCollisionShape::updatePlane));
     }
 
@@ -64 +65 @@
         SUPER(PlaneCollisionShape, XMLPort, xmlelement, mode);
 
-        XMLPortParam(PlaneCollisionShape, "planeNormal", setNormal, getNormal, xmlelement, mode);
-        XMLPortParam(PlaneCollisionShape, "planeOffset", setOffset, getOffset, xmlelement, mode);    
+        XMLPortParam(PlaneCollisionShape, "normal", setNormal, getNormal, xmlelement, mode);
+        XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);    
     }
 
-    void PlaneCollisionShape::setNormal(const Vector3& normal)
+    void PlaneCollisionShape::updatePlane()
     {
-        delete this->planeShape_;
-        this->planeNormal_ = normal;
-        this->planeShape_ = new btStaticPlaneShape(omni_cast<btVector3>(normal), this->planeOffset_);
-        this->collisionShape_ = this->planeShape_;
-    }
-
-    void PlaneCollisionShape::setOffset(float offset)
-    {
-        delete this->planeShape_;
-        this->planeOffset_ = offset;
-        this->planeShape_ = new btStaticPlaneShape(omni_cast<btVector3>(this->planeNormal_), offset);
-        this->collisionShape_ = this->planeShape_;
+        if (this->collisionShape_)
+            delete this->collisionShape_;
+        this->collisionShape_ = new btStaticPlaneShape(omni_cast<btVector3>(this->normal_), this->offset_);
     }
 }