Changeset 2407 for code/branches/physics/src

Timestamp:

Dec 11, 2008, 1:54:35 PM (16 years ago)

Author:

rgrieder

Message:

• Removed debug output
• Fixed a bug with parentID_ in CollisionShape
• Reactivated overwrite mechanism in ControllableEntity
• Build fix in WE for last commit.

Location:

code/branches/physics/src/orxonox/objects

Files:

• collisionshapes/CompoundCollisionShape.cc (modified) (2 diffs)
• collisionshapes/CompoundCollisionShape.h (modified) (1 diff)
• worldentities/ControllableEntity.cc (modified) (9 diffs)
• worldentities/ControllableEntity.h (modified) (1 diff)
• worldentities/LinearEntity.cc (modified) (4 diffs)
• worldentities/MovableEntity.cc (modified) (5 diffs)
• worldentities/MovableEntity.h (modified) (1 diff)
• worldentities/WorldEntity.cc (modified) (3 diffs)
• worldentities/WorldEntity.h (modified) (1 diff)

code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc

@@ -72 +72 @@
     }
 
-    void CompoundCollisionShape::addChildShape(CollisionShape* shape)
+    void CompoundCollisionShape::addChildShape(CollisionShape* shape, bool bWorldEntityRoot)
     {
         if (!shape)
@@ -97 +97 @@
 
         // network synchro
-        shape->setParent(this, this->getObjectID());
+        if (!bWorldEntityRoot)
+            shape->setParent(this, this->getObjectID());
     }
 

code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

@@ -45 +45 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void addChildShape(CollisionShape* shape);
+            void addChildShape(CollisionShape* shape, bool bWorldEntityRoot = false);
             CollisionShape* getChildShape(unsigned int index) const;
 

code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Reto Grieder
  *
  */
@@ -256 +256 @@
     {
         if (!this->bControlled_)
-        {
-            //COUT(0) << "override with server position: " << this << std::endl;
             this->setPosition(this->server_position_);
-        }
     }
 
@@ -282 +279 @@
     void ControllableEntity::processOverwrite()
     {
-        //if (this->bControlled_)
-        //{
-        //    COUT(0) << "complete override: " << this << std::endl;
-        //    this->setPosition(this->server_position_);
-        //    this->setVelocity(this->server_velocity_);
-        //    this->setOrientation(this->server_orientation_);
-
-        //    this->client_overwrite_ = this->server_overwrite_;
-        //}
+        if (this->bControlled_)
+        {
+            this->setPosition(this->server_position_);
+            this->setOrientation(this->server_orientation_);
+            this->setVelocity(this->server_linear_velocity_);
+            this->setAngularVelocity(this->server_angular_velocity_);
+
+            this->client_overwrite_ = this->server_overwrite_;
+        }
     }
 
     void ControllableEntity::processClientPosition()
     {
-        //if (this->server_overwrite_ == this->client_overwrite_)
-        if (!this->bControlled_)
-        {
-            //COUT(0) << "override with client position: " << this << std::endl;
-//            COUT(2) << "callback: setting client position" << endl;
+        if (this->server_overwrite_ == this->client_overwrite_)
+        {
             this->setPosition(this->client_position_);
-            //this->server_position_ = this->client_position_;
-        }
-        //else
-        //  COUT(2) << "callback: not setting client position" << endl;
+            // The call above increments the overwrite. This is not desired to reduce traffic
+            --this->server_overwrite_;
+        }
     }
 
     void ControllableEntity::processClientLinearVelocity()
     {
-        if (!this->bControlled_)
-        //if (this->server_overwrite_ == this->client_overwrite_)
+        if (this->server_overwrite_ == this->client_overwrite_)
         {
             this->setVelocity(this->client_linear_velocity_);
-            //this->server_velocity_ = this->client_velocity_;
+            // The call above increments the overwrite. This is not desired to reduce traffic
+            --this->server_overwrite_;
         }
     }
@@ -319 +312 @@
     void ControllableEntity::processClientOrientation()
     {
-        if (!this->bControlled_)
-        //if (this->server_overwrite_ == this->client_overwrite_)
+        if (this->server_overwrite_ == this->client_overwrite_)
         {
             this->setOrientation(this->client_orientation_);
-            //this->server_orientation_ = this->client_orientation_;
+            // The call above increments the overwrite. This is not desired to reduce traffic
+            --this->server_overwrite_;
         }
     }
@@ -329 +322 @@
     void ControllableEntity::processClientAngularVelocity()
     {
-        if (!this->bControlled_)
-        //if (this->server_overwrite_ == this->client_overwrite_)
+        if (this->server_overwrite_ == this->client_overwrite_)
         {
             this->setAngularVelocity(this->client_angular_velocity_);
-            //this->server_velocity_ = this->client_velocity_;
+            // The call above increments the overwrite. This is not desired to reduce traffic
+            --this->server_overwrite_;
         }
     }
@@ -342 +335 @@
         {
             this->server_position_ = this->getPosition();
-            ++this->server_overwrite_;
+            if (!bContinuous)
+                ++this->server_overwrite_;
         }
         else if (this->bControlled_)
@@ -355 +349 @@
         {
             this->server_orientation_ = this->getOrientation();
-            ++this->server_overwrite_;
+            if (!bContinuous)
+                ++this->server_overwrite_;
         }
         else if (this->bControlled_)
