Changeset 6396 for code/branches/presentation2

Timestamp:

Dec 22, 2009, 8:35:05 PM (15 years ago)

Author:

rgrieder

Message:

Fixed space ship boost sound synchronisation.

Location:

code/branches/presentation2/src/orxonox/items

Files:

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

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

@@ -70 +70 @@
         }
         this->state_ = 0;
-        this->steeringDirectionZ_ = 0.0;
+        this->oldState_ = 0;
 
         this->setSyncMode(ObjectDirection::Bidirectional);
@@ -106 +106 @@
     void MultiStateEngine::registerVariables()
     {
-        registerVariable(this->steeringDirectionZ_, VariableDirection::ToServer);
+        registerVariable(this->state_, VariableDirection::ToServer);
     }
 
@@ -113 +113 @@
         if (this->getShip())
         {
+            const Vector3& velocity = this->getShip()->getLocalVelocity();
+
             if (this->getShip()->hasLocalController())
-                this->steeringDirectionZ_ = this->getDirection().z;
+            {
+                const Vector3& direction = this->getDirection();
+                bool forward = (direction.z < 0.0 && velocity.z < -FORWARD_EFFECT_VELOCITY_THRESHOLD);
+
+                this->state_ = 0;
+                if (this->getShip()->getBoost() && forward)
+                    this->state_ = Boost;
+                else if (forward && !this->state_) // this->state_ == Boost
+                    this->state_ = Normal;
+                else if (direction.z > 0.0 && velocity.z < 0.0)
+                    this->state_ = Brake;
+                else
+                    this->state_ = Idle;
+            }
+
             if (GameMode::isMaster())
             {
-                const Vector3& velocity = this->getShip()->getLocalVelocity();
+                int changes = this->state_ | this->oldState_;
 
                 float pitch = velocity.length();
-                bool forward = (this->steeringDirectionZ_ < 0.0 && velocity.z < -FORWARD_EFFECT_VELOCITY_THRESHOLD);
-
-                int newState = 0;
-                if (this->getShip()->getBoost() && forward)
-                {
-                    newState = Boost;
+                if (this->state_ & Normal)
+                    defEngineSndNormal_->setPitch(clamp(pitch/MAX_VELOCITY_NORMAL + 1, 0.5f, 2.0f));
+                if (this->state_ & Boost)
                     defEngineSndBoost_->setPitch(clamp(pitch/MAX_VELOCITY_BOOST + 1, 0.5f, 2.0f));
-                }
-                else if (forward && !newState) // newState == Boost
-                {
-                    newState = Normal;
-                    defEngineSndNormal_->setPitch(clamp(pitch/MAX_VELOCITY_NORMAL + 1, 0.5f, 2.0f));
-                }
-                else if (this->steeringDirectionZ_ > 0.0 && velocity.z < 0.0)
-                    newState = Brake;
-                else
-                    newState = Idle;
-
-                int changes = newState | this->state_;
+
                 if (changes & Idle)
                 {
-                    lua_pushboolean(this->lua_->getInternalLuaState(), newState & Idle);
+                    lua_pushboolean(this->lua_->getInternalLuaState(), this->state_ & Idle);
                     lua_setglobal(this->lua_->getInternalLuaState(), "idle");
                 }
                 if (changes & Normal)
                 {
-                    lua_pushboolean(this->lua_->getInternalLuaState(), newState & Normal);
+                    lua_pushboolean(this->lua_->getInternalLuaState(), this->state_ & Normal);
                     lua_setglobal(this->lua_->getInternalLuaState(), "normal");
-                    if (newState & Normal)
+                    if (this->state_ & Normal)
                         defEngineSndNormal_->play();
                     else
@@ -155 +157 @@
                 if (changes & Brake)
                 {
-                    lua_pushboolean(this->lua_->getInternalLuaState(), newState & Brake);
+                    lua_pushboolean(this->lua_->getInternalLuaState(), this->state_ & Brake);
                     lua_setglobal(this->lua_->getInternalLuaState(), "brake");
                 }
                 if (changes & Boost)
                 {
-                    lua_pushboolean(this->lua_->getInternalLuaState(), newState & Boost);
+                    lua_pushboolean(this->lua_->getInternalLuaState(), this->state_ & Boost);
                     lua_setglobal(this->lua_->getInternalLuaState(), "boost");
-                    if (newState & Boost)
+                    if (this->state_ & Boost)
                         defEngineSndBoost_->play();
                     else
@@ -168 +170 @@
                 }
 
-                this->state_ = newState;
+                this->oldState_ = this->state_;
 
                 // Update all effect conditions

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

@@ -68 +68 @@
 
         private:
-            float steeringDirectionZ_;
             int state_;
+            int oldState_;
             LuaState* lua_;
             std::vector<EffectContainer*> effectContainers_;