Skip to content

Commit fdbb164

Browse files
UghuuuUghuuu
committed
generate new include files 123
1 parent 7dedcf2 commit fdbb164

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+480
-62
lines changed

‎include/godot_cpp/classes/editor_plugin_registration.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
#ifndef GODOT_EDITOR_PLUGIN_REGISTRATION_HPP
3232
#define GODOT_EDITOR_PLUGIN_REGISTRATION_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <editor/plugins/editor_plugin.h>
36+
#else
37+
3438
#include <godot_cpp/templates/vector.hpp>
3539

3640
namespace godot {
@@ -59,4 +63,5 @@ class EditorPlugins {
5963

6064
} // namespace godot
6165

62-
#endif // GODOT_EDITOR_PLUGIN_REGISTRATION_HPP
66+
#endif
67+
#endif // GODOT_EDITOR_PLUGIN_REGISTRATION_HPP

‎include/godot_cpp/classes/ref.hpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@
3131
#ifndef GODOT_REF_HPP
3232
#define GODOT_REF_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/ref_counted.h>
36+
#include <core/variant/binder_common.h>
37+
#include <core/variant/typed_dictionary.h>
38+
#include <core/variant/method_ptrcall.h>
39+
#include <core/variant/type_info.h>
40+
#include <core/variant/typed_array.h>
41+
#else
42+
3443
#include <godot_cpp/core/defs.hpp>
3544

3645
#include <godot_cpp/classes/object.hpp>
@@ -281,4 +290,5 @@ struct GetTypeInfo<const Ref<T> &, typename EnableIf<TypeInherits<RefCounted, T>
281290

282291
} // namespace godot
283292

284-
#endif // GODOT_REF_HPP
293+
#endif
294+
#endif // GODOT_REF_HPP

‎include/godot_cpp/classes/wrapped.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
#ifndef GODOT_WRAPPED_HPP
3232
#define GODOT_WRAPPED_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/object.h>
36+
#else
37+
3438
#include <godot_cpp/core/memory.hpp>
3539

3640
#include <godot_cpp/core/property_info.hpp>
@@ -511,4 +515,5 @@ public:
511515
#define GDVIRTUAL_IS_OVERRIDDEN(m_name) _gdvirtual_##m_name##_overridden()
512516
#define GDVIRTUAL_IS_OVERRIDDEN_PTR(m_obj, m_name) m_obj->_gdvirtual_##m_name##_overridden()
513517

514-
#endif // GODOT_WRAPPED_HPP
518+
#endif
519+
#endif // GODOT_WRAPPED_HPP

‎include/godot_cpp/core/binder_common.hpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@
3131
#ifndef GODOT_BINDER_COMMON_HPP
3232
#define GODOT_BINDER_COMMON_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/ref_counted.h>
36+
#include <core/variant/binder_common.h>
37+
#include <core/variant/typed_dictionary.h>
38+
#include <core/variant/method_ptrcall.h>
39+
#include <core/variant/type_info.h>
40+
#include <core/variant/typed_array.h>
41+
#else
42+
3443
#include <gdextension_interface.h>
3544

