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

Timestamp:

Dec 10, 2008, 1:38:17 PM (15 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/CollisionShape.cc (modified) (3 diffs)

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

@@ -37 +37 @@
 #include "tools/BulletConversions.h"
 
+#include "CompoundCollisionShape.h"
+
 namespace orxonox
 {
     CreateFactory(CollisionShape);
 
-    CollisionShape::CollisionShape(BaseObject* creator) : StaticEntity(creator)
+    CollisionShape::CollisionShape(BaseObject* creator)
+        : BaseObject(creator)
+        , network::Synchronisable(creator)
     {
         RegisterObject(CollisionShape);
 
-        this->bIsCompound_ = false;
+        this->parent_ = 0;
+        this->parentID_ = (unsigned int)-1;
+        this->collisionShape_ = 0;
     }
 
@@ -55 +61 @@
     {
         SUPER(CollisionShape, XMLPort, xmlelement, mode);
+
+        XMLPortParamTemplate(CollisionShape, "position", setPosition, getPosition, xmlelement, mode, const Vector3&);
+        XMLPortParamTemplate(CollisionShape, "orientation", setOrientation, getOrientation, xmlelement, mode, const Quaternion&);
+        XMLPortParamLoadOnly(CollisionShape, "yaw",   yaw,   xmlelement, mode);
+        XMLPortParamLoadOnly(CollisionShape, "pitch", pitch, xmlelement, mode);
+        XMLPortParamLoadOnly(CollisionShape, "roll",  roll,  xmlelement, mode);
+        XMLPortParamTemplate(CollisionShape, "scale3D", setScale3D, getScale3D, xmlelement, mode, const Vector3&);
+        XMLPortParamLoadOnly(CollisionShape, "scale", setScale, xmlelement, mode);
     }
 
-    bool CollisionShape::isCollisionTypeLegal(WorldEntity::CollisionType type) const
+    void CollisionShape::registerVariables()
     {
-        if (type != WorldEntity::None)
-        {
-            ThrowException(PhysicsViolation, "A CollisionShape can only have CollisionType 'None'.");
-            return false;
-        }
-        else
-            return true;
+        REGISTERDATA(this->parentID_, network::direction::toclient, new network::NetworkCallback<CollisionShape>(this, &CollisionShape::updateParent));
     }
 
-    bool CollisionShape::hasNoTransform() const
+    void CollisionShape::updateParent()
     {
-        return (this->getPosition().positionEquals(Vector3(0, 0, 0), 0.001) &&
-                this->getOrientation().equals(Quaternion(1,0,0,0), Degree(0.1)));
+        CompoundCollisionShape* parent = dynamic_cast<CompoundCollisionShape*>(Synchronisable::getSynchronisable(this->parentID_));
+        if (parent)
+            parent->addChildShape(this);
     }
 
-    btVector3 CollisionShape::getTotalScaling()
+    bool CollisionShape::hasTransform() const
     {
-        return omni_cast<btVector3>(this->node_->getScale());
+        return (!this->position_.positionEquals(Vector3(0, 0, 0), 0.001) ||
+                !this->orientation_.equals(Quaternion(1,0,0,0), Degree(0.1)));
     }
 
@@ -84 +94 @@
     }
 
-    void CollisionShape::scale3D(const Vector3& scale)
+    void CollisionShape::setScale(float scale)
     {
         ThrowException(NotImplemented, "Cannot set the scale of a collision shape: Not yet implemented.");