Browse Source

Fix linking NavigationServer2D/3D with all classes disabled in build profile

For some reason the destructor for NavigationMeshSourceGeometryData2D/3D
being implemented in the .cpp was causing linking issues.
Rémi Verschelde 1 year ago
parent
commit
6fdf3e5d22

+ 0 - 2
scene/resources/navigation_mesh.cpp

@@ -625,5 +625,3 @@ bool NavigationMesh::_get(const StringName &p_name, Variant &r_ret) const {
 	return false;
 }
 #endif // DISABLE_DEPRECATED
-
-NavigationMesh::NavigationMesh() {}

+ 2 - 1
scene/resources/navigation_mesh.h

@@ -199,7 +199,8 @@ public:
 	Ref<ArrayMesh> get_debug_mesh();
 #endif // DEBUG_ENABLED
 
-	NavigationMesh();
+	NavigationMesh() {}
+	~NavigationMesh() {}
 };
 
 VARIANT_ENUM_CAST(NavigationMesh::SamplePartitionType);

+ 0 - 7
scene/resources/navigation_mesh_source_geometry_data_2d.cpp

@@ -129,10 +129,3 @@ void NavigationMeshSourceGeometryData2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "traversable_outlines", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "set_traversable_outlines", "get_traversable_outlines");
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "obstruction_outlines", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "set_obstruction_outlines", "get_obstruction_outlines");
 }
-
-NavigationMeshSourceGeometryData2D::NavigationMeshSourceGeometryData2D() {
-}
-
-NavigationMeshSourceGeometryData2D::~NavigationMeshSourceGeometryData2D() {
-	clear();
-}

+ 2 - 2
scene/resources/navigation_mesh_source_geometry_data_2d.h

@@ -71,8 +71,8 @@ public:
 	bool has_data() { return traversable_outlines.size(); };
 	void clear();
 
-	NavigationMeshSourceGeometryData2D();
-	~NavigationMeshSourceGeometryData2D();
+	NavigationMeshSourceGeometryData2D() {}
+	~NavigationMeshSourceGeometryData2D() { clear(); }
 };
 
 #endif // NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_2D_H

+ 0 - 7
scene/resources/navigation_mesh_source_geometry_data_3d.cpp

@@ -182,10 +182,3 @@ void NavigationMeshSourceGeometryData3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR3_ARRAY, "vertices", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "set_vertices", "get_vertices");
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_INT32_ARRAY, "indices", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "set_indices", "get_indices");
 }
-
-NavigationMeshSourceGeometryData3D::NavigationMeshSourceGeometryData3D() {
-}
-
-NavigationMeshSourceGeometryData3D::~NavigationMeshSourceGeometryData3D() {
-	clear();
-}

+ 2 - 2
scene/resources/navigation_mesh_source_geometry_data_3d.h

@@ -68,8 +68,8 @@ public:
 	void add_mesh_array(const Array &p_mesh_array, const Transform3D &p_xform);
 	void add_faces(const PackedVector3Array &p_faces, const Transform3D &p_xform);
 
-	NavigationMeshSourceGeometryData3D();
-	~NavigationMeshSourceGeometryData3D();
+	NavigationMeshSourceGeometryData3D() {}
+	~NavigationMeshSourceGeometryData3D() { clear(); }
 };
 
 #endif // NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_3D_H

+ 0 - 2
scene/resources/navigation_polygon.cpp

@@ -541,5 +541,3 @@ void NavigationPolygon::_validate_property(PropertyInfo &p_property) const {
 		}
 	}
 }
-
-NavigationPolygon::NavigationPolygon() {}

+ 1 - 1
scene/resources/navigation_polygon.h

@@ -153,7 +153,7 @@ public:
 
 	void clear();
 
-	NavigationPolygon();
+	NavigationPolygon() {}
 	~NavigationPolygon() {}
 };