Changeset 1345 for code/branches
- Timestamp:
- May 21, 2008, 8:09:03 PM (16 years ago)
- Location:
- code/branches/input
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/input/bin/keybindings.ini
r1344 r1345 1 1 [KeyBinder] 2 2 KeyUNASSIGNED= 3 KeyESCAPE= OnPressexit3 KeyESCAPE=exit 4 4 Key1= 5 5 Key2= … … 154 154 MouseButton6= 155 155 MouseButton7= 156 MouseWheel1Up= AxisAmp 0.1 slomo157 MouseWheel1Down= AxisAmp 0.1 slomo156 MouseWheel1Up=#AxisAmp 0.1 slomo 157 MouseWheel1Down=#AxisAmp 0.1 slomo 158 158 MouseWheel2Up= 159 159 MouseWheel2Down= … … 175 175 JoyAxis4Neg= 176 176 JoyAxis5Pos= 177 JoyAxis5Neg= AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit178 JoyAxis6Pos= AxisAmp 10 slomo177 JoyAxis5Neg=#AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit 178 JoyAxis6Pos=#AxisAmp 10 slomo 179 179 JoyAxis6Neg= 180 180 JoyAxis7Pos= -
code/branches/input/src/core/InputManager.cc
r1340 r1345 98 98 windowHndStr << (unsigned int)windowHnd; 99 99 paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str())); 100 100 //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE"))); 101 //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_FOREGROUND"))); 101 102 //#if defined OIS_LINUX_PLATFORM 102 103 // paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true"))); … … 126 127 127 128 // Set mouse/joystick region 128 setWindowExtents(windowWidth, windowHeight); 129 if (mouse_) 130 { 131 //// hack the mouse position 132 //((OIS::MouseState&)mouse_->getMouseState()).X.abs = windowWidth/2; 133 //((OIS::MouseState&)mouse_->getMouseState()).Y.abs = windowHeight/2; 134 setWindowExtents(windowWidth, windowHeight); 135 } 129 136 130 137 state_ = IS_NONE; -
code/branches/input/src/orxonox/GraphicsEngine.cc
r1293 r1345 9 9 * modify it under the terms of the GNU General Public License 10 10 * as published by the Free Software Foundation; either version 2 11 * of the License, or (at lyour option) any later version.12 * lo11 * of the License, or (at your option) any later version. 12 * 13 13 * This program is distributed in the hope that it will be useful, 14 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of -
code/branches/input/visual_studio/vc8/orxonox.vcproj
r1323 r1345 165 165 </File> 166 166 <File 167 RelativePath="..\..\src\orxonox\PlayerManager.cc"168 >169 </File>170 <File171 167 RelativePath="..\..\src\orxonox\PrecompiledHeaderFiles.cc" 172 168 > … … 448 444 <File 449 445 RelativePath="..\..\src\orxonox\OrxonoxStableHeaders.h" 450 >451 </File>452 <File453 RelativePath="..\..\src\orxonox\PlayerManager.h"454 446 > 455 447 </File>
Note: See TracChangeset
for help on using the changeset viewer.