Changeset 1347

Timestamp:

May 21, 2008, 8:56:31 PM (16 years ago)

Author:

rgrieder

Message:

• gcc knows more…

Location:

code/branches/input/src/core

Files:

• InputHandler.cc (modified) (10 diffs)
• InputHandler.h (modified) (1 diff)

code/branches/input/src/core/InputHandler.cc

@@ -181 +181 @@
 
         // evaluate the command
-        CommandEvaluation& eval = CommandExecutor::evaluate(commandStr);
+        CommandEvaluation eval = CommandExecutor::evaluate(commandStr);
         if (!eval.isValid())
           continue;
@@ -405 +405 @@
       "MYCOMPUTER", "MAIL", "MEDIASELECT"
     };
-    for (int i = 0; i < nKeys_s; i++)
+    for (unsigned int i = 0; i < nKeys_s; i++)
       keys_[i].name_ = "Key" + keyNames[i];
 
@@ -415 +415 @@
       "MouseWheel1Up", "MouseWheel1Down",
       "MouseWheel2Up", "MouseWheel2Down" };
-    for (int i = 0; i < nMouseButtons_s; i++)
+    for (unsigned int i = 0; i < nMouseButtons_s; i++)
       mouseButtons_[i].name_ = mouseButtonNames[i];
 
     // joy stick buttons
-    for (int i = 0; i < 32; i++)
+    for (unsigned int i = 0; i < 32; i++)
       joyStickButtons_[i].name_ = "JoyButton" + getConvertedValue<int, std::string>(i);
-    for (int i = 32; i < nJoyStickButtons_s; i += 4)
+    for (unsigned int i = 32; i < nJoyStickButtons_s; i += 4)
     {
                   joyStickButtons_[i + 0].name_ = "JoyPOV" + getConvertedValue<int, std::string>((i - 32)/4 + 1) + "North";
@@ -527 +527 @@
   void KeyBinder::clearBindings(bool bInit)
   {
-    for (int i = 0; i < nKeys_s; i++)
+    for (unsigned int i = 0; i < nKeys_s; i++)
       keys_[i].clear();
 
-    for (int i = 0; i < nMouseButtons_s; i++)
+    for (unsigned int i = 0; i < nMouseButtons_s; i++)
       mouseButtons_[i].clear();
 
-    for (int i = 0; i < nJoyStickButtons_s; i++)
+    for (unsigned int i = 0; i < nJoyStickButtons_s; i++)
       joyStickButtons_[i].clear();
 
-    for (int i = 0; i < nHalfAxes_s; i++)
+    for (unsigned int i = 0; i < nHalfAxes_s; i++)
       halfAxes_[i].clear();
 
@@ -588 +588 @@
           if (mouseRelative_[i] > 0)
           {
-            halfAxes_[2*i + 0].absVal_ = mouseRelative_[i] * derivePeriod_ / 500;
+            halfAxes_[2*i + 0].absVal_ = mouseRelative_[i] * derivePeriod_ / 500 * mouseSensitivity_;
             halfAxes_[2*i + 1].absVal_ = 0.0f;
           }
@@ -594 +594 @@
           {
             halfAxes_[2*i + 0].absVal_ = 0.0f;
-            halfAxes_[2*i + 1].absVal_ = -mouseRelative_[i] * derivePeriod_ / 500;
+            halfAxes_[2*i + 1].absVal_ = -mouseRelative_[i] * derivePeriod_ / 500 * mouseSensitivity_;
           }
           COUT(3) << mouseRelative_[i] << " | ";
-          mouseRelative_[i] = 0.0f;
+          mouseRelative_[i] = 0;
         }
         COUT(3) << std::endl;
@@ -652 +652 @@
     {
       // y axis of mouse input is inverted
-      int rel[] = { rel_.x * mouseSensitivity_, -rel_.y * mouseSensitivity_ };
+      int rel[] = { rel_.x, -rel_.y };
 
       COUT(3) << rel[0] << " | " << rel[1] << std::endl;
@@ -668 +668 @@
             {
               halfAxes_[1 + 2*i].hasChanged_ = true;
-              halfAxes_[1 + 2*i].absVal_ = -((float)mousePosition_[i])/1024;
+              halfAxes_[1 + 2*i].absVal_ = -((float)mousePosition_[i])/1024 * mouseSensitivity_;
               halfAxes_[0 + 2*i].absVal_ =  0.0f;
             }
             else
-              halfAxes_[1 + 2*i].absVal_ =  ((float)mousePosition_[i])/1024;
+              halfAxes_[1 + 2*i].absVal_ =  ((float)mousePosition_[i])/1024 * mouseSensitivity_;
           }
           else
@@ -681 +681 @@
             {
               halfAxes_[0 + 2*i].hasChanged_ = true;
-              halfAxes_[0 + 2*i].absVal_ =  ((float)mousePosition_[i])/1024;
+              halfAxes_[0 + 2*i].absVal_ =  ((float)mousePosition_[i])/1024 * mouseSensitivity_;
               halfAxes_[1 + 2*i].absVal_ =  0.0f;
             }
             else
-              halfAxes_[1 + 2*i].absVal_ = -((float)mousePosition_[i])/1024;
+              halfAxes_[1 + 2*i].absVal_ = -((float)mousePosition_[i])/1024 * mouseSensitivity_;
           }
 
           // relative
           if (rel[i] > 0)
-            halfAxes_[0 + 2*i].relVal_ =  ((float)rel[i])/1024;
+            halfAxes_[0 + 2*i].relVal_ =  ((float)rel[i])/1024 * mouseSensitivity_;
           else
-            halfAxes_[1 + 2*i].relVal_ = -((float)rel[i])/1024;
+            halfAxes_[1 + 2*i].relVal_ = -((float)rel[i])/1024 * mouseSensitivity_;
         }
       }
@@ -698 +698 @@
     else
     {
-      mouseRelative_[0] += rel_.x * mouseSensitivity_;
-      mouseRelative_[1] -= rel_.y * mouseSensitivity_;
+      mouseRelative_[0] += rel_.x;
+      mouseRelative_[1] -= rel_.y;
     }
   }

code/branches/input/src/core/InputHandler.h

@@ -213 +213 @@
     float deriveTime_;
 
-    //**** ConfigValues *****\\
+    //##### ConfigValues #####
     //! Threshold for analog triggers until which the state is 0.
     float analogThreshold_;