Update compatibility to 4.0-stable

.github/workflows/linux_builds.yml

@@ -9,16 +9,23 @@ on:
 
 # Global Settings
 env:
-  GODOT_BASE_BRANCH: master
-  SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no --jobs=2 module_text_server_fb_enabled=yes
+  GODOT_REF: 92bee43adba8d2401ef40e2480e53087bcb1eaf1
+  SCONSFLAGS: platform=linuxbsd verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_LIMIT: 4096
 
 jobs:
   linux-editor:
     runs-on: "ubuntu-20.04"
-    name: Editor (target=release_debug, tools=yes, tests=yes)
+    name: Editor (target=editor, tools=yes, tests=yes)
 
     steps:
+    - name: Wait for static checks
+      uses: lewagon/[email protected]
+      with:
+       ref: ${{ github.ref }}
+       check-name: 'Static Checks (clang-format, black format, file format, documentation checks)'
+       repo-token: ${{ secrets.GITHUB_TOKEN }}
+       wait-interval: 10
     - name: Make godot dir
       run: |
        mkdir godot
@@ -33,10 +40,15 @@ jobs:
     - name: Clone godot for godex
       uses: actions/checkout@v2
       with:
-       repository: GodotECS/godot
-       ref: refs/heads/godex_version
+       repository: godotengine/godot
+       ref: ${{ env.GODOT_REF }}
        path: godot
 
+    - name: Apply patch
+      run: |
+        cd godot
+        git apply ../modules/godex/patches/add_custom_iterator.patch --reject --ignore-space-change --ignore-whitespace
+
     # Azure repositories are not reliable, we need to prevent azure giving us packages.
     - name: Make apt sources.list use the default Ubuntu repositories
       run: |
@@ -56,11 +68,11 @@ jobs:
       uses: actions/cache@v2
       with:
        path: ${{github.workspace}}/.scons_cache/
-       key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+       key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-{{env.GODOT_REF}}-${{github.ref}}-${{github.sha}}
        restore-keys: |
-        ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-        ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-        ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
+        ${{github.job}}-{{env.GODOT_REF}}-${{github.ref}}-${{github.sha}}
+        ${{github.job}}-{{env.GODOT_REF}}-${{github.ref}}
+        ${{github.job}}-{{env.GODOT_REF}}
 
     # Use python 3.x release (works cross platform; best to keep self contained in it's own step)
     - name: Set up Python 3.x
@@ -84,14 +96,14 @@ jobs:
         SCONS_CACHE: ${{github.workspace}}/.scons_cache/
       run: |
        cd godot
-       scons tools=yes tests=yes target=release_debug custom_modules="../modules" -j2
+       scons tools=yes tests=yes target=editor custom_modules="../modules"
        ls -l bin/
 
     # Execute unit tests for the editor
     - name: Unit Tests
       run: |
         cd ./godot
-        ./bin/godot.linuxbsd.opt.tools.64 --test
+        ./bin/godot.linuxbsd.editor.x86_64 --test --headless
         cd ../
 
     - uses: actions/upload-artifact@v2

.github/workflows/static_checks.yml

@@ -20,7 +20,7 @@ jobs:
           sudo apt-get install -qq dos2unix recode clang-format-11
           sudo update-alternatives --remove-all clang-format
           sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100
-          sudo pip3 install black==20.8b1 pygments
+          sudo pip3 install black==22.3.0 pygments
       - name: File formatting checks (file_format.sh)
         run: |
           bash ./misc/scripts/file_format.sh

.github/workflows/windows_builds.yml

@@ -10,18 +10,25 @@ on:
 # Global Settings
 # SCONS_CACHE for windows must be set in the build environment
 env:
-  GODOT_BASE_BRANCH: master
-  SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no --jobs=2 module_text_server_fb_enabled=yes
+  GODOT_REF: 92bee43adba8d2401ef40e2480e53087bcb1eaf1
+  SCONSFLAGS: platform=windows verbose=yes warnings=all werror=yes debug_symbols=no module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 3072
 
 jobs:
   windows-editor:
     # Windows 10 with latest image
     runs-on: "windows-latest"
