Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1345 for code/branches


Ignore:
Timestamp:
May 21, 2008, 8:09:03 PM (16 years ago)
Author:
rgrieder
Message:
  • commented silly key bindings
Location:
code/branches/input
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/input/bin/keybindings.ini

    r1344 r1345  
    11[KeyBinder]
    22KeyUNASSIGNED=
    3 KeyESCAPE=OnPress exit
     3KeyESCAPE=exit
    44Key1=
    55Key2=
     
    154154MouseButton6=
    155155MouseButton7=
    156 MouseWheel1Up=AxisAmp 0.1 slomo
    157 MouseWheel1Down=AxisAmp 0.1 slomo
     156MouseWheel1Up=#AxisAmp 0.1 slomo
     157MouseWheel1Down=#AxisAmp 0.1 slomo
    158158MouseWheel2Up=
    159159MouseWheel2Down=
     
    175175JoyAxis4Neg=
    176176JoyAxis5Pos=
    177 JoyAxis5Neg=AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit
    178 JoyAxis6Pos=AxisAmp  10 slomo
     177JoyAxis5Neg=#AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit
     178JoyAxis6Pos=#AxisAmp  10 slomo
    179179JoyAxis6Neg=
    180180JoyAxis7Pos=
  • code/branches/input/src/core/InputManager.cc

    r1340 r1345  
    9898      windowHndStr << (unsigned int)windowHnd;
    9999      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")));
    101102//#if defined OIS_LINUX_PLATFORM
    102103//      paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
     
    126127
    127128      // 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      }
    129136
    130137      state_ = IS_NONE;
  • code/branches/input/src/orxonox/GraphicsEngine.cc

    r1293 r1345  
    99 *   modify it under the terms of the GNU General Public License
    1010 *   as published by the Free Software Foundation; either version 2
    11  *   of the License, or (atl your option) any later version.
    12  *lo
     11 *   of the License, or (at your option) any later version.
     12 *
    1313 *   This program is distributed in the hope that it will be useful,
    1414 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  • code/branches/input/visual_studio/vc8/orxonox.vcproj

    r1323 r1345  
    165165                        </File>
    166166                        <File
    167                                 RelativePath="..\..\src\orxonox\PlayerManager.cc"
    168                                 >
    169                         </File>
    170                         <File
    171167                                RelativePath="..\..\src\orxonox\PrecompiledHeaderFiles.cc"
    172168                                >
     
    448444                        <File
    449445                                RelativePath="..\..\src\orxonox\OrxonoxStableHeaders.h"
    450                                 >
    451                         </File>
    452                         <File
    453                                 RelativePath="..\..\src\orxonox\PlayerManager.h"
    454446                                >
    455447                        </File>
Note: See TracChangeset for help on using the changeset viewer.