Changeset 3301 for code/trunk/src/core/input

Timestamp:

Jul 18, 2009, 4:03:59 PM (15 years ago)

Author:

rgrieder

Message:

Found even more casts. They sure aren't all of them, but I hope to have caught every pointer C-style cast because they can be very dangerous.
Note: I didn't do the pointer casts in the network library because that would have taken way too long.

Location:

code/trunk/src/core/input

Files:

• InputBuffer.cc (modified) (1 diff)
• InputManager.cc (modified) (1 diff)
• KeyBinder.cc (modified) (3 diffs)

code/trunk/src/core/input/InputBuffer.cc

@@ -218 +218 @@
         }
 
-        this->insert((char)evt.text);
+        this->insert(static_cast<char>(evt.text));
     }
 

code/trunk/src/core/input/InputManager.cc

@@ -175 +175 @@
 
             // Fill parameter list
-            windowHndStr << (unsigned int)windowHnd_;
+            windowHndStr << static_cast<unsigned int>(windowHnd);
             paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
 #if defined(ORXONOX_PLATFORM_WINDOWS)

code/trunk/src/core/input/KeyBinder.cc

@@ -444 +444 @@
                     if (mousePosition_[i] < 0)
                     {
-                        mouseAxes_[2*i + 0].absVal_ =  -mousePosition_[i]/(float)mouseClippingSize_ * mouseSensitivity_;
-                        mouseAxes_[2*i + 1].absVal_ =  0.0f;
+                        mouseAxes_[2*i + 0].absVal_ = -mouseSensitivity_ * mousePosition_[i] / mouseClippingSize_;
+                        mouseAxes_[2*i + 1].absVal_ = 0.0f;
                     }
                     else
                     {
-                        mouseAxes_[2*i + 0].absVal_ =  0.0f;
-                        mouseAxes_[2*i + 1].absVal_ =   mousePosition_[i]/(float)mouseClippingSize_ * mouseSensitivity_;
+                        mouseAxes_[2*i + 0].absVal_ = 0.0f;
+                        mouseAxes_[2*i + 1].absVal_ =  mouseSensitivity_ * mousePosition_[i] / mouseClippingSize_;
                     }
                 }
@@ -460 +460 @@
         {
             if (rel[i] < 0)
-                mouseAxes_[0 + 2*i].relVal_ = -((float)rel[i])/(float)mouseClippingSize_ * mouseSensitivity_;
+                mouseAxes_[0 + 2*i].relVal_ = -mouseSensitivity_ * rel[i] / mouseClippingSize_;
             else
-                mouseAxes_[1 + 2*i].relVal_ =  ((float)rel[i])/(float)mouseClippingSize_ * mouseSensitivity_;
+                mouseAxes_[1 + 2*i].relVal_ =  mouseSensitivity_ * rel[i] / mouseClippingSize_;
         }
     }
@@ -474 +474 @@
         if (rel < 0)
             for (int i = 0; i < -rel/mouseWheelStepSize_; i++)
-                mouseButtons_[8].execute(KeybindMode::OnPress, ((float)abs)/mouseWheelStepSize_);
+                mouseButtons_[8].execute(KeybindMode::OnPress, static_cast<float>(abs)/mouseWheelStepSize_);
         else
             for (int i = 0; i < rel/mouseWheelStepSize_; i++)
-                mouseButtons_[9].execute(KeybindMode::OnPress, ((float)abs)/mouseWheelStepSize_);
+                mouseButtons_[9].execute(KeybindMode::OnPress, static_cast<float>(abs)/mouseWheelStepSize_);
     }