aboutsummaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--editor/editor_node.cpp2
-rw-r--r--modules/recast/navigation_mesh_editor_plugin.cpp (renamed from editor/plugins/navigation_mesh_editor_plugin.cpp)5
-rw-r--r--modules/recast/navigation_mesh_editor_plugin.h (renamed from editor/plugins/navigation_mesh_editor_plugin.h)3
-rw-r--r--modules/recast/navigation_mesh_generator.cpp (renamed from editor/plugins/navigation_mesh_generator.cpp)4
-rw-r--r--modules/recast/navigation_mesh_generator.h (renamed from editor/plugins/navigation_mesh_generator.h)9
5 files changed, 2 insertions, 21 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 4b068f100..7e3af2b75 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -88,7 +88,6 @@
#include "editor/plugins/mesh_editor_plugin.h"
#include "editor/plugins/mesh_instance_editor_plugin.h"
#include "editor/plugins/multimesh_editor_plugin.h"
-#include "editor/plugins/navigation_mesh_editor_plugin.h"
#include "editor/plugins/navigation_polygon_editor_plugin.h"
#include "editor/plugins/particles_2d_editor_plugin.h"
#include "editor/plugins/particles_editor_plugin.h"
@@ -5365,7 +5364,6 @@ EditorNode::EditorNode() {
add_editor_plugin(memnew(TextureEditorPlugin(this)));
add_editor_plugin(memnew(AudioBusesEditorPlugin(audio_bus_editor)));
add_editor_plugin(memnew(AudioBusesEditorPlugin(audio_bus_editor)));
- add_editor_plugin(memnew(NavigationMeshEditorPlugin(this)));
add_editor_plugin(memnew(SkeletonEditorPlugin(this)));
add_editor_plugin(memnew(PhysicalBonePlugin(this)));
diff --git a/editor/plugins/navigation_mesh_editor_plugin.cpp b/modules/recast/navigation_mesh_editor_plugin.cpp
index da3c74432..8556b7aa0 100644
--- a/editor/plugins/navigation_mesh_editor_plugin.cpp
+++ b/modules/recast/navigation_mesh_editor_plugin.cpp
@@ -29,13 +29,12 @@
/*************************************************************************/
#include "navigation_mesh_editor_plugin.h"
+
#include "io/marshalls.h"
#include "io/resource_saver.h"
#include "scene/3d/mesh_instance.h"
#include "scene/gui/box_container.h"
-#ifdef RECAST_ENABLED
-
void NavigationMeshEditor::_node_removed(Node *p_node) {
if (p_node == node) {
@@ -162,5 +161,3 @@ NavigationMeshEditorPlugin::NavigationMeshEditorPlugin(EditorNode *p_node) {
NavigationMeshEditorPlugin::~NavigationMeshEditorPlugin() {
}
-
-#endif // RECAST_ENABLED
diff --git a/editor/plugins/navigation_mesh_editor_plugin.h b/modules/recast/navigation_mesh_editor_plugin.h
index 9382467d8..4f3e22200 100644
--- a/editor/plugins/navigation_mesh_editor_plugin.h
+++ b/modules/recast/navigation_mesh_editor_plugin.h
@@ -31,8 +31,6 @@
#ifndef NAVIGATION_MESH_GENERATOR_PLUGIN_H
#define NAVIGATION_MESH_GENERATOR_PLUGIN_H
-#ifdef RECAST_ENABLED
-
#include "editor/editor_node.h"
#include "editor/editor_plugin.h"
#include "navigation_mesh_generator.h"
@@ -83,5 +81,4 @@ public:
~NavigationMeshEditorPlugin();
};
-#endif // RECAST_ENABLED
#endif // NAVIGATION_MESH_GENERATOR_PLUGIN_H
diff --git a/editor/plugins/navigation_mesh_generator.cpp b/modules/recast/navigation_mesh_generator.cpp
index 0537c5c31..64c4b8526 100644
--- a/editor/plugins/navigation_mesh_generator.cpp
+++ b/modules/recast/navigation_mesh_generator.cpp
@@ -30,8 +30,6 @@
#include "navigation_mesh_generator.h"
-#ifdef RECAST_ENABLED
-
void NavigationMeshGenerator::_add_vertex(const Vector3 &p_vec3, Vector<float> &p_verticies) {
p_verticies.push_back(p_vec3.x);
p_verticies.push_back(p_vec3.y);
@@ -304,5 +302,3 @@ void NavigationMeshGenerator::clear(Ref<NavigationMesh> p_nav_mesh) {
p_nav_mesh->set_vertices(PoolVector<Vector3>());
}
}
-
-#endif //RECAST_ENABLED
diff --git a/editor/plugins/navigation_mesh_generator.h b/modules/recast/navigation_mesh_generator.h
index d26f541b8..3588539ef 100644
--- a/editor/plugins/navigation_mesh_generator.h
+++ b/modules/recast/navigation_mesh_generator.h
@@ -31,16 +31,11 @@
#ifndef NAVIGATION_MESH_GENERATOR_H
#define NAVIGATION_MESH_GENERATOR_H
-#ifdef RECAST_ENABLED
-
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
-
+#include "os/thread.h"
#include "scene/3d/mesh_instance.h"
-
#include "scene/3d/navigation_mesh.h"
-
-#include "os/thread.h"
#include "scene/resources/shape.h"
#include <Recast.h>
@@ -61,6 +56,4 @@ public:
static void clear(Ref<NavigationMesh> p_nav_mesh);
};
-#endif // RECAST_ENABLED
-
#endif // NAVIGATION_MESH_GENERATOR_H