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

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.h (modified) (3 diffs)

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

@@ -22 +22 @@
  *   Author:
  *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...
@@ -44 +45 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
             void registerVariables();
+
+            using WorldEntity::setPosition;
+            using WorldEntity::setOrientation;
+
+            inline void setPosition(const Vector3& position)
+                { MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); }
+            inline void setOrientation(const Quaternion& orientation)
+                { MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); }
 
         private:
@@ -57 +65 @@
                 { this->setAngularVelocity(this->angularVelocity_); }
 
-            void overwritePosition();
-            void overwriteOrientation();
+            inline void overwritePosition()
+                { this->setPosition(this->overwrite_position_); }
+            inline void overwriteOrientation()
+                { this->setOrientation(this->overwrite_orientation_); }
 
-            void positionChanged(bool bContinuous);
-            void orientationChanged(bool bContinuous);
-
-            Vector3 overwrite_position_;
+            Vector3    overwrite_position_;
             Quaternion overwrite_orientation_;
             Timer<MovableEntity>* continuousResynchroTimer_;