Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Godot 4.0 compile errors, update JavaScript integration, refactor code, and address minor issues #156

Merged
merged 62 commits into from
Oct 1, 2023

Conversation

fire
Copy link
Collaborator

@fire fire commented Apr 29, 2023

To review the changes on top of gd4.

This is blocked on the build process with mvsc.

Added a section to make it more clear to new users that this is self contained like vanilla Godot.
@fire fire changed the base branch from master to gd4 April 29, 2023 23:23
… code, and address minor issues

Fixed compilation errors, improved RefCounted bindings, renamed ECMAScript to JavaScript, implemented JavaScriptCallable, fixed typos, updated GDExtension migration, updated JS modules, and refactored code for Godot 4.0.

Co-Authored-By: Malik Ahmed <animanmaster@gmail.com>
@fire fire changed the title Gd4 rebase Fix Godot 4.0 compile errors, update JavaScript integration, refactor code, and address minor issues Apr 29, 2023
@Geequlim
Copy link
Collaborator

It's ok to keep master to compatiable with godot master branch.
It should be better to rename current master branch to 3.x for someone who need that and mention it in readme.
@fire Can you help make a new branch for 3.x and update the readme in this pr ?

@fire
Copy link
Collaborator Author

fire commented Apr 30, 2023

Since I'm not able to work on this immediately.

Here's the plan:

  1. Create a 3.x branch.
  2. Add phrasing to the README. Need some help on this.

@fire
Copy link
Collaborator Author

fire commented Jun 17, 2023

The current errors don't make sense:

scons: *** [thirdparty/glslang/glslang/MachineIndependent/attribute.windows.editor.x86_64.o] Error 1
In file included from thirdparty/glslang/glslang/MachineIndependent/ParseHelper.h:53,
                 from thirdparty/glslang/glslang/MachineIndependent/attribute.cpp:41:
thirdparty/glslang/glslang/MachineIndependent/SymbolTable.h:648:18: error: 'uint32_t' does not name a type
  648 |     static const uint32_t LevelFlagBitOffset = 56;
      |               ```

@wiredmatt
Copy link

wiredmatt commented Jun 18, 2023

Sounds related to this: godotengine/godot#77949

I get the same error locally if I try to build it using MSYS2 MinGW. Not sure if downgrading GCC to < 13 would change anything, but I can't afford to mess with it locally because it took me ages to get it working properly.

You could also try with UCRT64 instead of mingw

@fire
Copy link
Collaborator Author

fire commented Jun 18, 2023

It builds when I copy the module into git godot engine https://github.com/V-Sekai/godot/tree/vsk-javascript.

Note that only linux and windows platforms are set to build.

fire added 6 commits June 18, 2023 09:06
subrepo:
  subdir:   "modules/javascript"
  merged:   "87c3a7d2b6d"
upstream:
  origin:   "https://github.com/Geequlim/ECMAScript.git"
  branch:   "gd4-rebase"
  commit:   "1c753617ee6"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
subrepo:
  subdir:   "modules/javascript"
  merged:   "d062d5630b8"
upstream:
  origin:   "https://github.com/Geequlim/ECMAScript.git"
  branch:   "gd4-rebase"
  commit:   "b87a29e90bc"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@jaune
Copy link
Contributor

jaune commented Aug 21, 2023

@fire it compile and "run" => #161

It's really durty, but it's a first step.

I will rebase, and use godot 4.1.1-sable.

@jaune
Copy link
Contributor

jaune commented Aug 27, 2023

@fire Can I delete #161? I will have some time next week, I can try to make the CI pass for Windows.

What version for Godot this PR should work with?

@fire
Copy link
Collaborator Author

fire commented Aug 27, 2023

I am targeting master because of graph node changes.

@fire
Copy link
Collaborator Author

fire commented Aug 27, 2023

@jaune if you wish you can close it.

@jaune jaune mentioned this pull request Aug 30, 2023
@jaune
Copy link
Contributor

jaune commented Aug 30, 2023

@fire

I am targeting master because of graph node changes.

CI uses the last commit on branch 4.0 and not master because of GODOT_BASE_BRANCH: '4.0' in workflows.

PR #162 should fix the CI, I can not run the CI to make sure of it.

fire and others added 2 commits October 1, 2023 07:11
We have refactored the JavaScript integration to make it more efficient. We have also improved the readability of the code by adding comments and restructuring the code blocks. This will make it easier for other developers to understand and contribute to the project.

Co-Authored-By: NicolasMerget <Nicolas.Merget@deutschebahn.com>
Refactor JavaScript integration and improve code readability.
@fire fire merged commit b23b482 into gd4 Oct 1, 2023
@fire fire deleted the gd4-rebase branch October 1, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants