Changeset 2374 for code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/PlaneCollisionShape.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/PlaneCollisionShape.cc (modified) (5 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *      Reto Grieder
+ *      Martin Stypinski
  *   Co-authors:
  *      ...
@@ -30 +30 @@
 #include "PlaneCollisionShape.h"
 
-#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
-
-#include "tools/BulletConversions.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -45 +42 @@
         RegisterObject(PlaneCollisionShape);
 
-        this->planeShape_ = new btStaticPlaneShape(btVector3(1,1,1), 0);
+        this->planeShape_ = new btStaticPlaneShape(btVector3(1, 1, 1), 0);
         this->collisionShape_ = this->planeShape_;
+        this->planeNormal_ = Vector3(1, 1, 1);
+        this->planeOffset_ = 0.0f;
     }
 
@@ -52 +51 @@
     {
         if (this->isInitialized())
-            delete this->collisionShape_;
+            delete this->planeShape_;
     }
 
-    void PlaneCollisionShape::setNormal(const Vector3& normal)
+    void PlaneCollisionShape::registerVariables()
     {
-        btScalar offset = this->planeShape_->getPlaneConstant();
-        delete this->collisionShape_;
-        this->planeShape_ = new btStaticPlaneShape(omni_cast<btVector3>(normal), offset);
-        this->collisionShape_ = this->planeShape_;
-    }
-
-    void PlaneCollisionShape::setOffset(float offset)
-    {
-        btVector3 normal = this->planeShape_->getPlaneNormal();
-        delete this->collisionShape_;
-        this->planeShape_ = new btStaticPlaneShape(normal, offset);
-        this->collisionShape_ = this ->planeShape_;
+        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));
     }
 
@@ -75 +64 @@
         SUPER(PlaneCollisionShape, XMLPort, xmlelement, mode);
 
-        XMLPortParam(PlaneCollisionShape, "normal", setNormal, getNormal, xmlelement, mode);
-        XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);    
+        XMLPortParam(PlaneCollisionShape, "planeNormal", setNormal, getNormal, xmlelement, mode);
+        XMLPortParam(PlaneCollisionShape, "planeOffset", setOffset, getOffset, xmlelement, mode);    
     }
 
-    btVector3 PlaneCollisionShape::getTotalScaling()
+    void PlaneCollisionShape::setNormal(const Vector3& normal)
     {
-        return omni_cast<btVector3>(this->node_->getScale()); //* this->radius_;
+        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_;
     }
 }