Changeset 1340 for code/branches/input/src/orxonox

Timestamp:

May 21, 2008, 12:23:29 AM (17 years ago)

Author:

rgrieder

Message:

• tried a more object oriented approach for the KeyBinder
• things work as far as I can tell
• tested slomo command on joy stick slider: I was able to steer the time factor with the slider.
• more infos to come..

Location:

code/branches/input/src/orxonox

Files:

• Orxonox.cc (modified) (1 diff)
• objects/SpaceShip.cc (modified) (4 diffs)
• objects/SpaceShip.h (modified) (1 diff)

code/branches/input/src/orxonox/Orxonox.cc

@@ -83 +83 @@
 namespace orxonox
 {
-  ConsoleCommandShortcut(Orxonox, exit, AccessLevel::None);
-  ConsoleCommandShortcut(Orxonox, slomo, AccessLevel::Offline).setDefaultValue(0, 1.0);
+  ConsoleCommandShortcut(Orxonox, exit, AccessLevel::None).setKeybindMode(KeybindMode::OnPress);
+  ConsoleCommandShortcut(Orxonox, slomo, AccessLevel::Offline).setDefaultValue(0, 1.0)
+    .setAxisParamIndex(0).setIsAxisRelative(false);
   ConsoleCommandShortcut(Orxonox, setTimeFactor, AccessLevel::Offline).setDefaultValue(0, 1.0);
   ConsoleCommandShortcut(Orxonox, activateConsole, AccessLevel::None);

code/branches/input/src/orxonox/objects/SpaceShip.cc

@@ -296 +296 @@
     }
 
-    bool SpaceShip::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
+    void SpaceShip::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
     {
 /*
@@ -352 +352 @@
             this->mouseYRotation_ = Radian(yRotation);
         }
-
-        return true;
-    }
-
-    bool SpaceShip::mouseButtonPressed(MouseButton::Enum id)
+    }
+
+    void SpaceShip::mouseButtonPressed(MouseButton::Enum id)
     {
         if (id == MouseButton::Left)
@@ -362 +360 @@
         else if (id == MouseButton::Right)
             this->bRMousePressed_ = true;
-
-        return true;
-    }
-
-    bool SpaceShip::mouseButtonReleased(MouseButton::Enum id)
+    }
+
+    void SpaceShip::mouseButtonReleased(MouseButton::Enum id)
     {
         if (id == MouseButton::Left)
@@ -375 +371 @@
             this->camNode_->resetOrientation();
         }
-
-        return true;
     }
 

code/branches/input/src/orxonox/objects/SpaceShip.h

@@ -67 +67 @@
                 { SpaceShip::instance_s->setMaxSpeed(value); }
 
-            bool mouseButtonPressed (MouseButton::Enum id);
-            bool mouseButtonReleased(MouseButton::Enum id);
-            bool mouseButtonHeld    (MouseButton::Enum id) { return true; }
-            bool mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
-            bool mouseScrolled      (int abs, int rel) { return true; }
+            void mouseButtonPressed (MouseButton::Enum id);
+            void mouseButtonReleased(MouseButton::Enum id);
+            void mouseButtonHeld    (MouseButton::Enum id) { }
+            void mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
+            void mouseScrolled      (int abs, int rel) { }