Changeset 1597 for code/branches/core3/src

Timestamp:

Jun 12, 2008, 11:02:40 PM (16 years ago)

Author:

landauf

Message:

small cleanup in KeyBinder (don't panic reto, I've only replaced SetConfigValueGeneric with SetConfigValue) and ParticleProjectile uses now Particle::speedChanged() as a callback function instead of implementing it's own version.

Location:

code/branches/core3/src

Files:

• core/input/KeyBinder.cc (modified) (1 diff)
• orxonox/objects/ParticleProjectile.cc (modified) (1 diff)
• orxonox/objects/ParticleProjectile.h (modified) (1 diff)

code/branches/core3/src/core/input/KeyBinder.cc

@@ -234 +234 @@
   void KeyBinder::setConfigValues()
   {
-    SetConfigValue(/*Generic(KeyBinder, */analogThreshold_, 0.05f)  .description("Threshold for analog axes until which the state is 0.");
-    SetConfigValue(/*Generic(KeyBinder, */mouseSensitivity_, 1.0f)  .description("Mouse sensitivity.");
-    SetConfigValue(/*Generic(KeyBinder, */bDeriveMouseInput_, false).description("Whether or not to derive moues movement for the absolute value.");
-    SetConfigValue(/*Generic(KeyBinder, */derivePeriod_, 0.05f).description("Accuracy of the mouse input deriver. The higher the more precise, but laggier.");
-    SetConfigValue(/*Generic(KeyBinder, */mouseSensitivityDerived_, 1.0f).description("Mouse sensitivity if mouse input is derived.");
-    SetConfigValue(/*Generic(KeyBinder, */bClipMouse_, true).description("Whether or not to clip absolute value of mouse in non derive mode.");
+    SetConfigValue(analogThreshold_, 0.05f)  .description("Threshold for analog axes until which the state is 0.");
+    SetConfigValue(mouseSensitivity_, 1.0f)  .description("Mouse sensitivity.");
+    SetConfigValue(bDeriveMouseInput_, false).description("Whether or not to derive moues movement for the absolute value.");
+    SetConfigValue(derivePeriod_, 0.05f).description("Accuracy of the mouse input deriver. The higher the more precise, but laggier.");
+    SetConfigValue(mouseSensitivityDerived_, 1.0f).description("Mouse sensitivity if mouse input is derived.");
+    SetConfigValue(bClipMouse_, true).description("Whether or not to clip absolute value of mouse in non derive mode.");
 
     float oldThresh = buttonThreshold_;
-    SetConfigValue(/*Generic(KeyBinder, */buttonThreshold_, 0.80f).description("Threshold for analog axes until which the button is not pressed.");
+    SetConfigValue(buttonThreshold_, 0.80f).description("Threshold for analog axes until which the button is not pressed.");
     if (oldThresh != buttonThreshold_)
       for (unsigned int i = 0; i < nHalfAxes_s; i++)

code/branches/core3/src/orxonox/objects/ParticleProjectile.cc

@@ -67 +67 @@
     }
 
-    void ParticleProjectile::speedChanged()
-    {
-        Projectile::speed_s = this->speed_;
-        if (this->owner_)
-            this->setVelocity(this->owner_->getInitialDir() * this->speed_);
-    }
-
     void ParticleProjectile::changedVisibility()
     {

code/branches/core3/src/orxonox/objects/ParticleProjectile.h

@@ -45 +45 @@
             virtual void changedVisibility();
             void setConfigValues();
-            void speedChanged();
 
         private: