maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3689 from nunodonato/numpademulation

Browse source 
* Added numpad emulation in the 3d viewport (fixes #3612)
This commit is contained in:
Rémi Verschelde 2016-02-16 07:50:51 +01:00
parent 658153a088 67a839c791
commit 7496fd4788
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/editor/editor_settings.cpp
View file

@ -490,6 +490,7 @@ void EditorSettings::_load_defaults() {
hints["3d_editor/pan_modifier"]=PropertyInfo(Variant::INT,"3d_editor/pan_modifier",PROPERTY_HINT_ENUM,"None,Shift,Alt,Meta,Ctrl");
set("3d_editor/zoom_modifier",4);
hints["3d_editor/zoom_modifier"]=PropertyInfo(Variant::INT,"3d_editor/zoom_modifier",PROPERTY_HINT_ENUM,"None,Shift,Alt,Meta,Ctrl");
set("3d_editor/emulate_numpad",false);
set("2d_editor/bone_width",5);
set("2d_editor/bone_color1",Color(1.0,1.0,1.0,0.9));

20
tools/editor/plugins/spatial_editor_plugin.cpp
View file

@ -1631,8 +1631,11 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
_edit.snap=true;
}
} break;
case KEY_7:
case KEY_KP_7: {
bool emulate_numpad = EditorSettings::get_singleton()->get("3d_editor/emulate_numpad");
if (!emulate_numpad && k.scancode==KEY_7)
return;
cursor.y_rot=0;
if (k.mod.shift) {
cursor.x_rot=-Math_PI/2.0;
@ -1647,8 +1650,11 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
_update_name();
}
} break;
case KEY_1:
case KEY_KP_1: {
bool emulate_numpad = EditorSettings::get_singleton()->get("3d_editor/emulate_numpad");
if (!emulate_numpad && k.scancode==KEY_1)
return;
cursor.x_rot=0;
if (k.mod.shift) {
cursor.y_rot=Math_PI;
@ -1664,8 +1670,11 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
}
} break;
case KEY_3:
case KEY_KP_3: {
bool emulate_numpad = EditorSettings::get_singleton()->get("3d_editor/emulate_numpad");
if (!emulate_numpad && k.scancode==KEY_3)
return;
cursor.x_rot=0;
if (k.mod.shift) {
cursor.y_rot=Math_PI/2.0;
@ -1680,8 +1689,11 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
}
} break;
case KEY_5:
case KEY_KP_5: {
bool emulate_numpad = EditorSettings::get_singleton()->get("3d_editor/emulate_numpad");
if (!emulate_numpad && k.scancode==KEY_5)
return;
//orthogonal = !orthogonal;
_menu_option(orthogonal?VIEW_PERSPECTIVE:VIEW_ORTHOGONAL);