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

Godot 4.2 support #181

Merged
merged 13 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/actions/create-android-plugin/action.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Create Fmod native build
description: Creates fmod native build for a specific platform
env:
GODOT_VERSION: 4.1.2
GODOT_VERSION: 4.2
runs:
using: composite
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/create-native-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Creates fmod native build for a specific platform
env:
TARGET_PATH: demo/addons/fmod/libs/
TARGET_NAME: libGodotFmod
GODOT_VERSION: 4.1.2
GODOT_VERSION: 4.2
FMOD_VERSION: 20212
inputs:
platform:
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/check_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
PROJECT_FOLDER: fmod-gdextension
TARGET_PATH: demo/addons/fmod/libs/
TARGET_NAME: libGodotFmod
GODOT_VERSION: 4.1.2
GODOT_VERSION: 4.2
FMOD_VERSION: 20212

jobs:
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
fmod-studio-platform-folder: linux/studio/lib/x86_64
fmod-library-suffix: so
godot-executable-download-suffix: linux.x86_64.zip
godot-executable: Godot_v4.1.2-stable_linux.x86_64
godot-executable: Godot_v$GODOT_VERSION-stable_linux.x86_64
shell: bash

- name: Ubuntu Debug Compilation
Expand Down Expand Up @@ -156,6 +156,13 @@ jobs:
lfs: true
submodules: recursive

- name: Android dependencies
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is required due to this error:

 sh: 1: /usr/local/lib/android/sdk/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++: not found

if: ${{ matrix.platform == 'android' }}
uses: nttld/setup-ndk@v1
with:
ndk-version: r23c
link-to-sdk: true

- name: Compile native plugin
uses: ./.github/actions/create-native-build
with:
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
PROJECT_FOLDER: fmod-gdextension
TARGET_PATH: demo/addons/fmod/libs/
TARGET_NAME: libGodotFmod
GODOT_VERSION: 4.1.2
GODOT_VERSION: 4.2
FMOD_VERSION: 20212

jobs:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
fmod-studio-platform-folder: linux/studio/lib/x86_64
fmod-library-suffix: so
godot-executable-download-suffix: linux.x86_64.zip
godot-executable: Godot_v4.1.2-stable_linux.x86_64
godot-executable: Godot_v$GODOT_VERSION-stable_linux.x86_64
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Standardising this, so one only has to ever bump the env var

shell: bash

- name: Ubuntu Debug Compilation
Expand Down Expand Up @@ -157,6 +157,13 @@ jobs:
lfs: true
submodules: recursive

- name: Android dependencies
if: ${{ matrix.platform == 'android' }}
uses: nttld/setup-ndk@v1
with:
ndk-version: r23c
link-to-sdk: true