-    name: Editor (target=release_debug, tools=yes, tests=yes)
+    name: Editor (target=editor, tools=yes, tests=yes)
 
     steps:
+    - name: Wait for static checks
+      uses: lewagon/[email protected]
+      with:
+       ref: ${{ github.ref }}
+       check-name: 'Static Checks (clang-format, black format, file format, documentation checks)'
+       repo-token: ${{ secrets.GITHUB_TOKEN }}
+       wait-interval: 10
     - name: Make dir
       run: |
        mkdir godot
@@ -36,10 +43,15 @@ jobs:
     - name: Clone godot for godex
       uses: actions/checkout@v2
       with:
-       repository: GodotECS/godot
-       ref: refs/heads/godex_version
+       repository: godotengine/godot
+       ref: ${{ env.GODOT_REF }}
        path: godot
 
+    - name: Apply patch
+      run: |
+        cd godot
+        git apply ../modules/godex/patches/add_custom_iterator.patch --reject --ignore-space-change --ignore-whitespace
+
     # Upload cache on completion and check it out now
     # Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.
     - name: Load .scons_cache directory
@@ -49,9 +61,9 @@ jobs:
         path: ${{github.workspace}}/.scons_cache/
         key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
         restore-keys: |
-          ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-          ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-          ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
+          ${{github.job}}-${{env.GODOT_REF}}-${{github.ref}}-${{github.sha}}
+          ${{github.job}}-${{env.GODOT_REF}}-${{github.ref}}
+          ${{github.job}}-${{env.GODOT_REF}}
 
     # Use python 3.x release (works cross platform; best to keep self contained in it's own step)
     - name: Set up Python 3.x
@@ -76,14 +88,14 @@ jobs:
         SCONS_CACHE: ${{github.workspace}}/.scons_cache/
       run: |
         cd godot
-        scons tools=yes tests=yes target=release_debug custom_modules="../modules"
+        scons tools=yes tests=yes target=editor custom_modules="../modules"
         ls -l bin/
 
     # Execute unit tests for the editor
     - name: Unit Tests
       run: |
         cd ./godot
-        ./bin/godot.windows.opt.tools.64.exe --test
+        ./bin/godot.windows.editor.x86_64.exe --test
         cd ../
 
     - uses: actions/upload-artifact@v2

README.md

@@ -13,7 +13,7 @@ Godex is a Godot Engine ecs library.
 **Disclaimer:** this module is still in development, open an [issues](https://github.com/GodotECS/godex/issues) to report any problem or a new [discussion](https://github.com/GodotECS/godex/discussions) if you need any help. Any form of contribution is welcome.
 
 ### The tested Godot version
-Is `master` `35cfaafda8073f700c9d2fe42a43d3d81eaaea67`, please open an issue if the current master is not working or doesn't compile.
+Is `master` `92bee43adba8d2401ef40e2480e53087bcb1eaf1`, please open an issue if the current master is not working or doesn't compile.
 
 ### What is ECS
 Shortened as ECS, the Entity Component System is an architectural design pattern that allow to organize the data in a way so that the workload can be split into small and easy programs.

SCsub

@@ -6,7 +6,7 @@ Import("env")
 Import("env_modules")
 
 env_ecs = env_modules.Clone()
-if env_ecs["float"] == "64":
+if env_ecs["precision"] == "double":
     env_ecs.Append(CPPDEFINES=["BT_USE_DOUBLE_PRECISION=1"])
 
 methods_ecs.generate_system_structs()

ecs.cpp

@@ -1,5 +1,8 @@
 
 #include "ecs.h"
+#include <core/config/project_settings.h>
+#include <core/io/dir_access.h>
+#include <modules/gdscript/gdscript_parser.h>
 
 #include "components/dynamic_component.h"
 #include "core/object/message_queue.h"
@@ -159,6 +162,43 @@ ECS::ECS() :
 	}
 }
 