3645
#include <godot_cpp/core/method_ptrcall.hpp>
@@ -693,4 +702,5 @@ void call_with_ptr_args_static_method_ret(R (*p_method)(P...), const GDExtension
693702
#include <godot_cpp/classes/global_constants_binds.hpp>
694703
#include <godot_cpp/variant/builtin_binds.hpp>
695704

696-
#endif // GODOT_BINDER_COMMON_HPP
705+
#endif
706+
#endif // GODOT_BINDER_COMMON_HPP

‎include/godot_cpp/core/builtin_ptrcall.hpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
#ifndef GODOT_BUILTIN_PTRCALL_HPP
3232
#define GODOT_BUILTIN_PTRCALL_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#else
36+
3437
#include <gdextension_interface.h>
3538
#include <godot_cpp/core/object.hpp>
3639

@@ -89,4 +92,5 @@ T _call_builtin_ptr_getter(const GDExtensionPtrGetter getter, GDExtensionConstTy
8992

9093
} // namespace godot
9194

92-
#endif // GODOT_BUILTIN_PTRCALL_HPP
95+
#endif
96+
#endif // GODOT_BUILTIN_PTRCALL_HPP

‎include/godot_cpp/core/class_db.hpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@
3131
#ifndef GODOT_CLASS_DB_HPP
3232
#define GODOT_CLASS_DB_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/core_bind.h>
36+
#include <core/object/class_db.h>
37+
#include <servers/physics_server_3d.h>
38+
#include <servers/physics_server_2d.h>
39+
#else
40+
3441
#include <gdextension_interface.h>
3542

3643
#include <godot_cpp/core/defs.hpp>
@@ -359,4 +366,5 @@ MethodBind *ClassDB::bind_vararg_method(uint32_t p_flags, StringName p_name, M p
359366

360367
CLASSDB_SINGLETON_VARIANT_CAST;
361368

362-
#endif // GODOT_CLASS_DB_HPP
369+
#endif
370+
#endif // GODOT_CLASS_DB_HPP

‎include/godot_cpp/core/defs.hpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
#ifndef GODOT_DEFS_HPP
3232
#define GODOT_DEFS_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/version.h>
36+
#include <core/typedefs.h>
37+
#include <core/math/math_defs.h>
38+
#else
39+
3440
#include <cstddef>
3541
#include <cstdint>
3642
#include <cstring>
@@ -127,4 +133,5 @@ struct BuildIndexSequence : BuildIndexSequence<N - 1, N - 1, Is...> {};
127133
template <size_t... Is>
128134
struct BuildIndexSequence<0, Is...> : IndexSequence<Is...> {};
129135

130-
#endif // GODOT_DEFS_HPP
136+
#endif
137+
#endif // GODOT_DEFS_HPP

‎include/godot_cpp/core/engine_ptrcall.hpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
#ifndef GODOT_ENGINE_PTRCALL_HPP
3232
#define GODOT_ENGINE_PTRCALL_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#else
36+
3437
#include <gdextension_interface.h>
3538

3639
#include <godot_cpp/core/binder_common.hpp>
@@ -94,4 +97,5 @@ void _call_utility_no_ret(const GDExtensionPtrUtilityFunction func, const Args &
9497

9598
} // namespace godot
9699

97-
#endif // GODOT_ENGINE_PTRCALL_HPP
100+
#endif
101+
#endif // GODOT_ENGINE_PTRCALL_HPP

‎include/godot_cpp/core/error_macros.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
#ifndef GODOT_ERROR_MACROS_HPP
3232
#define GODOT_ERROR_MACROS_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/error/error_macros.h>
36+
#else
37+
3438
#include <godot_cpp/core/defs.hpp>
3539

3640
#include <atomic>
@@ -803,4 +807,5 @@ void _err_flush_stdout();
803807
#define CHECK_METHOD_BIND(m_mb)
804808
#endif
805809

806-
#endif // GODOT_ERROR_MACROS_HPP
810+
#endif
811+
#endif // GODOT_ERROR_MACROS_HPP

‎include/godot_cpp/core/math.hpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
#ifndef GODOT_MATH_HPP
3232
#define GODOT_MATH_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/typedefs.h>
36+
#include <core/math/math_defs.h>
37+
#else
38+
3439
#include <godot_cpp/core/defs.hpp>
3540

3641
#include <gdextension_interface.h>
@@ -816,4 +821,5 @@ inline float snap_scalar_separation(float p_offset, float p_step, float p_target
816821
} // namespace Math
817822
} // namespace godot
818823

819-
#endif // GODOT_MATH_HPP
824+
#endif
825+
#endif // GODOT_MATH_HPP

‎include/godot_cpp/core/memory.hpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
#ifndef GODOT_MEMORY_HPP
3232
#define GODOT_MEMORY_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/typedefs.h>
36+
#include <core/os/memory.h>
37+
#include <scene/main/node.h>
38+
#else
39+
3440
#include <cstddef>
3541
#include <cstdint>
3642

@@ -217,4 +223,5 @@ struct _GlobalNilClass {
217223

218224
} // namespace godot
219225

220-
#endif // GODOT_MEMORY_HPP
226+
#endif
227+
#endif // GODOT_MEMORY_HPP

‎include/godot_cpp/core/method_bind.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
#ifndef GODOT_METHOD_BIND_HPP
3232
#define GODOT_METHOD_BIND_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/method_bind.h>
36+
#else
37+
3438
#include <godot_cpp/core/binder_common.hpp>
3539
#include <godot_cpp/core/type_info.hpp>
3640

@@ -732,4 +736,5 @@ MethodBind *create_static_method_bind(R (*p_method)(P...)) {
732736

733737
} // namespace godot
734738

735-
#endif // GODOT_METHOD_BIND_HPP
739+
#endif
740+
#endif // GODOT_METHOD_BIND_HPP

‎include/godot_cpp/core/method_ptrcall.hpp

+14-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@
3131
#ifndef GODOT_METHOD_PTRCALL_HPP
3232
#define GODOT_METHOD_PTRCALL_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/ref_counted.h>
36+
#include <core/variant/binder_common.h>
37+
#include <core/variant/variant_internal.h>
38+
#include <core/variant/typed_dictionary.h>
39+
#include <core/variant/variant_construct.h>
40+
#include <core/variant/method_ptrcall.h>
41+
#include <core/variant/type_info.h>
42+
#include <core/variant/typed_array.h>
43+
#include <core/variant/native_ptr.h>
44+
#else
45+
3446
#include <godot_cpp/core/defs.hpp>
3547

3648
#include <godot_cpp/core/object.hpp>
@@ -235,4 +247,5 @@ GDVIRTUAL_NATIVE_PTR(double);
235247

236248
} // namespace godot
237249

