Changeset 2544 for code/branches/presentation/src/core/input/InputManager.h
- Timestamp:
- Dec 28, 2008, 11:57:27 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation/src/core/input/InputManager.h
r2543 r2544 71 71 struct JoyStickCalibration 72 72 { 73 int zeroStates[24];73 int middleValue[24]; 74 74 float positiveCoeff[24]; 75 75 float negativeCoeff[24]; … … 146 146 void _initialiseMouse(); 147 147 void _initialiseJoySticks(); 148 void _configureNumberOfJoySticks(); 148 void _configureJoySticks(); 149 150 void _loadCalibration(); 151 void _startCalibration(); 152 void _completeCalibration(); 153 void _evaluateCalibration(); 149 154 150 155 void _destroyKeyboard(); … … 155 160 156 161 void _reload(bool joyStickSupport); 157 158 void _completeCalibration();159 162 160 163 void _fireAxis(unsigned int iJoyStick, int axis, int value); … … 179 182 180 183 void setConfigValues(); 184 void _calibrationFileCallback(); 181 185 182 186 private: // variables … … 186 190 std::vector<OIS::JoyStick*> joySticks_; //!< OIS joy sticks 187 191 unsigned int joySticksSize_; 192 std::vector<std::string> joyStickIDs_; //!< Execution unique identification strings for the joy sticks 188 193 unsigned int devicesNum_; 189 194 size_t windowHnd_; //!< Render window handle … … 208 213 209 214 // joystick calibration 210 //std::vector<int> marginalsMaxConfig_; 211 //std::vector<int> marginalsMinConfig_; 212 int marginalsMax_[24]; 213 int marginalsMin_[24]; 214 bool bCalibrated_; 215 bool bCalibrating_; 215 std::vector<std::vector<int> > joyStickMinValues_; 216 std::vector<std::vector<int> > joyStickMaxValues_; 217 std::vector<std::vector<int> > joyStickMiddleValues_; 218 std::vector<ConfigValueContainer*> calibrationConfigValueContainers_; 219 std::vector<JoyStickCalibration> joyStickCalibrations_; 216 220 217 221 unsigned int keyboardModifiers_; //!< Bit mask representing keyboard modifiers. 218 222 std::vector<POVStates> povStates_; //!< Keeps track of the joy stick POV states. 219 223 std::vector<SliderStates> sliderStates_; //!< Keeps track of the possibly two slider axes. 220 std::vector<JoyStickCalibration> joySticksCalibration_;221 224 222 225 std::vector<Key> keysDown_; … … 224 227 std::vector<std::vector<JoyStickButtonCode::ByEnum> > joyStickButtonsDown_; 225 228 229 // ConfigValues 230 std::string calibrationFilename_; //!< Joy stick calibration ini filename 226 231 227 232 static InputManager* singletonRef_s;
Note: See TracChangeset
for help on using the changeset viewer.