+void get_script_files(const String &p_path, Vector<String> &scripts) {
+	for (const auto &directory : DirAccess::get_directories_at(p_path)) {
+		get_script_files(p_path.path_join(directory), scripts);
+	}
+	for (const auto &file : DirAccess::get_files_at(p_path)) {
+		auto file_path = p_path.path_join(file);
+		if (ResourceLoader::get_resource_type(file_path) == "GDScript") {
+			scripts.push_back(file_path);
+		}
+	}
+}
+
+void ECS::preload_scripts() {
+	if (Engine::get_singleton()->is_project_manager_hint()) {
+		return;
+	}
+
+	Vector<String> scripts;
+	print_line("Preloading component and system scripts");
+	get_script_files("res://", scripts);
+
+	for (const auto &script : scripts) {
+		auto code = FileAccess::get_file_as_string(script);
+		GDScriptParser parser;
+		if (parser.parse(code, script, false) == OK) {
+			auto tree = parser.get_tree();
+			if (tree->extends.has("System")) {
+				register_dynamic_system(script.get_file());
+			}
+
+			if (tree->extends.has("Component")) {
+				register_or_get_id_for_component_name(script.get_file());
+			}
+		}
+	}
+}
+
 ECS::~ECS() {
 }
 
@@ -1041,11 +1081,7 @@ const LocalVector<godex::component_id> &ECS::get_spawnable_components(godex::spa
 	return spawners_info[p_spawner].components;
 }
 
