Skip to content

Commit

Permalink
Updates for 4.1 (#56)
Browse files Browse the repository at this point in the history
- update godot-cpp
- fixes for new init interface
- add new compatibility to .gdextension files
  • Loading branch information
asmaloney authored Jul 6, 2023
1 parent 16a9c8e commit 1ada77c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion extern/godot-cpp
Submodule godot-cpp updated 49 files
+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
11 changes: 5 additions & 6 deletions src/RegisterExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,17 @@ extern "C"
/// @note The name of this function must match the "entry_symbol" in
/// templates/template.*.gdextension.in
///
/// @param p_interface the interface (need more info)
/// @param p_get_proc_address the interface (need more info)
/// @param p_library the library (need more info)
/// @param r_initialization the intialization (need more info)
///
/// @returns GDExtensionBool
GDExtensionBool GDE_EXPORT GDExtensionInit( const GDExtensionInterface *p_interface,
GDExtensionClassLibraryPtr p_library,
GDExtensionInitialization *r_initialization )
GDExtensionBool GDE_EXPORT GDExtensionInit(
GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library,
GDExtensionInitialization *r_initialization )
{

{
godot::GDExtensionBinding::InitObject init_obj( p_interface, p_library,
godot::GDExtensionBinding::InitObject init_obj( p_get_proc_address, p_library,
r_initialization );

init_obj.register_initializer( initializeExtension );
Expand Down
1 change: 1 addition & 0 deletions templates/template.debug.gdextension.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[configuration]

entry_symbol = "GDExtensionInit"
compatibility_minimum = 4.1

[libraries]

Expand Down
1 change: 1 addition & 0 deletions templates/template.release.gdextension.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[configuration]

entry_symbol = "GDExtensionInit"
compatibility_minimum = 4.1

[libraries]

Expand Down

0 comments on commit 1ada77c

Please sign in to comment.