Apply singleton instance binding clean-up fix no matter how it is created#1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsnopek wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Apply singleton instance binding clean-up fix no matter how it is created #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions binding_generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2078,6 +2078,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result = []

class_name = class_api["name"]
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
snake_class_name = camel_to_snake(class_name)
is_singleton = class_name in singletons

Expand DownExpand Up@@ -2117,27 +2118,37 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton_obj, nullptr);")
result.append("#endif // DEBUG_ENABLED")
# This will lead to the constructor which will set `singleton`.
result.append(
f"\t\tsingleton = reinterpret_cast<{class_name} *>(::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks));"
f"\t\t::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks);"
)
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton, nullptr);")
result.append("#endif // DEBUG_ENABLED")
result.append("\t\tif (likely(singleton)) {")
result.append(f"\t\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t\t}")
result.append("\t}")
result.append("\treturn singleton;")
result.append("}")
result.append("")

result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("\tif (singleton == nullptr) {")
result.append("\t\tsingleton = this;")
result.append(f"\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t}")
result.append("}")
result.append("")

result.append(f"{class_name}::~{class_name}() {{")
result.append("\tif (singleton == this) {")
result.append(f"\t\tClassDB::_unregister_engine_singleton({class_name}::get_class_static());")
result.append("\t\tsingleton = nullptr;")
result.append("\t}")
result.append("}")
result.append("")
else:
result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("}")
result.append("")

if "methods" in class_api:
for method in class_api["methods"]:
Expand Down
2 changes: 1 addition & 1 deletion include/godot_cpp/classes/wrapped.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ private: \
\
protected: \
m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \
m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \
m_class(GodotObject *p_godot_object); \
\
static void _bind_methods() {} \
\
Expand Down
3 changes: 2 additions & 1 deletion test/build_profile.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"TileMap",
"TileSet",
"Tween",
"Viewport"
"Viewport",
"XRServer"
]
}
5 changes: 3 additions & 2 deletions test/project/main.gd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,9 @@ func _ready():
assert_equal(example.test_virtual_implemented_in_script("Virtual", 939), "Implemented")
assert_equal(custom_signal_emitted, ["Virtual", 939])

# Test that we can access an engine singleton.
assert_equal(example.test_use_engine_singleton(), OS.get_name())
# Test that we can access an engine singletons.
assert_equal(example.test_use_engine_singleton1(), OS.get_name())
assert_equal(example.test_use_engine_singleton2(), true)

# Test that we can access the SceneTree singleton.
assert_equal(example.test_use_scene_tree_singleton(), true)
Expand Down
18 changes: 13 additions & 5 deletions test/src/example.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@

#include <godot_cpp/core/class_db.hpp>

#include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/classes/multiplayer_api.hpp>
#include <godot_cpp/classes/multiplayer_peer.hpp>
#include <godot_cpp/classes/os.hpp>
#include <godot_cpp/classes/scene_tree.hpp>
#include <godot_cpp/classes/xr_server.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

using namespace godot;
Expand DownExpand Up@@ -266,8 +268,9 @@ void Example::_bind_methods() {
ClassDB::bind_method(D_METHOD("test_virtual_implemented_in_script"), &Example::test_virtual_implemented_in_script);
GDVIRTUAL_BIND(_do_something_virtual_with_control, "control");

ClassDB::bind_method(D_METHOD("test_use_engine_singleton"), &Example::test_use_engine_singleton);
ClassDB::bind_method(D_METHOD("test_use_scene_tree_singleton"), &Example::test_use_scene_tree_singleton);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton1"), &Example::test_use_engine_singleton1);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton2"), &Example::test_use_engine_singleton2);

ClassDB::bind_method(D_METHOD("test_get_internal_class"), &Example::test_get_internal_class);

Expand DownExpand Up@@ -757,15 +760,20 @@ String Example::test_virtual_implemented_in_script(const String &p_name, int p_v
return "Unimplemented";
}

String Example::test_use_engine_singleton() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_scene_tree_singleton() const {
SceneTree *scene_tree = SceneTree::get_singleton();
return scene_tree != nullptr && scene_tree == get_tree();
}

String Example::test_use_engine_singleton1() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_engine_singleton2() const {
XRServer *xr_server = Object::cast_to<XRServer>(Engine::get_singleton()->get_singleton("XRServer"));
return xr_server != nullptr;
}

