Changeset 2488 for code/branches/presentation

Timestamp:

Dec 16, 2008, 7:46:31 PM (16 years ago)

Author:

landauf

Message:

backlights work

Location:

code/branches/presentation/src/orxonox/objects

Files:

• items/Engine.cc (modified) (1 diff)
• items/MultiStateEngine.cc (modified) (2 diffs)
• worldentities/MobileEntity.h (modified) (1 diff)

code/branches/presentation/src/orxonox/objects/items/Engine.cc

@@ -154 +154 @@
 
         const Vector3& direction = this->getDirection();
-        Vector3 velocity = this->ship_->getVelocity();
+        Vector3 velocity = this->ship_->getLocalVelocity();
         Vector3 acceleration = Vector3::ZERO;
 

code/branches/presentation/src/orxonox/objects/items/MultiStateEngine.cc

@@ -95 +95 @@
 
                 const Vector3& direction = this->getDirection();
-                const Vector3& velocity = this->getShip()->getVelocity();
+                const Vector3& velocity = this->getShip()->getLocalVelocity();
 
                 bool forward = (direction.z < 0 && velocity.z < -FORWARD_EFFECT_VELOCITY_THRESHOLD);
@@ -123 +123 @@
             }
 
-            if (this->getShip()->hasLocalController() || Core::isMaster())
+            if (Core::isMaster())
             {
                 for (std::list<WorldEntity*>::const_iterator it = this->activeEffects_.begin(); it != this->activeEffects_.end(); ++it)

code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h

@@ -54 +54 @@
             inline const Vector3& getVelocity() const
                 { return this->linearVelocity_; }
+            inline Vector3 getLocalVelocity() const
+                { return (this->getOrientation().Inverse() * this->getVelocity()); }
 
             virtual void setAngularVelocity(const Vector3& velocity);