Changeset 6329

Timestamp:

Dec 12, 2009, 7:54:12 PM (14 years ago)

Author:

rgrieder

Message:

Who the hell uses ints to synchronise part of a float vector? Well, I really don't know…

Location:

code/branches/presentation2/src/orxonox/items

Files:

• MultiStateEngine.cc (modified) (4 diffs)
• MultiStateEngine.h (modified) (1 diff)

code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc

@@ -71 +71 @@
         }
         this->state_ = 0;
-        this->steeringDirectionZ_ = 0;
+        this->steeringDirectionZ_ = 0.0;
 
         this->setSyncMode(ObjectDirection::Bidirectional);
@@ -115 +115 @@
         {
             if (this->getShip()->hasLocalController())
-                this->steeringDirectionZ_ = (int)this->getDirection().z;
+                this->steeringDirectionZ_ = this->getDirection().z;
             if (GameMode::isMaster())
             {
@@ -121 +121 @@
 
                 float pitch = velocity.length();
-                bool forward = (this->steeringDirectionZ_ < 0 && velocity.z < -FORWARD_EFFECT_VELOCITY_THRESHOLD);
+                bool forward = (this->steeringDirectionZ_ < 0.0 && velocity.z < -FORWARD_EFFECT_VELOCITY_THRESHOLD);
 
                 int newState = 0;
@@ -134 +134 @@
                     defEngineSndNormal_->setPitch(clamp(pitch/MAX_VELOCITY_NORMAL + 1, 0.5f, 2.0f));
                 }
-                else if (this->steeringDirectionZ_ > 0 && velocity.z < 0)
+                else if (this->steeringDirectionZ_ > 0.0 && velocity.z < 0.0)
                     newState = Brake;
                 else

code/branches/presentation2/src/orxonox/items/MultiStateEngine.h

@@ -71 +71 @@
 
         private:
-            int steeringDirectionZ_;
+            float steeringDirectionZ_;
             int state_;
             LuaState* lua_;