History

two new customizable actions for use in js

Sam Gondelman committed 11 years ago

Commit 53bbd511 parent fd0efd95 files · +17 −7Browse files

Showing the changes to interface/src/ui/UserInputMapper.cpp (1 of 5 files). Show all

Unified · Split

interface/src/ui/UserInputMapper.cpp+4−0
@@ -248,6 +248,8 @@ void UserInputMapper::assignDefaulActionScales() { · 247 unmodified lines
248 _actionScales[BOOM_IN] = 1.0f; // 1m per unit248 _actionScales[BOOM_IN] = 1.0f; // 1m per unit
249 _actionScales[BOOM_OUT] = 1.0f; // 1m per unit249 _actionScales[BOOM_OUT] = 1.0f; // 1m per unit
250 _actionStates[SHIFT] = 1.0f; // on250 _actionStates[SHIFT] = 1.0f; // on
251 _actionStates[ACTION1] = 1.0f; // default
252 _actionStates[ACTION2] = 1.0f; // default
251}253}
252 254
253// This is only necessary as long as the actions are hardcoded255// This is only necessary as long as the actions are hardcoded
@@ -266,4 +268,6 @@ void UserInputMapper::createActionNames() { · 12 unmodified lines
266 _actionNames[BOOM_IN] = "BOOM_IN";268 _actionNames[BOOM_IN] = "BOOM_IN";
267 _actionNames[BOOM_OUT] = "BOOM_OUT";269 _actionNames[BOOM_OUT] = "BOOM_OUT";
268 _actionNames[SHIFT] = "SHIFT";270 _actionNames[SHIFT] = "SHIFT";
271 _actionNames[ACTION1] = "ACTION1";
272 _actionNames[ACTION2] = "ACTION2";
269}273}