String Example::test_library_path() {
String library_path;
::godot::gdextension_interface::get_library_path(::godot::gdextension_interface::library, library_path._native_ptr());
Expand Down
3 changes: 3 additions & 0 deletions test/src/example.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,9 @@ class Example : public Control {
String test_use_engine_singleton() const;
bool test_use_scene_tree_singleton() const;

String test_use_engine_singleton1() const;
bool test_use_engine_singleton2() const;

static String test_library_path();

Ref<RefCounted> test_get_internal_class() const;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Apply singleton instance binding clean-up fix no matter how it is created#1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsnopek wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Apply singleton instance binding clean-up fix no matter how it is created #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions binding_generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2078,6 +2078,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result = []

class_name = class_api["name"]
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
snake_class_name = camel_to_snake(class_name)
is_singleton = class_name in singletons

Expand DownExpand Up@@ -2117,27 +2118,37 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton_obj, nullptr);")
result.append("#endif // DEBUG_ENABLED")
# This will lead to the constructor which will set `singleton`.
result.append(
f"\t\tsingleton = reinterpret_cast<{class_name} *>(::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks));"
f"\t\t::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks);"
)
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton, nullptr);")
result.append("#endif // DEBUG_ENABLED")
result.append("\t\tif (likely(singleton)) {")
result.append(f"\t\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t\t}")
result.append("\t}")
result.append("\treturn singleton;")
result.append("}")
result.append("")

result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("\tif (singleton == nullptr) {")
result.append("\t\tsingleton = this;")
result.append(f"\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t}")
result.append("}")
result.append("")

result.append(f"{class_name}::~{class_name}() {{")
result.append("\tif (singleton == this) {")
result.append(f"\t\tClassDB::_unregister_engine_singleton({class_name}::get_class_static());")
result.append("\t\tsingleton = nullptr;")
result.append("\t}")
result.append("}")
result.append("")
else:
result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("}")
result.append("")

if "methods" in class_api:
for method in class_api["methods"]:
Expand Down
2 changes: 1 addition & 1 deletion include/godot_cpp/classes/wrapped.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ private: \
\
protected: \
m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \
m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \
m_class(GodotObject *p_godot_object); \
\
static void _bind_methods() {} \
\
Expand Down
3 changes: 2 additions & 1 deletion test/build_profile.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"TileMap",
"TileSet",
"Tween",
"Viewport"
"Viewport",
"XRServer"
]
}
5 changes: 3 additions & 2 deletions test/project/main.gd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,9 @@ func _ready():
assert_equal(example.test_virtual_implemented_in_script("Virtual", 939), "Implemented")
assert_equal(custom_signal_emitted, ["Virtual", 939])

# Test that we can access an engine singleton.
assert_equal(example.test_use_engine_singleton(), OS.get_name())
# Test that we can access an engine singletons.
assert_equal(example.test_use_engine_singleton1(), OS.get_name())
assert_equal(example.test_use_engine_singleton2(), true)

# Test that we can access the SceneTree singleton.
assert_equal(example.test_use_scene_tree_singleton(), true)
Expand Down
18 changes: 13 additions & 5 deletions test/src/example.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@

#include <godot_cpp/core/class_db.hpp>

#include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/classes/multiplayer_api.hpp>
#include <godot_cpp/classes/multiplayer_peer.hpp>
#include <godot_cpp/classes/os.hpp>
#include <godot_cpp/classes/scene_tree.hpp>
#include <godot_cpp/classes/xr_server.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

using namespace godot;
Expand DownExpand Up@@ -266,8 +268,9 @@ void Example::_bind_methods() {
ClassDB::bind_method(D_METHOD("test_virtual_implemented_in_script"), &Example::test_virtual_implemented_in_script);
GDVIRTUAL_BIND(_do_something_virtual_with_control, "control");

ClassDB::bind_method(D_METHOD("test_use_engine_singleton"), &Example::test_use_engine_singleton);
ClassDB::bind_method(D_METHOD("test_use_scene_tree_singleton"), &Example::test_use_scene_tree_singleton);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton1"), &Example::test_use_engine_singleton1);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton2"), &Example::test_use_engine_singleton2);

ClassDB::bind_method(D_METHOD("test_get_internal_class"), &Example::test_get_internal_class);

Expand DownExpand Up@@ -757,15 +760,20 @@ String Example::test_virtual_implemented_in_script(const String &p_name, int p_v
return "Unimplemented";
}

String Example::test_use_engine_singleton() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_scene_tree_singleton() const {
SceneTree *scene_tree = SceneTree::get_singleton();
return scene_tree != nullptr && scene_tree == get_tree();
}

String Example::test_use_engine_singleton1() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_engine_singleton2() const {
XRServer *xr_server = Object::cast_to<XRServer>(Engine::get_singleton()->get_singleton("XRServer"));
return xr_server != nullptr;
}

