Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #105449 from raulsntos/MissingNode/recording_signals

Browse source 
Add `recording_signals` to MissingNode, and rename `MTVIRTUAL` to `DEBUG_VIRTUAL`
This commit is contained in:
Thaddeus Crews 2025-10-10 10:25:57 -05:00
commit dd3b17de88
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
4 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
core/object/object.h
View file

@ -926,22 +926,22 @@ public:
/* SCRIPT */
// When in debug, some non-virtual functions can be overridden for multithreaded guards.
// When in debug, some non-virtual functions can be overridden.
#ifdef DEBUG_ENABLED
#define MTVIRTUAL virtual
#define DEBUG_VIRTUAL virtual
#else
#define MTVIRTUAL
#define DEBUG_VIRTUAL
#endif // DEBUG_ENABLED
MTVIRTUAL void set_script(const Variant &p_script);
MTVIRTUAL Variant get_script() const;
DEBUG_VIRTUAL void set_script(const Variant &p_script);
DEBUG_VIRTUAL Variant get_script() const;
MTVIRTUAL bool has_meta(const StringName &p_name) const;
MTVIRTUAL void set_meta(const StringName &p_name, const Variant &p_value);
MTVIRTUAL void remove_meta(const StringName &p_name);
MTVIRTUAL Variant get_meta(const StringName &p_name, const Variant &p_default = Variant()) const;
MTVIRTUAL void get_meta_list(List<StringName> *p_list) const;
MTVIRTUAL void merge_meta_from(const Object *p_src);
DEBUG_VIRTUAL bool has_meta(const StringName &p_name) const;
DEBUG_VIRTUAL void set_meta(const StringName &p_name, const Variant &p_value);
DEBUG_VIRTUAL void remove_meta(const StringName &p_name);
DEBUG_VIRTUAL Variant get_meta(const StringName &p_name, const Variant &p_default = Variant()) const;
DEBUG_VIRTUAL void get_meta_list(List<StringName> *p_list) const;
DEBUG_VIRTUAL void merge_meta_from(const Object *p_src);
#ifdef TOOLS_ENABLED
void set_edited(bool p_edited);
@ -968,18 +968,18 @@ public:
return emit_signalp(p_name, sizeof...(p_args) == 0 ? nullptr : (const Variant **)argptrs, sizeof...(p_args));
}
MTVIRTUAL Error emit_signalp(const StringName &p_name, const Variant **p_args, int p_argcount);
MTVIRTUAL bool has_signal(const StringName &p_name) const;
MTVIRTUAL void get_signal_list(List<MethodInfo> *p_signals) const;
MTVIRTUAL void get_signal_connection_list(const StringName &p_signal, List<Connection> *p_connections) const;
MTVIRTUAL void get_all_signal_connections(List<Connection> *p_connections) const;
MTVIRTUAL int get_persistent_signal_connection_count() const;
MTVIRTUAL void get_signals_connected_to_this(List<Connection> *p_connections) const;
DEBUG_VIRTUAL Error emit_signalp(const StringName &p_name, const Variant **p_args, int p_argcount);
DEBUG_VIRTUAL bool has_signal(const StringName &p_name) const;
DEBUG_VIRTUAL void get_signal_list(List<MethodInfo> *p_signals) const;
DEBUG_VIRTUAL void get_signal_connection_list(const StringName &p_signal, List<Connection> *p_connections) const;
DEBUG_VIRTUAL void get_all_signal_connections(List<Connection> *p_connections) const;
DEBUG_VIRTUAL int get_persistent_signal_connection_count() const;
DEBUG_VIRTUAL void get_signals_connected_to_this(List<Connection> *p_connections) const;
MTVIRTUAL Error connect(const StringName &p_signal, const Callable &p_callable, uint32_t p_flags = 0);
MTVIRTUAL void disconnect(const StringName &p_signal, const Callable &p_callable);
MTVIRTUAL bool is_connected(const StringName &p_signal, const Callable &p_callable) const;
MTVIRTUAL bool has_connections(const StringName &p_signal) const;
DEBUG_VIRTUAL Error connect(const StringName &p_signal, const Callable &p_callable, uint32_t p_flags = 0);
DEBUG_VIRTUAL void disconnect(const StringName &p_signal, const Callable &p_callable);
DEBUG_VIRTUAL bool is_connected(const StringName &p_signal, const Callable &p_callable) const;
DEBUG_VIRTUAL bool has_connections(const StringName &p_signal) const;
template <typename... VarArgs>
void call_deferred(const StringName &p_name, VarArgs... p_args) {

3
doc/classes/MissingNode.xml
View file

@ -19,5 +19,8 @@
<member name="recording_properties" type="bool" setter="set_recording_properties" getter="is_recording_properties">
If [code]true[/code], allows new properties to be set along with existing ones. If [code]false[/code], only existing properties' values can be set, and new properties cannot be added.
</member>
<member name="recording_signals" type="bool" setter="set_recording_signals" getter="is_recording_signals">
If [code]true[/code], allows new signals to be connected to along with existing ones. If [code]false[/code], only existing signals can be connected to, and new signals cannot be added.
</member>
</members>
</class>

23
scene/main/missing_node.cpp
View file

@ -58,6 +58,17 @@ void MissingNode::_get_property_list(List<PropertyInfo> *p_list) const {
}
}
#ifdef DEBUG_ENABLED
Error MissingNode::connect(const StringName &p_signal, const Callable &p_callable, uint32_t p_flags) {
if (is_recording_signals()) {
if (!has_signal(p_signal)) {
add_user_signal(MethodInfo(p_signal));
}
}
return Object::connect(p_signal, p_callable, p_flags);
}
#endif
void MissingNode::set_original_class(const String &p_class) {
original_class = p_class;
}
@ -82,6 +93,14 @@ bool MissingNode::is_recording_properties() const {
return recording_properties;
}
void MissingNode::set_recording_signals(bool p_enable) {
recording_signals = p_enable;
}
bool MissingNode::is_recording_signals() const {
return recording_signals;
}
PackedStringArray MissingNode::get_configuration_warnings() const {
// The mere existence of this node is warning.
PackedStringArray warnings = Node::get_configuration_warnings();
@ -107,10 +126,14 @@ void MissingNode::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_recording_properties", "enable"), &MissingNode::set_recording_properties);
ClassDB::bind_method(D_METHOD("is_recording_properties"), &MissingNode::is_recording_properties);
ClassDB::bind_method(D_METHOD("set_recording_signals", "enable"), &MissingNode::set_recording_signals);
ClassDB::bind_method(D_METHOD("is_recording_signals"), &MissingNode::is_recording_signals);
// Expose, but not save.
ADD_PROPERTY(PropertyInfo(Variant::STRING, "original_class", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_original_class", "get_original_class");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "original_scene", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_original_scene", "get_original_scene");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "recording_properties", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_recording_properties", "is_recording_properties");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "recording_signals", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_recording_signals", "is_recording_signals");
}
MissingNode::MissingNode() {

8
scene/main/missing_node.h
View file

@ -39,12 +39,17 @@ class MissingNode : public Node {
String original_class;
String original_scene;
bool recording_properties = false;
bool recording_signals = false;
protected:
bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const;
void _get_property_list(List<PropertyInfo> *p_list) const;
#ifdef DEBUG_ENABLED
virtual Error connect(const StringName &p_signal, const Callable &p_callable, uint32_t p_flags = 0) override;
#endif
static void _bind_methods();
public:
@ -57,6 +62,9 @@ public:
void set_recording_properties(bool p_enable);
bool is_recording_properties() const;
void set_recording_signals(bool p_enable);
bool is_recording_signals() const;
virtual PackedStringArray get_configuration_warnings() const override;
MissingNode();