diff options
| author | punto- <ariel@godotengine.org> | 2016-02-02 21:58:20 -0300 |
|---|---|---|
| committer | punto- <ariel@godotengine.org> | 2016-02-02 21:58:20 -0300 |
| commit | dcb823b2934ffddb74ff55aa7ff7f5be9e8c29b4 (patch) | |
| tree | a8a6d5a658de870b5089206704c40e5c8df6c041 /tools/editor | |
| parent | f026838cbc60ec7eeed45d6d30c22a3b73a57bc0 (diff) | |
| parent | 1395029d8a1ed72806a103180a7ffca30fdb4aa0 (diff) | |
Merge pull request #3560 from Hinsbart/axis_names
fix joystick axis names in project settings
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/project_settings.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index fab2d9ce5c..873e397010 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -299,18 +299,18 @@ void ProjectSettings::_add_item(int p_item){ device_id->set_val(0); device_index_label->set_text("Joy Button Axis:"); device_index->clear(); - for(int i=0;i<24;i++) { + for(int i=0;i<JOY_AXIS_MAX*2;i++) { String desc; int ax=i/2; - if (ax==0) + if (ax==0 || ax==1) desc=" (Left Stick)"; - else if (ax==1) + else if (ax==2 || ax==3) desc=" (Right Stick)"; - else if (ax==4) + else if (ax==6) desc=" (L2)"; - else if (ax==5) + else if (ax==7) desc=" (R2)"; @@ -511,7 +511,18 @@ void ProjectSettings::_update_actions() { } break; case InputEvent::JOYSTICK_MOTION: { - String str = "Device "+itos(ie.device)+", Axis "+itos(ie.joy_motion.axis)+" "+(ie.joy_motion.axis_value<0?"-.":"+."); + String desc; + int ax = ie.joy_motion.axis; + + if (ax==0 || ax==1) + desc=" (Left Stick)."; + else if (ax==2 || ax==3) + desc=" (Right Stick)."; + else if (ax==6) + desc=" (L2)."; + else if (ax==7) + desc=" (R2)."; + String str = "Device "+itos(ie.device)+", Axis "+itos(ie.joy_motion.axis)+" "+(ie.joy_motion.axis_value<0?"-":"+")+desc; action->set_text(0,str); action->set_icon(0,get_icon("JoyAxis","EditorIcons")); } break; |