Merge pull request #99 from outobugi/4.1-update

4.1 update
TokisanGames · Jul 16, 2023 · d42c79a · d42c79a
2 parents 7b73a67 + da45514
commit d42c79a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/godot-cpp b/godot-cpp
diff --git a/project/addons/terrain_3d/editor/editor.gd b/project/addons/terrain_3d/editor/editor.gd
@@ -59,11 +59,9 @@ func _edit(object: Object) -> void:
 	if object is Terrain3D:
 		if object == terrain:
 			return
-
 		terrain = object
-		# If 'terrain' is passed to editor instead of 'object', Godot crashes.
-		editor.set_terrain(object)
-		region_gizmo.set_node_3d(object)
+		editor.set_terrain(terrain)
+		region_gizmo.set_node_3d(terrain)
 		terrain.add_gizmo(region_gizmo)
 		terrain.set_plugin(self)
 

diff --git a/project/addons/terrain_3d/terrain.gdextension b/project/addons/terrain_3d/terrain.gdextension
@@ -1,6 +1,7 @@
 [configuration]
 
 entry_symbol = "terrain_library_init"
+compatibility_minimum = 4.1
 
 [libraries]
 

diff --git a/project/project.godot b/project/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Terrain3D"
 run/main_scene="res://demo/Demo.tscn"
-config/features=PackedStringArray("4.0")
+config/features=PackedStringArray("4.1")
 
 [display]
 

diff --git a/src/register_types.cpp b/src/register_types.cpp
@@ -28,11 +28,9 @@ void uninitialize_terrain_types(ModuleInitializationLevel p_level) {
 }
 
 extern "C" {
-
 // Initialization.
-
-GDExtensionBool GDE_EXPORT terrain_library_init(const GDExtensionInterface *p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
-	GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
+GDExtensionBool GDE_EXPORT terrain_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
+	GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);
 
 	init_obj.register_initializer(initialize_terrain_types);
 	init_obj.register_terminator(uninitialize_terrain_types);
+71 −0		.github/ISSUE_TEMPLATE/bug_report.yml
+14 −0		.github/ISSUE_TEMPLATE/config.yml
+32 −0		.github/workflows/ci.yml
+1 −1		CMakeLists.txt
+8 −4		README.md
+1 −0		SConstruct
+130 −61		binding_generator.py
+7,623 −728		gdextension/extension_api.json
+1,877 −216		gdextension/gdextension_interface.h
+10 −21		include/godot_cpp/classes/ref.hpp
+81 −81		include/godot_cpp/classes/wrapped.hpp
+3 −3		include/godot_cpp/core/binder_common.hpp
+24 −10		include/godot_cpp/core/class_db.hpp
+5 −5		include/godot_cpp/core/engine_ptrcall.hpp
+1 −1		include/godot_cpp/core/memory.hpp
+2 −2		include/godot_cpp/core/method_bind.hpp
+3 −2		include/godot_cpp/core/method_ptrcall.hpp
+12 −6		include/godot_cpp/core/object.hpp
+2 −2		include/godot_cpp/core/type_info.hpp
+147 −7		include/godot_cpp/godot.hpp
+61 −0		src/classes/editor_plugin.cpp
+5 −5		src/classes/low_level.cpp
+3 −3		src/classes/wrapped.cpp
+19 −9		src/core/class_db.cpp
+4 −4		src/core/error_macros.cpp
+4 −4		src/core/memory.cpp
+1 −1		src/core/method_bind.cpp
+30 −0		src/core/object.cpp
+328 −15		src/godot.cpp
+25 −25		src/variant/char_string.cpp
+42 −42		src/variant/packed_arrays.cpp
+38 −37		src/variant/variant.cpp
+1 −4		test/README.md
+2 −2		test/SConstruct
+0 −80		test/demo/main.gd
+0 −0		test/project/bin/libgdexample.osx.template_debug.framework/Resources/Info.plist
+0 −0		test/project/bin/libgdexample.osx.template_release.framework/Resources/Info.plist
+1 −1		test/project/default_env.tres
+1 −0		test/project/example.gdextension
+ −		test/project/icon.png
+1 −1		test/project/icon.png.import
+121 −0		test/project/main.gd
+2 −2		test/project/main.tscn
+1 −1		test/project/project.godot
+59 −0		test/project/test_base.gd
+24 −0		test/run-tests.sh
+82 −31		test/src/example.cpp
+17 −1		test/src/example.h
+2 −2		test/src/register_types.cpp