From: <au...@us...> - 2009-03-31 16:01:47
|
Revision: 3328 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3328&view=rev Author: auria Date: 2009-03-31 16:01:42 +0000 (Tue, 31 Mar 2009) Log Message: ----------- added default bindings for gamepad buttons + other minor fixes Modified Paths: -------------- main/branches/irrlicht/src/gui/screen_loader.cpp main/branches/irrlicht/src/gui/widget.cpp main/branches/irrlicht/src/input/input_device.cpp Modified: main/branches/irrlicht/src/gui/screen_loader.cpp =================================================================== --- main/branches/irrlicht/src/gui/screen_loader.cpp 2009-03-31 15:14:23 UTC (rev 3327) +++ main/branches/irrlicht/src/gui/screen_loader.cpp 2009-03-31 16:01:42 UTC (rev 3328) @@ -101,7 +101,6 @@ { type = WTYPE_MODEL_VIEW; append_to.push_back(new ModelViewWidget()); - std::cout << "creating a ModelViewWidget\n"; } else { Modified: main/branches/irrlicht/src/gui/widget.cpp =================================================================== --- main/branches/irrlicht/src/gui/widget.cpp 2009-03-31 15:14:23 UTC (rev 3327) +++ main/branches/irrlicht/src/gui/widget.cpp 2009-03-31 16:01:42 UTC (rev 3328) @@ -956,7 +956,7 @@ #if 0 #pragma mark - -#pragma mark Ribbon Grid Widget +#pragma mark Model View Widget #endif // ----------------------------------------------------------------------------- Modified: main/branches/irrlicht/src/input/input_device.cpp =================================================================== --- main/branches/irrlicht/src/input/input_device.cpp 2009-03-31 15:14:23 UTC (rev 3327) +++ main/branches/irrlicht/src/input/input_device.cpp 2009-03-31 16:01:42 UTC (rev 3328) @@ -84,6 +84,12 @@ return true; } + +#if 0 +#pragma mark - +#pragma mark Keyboard +#endif + // ----------------------------------------------------------------------------- KeyboardDevice::KeyboardDevice() { @@ -137,6 +143,13 @@ return false; } // ----------------------------------------------------------------------------- + + +#if 0 +#pragma mark - +#pragma mark gamepad +#endif + /** * Creates a GamePade device from a config file. Note that this device will not yet be ready to be used, * it must first be detected to be connected by SDL (hence m_sdlJoystick is NULL) @@ -191,16 +204,23 @@ // ----------------------------------------------------------------------------- void GamePadDevice::loadDefaults() { - /* - TODO - default bindings for joystic buttons - m_bindings[PA_NITRO] - m_bindings[PA_DRIFT] - m_bindings[PA_RESCUE] - m_bindings[PA_FIRE] - m_bindings[PA_LOOK_BACK] - */ - // m_bindings[PA_NITRO].type = Input::IT_STICKBUTTON; + // buttons + m_bindings[PA_FIRE].type = Input::IT_STICKBUTTON; + m_bindings[PA_FIRE].id = 0; + m_bindings[PA_NITRO].type = Input::IT_STICKBUTTON; + m_bindings[PA_NITRO].id = 1; + + m_bindings[PA_DRIFT].type = Input::IT_STICKBUTTON; + m_bindings[PA_DRIFT].id = 2; + + m_bindings[PA_RESCUE].type = Input::IT_STICKBUTTON; + m_bindings[PA_RESCUE].id = 3; + + m_bindings[PA_LOOK_BACK].type = Input::IT_STICKBUTTON; + m_bindings[PA_LOOK_BACK].id = 4; + + // axes m_bindings[PA_ACCEL].type = Input::IT_STICKMOTION; m_bindings[PA_ACCEL].id = 1; m_bindings[PA_ACCEL].dir = Input::AD_NEGATIVE; @@ -219,23 +239,16 @@ /* - set(GA_CURSOR_UP, - Input(Input::IT_STICKMOTION, 0, 1, Input::AD_NEGATIVE)); - set(GA_CURSOR_DOWN, - Input(Input::IT_STICKMOTION, 0, 1, Input::AD_POSITIVE)); - set(GA_CURSOR_LEFT, - Input(Input::IT_STICKMOTION, 0, 0, Input::AD_NEGATIVE)); - set(GA_CURSOR_RIGHT, - Input(Input::IT_STICKMOTION, 0, 0, Input::AD_POSITIVE)); + TODO - mappings for clear/enter/leave ? set(GA_CLEAR_MAPPING, Input(Input::IT_STICKBUTTON, 0, 2)); + set(GA_ENTER, Input(Input::IT_STICKBUTTON, 0, 0), + set(GA_LEAVE, Input(Input::IT_STICKBUTTON, 0, 1), - - Input::IT_KEYBOARD */ } // ----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |