Changeset 1345

Timestamp:

May 21, 2008, 8:09:03 PM (16 years ago)

Author:

rgrieder

Message:

• commented silly key bindings

Location:

code/branches/input

Files:

• bin/keybindings.ini (modified) (3 diffs)
• src/core/InputManager.cc (modified) (2 diffs)
• src/orxonox/GraphicsEngine.cc (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/input/bin/keybindings.ini

@@ -1 +1 @@
 [KeyBinder]
 KeyUNASSIGNED=
-KeyESCAPE=OnPress exit
+KeyESCAPE=exit
 Key1=
 Key2=
@@ -154 +154 @@
 MouseButton6=
 MouseButton7=
-MouseWheel1Up=AxisAmp 0.1 slomo
-MouseWheel1Down=AxisAmp 0.1 slomo
+MouseWheel1Up=#AxisAmp 0.1 slomo
+MouseWheel1Down=#AxisAmp 0.1 slomo
 MouseWheel2Up=
 MouseWheel2Down=
@@ -175 +175 @@
 JoyAxis4Neg=
 JoyAxis5Pos=
-JoyAxis5Neg=AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit
-JoyAxis6Pos=AxisAmp  10 slomo
+JoyAxis5Neg=#AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit
+JoyAxis6Pos=#AxisAmp  10 slomo
 JoyAxis6Neg=
 JoyAxis7Pos=

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

@@ -98 +98 @@
       windowHndStr << (unsigned int)windowHnd;
       paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
-
+      //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE")));
+      //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_FOREGROUND")));
 //#if defined OIS_LINUX_PLATFORM
 //      paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
@@ -126 +127 @@
 
       // Set mouse/joystick region
-      setWindowExtents(windowWidth, windowHeight);
+      if (mouse_)
+      {
+        //// hack the mouse position
+        //((OIS::MouseState&)mouse_->getMouseState()).X.abs = windowWidth/2;
+        //((OIS::MouseState&)mouse_->getMouseState()).Y.abs = windowHeight/2;
+        setWindowExtents(windowWidth, windowHeight);
+      }
 
       state_ = IS_NONE;

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

@@ -9 +9 @@
  *   modify it under the terms of the GNU General Public License
  *   as published by the Free Software Foundation; either version 2
- *   of the License, or (atl your option) any later version.
- *lo
+ *   of the License, or (at your option) any later version.
+ *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of

code/branches/input/visual_studio/vc8/orxonox.vcproj

@@ -165 +165 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\orxonox\PlayerManager.cc"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\orxonox\PrecompiledHeaderFiles.cc"
                                 >
@@ -448 +444 @@
                         <File
                                 RelativePath="..\..\src\orxonox\OrxonoxStableHeaders.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\orxonox\PlayerManager.h"
                                 >
                         </File>