Merge pull request #1164 from dsnopek/classdb-singleton-alternate
Add static methods to `ClassDB` for the methods bound to the `ClassDB` singletonpull/1165/head
David Snopek
GitHub
commit
0d6de7a80e
|
|
@ -97,9 +97,10 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
|
|||
files.append(str(source_filename.as_posix()))
|
||||
|
||||
for engine_class in api["classes"]:
|
||||
# TODO: Properly setup this singleton since it conflicts with ClassDB in the bindings.
|
||||
# Generate code for the ClassDB singleton under a different name.
|
||||
if engine_class["name"] == "ClassDB":
|
||||
continue
|
||||
engine_class["name"] = "ClassDBSingleton"
|
||||
engine_class["alias_for"] = "ClassDB"
|
||||
header_filename = include_gen_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".hpp")
|
||||
source_filename = source_gen_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".cpp")
|
||||
if headers:
|
||||
|
|
@ -1075,21 +1076,23 @@ def generate_engine_classes_bindings(api, output_dir, use_template_get_node):
|
|||
|
||||
# First create map of classes and singletons.
|
||||
for class_api in api["classes"]:
|
||||
# TODO: Properly setup this singleton since it conflicts with ClassDB in the bindings.
|
||||
# Generate code for the ClassDB singleton under a different name.
|
||||
if class_api["name"] == "ClassDB":
|
||||
continue
|
||||
class_api["name"] = "ClassDBSingleton"
|
||||
class_api["alias_for"] = "ClassDB"
|
||||
engine_classes[class_api["name"]] = class_api["is_refcounted"]
|
||||
for native_struct in api["native_structures"]:
|
||||
engine_classes[native_struct["name"]] = False
|
||||
native_structures.append(native_struct["name"])
|
||||
|
||||
for singleton in api["singletons"]:
|
||||
# Generate code for the ClassDB singleton under a different name.
|
||||
if singleton["name"] == "ClassDB":
|
||||
singleton["name"] = "ClassDBSingleton"
|
||||
singleton["alias_for"] = "ClassDB"
|
||||
singletons.append(singleton["name"])
|
||||
|
||||
for class_api in api["classes"]:
|
||||
# TODO: Properly setup this singleton since it conflicts with ClassDB in the bindings.
|
||||
if class_api["name"] == "ClassDB":
|
||||
continue
|
||||
# Check used classes for header include.
|
||||
used_classes = set()
|
||||
fully_used_classes = set()
|
||||
|
|
@ -1287,7 +1290,7 @@ def generate_engine_class_header(class_api, used_classes, fully_used_classes, us
|
|||
if len(fully_used_classes) > 0:
|
||||
result.append("")
|
||||
|
||||
if class_name != "Object":
|
||||
if class_name != "Object" and class_name != "ClassDBSingleton":
|
||||
result.append("#include <godot_cpp/core/class_db.hpp>")
|
||||
result.append("")
|
||||
result.append("#include <type_traits>")
|
||||
|
|
@ -1308,6 +1311,9 @@ def generate_engine_class_header(class_api, used_classes, fully_used_classes, us
|
|||
inherits = class_api["inherits"] if "inherits" in class_api else "Wrapped"
|
||||
result.append(f"class {class_name} : public {inherits} {{")
|
||||
|
||||
if "alias_for" in class_api:
|
||||
result.append(f"\tGDEXTENSION_CLASS_ALIAS({class_name}, {class_api['alias_for']}, {inherits})")
|
||||
else:
|
||||
result.append(f"\tGDEXTENSION_CLASS({class_name}, {inherits})")
|
||||
result.append("")
|
||||
|
||||
|
|
@ -1466,6 +1472,51 @@ def generate_engine_class_header(class_api, used_classes, fully_used_classes, us
|
|||
result.append(f'VARIANT_ENUM_CAST({class_name}::{enum_api["name"]});')
|
||||
result.append("")
|
||||
|
||||
if class_name == "ClassDBSingleton":
|
||||
result.append("#define CLASSDB_SINGLETON_FORWARD_METHODS \\")
|
||||
for method in class_api["methods"]:
|
||||
# ClassDBSingleton shouldn't have any static or vararg methods, but if some appear later, lets skip them.
|
||||
if vararg:
|
||||
continue
|
||||
if "is_static" in method and method["is_static"]:
|
||||
continue
|
||||
|
||||
method_signature = "\tstatic "
|
||||
if "return_type" in method:
|
||||
method_signature += f'{correct_type(method["return_type"])} '
|
||||
elif "return_value" in method:
|
||||
method_signature += (
|
||||
correct_type(method["return_value"]["type"], method["return_value"].get("meta", None)) + " "
|
||||
)
|
||||
else:
|
||||
method_signature += "void "
|
||||
|
||||
method_signature += f'{method["name"]}('
|
||||
|
||||
method_arguments = []
|
||||
if "arguments" in method:
|
||||
method_arguments = method["arguments"]
|
||||
|
||||
method_signature += make_function_parameters(
|
||||
method_arguments, include_default=True, for_builtin=True, is_vararg=False
|
||||
)
|
||||
|
||||
method_signature += ") { \\"
|
||||
|
||||
result.append(method_signature)
|
||||
|
||||
method_body = "\t\t"
|
||||
if "return_type" in method or "return_value" in method:
|
||||
method_body += "return "
|
||||
method_body += f'ClassDBSingleton::get_singleton()->{method["name"]}('
|
||||
method_body += ", ".join(map(lambda x: escape_identifier(x["name"]), method_arguments))
|
||||
method_body += "); \\"
|
||||
|
||||
result.append(method_body)
|
||||
result.append("\t} \\")
|
||||
result.append("\t;")
|
||||
result.append("")
|
||||
|
||||
result.append(f"#endif // ! {header_guard}")
|
||||
|
||||
return "\n".join(result)
|
||||
|
|
@ -2399,6 +2450,7 @@ def escape_identifier(id):
|
|||
"operator": "_operator",
|
||||
"typeof": "type_of",
|
||||
"typename": "type_name",
|
||||
"enum": "_enum",
|
||||
}
|
||||
if id in cpp_keywords_map:
|
||||
return cpp_keywords_map[id]
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ public:
|
|||
};
|
||||
|
||||
// Don't use this for your classes, use GDCLASS() instead.
|
||||
#define GDEXTENSION_CLASS(m_class, m_inherits) \
|
||||
#define GDEXTENSION_CLASS_ALIAS(m_class, m_alias_for, m_inherits) \
|
||||
private: \
|
||||
void operator=(const m_class &p_rval) {} \
|
||||
\
|
||||
|
|
@ -378,7 +378,7 @@ public:
|
|||
static void initialize_class() {} \
|
||||
\
|
||||
static ::godot::StringName &get_class_static() { \
|
||||
static ::godot::StringName string_name = ::godot::StringName(#m_class); \
|
||||
static ::godot::StringName string_name = ::godot::StringName(#m_alias_for); \
|
||||
return string_name; \
|
||||
} \
|
||||
\
|
||||
|
|
@ -403,6 +403,9 @@ public:
|
|||
_gde_binding_free_callback, \
|
||||
_gde_binding_reference_callback, \
|
||||
}; \
|
||||
m_class() : m_class(#m_class) {}
|
||||
m_class() : m_class(#m_alias_for) {}
|
||||
|
||||
// Don't use this for your classes, use GDCLASS() instead.
|
||||
#define GDEXTENSION_CLASS(m_class, m_inherits) GDEXTENSION_CLASS_ALIAS(m_class, m_class, m_inherits)
|
||||
|
||||
#endif // GODOT_WRAPPED_HPP
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@
|
|||
#include <godot_cpp/core/method_bind.hpp>
|
||||
#include <godot_cpp/core/object.hpp>
|
||||
|
||||
#include <godot_cpp/classes/class_db_singleton.hpp>
|
||||
|
||||
#include <list>
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
|
@ -139,6 +141,8 @@ public:
|
|||
|
||||
static void initialize(GDExtensionInitializationLevel p_level);
|
||||
static void deinitialize(GDExtensionInitializationLevel p_level);
|
||||
|
||||
CLASSDB_SINGLETON_FORWARD_METHODS;
|
||||
};
|
||||
|
||||
#define BIND_CONSTANT(m_constant) \
|
||||
|
|
|
|||
Loading…
Reference in New Issue