String Example::test_library_path() {
String library_path;
::godot::gdextension_interface::get_library_path(::godot::gdextension_interface::library, library_path._native_ptr());
Expand Down
3 changes: 3 additions & 0 deletions test/src/example.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,9 @@ class Example : public Control {
String test_use_engine_singleton() const;
bool test_use_scene_tree_singleton() const;

String test_use_engine_singleton1() const;
bool test_use_engine_singleton2() const;

static String test_library_path();

Ref<RefCounted> test_get_internal_class() const;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Apply singleton instance binding clean-up fix no matter how it is created#1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsnopek wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Apply singleton instance binding clean-up fix no matter how it is created #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions binding_generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2078,6 +2078,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result = []

class_name = class_api["name"]
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
snake_class_name = camel_to_snake(class_name)
is_singleton = class_name in singletons

Expand DownExpand Up@@ -2117,27 +2118,37 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton_obj, nullptr);")
result.append("#endif // DEBUG_ENABLED")
# This will lead to the constructor which will set `singleton`.
result.append(
f"\t\tsingleton = reinterpret_cast<{class_name} *>(::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks));"
f"\t\t::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks);"
)
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton, nullptr);")
result.append("#endif // DEBUG_ENABLED")
result.append("\t\tif (likely(singleton)) {")
result.append(f"\t\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t\t}")
result.append("\t}")
result.append("\treturn singleton;")
result.append("}")
result.append("")

result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("\tif (singleton == nullptr) {")
result.append("\t\tsingleton = this;")
result.append(f"\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t}")
result.append("}")
result.append("")

result.append(f"{class_name}::~{class_name}() {{")
result.append("\tif (singleton == this) {")
result.append(f"\t\tClassDB::_unregister_engine_singleton({class_name}::get_class_static());")
result.append("\t\tsingleton = nullptr;")
result.append("\t}")
result.append("}")
result.append("")
else:
result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("}")
result.append("")

if "methods" in class_api:
for method in class_api["methods"]:
Expand Down
2 changes: 1 addition & 1 deletion include/godot_cpp/classes/wrapped.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ private: \
\
protected: \
m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \
m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \
m_class(GodotObject *p_godot_object); \
\
static void _bind_methods() {} \
\
Expand Down
3 changes: 2 additions & 1 deletion test/build_profile.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"TileMap",
"TileSet",
"Tween",
"Viewport"
"Viewport",
"XRServer"
]
}
5 changes: 3 additions & 2 deletions test/project/main.gd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,9 @@ func _ready():
assert_equal(example.test_virtual_implemented_in_script("Virtual", 939), "Implemented")
assert_equal(custom_signal_emitted, ["Virtual", 939])

# Test that we can access an engine singleton.
assert_equal(example.test_use_engine_singleton(), OS.get_name())
# Test that we can access an engine singletons.
assert_equal(example.test_use_engine_singleton1(), OS.get_name())
assert_equal(example.test_use_engine_singleton2(), true)

# Test that we can access the SceneTree singleton.
assert_equal(example.test_use_scene_tree_singleton(), true)
Expand Down
18 changes: 13 additions & 5 deletions test/src/example.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@

#include <godot_cpp/core/class_db.hpp>

#include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/classes/multiplayer_api.hpp>
#include <godot_cpp/classes/multiplayer_peer.hpp>
#include <godot_cpp/classes/os.hpp>
#include <godot_cpp/classes/scene_tree.hpp>
#include <godot_cpp/classes/xr_server.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

using namespace godot;
Expand DownExpand Up@@ -266,8 +268,9 @@ void Example::_bind_methods() {
ClassDB::bind_method(D_METHOD("test_virtual_implemented_in_script"), &Example::test_virtual_implemented_in_script);
GDVIRTUAL_BIND(_do_something_virtual_with_control, "control");

ClassDB::bind_method(D_METHOD("test_use_engine_singleton"), &Example::test_use_engine_singleton);
ClassDB::bind_method(D_METHOD("test_use_scene_tree_singleton"), &Example::test_use_scene_tree_singleton);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton1"), &Example::test_use_engine_singleton1);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton2"), &Example::test_use_engine_singleton2);

ClassDB::bind_method(D_METHOD("test_get_internal_class"), &Example::test_get_internal_class);

Expand DownExpand Up@@ -757,15 +760,20 @@ String Example::test_virtual_implemented_in_script(const String &p_name, int p_v
return "Unimplemented";
}

String Example::test_use_engine_singleton() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_scene_tree_singleton() const {
SceneTree *scene_tree = SceneTree::get_singleton();
return scene_tree != nullptr && scene_tree == get_tree();
}

String Example::test_use_engine_singleton1() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_engine_singleton2() const {
XRServer *xr_server = Object::cast_to<XRServer>(Engine::get_singleton()->get_singleton("XRServer"));
return xr_server != nullptr;
}

String Example::test_library_path() {
String library_path;
::godot::gdextension_interface::get_library_path(::godot::gdextension_interface::library, library_path._native_ptr());
Expand Down
3 changes: 3 additions & 0 deletions test/src/example.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,9 @@ class Example : public Control {
String test_use_engine_singleton() const;
bool test_use_scene_tree_singleton() const;

String test_use_engine_singleton1() const;
bool test_use_engine_singleton2() const;

static String test_library_path();

Ref<RefCounted> test_get_internal_class() const;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Apply singleton instance binding clean-up fix no matter how it is created#1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsnopek wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Apply singleton instance binding clean-up fix no matter how it is created #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions binding_generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2078,6 +2078,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result = []

class_name = class_api["name"]
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
snake_class_name = camel_to_snake(class_name)
is_singleton = class_name in singletons

Expand DownExpand Up@@ -2117,27 +2118,37 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton_obj, nullptr);")
result.append("#endif // DEBUG_ENABLED")
# This will lead to the constructor which will set `singleton`.
result.append(
f"\t\tsingleton = reinterpret_cast<{class_name} *>(::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks));"
f"\t\t::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks);"
)
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton, nullptr);")
result.append("#endif // DEBUG_ENABLED")
result.append("\t\tif (likely(singleton)) {")
result.append(f"\t\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t\t}")
result.append("\t}")
result.append("\treturn singleton;")
result.append("}")
result.append("")

