Update compatibility to 4.0-stable #304

Beliar83 · 2022-10-31T13:49:21Z

This makes godex compile with commit 92bee43adba8d2401ef40e2480e53087bcb1eaf1, which is the one that was used to build the stable reelase of Godot 4.0.

I am not 100% if the function I wrote to replace remove_and_skip is working correctly. I did some quick tests and it looks okay, but maybe someone with a deeper knowledge of godex should double check.

Beliar83 · 2023-02-12T12:36:18Z

I have added changes for compatibility for up to 4.0 rc1.
I also added a fix for register_runtime_scripts that does not need a godot change.

…eaaea67)

… crash

Remove VisualScript checking, as it was discontinued

Handle WorldECSEditorPlugin::edit being called with nullptr Move adding Components3DGizmoPlugin to _editor_init Reset default properties when destructing ScriptEcs

Remove explicit -j option and let the godot build system automatically find the best

…0-stable)

RevoluPowered

Minor comments left if they're irrelevant feel free to ignore :) I didn't see anything scary

RevoluPowered · 2023-03-18T19:11:11Z

ecs.cpp

 	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 (


extra whitespace

RevoluPowered · 2023-03-18T19:13:09Z

modules/godot/nodes/ecs_utilities.cpp

@@ -332,6 +338,13 @@ String Component::validate_script(Ref<Script> p_script) {
 	List<PropertyInfo> properties;
 	p_script->get_script_property_list(&properties);
 	for (List<PropertyInfo>::Element *e = properties.front(); e; e = e->next()) {
+		if (


extra whitespace

RevoluPowered · 2023-03-18T19:13:55Z

modules/godot/register_types.cpp

 			// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Gizmos
 			Components3DGizmoPlugin::get_singleton()->add_component_gizmo(memnew(TransformComponentGizmo));
 			Components3DGizmoPlugin::get_singleton()->add_component_gizmo(memnew(MeshComponentGizmo));

 		} else {
 			// Load the Scripted Components/Databags/Systems
-			ScriptEcs::get_singleton()->register_runtime_scripts();
+			// ScriptEcs::get_singleton()->register_runtime_scripts();


is this meant to be disabled?

As far as I remember it caused problems at that point, and we agreed to comment it out for now.

I can check the extra whitespace ones, as long as it passes the static checks

Beliar83 · 2023-03-20T11:26:42Z

@RevoluPowered Where exactly are the extra whitespaces? Or is there one missing?

mkay-dev · 2023-04-11T11:43:53Z

This makes godex compile with commit 92bee43adba8d2401ef40e2480e53087bcb1eaf1, which is the one that was used to build the stable reelase of Godot 4.0.

Please continue updating Godex while Andrea Catania is busy. There seem to be new issues with compilation due to the following Godot commit godotengine/godot@4e34cf2 .

Beliar83 · 2023-04-11T12:22:22Z

@mkay-dev Ah, I guess that was the error on the build I got earlier. I'll try to check that when I am home later today.

mkay-dev · 2023-04-11T14:04:26Z

@Beliar83 Thanks in advance. Can I maybe also motivate you to fix some linux issues should they arise. I'm not yet deeply familiar with c++ and godot/godexs source code so I'm only working up to fixing these kind of issues myself.

Beliar83 · 2023-04-11T14:09:37Z

@mkay-dev It should generally build on linux (the automatic builds in my fork and this PR do), though I have WSL or a VM at best. If you have any specific problem I can look at it, though.

mkay-dev · 2023-04-11T14:21:41Z

@Beliar83 Sounds great. Your fork did compile against Godots 4.0 release build just fine so I'm just being heedful of possible issues. Again thanks for the help.

mkay-dev · 2023-04-12T09:33:25Z

Here is the compilation error I am getting:

[ 7%] Generating modules tests header.
[ 26%] Compiling modules/gdscript/gdscript_byte_codegen.cpp ...
[ 26%] Compiling tests/test_main.cpp ...
[ 26%] Compiling modules/gdscript/gdscript_cache.cpp ...
[ 26%] Compiling modules/gdscript/gdscript_compiler.cpp ...
In file included from /home/mkay/projects/godot/from_scratch/modules/godex/tests/test_ecs_pipeline_builder.h:14,
from ./modules/modules_tests.gen.h:12,
from tests/test_main.cpp:113:
/home/mkay/projects/godot/from_scratch/modules/godex/tests/test_utilities.h: In function 'bool register_ecs_script(const StringName&, const String&)':
/home/mkay/projects/godot/from_scratch/modules/godex/tests/test_utilities.h:32: warning: comparison with string literal results in unspecified behavior [-Waddress]
32 | if (extends == "System") {
|
/home/mkay/projects/godot/from_scratch/modules/godex/tests/test_utilities.h:32: error: comparison between distinct pointer types 'GDScriptParser::IdentifierNode*' and 'const char*' lacks a cast [-fpermissive]
[ 26%] Compiling modules/gdscript/gdscript_disassembler.cpp ...
scons: *** [tests/test_main.linuxbsd.editor.x86_64.o] Error 1
scons: building terminated because of errors.
[Time elapsed: 00:00:38.732]

…able)

Beliar83 · 2023-04-12T09:47:35Z

@mkay-dev I reset my fork and worked on a separate branch for updating the compatibility - as I should have done from the start, so there was nothing changed yet for this PR. I have fixed the problem, but I am doing one more check build after merging from this repo.

mkay-dev · 2023-04-12T10:01:56Z

@Beliar83 Excellent! You're a true hero.
Seems to be compiling fine for now. Only had to add missing #include "utility" in /modules/godex/tests/test_ecs_storage_hierarchical.h and /modules/godot/nodes/ecs_world.cpp as I was getting:

error: 'as_const' is not a member of 'std'; did you mean 'is_const'?

fire · 2023-06-06T23:06:52Z

Typically godot engine developers do one merge commit (rebase and then force push to a feature branch). What does @AndreaCatania prefer and how far is this from working?

fire · 2023-07-09T20:03:24Z

Godot 4.1-stable released a few days ago.

fire · 2023-07-09T20:45:26Z

https://github.com/Beliar83/godex/blob/main/systems/system.h#L6 is using the wrong type of include.

#include "../ecs_types.h"

Beliar83 · 2023-07-10T04:22:54Z

Yeah, I have already updated it in https://github.com/Beliar83/godex/tree/dev_main

AndreaCatania added topic:build topic:godot_integration labels Oct 31, 2022

Beliar83 changed the title ~~Update compatibility for 4.0 beta3~~ Update compatibility for 4.0 rc1 Feb 11, 2023

Beliar83 added 9 commits February 13, 2023 07:27

Update compatibility for 4.0 beta3 (35cfaafda8073f700c9d2fe42a43d3d81…

2fd59b7

…eaaea67)

Update compatibility to 889868cbbc8beac74d5f49f9b7ef41efc4ae7d5a

c5bba89

Ignore script name when checking properties

b99963a

Temporarily disable registering scripts when running a project to fix…

f8db5b6

… crash

Fix loading of components from C#

f8bf505

Remove VisualScript checking, as it was discontinued

Update compatibility

1a200e4

Update compatibility

6d2a012

Move register_runtime_scripts to NOTIFICATION_POSTINITIALIZE

f3a5fd2

Call register_runtime_scripts in NOTIFICATION_READY as well.

1412b3c

Beliar83 force-pushed the main branch from f16aa15 to 1412b3c Compare February 13, 2023 06:33

Beliar83 added 11 commits February 14, 2023 15:33

Fix formatting

5291ad1

Compatibility changes

9ab9ed5

Handle WorldECSEditorPlugin::edit being called with nullptr Move adding Components3DGizmoPlugin to _editor_init Reset default properties when destructing ScriptEcs

Change godot version to check out

0069914

Adjust target

27d873b

Update patch

9c282c2

Fix g++ warnings

abb7ed4

Fixing builds

dc228d8

Remove explicit -j option and let the godot build system automatically find the best

Fix formatting

3b7098e

Fix godot tests

b8514f0

Fix tests

e0c8e08

Preload scripts for registering system and component names

eac4c95

Beliar83 force-pushed the main branch from 322883c to eac4c95 Compare February 22, 2023 06:53

Beliar83 added 4 commits February 22, 2023 08:10

Wait for static checks

d62c5f2

Update ref

d19166a

Run tests with headless

ccba0ee

Print message when preloading scripts

7d87207

Beliar83 added 4 commits February 22, 2023 19:24

Remove left over debug statement

d2f0ecc

Move resetting of default values to fix crash with mono builds.

27b6469

Fix building with clang

816bf03

Use newer black version

76b6755

Beliar83 mentioned this pull request Feb 23, 2023

Fix building without tools enabled #281

Open

Updated godot version to 92bee43adba8d2401ef40e2480e53087bcb1eaf1 (4.…

f676895

…0-stable)

Beliar83 changed the title ~~Update compatibility for 4.0 rc3~~ Update compatibility to 4.0-stable Mar 1, 2023

RevoluPowered approved these changes Mar 18, 2023

View reviewed changes

Beliar83 mentioned this pull request Mar 30, 2023

GodotECS not compiling against Godot master branch #303

Open

Beliar83 force-pushed the main branch from addca08 to f676895 Compare April 12, 2023 07:13

Beliar83 added 3 commits April 12, 2023 11:41

Merge branch 'GodotECS:main' into main

43f6c34

Updated version to 7a0977ce2c558fe6219f0a14f8bd4d05aea8f019 (4.0.2-st…

9c4b85b

…able)

Update compatibility to ab7cb2a95d060a6533e6ff5111c11f71972ab43f

369a473

Fix builds for PRs

f919dff

Beliar83 force-pushed the main branch from 02d8365 to f919dff Compare May 26, 2023 12:23

Fix shadow warnigs

d329668

fire mentioned this pull request Jul 9, 2023

Port to Godot 4 #308

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update compatibility to 4.0-stable #304

Update compatibility to 4.0-stable #304

Beliar83 commented Oct 31, 2022 •

edited

Beliar83 commented Feb 12, 2023

RevoluPowered left a comment

RevoluPowered Mar 18, 2023

RevoluPowered Mar 18, 2023

RevoluPowered Mar 18, 2023

Beliar83 Mar 18, 2023

Beliar83 Mar 18, 2023

Beliar83 commented Mar 20, 2023

mkay-dev commented Apr 11, 2023 •

edited

Beliar83 commented Apr 11, 2023

mkay-dev commented Apr 11, 2023 •

edited

Beliar83 commented Apr 11, 2023 •

edited

mkay-dev commented Apr 11, 2023

mkay-dev commented Apr 12, 2023 •

edited

Beliar83 commented Apr 12, 2023 •

edited

mkay-dev commented Apr 12, 2023

fire commented Jun 6, 2023 •

edited

fire commented Jul 9, 2023

fire commented Jul 9, 2023

Beliar83 commented Jul 10, 2023

Update compatibility to 4.0-stable #304

Are you sure you want to change the base?

Update compatibility to 4.0-stable #304

Conversation

Beliar83 commented Oct 31, 2022 • edited

Beliar83 commented Feb 12, 2023

RevoluPowered left a comment

Choose a reason for hiding this comment

RevoluPowered Mar 18, 2023

Choose a reason for hiding this comment

RevoluPowered Mar 18, 2023

Choose a reason for hiding this comment

RevoluPowered Mar 18, 2023

Choose a reason for hiding this comment

Beliar83 Mar 18, 2023

Choose a reason for hiding this comment

Beliar83 Mar 18, 2023

Choose a reason for hiding this comment

Beliar83 commented Mar 20, 2023

mkay-dev commented Apr 11, 2023 • edited

Beliar83 commented Apr 11, 2023

mkay-dev commented Apr 11, 2023 • edited

Beliar83 commented Apr 11, 2023 • edited

mkay-dev commented Apr 11, 2023

mkay-dev commented Apr 12, 2023 • edited

Beliar83 commented Apr 12, 2023 • edited

mkay-dev commented Apr 12, 2023

fire commented Jun 6, 2023 • edited

fire commented Jul 9, 2023

fire commented Jul 9, 2023

Beliar83 commented Jul 10, 2023

Beliar83 commented Oct 31, 2022 •

edited

mkay-dev commented Apr 11, 2023 •

edited

mkay-dev commented Apr 11, 2023 •

edited

Beliar83 commented Apr 11, 2023 •

edited

mkay-dev commented Apr 12, 2023 •

edited

Beliar83 commented Apr 12, 2023 •

edited

fire commented Jun 6, 2023 •

edited