@@ -368 +363 @@
         {
             this->server_linear_velocity_ = this->getVelocity();
-            ++this->server_overwrite_;
+            if (!bContinuous)
+                ++this->server_overwrite_;
         }
         else if (this->bControlled_)
@@ -381 +377 @@
         {
             this->server_angular_velocity_ = this->getAngularVelocity();
-            ++this->server_overwrite_;
+            if (!bContinuous)
+                ++this->server_overwrite_;
         }
         else if (this->bControlled_)

code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Reto Grieder
  *
  */

code/branches/physics/src/orxonox/objects/worldentities/LinearEntity.cc

@@ -80 +80 @@
     void LinearEntity::overwritePosition()
     {
-        //COUT(0) << "Setting position on client: " << this->overwrite_position_ << std::endl;
         this->setPosition(this->overwrite_position_);
     }
@@ -86 +85 @@
     void LinearEntity::overwriteOrientation()
     {
-        //COUT(0) << "Setting orientation on client: " << this->overwrite_orientation_ << std::endl;
         this->setOrientation(this->overwrite_orientation_);
     }
@@ -109 +107 @@
     {
         if (!bContinuous)
-        {
-            //if (Core::isMaster())
-            //    COUT(0) << "Setting position on server: " << this->getPosition() << std::endl;
             this->overwrite_position_ = this->getPosition();
-        }
     }
 
@@ -119 +113 @@
     {
         if (!bContinuous)
-        {
-            //if (Core::isMaster())
-            //    COUT(0) << "Setting orientation on server: " << this->getOrientation() << std::endl;
             this->overwrite_orientation_ = this->getOrientation();
-        }
     }
 }

code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -108 +108 @@
         if (this->isDynamic())
         {
-            //if (this->isPhysicsRunning())
-            //    return;
             btTransform transf = this->physicalBody_->getWorldTransform();
             transf.setOrigin(btVector3(position.x, position.y, position.z));
@@ -115 +113 @@
         }
 
-        //COUT(0) << "setting position: " << position << std::endl;
         this->node_->setPosition(position);
         positionChanged(false);
@@ -212 +209 @@
             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot align physical object relative \
                                                           to any other space than TS_LOCAL.");
-            //btTransform transf = this->physicalBody_->getWorldTransform();
-            //this->physicalBody_->setWorldTransform(transf);
         }
 
@@ -227 +222 @@
             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot align physical object relative \
                                                           to any other space than TS_LOCAL.");
-            //btTransform transf = this->physicalBody_->getWorldTransform();
-            //this->physicalBody_->setWorldTransform(transf);
         }
 
@@ -288 +281 @@
         this->node_->setPosition(Vector3(worldTrans.getOrigin().x(), worldTrans.getOrigin().y(), worldTrans.getOrigin().z()));
         this->node_->setOrientation(Quaternion(worldTrans.getRotation().w(), worldTrans.getRotation().x(), worldTrans.getRotation().y(), worldTrans.getRotation().z()));
-        COUT(0) << "setting world transform: " << omni_cast<std::string>(node_->getPosition()) << std::endl;
         this->linearVelocity_.x = this->physicalBody_->getLinearVelocity().x();
         this->linearVelocity_.y = this->physicalBody_->getLinearVelocity().y();

code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h

@@ -108 +108 @@
 
         private:
-            virtual void positionChanged       (bool bContinuous) { }
-            virtual void orientationChanged    (bool bContinuous) { }
+            virtual void positionChanged       (bool bContinuous) = 0;
+            virtual void orientationChanged    (bool bContinuous) = 0;
             virtual void linearVelocityChanged (bool bContinuous) { }
             virtual void angularVelocityChanged(bool bContinuous) { }

code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -44 +44 @@
 
 #include "objects/Scene.h"
-#include "objects/worldentities/collisionshapes/CollisionShape.h"
-#include "objects/worldentities/collisionshapes/CompoundCollisionShape.h"
+#include "objects/collisionshapes/CollisionShape.h"
+#include "objects/collisionshapes/CompoundCollisionShape.h"
 
 namespace orxonox
@@ -191 +191 @@
                 // static to static/kinematic/dynamic --> merge shapes
                 this->childMass_ += object->getMass();
-                this->attachCollisionShape(object->getCollisionShape());
+                this->attachCollisionShape(object->getCollisionShape(), true);
                 // Remove the btRigidBody from the child object.
                 // That also implies that cannot add a physics WE to the child afterwards.
@@ -237 +237 @@
     }
 
-    void WorldEntity::attachCollisionShape(CollisionShape* shape)
-    {
-        this->collisionShape_->addChildShape(shape);
+    void WorldEntity::attachCollisionShape(CollisionShape* shape, bool bWorldEntityRoot)
+    {
+        this->collisionShape_->addChildShape(shape, bWorldEntityRoot);
 
         if (this->physicalBody_)

code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h

@@ -202 +202 @@
                 { return this->mass_; }
 
-            void attachCollisionShape(CollisionShape* shape);
+            void attachCollisionShape(CollisionShape* shape, bool bWorldEntityRoot = false);
             CollisionShape* getAttachedCollisionShape(unsigned int index) const;