result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("\tif (singleton == nullptr) {")
result.append("\t\tsingleton = this;")
result.append(f"\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t}")
result.append("}")
result.append("")

result.append(f"{class_name}::~{class_name}() {{")
result.append("\tif (singleton == this) {")
result.append(f"\t\tClassDB::_unregister_engine_singleton({class_name}::get_class_static());")
result.append("\t\tsingleton = nullptr;")
result.append("\t}")
result.append("}")
result.append("")
else:
result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("}")
result.append("")

if "methods" in class_api:
for method in class_api["methods"]:
Expand Down
2 changes: 1 addition & 1 deletion include/godot_cpp/classes/wrapped.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ private: \
\
protected: \
m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \
m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \
m_class(GodotObject *p_godot_object); \
\
static void _bind_methods() {} \
\
Expand Down
3 changes: 2 additions & 1 deletion test/build_profile.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"TileMap",
"TileSet",
"Tween",
"Viewport"
"Viewport",
"XRServer"
]
}
5 changes: 3 additions & 2 deletions test/project/main.gd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,9 @@ func _ready():
assert_equal(example.test_virtual_implemented_in_script("Virtual", 939), "Implemented")
assert_equal(custom_signal_emitted, ["Virtual", 939])

# Test that we can access an engine singleton.
assert_equal(example.test_use_engine_singleton(), OS.get_name())
# Test that we can access an engine singletons.
assert_equal(example.test_use_engine_singleton1(), OS.get_name())
assert_equal(example.test_use_engine_singleton2(), true)

# Test that we can access the SceneTree singleton.
assert_equal(example.test_use_scene_tree_singleton(), true)
Expand Down
18 changes: 13 additions & 5 deletions test/src/example.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@

#include <godot_cpp/core/class_db.hpp>

#include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/classes/multiplayer_api.hpp>
#include <godot_cpp/classes/multiplayer_peer.hpp>
#include <godot_cpp/classes/os.hpp>
#include <godot_cpp/classes/scene_tree.hpp>
#include <godot_cpp/classes/xr_server.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

using namespace godot;
Expand DownExpand Up@@ -266,8 +268,9 @@ void Example::_bind_methods() {
ClassDB::bind_method(D_METHOD("test_virtual_implemented_in_script"), &Example::test_virtual_implemented_in_script);
GDVIRTUAL_BIND(_do_something_virtual_with_control, "control");

ClassDB::bind_method(D_METHOD("test_use_engine_singleton"), &Example::test_use_engine_singleton);
ClassDB::bind_method(D_METHOD("test_use_scene_tree_singleton"), &Example::test_use_scene_tree_singleton);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton1"), &Example::test_use_engine_singleton1);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton2"), &Example::test_use_engine_singleton2);

ClassDB::bind_method(D_METHOD("test_get_internal_class"), &Example::test_get_internal_class);

Expand DownExpand Up@@ -757,15 +760,20 @@ String Example::test_virtual_implemented_in_script(const String &p_name, int p_v
return "Unimplemented";
}

String Example::test_use_engine_singleton() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_scene_tree_singleton() const {
SceneTree *scene_tree = SceneTree::get_singleton();
return scene_tree != nullptr && scene_tree == get_tree();
}

String Example::test_use_engine_singleton1() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_engine_singleton2() const {
XRServer *xr_server = Object::cast_to<XRServer>(Engine::get_singleton()->get_singleton("XRServer"));
return xr_server != nullptr;
}

String Example::test_library_path() {
String library_path;
::godot::gdextension_interface::get_library_path(::godot::gdextension_interface::library, library_path._native_ptr());
Expand Down
3 changes: 3 additions & 0 deletions test/src/example.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,9 @@ class Example : public Control {
String test_use_engine_singleton() const;
bool test_use_scene_tree_singleton() const;

String test_use_engine_singleton1() const;
bool test_use_engine_singleton2() const;

static String test_library_path();

Ref<RefCounted> test_get_internal_class() const;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Apply singleton instance binding clean-up fix no matter how it is created#1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsnopek wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Apply singleton instance binding clean-up fix no matter how it is created #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions binding_generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2078,6 +2078,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result = []

class_name = class_api["name"]
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
snake_class_name = camel_to_snake(class_name)
is_singleton = class_name in singletons

Expand DownExpand Up@@ -2117,27 +2118,37 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton_obj, nullptr);")
result.append("#endif // DEBUG_ENABLED")
# This will lead to the constructor which will set `singleton`.
result.append(
f"\t\tsingleton = reinterpret_cast<{class_name} *>(::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks));"
f"\t\t::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks);"
)
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton, nullptr);")
result.append("#endif // DEBUG_ENABLED")
result.append("\t\tif (likely(singleton)) {")
result.append(f"\t\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t\t}")
result.append("\t}")
result.append("\treturn singleton;")
result.append("}")
result.append("")

