Skip to content

Commit

Permalink
Merge pull request #24 from 98teg/godot-4.1
Browse files Browse the repository at this point in the history 
Update plugin to Godot 4.1
  • Loading branch information
@98teg
98teg authored Jul 29, 2023
2 parents c3b48f8 + daf40f1 commit 0009bbf
Show file tree
Hide file tree
Showing 14 changed files with 171 additions and 21 deletions.
0 src/icons/NativeAcceptDialog.svg → ...ve_dialogs/icons/native_accept_dialog.svg
View file
File renamed without changes
37 changes: 37 additions & 0 deletions demo/addons/native_dialogs/icons/native_accept_dialog.svg.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://byxb1khbmskho"
path="res://.godot/imported/native_accept_dialog.svg-29bc0991aa5bf1244bb9d9d5fee5b403.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/native_dialogs/icons/native_accept_dialog.svg"
dest_files=["res://.godot/imported/native_accept_dialog.svg-29bc0991aa5bf1244bb9d9d5fee5b403.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
0 src/icons/NativeConfirmationDialog.svg → ...logs/icons/native_confirmation_dialog.svg
View file
File renamed without changes
37 changes: 37 additions & 0 deletions demo/addons/native_dialogs/icons/native_confirmation_dialog.svg.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bqc06qvvvhcrs"
path="res://.godot/imported/native_confirmation_dialog.svg-dc5b681628a3393fd579446b7fc6e9c2.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/native_dialogs/icons/native_confirmation_dialog.svg"
dest_files=["res://.godot/imported/native_confirmation_dialog.svg-dc5b681628a3393fd579446b7fc6e9c2.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
0 src/icons/NativeFileDialog.svg → ...tive_dialogs/icons/native_file_dialog.svg
View file
File renamed without changes
37 changes: 37 additions & 0 deletions demo/addons/native_dialogs/icons/native_file_dialog.svg.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cw1rhuvsspl32"
path="res://.godot/imported/native_file_dialog.svg-3682a30350fe181d2f98696f239d4dc8.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/native_dialogs/icons/native_file_dialog.svg"
dest_files=["res://.godot/imported/native_file_dialog.svg-3682a30350fe181d2f98696f239d4dc8.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
0 src/icons/NativeNotification.svg → ...ive_dialogs/icons/native_notification.svg
View file
File renamed without changes
37 changes: 37 additions & 0 deletions demo/addons/native_dialogs/icons/native_notification.svg.import
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bfiq688swf5bg"
path="res://.godot/imported/native_notification.svg-aeed5747dd1cc9332f06d2a8339dd62a.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/native_dialogs/icons/native_notification.svg"
dest_files=["res://.godot/imported/native_notification.svg-aeed5747dd1cc9332f06d2a8339dd62a.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
8 changes: 8 additions & 0 deletions demo/addons/native_dialogs/native_dialogs.gdextension
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
[configuration]

entry_symbol = "native_dialogs_init"
compatibility_minimum = 4.1

[icons]

NativeAcceptDialog = "res://addons/native_dialogs/icons/native_accept_dialog.svg"
NativeConfirmationDialog = "res://addons/native_dialogs/icons/native_confirmation_dialog.svg"
NativeFileDialog = "res://addons/native_dialogs/icons/native_file_dialog.svg"
NativeNotification = "res://addons/native_dialogs/icons/native_notification.svg"

[libraries]

Expand Down
2 changes: 1 addition & 1 deletion demo/addons/native_dialogs/plugin.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
name="Native Dialogs"
description="Native Dialogs is a plugin for Godot that allows you to interact with OS-specific dialogs, such as notifications, messages and file dialogs. "
author="Teggy"
version="2.1.0"
version="2.2.0"
script="plugin.gd"
26 changes: 10 additions & 16 deletions demo/main_theme.tres
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/project.godot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config_version=5

config/name="Native Dialogs"
run/main_scene="res://main.tscn"
config/features=PackedStringArray("4.0")
config/features=PackedStringArray("4.1")
config/icon="res://icon.png"

[debug]
Expand Down
2 changes: 1 addition & 1 deletion 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,996 −840 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
4 changes: 2 additions & 2 deletions src/register_types.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ extern "C" {

// Initialization.

GDExtensionBool GDE_EXPORT native_dialogs_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 native_dialogs_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);

init_obj.register_initializer(register_types);
init_obj.register_terminator(unregister_types);
Expand Down

0 comments on commit 0009bbf

Please sign in to comment.