godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #3560 from Hinsbart/axis_names

Browse Source 
fix joystick axis names in project settings
This commit is contained in:
punto-
2016-02-02 21:58:20 -03:00
parent f026838cbc 1395029d8a
commit dcb823b293
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/editor/project_settings.cpp
View File

@@ -299,18 +299,18 @@ void ProjectSettings::_add_item(int p_item){
device_id->set_val(0); device_id->set_val(0);
device_index_label->set_text("Joy Button Axis:"); device_index_label->set_text("Joy Button Axis:");
device_index->clear(); device_index->clear();
for(int i=0;i<24;i++) { for(int i=0;i<JOY_AXIS_MAX*2;i++) {
String desc; String desc;
int ax=i/2; int ax=i/2;
if (ax==0) if (ax==0 || ax==1)
desc=" (Left Stick)"; desc=" (Left Stick)";
else if (ax==1) else if (ax==2 || ax==3)
desc=" (Right Stick)"; desc=" (Right Stick)";
else if (ax==4) else if (ax==6)
desc=" (L2)"; desc=" (L2)";
else if (ax==5) else if (ax==7)
desc=" (R2)"; desc=" (R2)";
@@ -511,7 +511,18 @@ void ProjectSettings::_update_actions() {
} break; } break;
case InputEvent::JOYSTICK_MOTION: { 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_text(0,str);
action->set_icon(0,get_icon("JoyAxis","EditorIcons")); action->set_icon(0,get_icon("JoyAxis","EditorIcons"));
} break; } break;