result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("\tif (singleton == nullptr) {")
result.append("\t\tsingleton = this;")
result.append(f"\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t}")
result.append("}")
result.append("")

result.append(f"{class_name}::~{class_name}() {{")
result.append("\tif (singleton == this) {")
result.append(f"\t\tClassDB::_unregister_engine_singleton({class_name}::get_class_static());")
result.append("\t\tsingleton = nullptr;")
result.append("\t}")
result.append("}")
result.append("")
else:
result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("}")
result.append("")

if "methods" in class_api:
for method in class_api["methods"]:
Expand Down
2 changes: 1 addition & 1 deletion include/godot_cpp/classes/wrapped.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ private: \
\
protected: \
m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \
m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \
m_class(GodotObject *p_godot_object); \
\
static void _bind_methods() {} \
\
Expand Down
3 changes: 2 additions & 1 deletion test/build_profile.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"TileMap",
"TileSet",
"Tween",
"Viewport"
"Viewport",
"XRServer"
]
}
5 changes: 3 additions & 2 deletions test/project/main.gd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,9 @@ func _ready():
assert_equal(example.test_virtual_implemented_in_script("Virtual", 939), "Implemented")
assert_equal(custom_signal_emitted, ["Virtual", 939])

# Test that we can access an engine singleton.
assert_equal(example.test_use_engine_singleton(), OS.get_name())
# Test that we can access an engine singletons.
assert_equal(example.test_use_engine_singleton1(), OS.get_name())
assert_equal(example.test_use_engine_singleton2(), true)

# Test that we can access the SceneTree singleton.
assert_equal(example.test_use_scene_tree_singleton(), true)
Expand Down
18 changes: 13 additions & 5 deletions test/src/example.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@

#include <godot_cpp/core/class_db.hpp>

#include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/classes/multiplayer_api.hpp>
#include <godot_cpp/classes/multiplayer_peer.hpp>
#include <godot_cpp/classes/os.hpp>
#include <godot_cpp/classes/scene_tree.hpp>
#include <godot_cpp/classes/xr_server.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

using namespace godot;
Expand DownExpand Up@@ -266,8 +268,9 @@ void Example::_bind_methods() {
ClassDB::bind_method(D_METHOD("test_virtual_implemented_in_script"), &Example::test_virtual_implemented_in_script);
GDVIRTUAL_BIND(_do_something_virtual_with_control, "control");

ClassDB::bind_method(D_METHOD("test_use_engine_singleton"), &Example::test_use_engine_singleton);
ClassDB::bind_method(D_METHOD("test_use_scene_tree_singleton"), &Example::test_use_scene_tree_singleton);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton1"), &Example::test_use_engine_singleton1);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton2"), &Example::test_use_engine_singleton2);

ClassDB::bind_method(D_METHOD("test_get_internal_class"), &Example::test_get_internal_class);

Expand DownExpand Up@@ -757,15 +760,20 @@ String Example::test_virtual_implemented_in_script(const String &p_name, int p_v
return "Unimplemented";
}

String Example::test_use_engine_singleton() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_scene_tree_singleton() const {
SceneTree *scene_tree = SceneTree::get_singleton();
return scene_tree != nullptr && scene_tree == get_tree();
}

String Example::test_use_engine_singleton1() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_engine_singleton2() const {
XRServer *xr_server = Object::cast_to<XRServer>(Engine::get_singleton()->get_singleton("XRServer"));
return xr_server != nullptr;
}

String Example::test_library_path() {
String library_path;
::godot::gdextension_interface::get_library_path(::godot::gdextension_interface::library, library_path._native_ptr());
Expand Down
3 changes: 3 additions & 0 deletions test/src/example.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,9 @@ class Example : public Control {
String test_use_engine_singleton() const;
bool test_use_scene_tree_singleton() const;

String test_use_engine_singleton1() const;
bool test_use_engine_singleton2() const;

static String test_library_path();

Ref<RefCounted> test_get_internal_class() const;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Apply singleton instance binding clean-up fix no matter how it is created#1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsnopek wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Apply singleton instance binding clean-up fix no matter how it is created #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions binding_generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2078,6 +2078,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result = []

class_name = class_api["name"]
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
snake_class_name = camel_to_snake(class_name)
is_singleton = class_name in singletons

Expand DownExpand Up@@ -2117,27 +2118,37 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton_obj, nullptr);")
result.append("#endif // DEBUG_ENABLED")
# This will lead to the constructor which will set `singleton`.
result.append(
f"\t\tsingleton = reinterpret_cast<{class_name} *>(::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks));"
f"\t\t::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks);"
)
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton, nullptr);")
result.append("#endif // DEBUG_ENABLED")
result.append("\t\tif (likely(singleton)) {")
result.append(f"\t\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t\t}")
result.append("\t}")
result.append("\treturn singleton;")
result.append("}")
result.append("")

