update to also take missing classes/structs

Author: Ughuuu

binding_generator.py

@@ -222,11 +222,9 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
             continue
 
         header_filename = include_gen_folder / "variant" / (camel_to_snake(builtin_class["name"]) + ".hpp")
-        header_compat_filename = include_gen_compat_folder / "variant" / (camel_to_snake(builtin_class["name"]) + ".hpp")
         source_filename = source_gen_folder / "variant" / (camel_to_snake(builtin_class["name"]) + ".cpp")
         if headers:
             files.append(str(header_filename.as_posix()))
-            files.append(str(header_compat_filename.as_posix()))
         if sources:
             files.append(str(source_filename.as_posix()))
 
@@ -236,11 +234,9 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
             engine_class["name"] = "ClassDBSingleton"
             engine_class["alias_for"] = "ClassDB"
         header_filename = include_gen_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".hpp")
-        header_compat_filename = include_gen_compat_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".hpp")
         source_filename = source_gen_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".cpp")
         if headers:
             files.append(str(header_filename.as_posix()))
-            files.append(str(header_compat_filename.as_posix()))
         if sources:
             files.append(str(source_filename.as_posix()))
 
@@ -251,10 +247,8 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
         snake_struct_name = camel_to_snake(struct_name)
 
         header_filename = include_gen_folder / "classes" / (snake_struct_name + ".hpp")
-        header_compat_filename = include_gen_compat_folder / "classes" / (snake_struct_name + ".hpp")
         if headers:
             files.append(str(header_filename.as_posix()))
-            files.append(str(header_compat_filename.as_posix()))
 
     if headers:
         for path in [
@@ -1485,6 +1479,7 @@ def generate_compat_includes(output_dir: Path, target_dir: Path):
             result.append(f"#include <{file_godot_name}>")
         result.append(f"#else")
         result.append(f"#include <{file_godot_cpp_name}>")
+        result.append(f"using namespace godot;")
         result.append(f"#endif")
         result.append("")
         result.append(f"#endif // ! {header_guard}")

compat_generator.py

@@ -11,8 +11,8 @@ def parse_header_file(file_path):
         content = file.read()
 
         # Regular expressions to match different types
-        class_pattern = r"class\s+([a-zA-Z_]\w*)\s*[:{]"
-        struct_pattern = r"struct\s+([a-zA-Z_]\w*)\s*[:{]"
+        struct_pattern = r"struct\s+[\w\s]*?([a-zA-Z_]\w*)\s*[:{]"
+        class_pattern = r"class\s+[\w\s]*?([a-zA-Z_]\w*)\s*[:{]"
         define_pattern = r"#define\s+([a-zA-Z_]\w*)"
 
         # Extract classes

module_converter.py

@@ -9,11 +9,14 @@
 from header_matcher import match_headers
 
 if __name__ == "__main__":
-    if len(sys.argv) > 2:
-        current_directory = os.path.join(os.getcwd(), sys.argv[1])
-        godot_cpp_directory = os.path.join(os.getcwd(), sys.argv[2])
+    if len(sys.argv) > 3:
+        src_directory = os.path.join(os.getcwd(), sys.argv[1])
+        godot_directory = os.path.join(os.getcwd(), sys.argv[2])
+        godot_cpp_directory = os.path.join(os.getcwd(), sys.argv[3])
+    else:
+        raise Exception("Usage: python module_converter.py <source directory> <godot directory> <godot-cpp directory>")
     # Load the godot mappings
-    with open(f"{godot_cpp_directory}/output_header_mapping.json", "r") as file:
+    with open(f"{godot_directory}/output_header_mapping_godot.json", "r") as file:
         godot_mappings = json.load(file)
 
     # Generate mappings for godot-cpp
@@ -22,9 +25,9 @@
     # Save matches to a file
     with open("header_matches.json", "w") as outfile:
         json.dump(matches, outfile, indent=4)
-    current_directory = os.getcwd()
+    src_directory = os.getcwd()
     # Go through folder specified through all files with .cpp, .h or .hpp
-    for root, dirs, files in os.walk(current_directory):
+    for root, dirs, files in os.walk(src_directory):
         for file in files:
             if file.endswith(".cpp") or file.endswith(".h") or file.endswith(".hpp"):
                 with open(os.path.join(root, file), "r") as f: