Fix compiling with latest Godot 4.3

Zylann · Feb 26, 2024 · 2e91857 · 2e91857
1 parent f94e348
commit 2e91857
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 0 deletions.
diff --git a/util/godot/classes/box_mesh.h b/util/godot/classes/box_mesh.h
@@ -2,7 +2,14 @@
 #define ZN_GODOT_BOX_MESH_H
 
 #if defined(ZN_GODOT)
+#include <core/version.h>
+
+#if VERSION_MAJOR == 4 && VERSION_MINOR <= 2
 #include <scene/resources/primitive_meshes.h>
+#else
+#include <scene/resources/3d/primitive_meshes.h>
+#endif
+
 #elif defined(ZN_GODOT_EXTENSION)
 #include <godot_cpp/classes/box_mesh.hpp>
 using namespace godot;

diff --git a/util/godot/classes/box_shape_3d.h b/util/godot/classes/box_shape_3d.h
@@ -2,7 +2,14 @@
 #define ZN_GODOT_BOX_SHAPE_3D_H
 
 #if defined(ZN_GODOT)
+#include <core/version.h>
+
+#if VERSION_MAJOR == 4 && VERSION_MINOR <= 2
 #include <scene/resources/box_shape_3d.h>
+#else
+#include <scene/resources/3d/box_shape_3d.h>
+#endif
+
 #elif defined(ZN_GODOT_EXTENSION)
 #include <godot_cpp/classes/box_shape3d.h>
 using namespace godot;

diff --git a/util/godot/classes/concave_polygon_shape_3d.h b/util/godot/classes/concave_polygon_shape_3d.h
@@ -6,7 +6,14 @@
 #include "../../math/vector3f.h"
 
 #if defined(ZN_GODOT)
+#include <core/version.h>
+
+#if VERSION_MAJOR == 4 && VERSION_MINOR <= 2
 #include <scene/resources/concave_polygon_shape_3d.h>
+#else
+#include <scene/resources/3d/concave_polygon_shape_3d.h>
+#endif
+
 #elif defined(ZN_GODOT_EXTENSION)
 #include <godot_cpp/classes/concave_polygon_shape3d.hpp>
 using namespace godot;

diff --git a/util/godot/classes/convex_polygon_shape_3d.h b/util/godot/classes/convex_polygon_shape_3d.h
@@ -2,7 +2,14 @@
 #define ZN_GODOT_CONVEX_POLYGON_SHAPE_3D_H
 
 #if defined(ZN_GODOT)
+#include <core/version.h>
+
+#if VERSION_MAJOR == 4 && VERSION_MINOR <= 2
 #include <scene/resources/convex_polygon_shape_3d.h>
+#else
+#include <scene/resources/3d/convex_polygon_shape_3d.h>
+#endif
+
 #elif defined(ZN_GODOT_EXTENSION)
 #include <godot_cpp/classes/convex_polygon_shape3d.hpp>
 using namespace godot;

diff --git a/util/godot/classes/point_mesh.h b/util/godot/classes/point_mesh.h
@@ -2,7 +2,14 @@
 #define ZN_GODOT_POINT_MESH_H
 
 #if defined(ZN_GODOT)
+#include <core/version.h>
+
+#if VERSION_MAJOR == 4 && VERSION_MINOR <= 2
 #include <scene/resources/primitive_meshes.h>
+#else
+#include <scene/resources/3d/primitive_meshes.h>
+#endif
+
 #elif defined(ZN_GODOT_EXTENSION)
 #include <godot_cpp/classes/point_mesh.hpp>
 using namespace godot;

diff --git a/util/godot/classes/shape_3d.h b/util/godot/classes/shape_3d.h
@@ -2,7 +2,14 @@
 #define ZN_GODOT_SHAPE_3D_H
 
 #if defined(ZN_GODOT)
+#include <core/version.h>
+
+#if VERSION_MAJOR == 4 && VERSION_MINOR <= 2
 #include <scene/resources/shape_3d.h>
+#else
+#include <scene/resources/3d/shape_3d.h>
+#endif
+
 #elif defined(ZN_GODOT_EXTENSION)
 #include <godot_cpp/classes/shape3d.hpp>
 using namespace godot;

diff --git a/util/godot/classes/world_3d.h b/util/godot/classes/world_3d.h
@@ -2,7 +2,14 @@
 #define ZN_GODOT_WORLD_3D_H
 
 #if defined(ZN_GODOT)
+#include <core/version.h>
+
+#if VERSION_MAJOR == 4 && VERSION_MINOR <= 2
 #include <scene/resources/world_3d.h>
+#else
+#include <scene/resources/3d/world_3d.h>
+#endif
+
 #elif defined(ZN_GODOT_EXTENSION)
 #include <godot_cpp/classes/world3d.hpp>
 using namespace godot;