result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("\tif (singleton == nullptr) {")
result.append("\t\tsingleton = this;")
result.append(f"\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t}")
result.append("}")
result.append("")

result.append(f"{class_name}::~{class_name}() {{")
result.append("\tif (singleton == this) {")
result.append(f"\t\tClassDB::_unregister_engine_singleton({class_name}::get_class_static());")
result.append("\t\tsingleton = nullptr;")
result.append("\t}")
result.append("}")
result.append("")
else:
result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("}")
result.append("")

if "methods" in class_api:
for method in class_api["methods"]:
Expand Down
2 changes: 1 addition & 1 deletion include/godot_cpp/classes/wrapped.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ private: \
\
protected: \
m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \
m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \
m_class(GodotObject *p_godot_object); \
\
static void _bind_methods() {} \
\
Expand Down
3 changes: 2 additions & 1 deletion test/build_profile.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"TileMap",
"TileSet",
"Tween",
"Viewport"
"Viewport",
"XRServer"
]
}
5 changes: 3 additions & 2 deletions test/project/main.gd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,9 @@ func _ready():
assert_equal(example.test_virtual_implemented_in_script("Virtual", 939), "Implemented")
assert_equal(custom_signal_emitted, ["Virtual", 939])

# Test that we can access an engine singleton.
assert_equal(example.test_use_engine_singleton(), OS.get_name())
# Test that we can access an engine singletons.
assert_equal(example.test_use_engine_singleton1(), OS.get_name())
assert_equal(example.test_use_engine_singleton2(), true)

# Test that we can access the SceneTree singleton.
assert_equal(example.test_use_scene_tree_singleton(), true)
Expand Down
18 changes: 13 additions & 5 deletions test/src/example.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@

#include <godot_cpp/core/class_db.hpp>

#include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/classes/multiplayer_api.hpp>
#include <godot_cpp/classes/multiplayer_peer.hpp>
#include <godot_cpp/classes/os.hpp>
#include <godot_cpp/classes/scene_tree.hpp>
#include <godot_cpp/classes/xr_server.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

using namespace godot;
Expand DownExpand Up@@ -266,8 +268,9 @@ void Example::_bind_methods() {
ClassDB::bind_method(D_METHOD("test_virtual_implemented_in_script"), &Example::test_virtual_implemented_in_script);
GDVIRTUAL_BIND(_do_something_virtual_with_control, "control");

ClassDB::bind_method(D_METHOD("test_use_engine_singleton"), &Example::test_use_engine_singleton);
ClassDB::bind_method(D_METHOD("test_use_scene_tree_singleton"), &Example::test_use_scene_tree_singleton);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton1"), &Example::test_use_engine_singleton1);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton2"), &Example::test_use_engine_singleton2);

ClassDB::bind_method(D_METHOD("test_get_internal_class"), &Example::test_get_internal_class);

Expand DownExpand Up@@ -757,15 +760,20 @@ String Example::test_virtual_implemented_in_script(const String &p_name, int p_v
return "Unimplemented";
}

String Example::test_use_engine_singleton() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_scene_tree_singleton() const {
SceneTree *scene_tree = SceneTree::get_singleton();
return scene_tree != nullptr && scene_tree == get_tree();
}

String Example::test_use_engine_singleton1() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_engine_singleton2() const {
XRServer *xr_server = Object::cast_to<XRServer>(Engine::get_singleton()->get_singleton("XRServer"));
return xr_server != nullptr;
}

String Example::test_library_path() {
String library_path;
::godot::gdextension_interface::get_library_path(::godot::gdextension_interface::library, library_path._native_ptr());
Expand Down
3 changes: 3 additions & 0 deletions test/src/example.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,9 @@ class Example : public Control {
String test_use_engine_singleton() const;
bool test_use_scene_tree_singleton() const;

String test_use_engine_singleton1() const;
bool test_use_engine_singleton2() const;

static String test_library_path();

Ref<RefCounted> test_get_internal_class() const;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Apply singleton instance binding clean-up fix no matter how it is created#1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsnopek wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Apply singleton instance binding clean-up fix no matter how it is created #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions binding_generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2078,6 +2078,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result = []

class_name = class_api["name"]
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
snake_class_name = camel_to_snake(class_name)
is_singleton = class_name in singletons

Expand DownExpand Up@@ -2117,27 +2118,37 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton_obj, nullptr);")
result.append("#endif // DEBUG_ENABLED")
# This will lead to the constructor which will set `singleton`.
result.append(
f"\t\tsingleton = reinterpret_cast<{class_name} *>(::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks));"
f"\t\t::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks);"
)
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton, nullptr);")
result.append("#endif // DEBUG_ENABLED")
result.append("\t\tif (likely(singleton)) {")
result.append(f"\t\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t\t}")
result.append("\t}")
result.append("\treturn singleton;")
result.append("}")
result.append("")

