diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-10 16:25:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 16:25:21 +0100 |
| commit | 2dd73b1ffad10824a9f66e3ac04f4e2a7d51a85e (patch) | |
| tree | 683288f29c949e731bcc34c62212ed7f184ba76a /editor | |
| parent | 1dd0eb4f339a9f0ae78077aaac3dafeafdf78279 (diff) | |
| parent | 383c583a0b46b36ab9b0de57d0f3f7bdecb62fc8 (diff) | |
Merge pull request #34776 from AndreaCatania/nav_pr
Integrated the new `NavigationServer` and `NavigationServer2D`
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/mesh_instance_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/mesh_library_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/spatial_editor_gizmos.cpp | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 7d0601e8db..f7d8d2c7c4 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -62,6 +62,8 @@ #include "scene/gui/texture_progress.h" #include "scene/gui/tool_button.h" #include "scene/resources/packed_scene.h" +#include "servers/navigation_2d_server.h" +#include "servers/navigation_server.h" #include "servers/physics_2d_server.h" #include "editor/audio_stream_preview.h" @@ -5584,6 +5586,8 @@ EditorNode::EditorNode() { VisualServer::get_singleton()->textures_keep_original(true); VisualServer::get_singleton()->set_debug_generate_wireframes(true); + NavigationServer::get_singleton()->set_active(false); // no nav by default if editor + PhysicsServer::get_singleton()->set_active(false); // no physics by default if editor Physics2DServer::get_singleton()->set_active(false); // no physics by default if editor ScriptServer::set_scripting_enabled(false); // no scripting by default if editor diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index 6e5307cebe..aaba6406c7 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "editor/editor_scale.h" #include "scene/3d/collision_shape.h" -#include "scene/3d/navigation_mesh.h" +#include "scene/3d/navigation_mesh_instance.h" #include "scene/3d/physics_body.h" #include "scene/gui/box_container.h" #include "spatial_editor_plugin.h" diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp index 92898ff9c3..42859e9190 100644 --- a/editor/plugins/mesh_library_editor_plugin.cpp +++ b/editor/plugins/mesh_library_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "editor/editor_settings.h" #include "main/main.h" #include "scene/3d/mesh_instance.h" -#include "scene/3d/navigation_mesh.h" +#include "scene/3d/navigation_mesh_instance.h" #include "scene/3d/physics_body.h" #include "scene/main/viewport.h" #include "scene/resources/packed_scene.h" diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index c94b0eeab0..d012b2f821 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -41,7 +41,7 @@ #include "scene/3d/light.h" #include "scene/3d/listener.h" #include "scene/3d/mesh_instance.h" -#include "scene/3d/navigation_mesh.h" +#include "scene/3d/navigation_mesh_instance.h" #include "scene/3d/particles.h" #include "scene/3d/physics_joint.h" #include "scene/3d/position_3d.h" |