diff options
| author | reduz <reduzio@gmail.com> | 2022-03-10 08:17:38 +0100 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2022-03-10 12:28:11 +0100 |
| commit | 6f51eca1e3045571ccc68414a922e8b0229111f0 (patch) | |
| tree | 8aee693d8f1972009c5788f34fcebfd6c681e9e1 /core/object/object.h | |
| parent | 741bbb9d7c95dfd810c113ca935a8f16238b5334 (diff) | |
| download | redot-engine-6f51eca1e3045571ccc68414a922e8b0229111f0.tar.gz | |
Discern between virtual and abstract class bindings
* Previous "virtual" classes (which can't be instantiated) are not corretly named "abstract".
* Added a new "virtual" category for classes, they can't be instantiated from the editor, but can be inherited from script and extensions.
* Converted a large amount of classes from "abstract" to "virtual" where it makes sense.
Most classes that make sense have been converted. Missing:
* Physics servers
* VideoStream
* Script* classes.
which will go in a separate PR due to the complexity involved.
Diffstat (limited to 'core/object/object.h')
| -rw-r--r-- | core/object/object.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/object/object.h b/core/object/object.h index 8a8b6b5487..3aa7e3f9f2 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -255,6 +255,7 @@ struct ObjectNativeExtension { GDNativeExtensionClassToString to_string; GDNativeExtensionClassReference reference; GDNativeExtensionClassReference unreference; + GDNativeExtensionClassGetRID get_rid; _FORCE_INLINE_ bool is_class(const String &p_class) const { const ObjectNativeExtension *e = this; @@ -273,8 +274,12 @@ struct ObjectNativeExtension { GDNativeExtensionClassGetVirtual get_virtual; }; -#define GDVIRTUAL_CALL(m_name, ...) _gdvirtual_##m_name##_call(__VA_ARGS__) -#define GDVIRTUAL_CALL_PTR(m_obj, m_name, ...) m_obj->_gdvirtual_##m_name##_call(__VA_ARGS__) +#define GDVIRTUAL_CALL(m_name, ...) _gdvirtual_##m_name##_call<false>(__VA_ARGS__) +#define GDVIRTUAL_CALL_PTR(m_obj, m_name, ...) m_obj->_gdvirtual_##m_name##_call<false>(__VA_ARGS__) + +#define GDVIRTUAL_REQUIRED_CALL(m_name, ...) _gdvirtual_##m_name##_call<true>(__VA_ARGS__) +#define GDVIRTUAL_REQUIRED_CALL_PTR(m_obj, m_name, ...) m_obj->_gdvirtual_##m_name##_call<true>(__VA_ARGS__) + #ifdef DEBUG_METHODS_ENABLED #define GDVIRTUAL_BIND(m_name, ...) ::ClassDB::add_virtual_method(get_class_static(), _gdvirtual_##m_name##_get_method_info(), true, sarray(__VA_ARGS__)); #else |