result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("\tif (singleton == nullptr) {")
result.append("\t\tsingleton = this;")
result.append(f"\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t}")
result.append("}")
result.append("")

result.append(f"{class_name}::~{class_name}() {{")
result.append("\tif (singleton == this) {")
result.append(f"\t\tClassDB::_unregister_engine_singleton({class_name}::get_class_static());")
result.append("\t\tsingleton = nullptr;")
result.append("\t}")
result.append("}")
result.append("")
else:
result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("}")
result.append("")

if "methods" in class_api:
for method in class_api["methods"]:
Expand Down
2 changes: 1 addition & 1 deletion include/godot_cpp/classes/wrapped.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ private: \
\
protected: \
m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \
m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \
m_class(GodotObject *p_godot_object); \
\
static void _bind_methods() {} \
\
Expand Down
3 changes: 2 additions & 1 deletion test/build_profile.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"TileMap",
"TileSet",
"Tween",
"Viewport"
"Viewport",
"XRServer"
]
}
5 changes: 3 additions & 2 deletions test/project/main.gd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,9 @@ func _ready():
assert_equal(example.test_virtual_implemented_in_script("Virtual", 939), "Implemented")
assert_equal(custom_signal_emitted, ["Virtual", 939])

# Test that we can access an engine singleton.
assert_equal(example.test_use_engine_singleton(), OS.get_name())
# Test that we can access an engine singletons.
assert_equal(example.test_use_engine_singleton1(), OS.get_name())
assert_equal(example.test_use_engine_singleton2(), true)

# Test that we can access the SceneTree singleton.
assert_equal(example.test_use_scene_tree_singleton(), true)
Expand Down
18 changes: 13 additions & 5 deletions test/src/example.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@

#include <godot_cpp/core/class_db.hpp>

#include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/classes/multiplayer_api.hpp>
#include <godot_cpp/classes/multiplayer_peer.hpp>
#include <godot_cpp/classes/os.hpp>
#include <godot_cpp/classes/scene_tree.hpp>
#include <godot_cpp/classes/xr_server.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

using namespace godot;
Expand DownExpand Up@@ -266,8 +268,9 @@ void Example::_bind_methods() {
ClassDB::bind_method(D_METHOD("test_virtual_implemented_in_script"), &Example::test_virtual_implemented_in_script);
GDVIRTUAL_BIND(_do_something_virtual_with_control, "control");

ClassDB::bind_method(D_METHOD("test_use_engine_singleton"), &Example::test_use_engine_singleton);
ClassDB::bind_method(D_METHOD("test_use_scene_tree_singleton"), &Example::test_use_scene_tree_singleton);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton1"), &Example::test_use_engine_singleton1);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton2"), &Example::test_use_engine_singleton2);

ClassDB::bind_method(D_METHOD("test_get_internal_class"), &Example::test_get_internal_class);

Expand DownExpand Up@@ -757,15 +760,20 @@ String Example::test_virtual_implemented_in_script(const String &p_name, int p_v
return "Unimplemented";
}

String Example::test_use_engine_singleton() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_scene_tree_singleton() const {
SceneTree *scene_tree = SceneTree::get_singleton();
return scene_tree != nullptr && scene_tree == get_tree();
}

String Example::test_use_engine_singleton1() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_engine_singleton2() const {
XRServer *xr_server = Object::cast_to<XRServer>(Engine::get_singleton()->get_singleton("XRServer"));
return xr_server != nullptr;
}

