diff options
| author | marynate <mary.w.nate@gmail.com> | 2014-03-31 15:52:27 +0800 |
|---|---|---|
| committer | marynate <mary.w.nate@gmail.com> | 2014-04-01 00:50:15 +0800 |
| commit | 35bf23859a145989ef79c8cfac20d8c8eefe371c (patch) | |
| tree | 2d0c6dbec39dbfdac7c3e4cc824828ad77a6bd6c /tools/editor | |
| parent | eb294bb6eadc3dcb4e7c91459d5261ce10885c5d (diff) | |
Fix bug in 3d navigation scheme selection; Add modo navigation scheme
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/editor_settings.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 14 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.h | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index c5270753f0..6f4db7412b 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -404,7 +404,7 @@ void EditorSettings::_load_defaults() { set("3d_editor/default_z_far",500.0); set("3d_editor/navigation_scheme",0); - hints["3d_editor/navigation_scheme"]=PropertyInfo(Variant::INT,"3d_editor/navigation_scheme",PROPERTY_HINT_ENUM,"Godot,Maya"); + hints["3d_editor/navigation_scheme"]=PropertyInfo(Variant::INT,"3d_editor/navigation_scheme",PROPERTY_HINT_ENUM,"Godot,Maya,Modo"); set("3d_editor/orbit_modifier",0); hints["3d_editor/orbit_modifier"]=PropertyInfo(Variant::INT,"3d_editor/orbit_modifier",PROPERTY_HINT_ENUM,"None,Shift,Alt,Meta,Ctrl"); set("3d_editor/pan_modifier",1); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 600d4f5103..5c019d9f20 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -528,11 +528,11 @@ static int _get_key_modifier(const String& p_property) { SpatialEditorViewport::NavigationScheme SpatialEditorViewport::_get_navigation_schema(const String& p_property) { switch(EditorSettings::get_singleton()->get(p_property).operator int()) { + case 0: return NAVIGATION_GODOT; case 1: return NAVIGATION_MAYA; - case 0: - default: - return NAVIGATION_GODOT; + case 2: return NAVIGATION_MODO; } + return NAVIGATION_GODOT; } bool SpatialEditorViewport::_gizmo_select(const Vector2& p_screenpos,bool p_hilite_only) { @@ -1013,7 +1013,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { } - NavigationScheme nav_scheme = _get_navigation_schema("3d_editor/navigation_schema"); + NavigationScheme nav_scheme = _get_navigation_schema("3d_editor/navigation_scheme"); NavigationMode nav_mode = NAVIGATION_NONE; if (_edit.gizmo.is_valid()) { @@ -1036,6 +1036,12 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { } else if (m.button_mask&1) { if (nav_scheme == NAVIGATION_MAYA && m.mod.alt) { + nav_mode = NAVIGATION_ORBIT; + } else if (nav_scheme == NAVIGATION_MODO && m.mod.alt && m.mod.shift) { + nav_mode = NAVIGATION_PAN; + } else if (nav_scheme == NAVIGATION_MODO && m.mod.alt && m.mod.control) { + nav_mode = NAVIGATION_ZOOM; + } else if (nav_scheme == NAVIGATION_MODO && m.mod.alt) { nav_mode = NAVIGATION_ORBIT; } else { if (clicked) { diff --git a/tools/editor/plugins/spatial_editor_plugin.h b/tools/editor/plugins/spatial_editor_plugin.h index 30eba5facc..94711a5f02 100644 --- a/tools/editor/plugins/spatial_editor_plugin.h +++ b/tools/editor/plugins/spatial_editor_plugin.h @@ -120,7 +120,8 @@ class SpatialEditorViewport : public Control { enum NavigationScheme { NAVIGATION_GODOT, - NAVIGATION_MAYA + NAVIGATION_MAYA, + NAVIGATION_MODO, }; NavigationScheme _get_navigation_schema(const String& p_property); |