- name: Compile native plugin
uses: ./.github/actions/create-native-build
with:
Expand Down
2 changes: 1 addition & 1 deletion android-plugin/library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ tasks.build {
dependencies {
implementation("androidx.core:core-ktx:1.10.1")
implementation(files("libraries/fmod.jar"))
compileOnly(files("libraries/godot-lib.4.1.2.stable.template_release.aar"))
compileOnly(files("libraries/godot-lib.4.2.stable.template_release.aar"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Anim={
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
"ofs": Vector2(-180, -125),
"primary_grid_steps": 8,
"primary_grid_step": Vector2i(8, 8),
"show_edit_locks": true,
"show_guides": true,
"show_helpers": false,
Expand Down
4 changes: 2 additions & 2 deletions demo/.godot/editor/editor_layout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ dock_filesystem_split=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
dock_filesystem_selected_paths=PackedStringArray("res://")
dock_filesystem_uncollapsed_paths=PackedStringArray("res://")
dock_filesystem_selected_paths=PackedStringArray("res://addons/gut/fonts/AnonymousPro-Regular.ttf")
dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://addons/", "res://addons/gut/", "res://addons/gut/fonts/")
dock_3="Scene,Import"
dock_4="FileSystem"
dock_5="Inspector,Node,History"
Expand Down
456 changes: 249 additions & 207 deletions demo/.godot/editor/filesystem_cache8

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions demo/.godot/editor/project_metadata.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[editor_metadata]

executable_path="/private/var/folders/ty/07fn19xn1kggwr0lbqtn3khw0000gn/T/AppTranslocation/5F1762E9-DDF0-4FC3-BCC5-4ED51374642B/d/Godot.app/Contents/MacOS/Godot"
executable_path="C:/Program Files/Godot/godot.exe"

[debug_options]

Expand All @@ -15,7 +15,3 @@ scripts=["res://low_level/FmodTest.gd"]
[linked_properties]

Node2D:scale=true

[dialog_bounds]

export=Rect2(540, 200, 1800, 1400)
66 changes: 66 additions & 0 deletions demo/.godot/global_script_class_cache.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,64 @@
list=Array[Dictionary]([{
"base": &"ScrollContainer",
"class": &"EventParametersDisplay",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/ui/EventParametersDisplay.gd"
}, {
"base": &"Window",
"class": &"FmodBankExplorer",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/ui/FmodBankExplorer.gd"
}, {
"base": &"EditorInspectorPlugin",
"class": &"FmodBankLoaderPropertyInspectorPlugin",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/inspectors/FmodBankLoaderPropertyInspectorPlugin.gd"
}, {
"base": &"EditorProperty",
"class": &"FmodBankPathEditorProperty",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/property_editors/FmodBankPathEditorProperty.gd"
}, {
"base": &"FmodEditorExportPlugin",
"class": &"FmodEditorExportPluginProxy",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/FmodEditorExportPluginProxy.gd"
}, {
"base": &"EditorInspectorPlugin",
"class": &"FmodEmitterPropertyInspectorPlugin",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/inspectors/FmodEmitterPropertyInspectorPlugin.gd"
}, {
"base": &"FmodPathEditorProperty",
"class": &"FmodEventEditorProperty",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/property_editors/FmodEventEditorProperty.gd"
}, {
"base": &"HBoxContainer",
"class": &"FmodGuidAndPathPropertyEditorUi",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/property_editors/FmodGuidAndPathPropertyEditorUi.gd"
}, {
"base": &"EditorProperty",
"class": &"FmodPathEditorProperty",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/property_editors/FmodPathEditorProperty.gd"
}, {
"base": &"EditorPlugin",
"class": &"FmodPlugin",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/FmodPlugin.gd"
}, {
"base": &"RefCounted",
"class": &"GutHookScript",
"icon": "",
Expand All @@ -22,4 +76,16 @@ list=Array[Dictionary]([{
"icon": "",
"language": &"GDScript",
"path": "res://addons/gut/test.gd"
}, {
"base": &"RefCounted",
"class": &"GutUtils",
"icon": "",
"language": &"GDScript",
"path": "res://addons/gut/utils.gd"
}, {
"base": &"VBoxContainer",
"class": &"ParameterDisplay",
"icon": "",
"language": &"GDScript",
"path": "res://addons/fmod/tool/ui/ParameterDisplay.gd"
}])
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="401e77d048b500d714375a77d4ca4326"
dest_md5="376ef640816dcc0149db79b71bdcbbbb"
dest_md5="3a20234042b77d001742527a01ccce64"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="75a018507317f09d0004b8c1148dd3e5"
dest_md5="bc83b79ff58cca765d8e12df7faf54cb"
dest_md5="0de704856a8cdc25de93a0d1d6d2e3f4"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="b3f0e3061651d3bf5c65104a3179e57b"
dest_md5="eab8a06863927387f4bc23e375109c3b"
dest_md5="60a184c31bf6cbd13052b7978fa18a0f"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="418d6668afcddb7714104f43bfb39657"
dest_md5="f680418dcdd31ba96fa61efe5d279da4"
dest_md5="df7480ae862bca6e37076ead4770e199"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="696e70ec3151341523d0a1362670d8ad"
dest_md5="b025012356fc82018f589b4694eb595b"
dest_md5="4c17376a053895673a250ddcf17eccc5"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="15e9706fbc67b38db21e8e963fc1a6c0"
dest_md5="ec95e8acf158b8542ea9788d38c258d3"
dest_md5="c3f6f2b3c841eba203550235c9fb7fec"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="ace04e0c254883041bc7effb9d951cf2"
dest_md5="3c2fe263c5b08b4425c7b172f2577531"
dest_md5="ed543b2300d51667cc14a403a5b3917b"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="03ef685b34f3356631c3f60c91917002"
dest_md5="7fc50685f0f64d4d3534642eab964093"
dest_md5="e25b141cea138b12ae1cbd23cdbcbc7d"

Binary file not shown.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="b2eb5b5a4efd5c7a7ebed1d28d72d7e8"
dest_md5="43e6e3c565cecde497e3dca4f9324533"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="a39e5778312a715a82d7afe88ebac015"
dest_md5="5f68f64074cec872372a931e7ef33032"
dest_md5="5ab26d53610e6ba68b02e26a9b74f08c"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="9f56fb2bffbac7662cb53b783248698a"
dest_md5="c0b8a4d0adc31f95854b369d5cce6602"
dest_md5="65e93b0f81fd41715bca0797db8a17f5"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="40a68e931d9f1c543eac616acb53b2d8"
dest_md5="ee9c380d291be2176f54d24ecbb34c55"
dest_md5="365bbaed1e5ead8de63a883e02e6ef39"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="fb8c29136b1ee99fe9dd45a6f8bcc9fd"
dest_md5="740633d7576344df46ecb52b001b78aa"
dest_md5="d7b2307bee68dce4326d5d0bc104da83"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="bfe6d3baadf5fbe569922334140eb2fe"
dest_md5="a1f5358b8ed3c01a32ddfa4b67484795"

Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="ced1016dc14945d0de53e048c65a2634"
dest_md5="09dabb6c6022ef4ac6db4eda8c2b15ad"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="263aa6aaf80ff6be43bc0541d1b27575"
dest_md5="bf912569b96ea5377b854aeb3500121a"
dest_md5="3976c89e461a898979b0f60a3cb5adb9"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="46b4f7f23b855a09357092a37a8963bd"
dest_md5="2c9247fdfcf79d32bf5576a50f04c2b4"
dest_md5="a0cc910ec88bc535b3b0ac3adfb41e92"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="c5a08db64e5cb9771a0d221ee490e1b5"
dest_md5="c406c31e515527ce4263fd9dd074575a"
dest_md5="445820d0eb13ba06acd3a3344cadaa57"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="87a2335b9a8b082814b00be12822338b"
dest_md5="1e926de509eff40041cdacb31aca3d1e"
dest_md5="69c840af016fb4e15ac549520f31cb48"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="2dfeccd003dd414a37764485bf007136"
dest_md5="49182a5251f993350aa8f41dc7ae8247"
dest_md5="dcedd447cab4e0af746da3a6d8172fa9"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="568949c73152e8704d3b6e2729c5371f"
dest_md5="917679b08d153b4411d7993241312a74"
dest_md5="03ad31d54223bf2797ce417713bb286f"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="47a49480f57f056effb8b6f71335cda6"
dest_md5="660085c1629ae0b79e0d20d01c8aa1c3"
dest_md5="37dc650638c8ba78668f103f0e2793f2"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="0679f9268d0182d98f946fbd3b23ad2b"
dest_md5="95368cba27abdd233dd284316d98a772"
dest_md5="3bbe9055d3e26961f2ab07d8e46f17eb"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="15c243c3b26cd9bf7d1b36406890cdec"
dest_md5="0bb34ea53ae71b1326c41b6d02185a30"
dest_md5="c3bc236df1372d928609bd31f418210c"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="aa45cd016a3824a5deaa452e103b00fb"
dest_md5="643823274ac035f98429965941d271de"
dest_md5="c1944d55cb2e1f4ee74ea94eafde070d"

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="954f96a067252d9a6e3fc71a6c83c562"
dest_md5="09dabb6c6022ef4ac6db4eda8c2b15ad"

Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="3abf92cd2757a559a7f328189419e2fa"
dest_md5="520c320e04a863bbcf23aa9043f47155"

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="8f357819da0d5101a67a5e46be6de1ab"
dest_md5="0c43ded8cd9064fec572a247a79a2a29"
dest_md5="e45d59b2774e6573c7f77b0ce4f3fdbb"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="3c4786f48407df7594b6b61c3ab8a108"
dest_md5="78c39902bcfb06ba94bfdc183a1d48f4"
dest_md5="eeaf9645578852b942173f9efcda36f7"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="c5088752a8b01837d294d6c687957f67"
dest_md5="cf5ef904aa3b78d2611472a60a397b2a"
dest_md5="d14e233599e27c13059177b99dca7b06"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="7bb086582f50adf131d662d839d25071"
dest_md5="6759b3893ceee7616a60cda562445cf0"
dest_md5="2fc013e3768c7419a04adf77e12fe5c6"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="7419241aec89f62472f1171073662217"
dest_md5="d6219a18e41b0bf3b23e8eaff01eb4d5"
dest_md5="244850be583bd32c84f020c4ff1c525b"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="e104d70e9ff663d5e0dd9a39ade8f474"
dest_md5="6eedb3b0c5e367ae62d3a93ae1173176"
dest_md5="2da6294427f40df40aa16367abc4c3c2"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="da5a18f8d2aa3b1e1ed4e7caa63b10a0"
dest_md5="055c9c67a8a229a1efc586d74af6457a"
dest_md5="7c308efe89f74d56cc7fe8c5916e3cde"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="983491662cb14781dd0b08ce0191e3d6"
dest_md5="aa734e99c48d198887524323974918ab"
dest_md5="9c1a6c7e9d6cfd36a93d0894a761ae40"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="6c1a5859e223844e7fb5fdfb1210bf1a"
dest_md5="f6176314b0bcfbfbe9a9d25ee82fa795"
dest_md5="03791de3e7cf915bc93bbb42c13a2dd6"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="f319fa326b96e6148a1b91fe47ab649a"
dest_md5="0c627f774808eb9d62feb1f4a32a0024"
dest_md5="bf1a562afc2d13aaa21d3964f3d014b0"

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="531b4936e99fa9bb28d035587a134b84"
dest_md5="ce96ef0d932eb7473e9806cd8da843d6"

Loading
Loading