Changeset 7326 in orxonox.OLD for trunk/src

Timestamp:

Apr 17, 2006, 2:42:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: limiting the maximum rotation speed of the turbine_hover, as proposed by the network-guys

Location:

trunk/src

Files:

• lib/sound/sound_source.cc (modified) (1 diff)
• world_entities/space_ships/turbine_hover.cc (modified) (2 diffs)

trunk/src/lib/sound/sound_source.cc

@@ -253 +253 @@
   alSource3f(sourceID, AL_DIRECTION,       0.0, 0.0, 0.0);
   alSourcef (sourceID, AL_ROLLOFF_FACTOR,  0.0          );
-  alSourcei (sourceID, AL_SOURCE_RELATIVE, AL_TRUE      );
+  //alSourcei (sourceID, AL_SOURCE_RELATIVE, AL_TRUE      );
   alSourcef (sourceID, AL_GAIN,            SoundEngine::getInstance()->getEffectsVolume());
 }

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -331 +331 @@
 
   this->velocity += (accelerationDir - damping)* dt;
-
   this->shiftCoor (this->velocity * dt);
-  this->rotation = 0.0f;
+
+  // limit the maximum rotation speed.
+  if (this->rotation != 0.0f)
+  {
+    float maxRot = 10.0 * dt;
+    if (unlikely(this->rotation > maxRot)) this->rotation = maxRot;
+    if (unlikely(this->rotation < -maxRot)) this->rotation = -maxRot;
+    this->direction *= Quaternion(-M_PI/4.0*this->rotation, Vector(0,1,0));
+
+    this->rotation = 0.0f;
+  }
 
   this->setRelDirSoft(this->direction * Quaternion(-cameraLook, Vector(0,0,1)), 5);
@@ -421 +430 @@
 
     // rotate the Player around the y-axis
-    this->direction *= Quaternion(-M_PI/4.0*xMouse, Vector(0,1,0));
     this->rotation += xMouse;