Changeset 2427 for code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc

Timestamp:

Dec 13, 2008, 9:38:30 PM (15 years ago)

Author:

rgrieder

Message:

Changed the way setPosition, setVelocity, setOrientation and setAngularVelocity is handled in MobileEntity and upwards.
This allows to introduce a lost feature: Position of an enemy ship on the client can't be set anymore at all (local changes were allowed before).

File:

• code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc (modified) (3 diffs)

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

@@ -22 +22 @@
  *   Author:
  *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...
@@ -76 +77 @@
     }
 
-    void MovableEntity::tick(float dt)
-    {
-        MobileEntity::tick(dt);
-
-        if (this->isActive())
-        {
-        }
-    }
-
-    void MovableEntity::overwritePosition()
-    {
-        this->setPosition(this->overwrite_position_);
-    }
-
-    void MovableEntity::overwriteOrientation()
-    {
-        this->setOrientation(this->overwrite_orientation_);
-    }
-
     void MovableEntity::clientConnected(unsigned int clientID)
     {
@@ -106 +88 @@
     void MovableEntity::resynchronize()
     {
-        positionChanged(false);
-        orientationChanged(false);
-    }
-
-    void MovableEntity::positionChanged(bool bContinuous)
-    {
-        if (!bContinuous)
-            this->overwrite_position_ = this->getPosition();
-    }
-
-    void MovableEntity::orientationChanged(bool bContinuous)
-    {
-        if (!bContinuous)
-            this->overwrite_orientation_ = this->getOrientation();
+        this->overwrite_position_ = this->getPosition();
+        this->overwrite_orientation_ = this->getOrientation();
     }
 }