String Example::test_library_path() {
String library_path;
::godot::gdextension_interface::get_library_path(::godot::gdextension_interface::library, library_path._native_ptr());
Expand Down
3 changes: 3 additions & 0 deletions test/src/example.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,9 @@ class Example : public Control {
String test_use_engine_singleton() const;
bool test_use_scene_tree_singleton() const;

String test_use_engine_singleton1() const;
bool test_use_engine_singleton2() const;

static String test_library_path();

Ref<RefCounted> test_get_internal_class() const;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Apply singleton instance binding clean-up fix no matter how it is created#1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsnopek wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Apply singleton instance binding clean-up fix no matter how it is created #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions binding_generator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2078,6 +2078,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result = []

class_name = class_api["name"]
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
snake_class_name = camel_to_snake(class_name)
is_singleton = class_name in singletons

Expand DownExpand Up@@ -2117,27 +2118,37 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton_obj, nullptr);")
result.append("#endif // DEBUG_ENABLED")
# This will lead to the constructor which will set `singleton`.
result.append(
f"\t\tsingleton = reinterpret_cast<{class_name} *>(::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks));"
f"\t\t::godot::gdextension_interface::object_get_instance_binding(singleton_obj, ::godot::gdextension_interface::token, &{class_name}::_gde_binding_callbacks);"
)
result.append("#ifdef DEBUG_ENABLED")
result.append("\t\tERR_FAIL_NULL_V(singleton, nullptr);")
result.append("#endif // DEBUG_ENABLED")
result.append("\t\tif (likely(singleton)) {")
result.append(f"\t\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t\t}")
result.append("\t}")
result.append("\treturn singleton;")
result.append("}")
result.append("")

result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("\tif (singleton == nullptr) {")
result.append("\t\tsingleton = this;")
result.append(f"\t\tClassDB::_register_engine_singleton({class_name}::get_class_static(), singleton);")
result.append("\t}")
result.append("}")
result.append("")

result.append(f"{class_name}::~{class_name}() {{")
result.append("\tif (singleton == this) {")
result.append(f"\t\tClassDB::_unregister_engine_singleton({class_name}::get_class_static());")
result.append("\t\tsingleton = nullptr;")
result.append("\t}")
result.append("}")
result.append("")
else:
result.append(f"{class_name}::{class_name}(GodotObject *p_godot_object) : {inherits}(p_godot_object) {{")
result.append("}")
result.append("")

if "methods" in class_api:
for method in class_api["methods"]:
Expand Down
2 changes: 1 addition & 1 deletion include/godot_cpp/classes/wrapped.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -434,7 +434,7 @@ private: \
\
protected: \
m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \
m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \
m_class(GodotObject *p_godot_object); \
\
static void _bind_methods() {} \
\
Expand Down
3 changes: 2 additions & 1 deletion test/build_profile.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
"TileMap",
"TileSet",
"Tween",
"Viewport"
"Viewport",
"XRServer"
]
}
5 changes: 3 additions & 2 deletions test/project/main.gd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,8 +276,9 @@ func _ready():
assert_equal(example.test_virtual_implemented_in_script("Virtual", 939), "Implemented")
assert_equal(custom_signal_emitted, ["Virtual", 939])

# Test that we can access an engine singleton.
assert_equal(example.test_use_engine_singleton(), OS.get_name())
# Test that we can access an engine singletons.
assert_equal(example.test_use_engine_singleton1(), OS.get_name())
assert_equal(example.test_use_engine_singleton2(), true)

# Test that we can access the SceneTree singleton.
assert_equal(example.test_use_scene_tree_singleton(), true)
Expand Down
18 changes: 13 additions & 5 deletions test/src/example.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@

#include <godot_cpp/core/class_db.hpp>

#include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/classes/label.hpp>
#include <godot_cpp/classes/multiplayer_api.hpp>
#include <godot_cpp/classes/multiplayer_peer.hpp>
#include <godot_cpp/classes/os.hpp>
#include <godot_cpp/classes/scene_tree.hpp>
#include <godot_cpp/classes/xr_server.hpp>
#include <godot_cpp/variant/utility_functions.hpp>

using namespace godot;
Expand DownExpand Up@@ -266,8 +268,9 @@ void Example::_bind_methods() {
ClassDB::bind_method(D_METHOD("test_virtual_implemented_in_script"), &Example::test_virtual_implemented_in_script);
GDVIRTUAL_BIND(_do_something_virtual_with_control, "control");

ClassDB::bind_method(D_METHOD("test_use_engine_singleton"), &Example::test_use_engine_singleton);
ClassDB::bind_method(D_METHOD("test_use_scene_tree_singleton"), &Example::test_use_scene_tree_singleton);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton1"), &Example::test_use_engine_singleton1);
ClassDB::bind_method(D_METHOD("test_use_engine_singleton2"), &Example::test_use_engine_singleton2);

ClassDB::bind_method(D_METHOD("test_get_internal_class"), &Example::test_get_internal_class);

Expand DownExpand Up@@ -757,15 +760,20 @@ String Example::test_virtual_implemented_in_script(const String &p_name, int p_v
return "Unimplemented";
}

String Example::test_use_engine_singleton() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_scene_tree_singleton() const {
SceneTree *scene_tree = SceneTree::get_singleton();
return scene_tree != nullptr && scene_tree == get_tree();
}

String Example::test_use_engine_singleton1() const {
return OS::get_singleton()->get_name();
}

bool Example::test_use_engine_singleton2() const {
XRServer *xr_server = Object::cast_to<XRServer>(Engine::get_singleton()->get_singleton("XRServer"));
return xr_server != nullptr;
}

String Example::test_library_path() {
String library_path;
::godot::gdextension_interface::get_library_path(::godot::gdextension_interface::library, library_path._native_ptr());
Expand Down
3 changes: 3 additions & 0 deletions test/src/example.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,9 @@ class Example : public Control {
String test_use_engine_singleton() const;
bool test_use_scene_tree_singleton() const;

String test_use_engine_singleton1() const;
bool test_use_engine_singleton2() const;

static String test_library_path();

Ref<RefCounted> test_get_internal_class() const;
Expand Down
Loading