238-
#endif // GODOT_METHOD_PTRCALL_HPP
250+
#endif
251+
#endif // GODOT_METHOD_PTRCALL_HPP

‎include/godot_cpp/core/mutex_lock.hpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
#ifndef GODOT_MUTEX_LOCK_HPP
3232
#define GODOT_MUTEX_LOCK_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/os/thread_safe.h>
36+
#include <core/os/mutex.h>
37+
#else
38+
3439
#include <godot_cpp/classes/mutex.hpp>
3540

3641
namespace godot {
@@ -56,4 +61,5 @@ class MutexLock {
5661

5762
} // namespace godot
5863

59-
#endif // GODOT_MUTEX_LOCK_HPP
64+
#endif
65+
#endif // GODOT_MUTEX_LOCK_HPP

‎include/godot_cpp/core/object.hpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
#ifndef GODOT_OBJECT_HPP
3232
#define GODOT_OBJECT_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/object.h>
36+
#include <platform/android/api/java_class_wrapper.h>
37+
#else
38+
3439
#include <godot_cpp/core/defs.hpp>
3540

3641
#include <godot_cpp/core/object_id.hpp>
@@ -149,4 +154,5 @@ const T *Object::cast_to(const Object *p_object) {
149154

150155
} // namespace godot
151156

152-
#endif // GODOT_OBJECT_HPP
157+
#endif
158+
#endif // GODOT_OBJECT_HPP

‎include/godot_cpp/core/object_id.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
#ifndef GODOT_OBJECT_ID_HPP
3232
#define GODOT_OBJECT_ID_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/object_id.h>
36+
#else
37+
3438
#include <godot_cpp/core/defs.hpp>
3539

3640
namespace godot {
@@ -59,4 +63,5 @@ class ObjectID {
5963

6064
} // namespace godot
6165

62-
#endif // GODOT_OBJECT_ID_HPP
66+
#endif
67+
#endif // GODOT_OBJECT_ID_HPP

‎include/godot_cpp/core/property_info.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
#ifndef GODOT_PROPERTY_INFO_HPP
3232
#define GODOT_PROPERTY_INFO_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/object.h>
36+
#else
37+
3438
#include <godot_cpp/core/defs.hpp>
3539

3640
#include <godot_cpp/classes/global_constants.hpp>
@@ -129,4 +133,5 @@ struct PropertyInfo {
129133

130134
} // namespace godot
131135

132-
#endif // GODOT_PROPERTY_INFO_HPP
136+
#endif
137+
#endif // GODOT_PROPERTY_INFO_HPP

‎include/godot_cpp/core/type_info.hpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@
3131
#ifndef GODOT_TYPE_INFO_HPP
3232
#define GODOT_TYPE_INFO_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#include <core/object/ref_counted.h>
36+
#include <core/variant/binder_common.h>
37+
#include <core/variant/typed_dictionary.h>
38+
#include <core/variant/method_ptrcall.h>
39+
#include <core/variant/type_info.h>
40+
#include <core/variant/typed_array.h>
41+
#else
42+
3443
#include <godot_cpp/core/object.hpp>
3544
#include <godot_cpp/variant/typed_array.hpp>
3645
#include <godot_cpp/variant/variant.hpp>
@@ -417,4 +426,5 @@ MAKE_TYPED_ARRAY_INFO(IPAddress, Variant::STRING)
417426

418427
} // namespace godot
419428

420-
#endif // GODOT_TYPE_INFO_HPP
429+
#endif
430+
#endif // GODOT_TYPE_INFO_HPP

‎include/godot_cpp/godot.hpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
#ifndef GODOT_GODOT_HPP
3232
#define GODOT_GODOT_HPP
3333

34+
#ifdef GODOT_MODULE_COMPAT
35+
#else
36+
3437
#include <gdextension_interface.h>
3538

3639
namespace godot {
@@ -263,4 +266,5 @@ class GDExtensionBinding {
263266

264267
} // namespace godot
265268

266-
#endif // GODOT_GODOT_HPP
269+
#endif
270+
#endif // GODOT_GODOT_HPP

0 commit comments

Comments
 (0)