-uint32_t ECS::register_or_update_script_component(
-		const StringName &p_name,
-		const LocalVector<ScriptProperty> &p_properties,
-		StorageType p_storage_type,
-		Vector<StringName> p_spawners) {
+uint32_t ECS::register_or_get_id_for_component_name(const StringName &p_name) {
 	godex::component_id id = get_component_id(p_name);
 	DynamicComponentInfo *info;
 
@@ -1058,18 +1094,38 @@ uint32_t ECS::register_or_update_script_component(
 		components.push_back(p_name);
 		components_info.push_back(ComponentInfo());
 		components_info[id].dynamic_component_info = info;
-	} else {
-		// This is an old component, verify is a script component.
-		ERR_FAIL_COND_V_MSG(components_info[id].dynamic_component_info == nullptr, godex::COMPONENT_NONE, "This component " + p_name + " is not a script component and can't be updated. Your component must be an unique name.");
-		info = components_info[id].dynamic_component_info;
+
+		// Add a new scripting constant, for fast and easy `component` access.
+		ClassDB::bind_integer_constant(get_class_static(), StringName(), String(p_name).replace(".", "_"), id);
+		print_line("ComponentScript: " + p_name + " registered with ID: " + itos(id));
 	}
 
+	return id;
+}
+
+uint32_t ECS::register_or_update_script_component(
+		const StringName &p_name,
+		const LocalVector<ScriptProperty> &p_properties,
+		StorageType p_storage_type,
+		Vector<StringName> p_spawners) {
+	godex::component_id id = register_or_get_id_for_component_name(p_name);
+	DynamicComponentInfo *info;
+	ERR_FAIL_COND_V_MSG(components_info[id].dynamic_component_info == nullptr, godex::COMPONENT_NONE, "This component " + p_name + " is not a script component and can't be updated. Your component must be an unique name.");
+	info = components_info[id].dynamic_component_info;
+
 	info->property_map.resize(p_properties.size());
 	info->properties.resize(p_properties.size());
 	info->defaults.resize(p_properties.size());
 
 	// Validate and initialize the parameters.
 	for (uint32_t i = 0; i < p_properties.size(); i += 1) {
+		if (
+				// Filter GDScript file name
+				p_properties[i].property.name == p_name
+				// Filter C# file name. It uses only the class name
+				|| p_properties[i].property.name + ".cs" == p_name) {
+			continue;
+		}
 		// Is  type supported?
 		switch (p_properties[i].property.type) {
 			case Variant::NIL:
@@ -1078,7 +1134,7 @@ uint32_t ECS::register_or_update_script_component(
 			case Variant::SIGNAL:
 			case Variant::CALLABLE:
 				// TODO what about dictionary and arrays?
-				ERR_PRINT("The script component " + p_name + " is using a pointer variable. This is unsafe, so not supported. Please use a databag.");
+				ERR_PRINT("The property " + p_properties[i].property.name + " of script component " + p_name + " is using a pointer variable. This is unsafe, so not supported. Please use a databag.");
 				return UINT32_MAX;
 			default:
 				// Valid!
@@ -1108,10 +1164,6 @@ uint32_t ECS::register_or_update_script_component(
 		spawners_info[spawner].components.push_back(info->component_id);
 	}
 
-	// Add a new scripting constant, for fast and easy `component` access.
-	ClassDB::bind_integer_constant(get_class_static(), StringName(), String(p_name).replace(".", "_"), id);
-	print_line("ComponentScript: " + p_name + " registered with ID: " + itos(id));
-
 	return id;
 }
 

ecs.h

@@ -224,6 +224,7 @@ class ECS : public Object {
 	template <class C>
 	static void register_component(StorageBase *(*create_storage)());
 
+	static uint32_t register_or_get_id_for_component_name(const StringName &p_name);
 	static uint32_t register_or_update_script_component(const StringName &p_name, const LocalVector<ScriptProperty> &p_properties, StorageType p_storage_type, Vector<StringName> p_spawners);
 
 	static uint32_t get_components_count();
@@ -488,6 +489,8 @@ class ECS : public Object {
 	/// time, making the pipeline switch immediate.
 	static void system_set_active_system(godex::system_id p_id, uint8_t *p_mem, bool p_active);
 
+	static void preload_scripts();
+
 private:
 	static void clear_emitters_for_system(godex::system_id p_id);
 

iterators/dynamic_query.cpp

@@ -13,7 +13,7 @@ void DynamicQuery::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("not_component", "component_id"), &DynamicQuery::not_component);
 
 	ClassDB::bind_method(D_METHOD("is_valid"), &DynamicQuery::is_valid);
-	ClassDB::bind_method(D_METHOD("prepare_world"), &DynamicQuery::prepare_world_script);
+	ClassDB::bind_method(D_METHOD("prepare_world", "world"), &DynamicQuery::prepare_world_script);
 	ClassDB::bind_method(D_METHOD("reset"), &DynamicQuery::reset);
 	ClassDB::bind_method(D_METHOD("get_component", "index"), &DynamicQuery::get_access_by_index_gd);
 

modules/bullet_physics/SCsub

@@ -2,12 +2,15 @@
 
 Import("env")
 Import("env_modules")
+import methods
 
 env_bullet = env_modules.Clone()
 
 thirdparty_obj = []
 
 env.Append(builtin_bullet=True)
+if methods.using_clang(env_bullet) or methods.using_emcc(env_bullet):
+    env_bullet.Append(CXXFLAGS=["-frelaxed-template-template-args"])
 
 # Add bullet header, no need to compile Bullet third party, because it's
 # already done by the godot bullet module.
@@ -208,7 +211,7 @@ if env["builtin_bullet"]:
     if env["target"] == "debug" or env["target"] == "release_debug":
         env_bullet.Append(CPPDEFINES=["DEBUG"])
 
-    if env["float"] == "64":
+    if env["precision"] == "double":
         env_bullet.Append(CPPDEFINES=["BT_USE_DOUBLE_PRECISION"])
 
     env_bullet.Append(CPPDEFINES=["BT_USE_OLD_DAMPING_METHOD"])