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.

Sign up for GitHub

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

Jump to bottom

Godot 4.0 adaption (Windows + MacOS) #123

Merged
merged 93 commits into from
Feb 3, 2023
Merged

Godot 4.0 adaption (Windows + MacOS) #123

Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
c0c87ea
:construction: initial setup, includes and gdscript not adjusted yet
bitbrain Jul 27, 2022
bf5db0f
adjust includes
bitbrain Jul 27, 2022
8f21002
more header fixes
bitbrain Jul 27, 2022
094e8f6
fix up godot_fmod.cpp
bitbrain Jul 27, 2022
f06097c
:bug: copy-paste mistake in header file
bitbrain Jul 27, 2022
1b79601
:bug: more fixes
bitbrain Jul 27, 2022
63e4bae
Update README.md (WIP)
bitbrain Jul 27, 2022
2857401
:bug: more compilation fixes
bitbrain Jul 28, 2022
c8ea76c
:bug: some more progress
bitbrain Jul 28, 2022
f25a709
:bug: fix alloc_c_string and map access
bitbrain Jul 29, 2022
e2c62b8
:bug: more fixes
bitbrain Jul 29, 2022
916d82d
:recycle: improve code style and fix instance check
bitbrain Jul 29, 2022
cd380e1
:recycle: migrate most of gdscript over to Godot 4
bitbrain Jul 30, 2022
fdcda25
Update GUT to Godot 4
bitbrain Jul 30, 2022
4af00de
Merge branch 'godot-4.x' into godot-4.0-adaption
bitbrain Jul 31, 2022
d9cb241
:bug: fix PackedByteArray issue
bitbrain Jul 31, 2022
866c3ee
:bug: temporarily get rid of String cast issue
bitbrain Jul 31, 2022
adcacdc
:boom: delete gdscript Fmod type. Not longer required with GDExtension
bitbrain Jul 31, 2022
b4ce89e
add method descriptions
bitbrain Aug 1, 2022
b50a112
Merge branch 'godot-4.0-adaption' of github.com:utopia-rise/fmod-gdna…
bitbrain Aug 1, 2022
c9a21be
:recycle: change constant binding
bitbrain Aug 1, 2022
afe2697
:bug: fix SConstruct compilation errors on Windows
bitbrain Aug 10, 2022
6aa9257
:bug: fix file callback import and type conversion
bitbrain Aug 10, 2022
aca811b
:boom: migrate to new SConstruct format
bitbrain Aug 11, 2022
f7ff7dc
Update docs
bitbrain Aug 11, 2022
bac6d28
:bug: additional fixes for Gut
bitbrain Aug 11, 2022
bf34b44
Fix SConstruct build
bitbrain Aug 11, 2022
6bcd880
attempt to fix project (does not work)
bitbrain Aug 11, 2022
3855d16
adjust gdextension
bitbrain Aug 11, 2022
570d13e
:bug: fix gdextension file
bitbrain Aug 12, 2022
6be8657
fix remaining issues with Windows
bitbrain Aug 12, 2022
2894958
:sparkles: introduce Fmod singleton
bitbrain Aug 12, 2022
703e124
:bug: solve remaining loading issues for GDExtension
bitbrain Aug 13, 2022
8904b7c
Port Github Actions to gd-extension for Windows, Linux & MacOS
2shady4u Aug 14, 2022
d6e44a0
:bug: fix remaining gdscript errors
bitbrain Aug 14, 2022
f592423
Add Android & iOS compilation to Github Actions
2shady4u Aug 14, 2022
92bf656
temporarily disable filerunner join
bitbrain Aug 14, 2022
07c8530
Add 'godot-4.x'-branch to trigger workflow on push
2shady4u Aug 14, 2022
04e0202
Merge pull request #127 from utopia-rise/godot-4.0-adaption-actions-2
2shady4u Aug 14, 2022
daad9f3
fix further gdscript issues
bitbrain Aug 14, 2022
6bd7326
Merge branch 'godot-4.0-adaption' of github.com:utopia-rise/fmod-gdna…
bitbrain Aug 14, 2022
da1e436
:sparkles: introduce FmodEventEmitter2D
bitbrain Aug 14, 2022
fcfe1b2
expose properties on FmodEventEmitter2D
bitbrain Aug 14, 2022
ff2953a
Pause/Unpause node
bitbrain Aug 15, 2022
8a3ad1a
add FMOD icon
bitbrain Aug 15, 2022
27e6d09
Still broken...
bitbrain Aug 16, 2022
bc97741
fix gdextension loading error
bitbrain Aug 25, 2022
69e73af
fix name of getter
bitbrain Aug 25, 2022
687752b
:bookmark: upgrade Gut
bitbrain Aug 28, 2022
ddcde48
Update GUT again
bitbrain Sep 3, 2022
7ad86d1
Upgrade GUT
bitbrain Sep 10, 2022
110e542
additional fixes (still crashes with Godot 4
bitbrain Sep 10, 2022
c118020
:bug: Godot 4.0 beta1 compatibility fixes
bitbrain Sep 23, 2022
bdadd68
:recycle: add icon and prevent FMOD loading on startup
bitbrain Sep 24, 2022
93197dc
:bug: ensure we only run the FileRunner within the game
bitbrain Sep 24, 2022
965758c
update Gut
bitbrain Oct 8, 2022
d020659
upgrade SConstruct to latest Beta 2
bitbrain Oct 8, 2022
18bd472
attempt to fix Github workflow
bitbrain Oct 8, 2022
221b446
fix gdextension to use editor
bitbrain Oct 8, 2022
d8e452c
manually call _init to fix issues
bitbrain Oct 8, 2022
a8175d0
additional fixes
bitbrain Oct 8, 2022
9a3e331
dirty hack to make autoload work
bitbrain Oct 8, 2022
0862bae
simplify autoload logic
bitbrain Oct 8, 2022
1b5015e
upgrade to latest Godot
bitbrain Oct 14, 2022
1175bf9
Change registered constant names
CedNaru Oct 14, 2022
033b842
Format with new clang format
CedNaru Oct 14, 2022
4cbcbd9
Improve header imports
CedNaru Oct 14, 2022
872f9d7
generate bindings in github actions
CedNaru Oct 14, 2022
5386fec
fix added source directory in Sconstruct
CedNaru Oct 15, 2022
4c8d44f
Try more recent macos version for ios build
CedNaru Oct 15, 2022
5dc5fa5
:bookmark: bump Gut
bitbrain Oct 15, 2022
5f3fc58
update to latest Godot
bitbrain Nov 14, 2022
8ace992
Update Fmod to 2.02.10 to see if it fixes IOS symbol issues
CedNaru Dec 1, 2022
948fc57
Update scons script
CedNaru Dec 1, 2022
68de599
Remove Cocoa
CedNaru Dec 1, 2022
0353ab8
upgrade to latest Gut
bitbrain Dec 5, 2022
1ac8294
Merge branch 'godot-4.0-adaption' of github.com:utopia-rise/fmod-gdna…
bitbrain Dec 5, 2022
9296ea5
:bug: upgrade to latest godot-cpp
bitbrain Dec 30, 2022
587897d
additional fixes
bitbrain Dec 30, 2022
95c886b
Fix Macos build
CedNaru Dec 30, 2022
29b8fe6
Fix Macos build
CedNaru Dec 30, 2022
05f56a8
Fix Macos build
CedNaru Dec 30, 2022
82aadf2
Update fmod.gdextension
bitbrain Jan 2, 2023
f2a23cc
:bug: fix Windows build (32bit)
bitbrain Jan 2, 2023
2239ad6
update fmod.gdextension
bitbrain Jan 3, 2023
af1f674
ignore .exp and .lib
bitbrain Jan 3, 2023
ad96868
:bug: add missing constants
bitbrain Jan 3, 2023
4a0e0b0
:recycle: make naming consistent
bitbrain Jan 3, 2023
904db6a
FmodEventEmitter2D: stop events when exiting tree
bitbrain Jan 3, 2023
e769f22
:bug: use correct filename for MacOS
bitbrain Jan 15, 2023
d1bbfd3
:bookmark: update to latest Godot 4 Beta 14
bitbrain Jan 21, 2023
2b51f80
fix inverted is_dead method
piiertho Jan 31, 2023
61c1c8e
upgrade Godot
bitbrain Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .README/fmod-gdextension-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
477 changes: 67 additions & 410 deletions .github/workflows/all_builds.yml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,5 @@ config.log
.sconf_temp

# End of https://www.gitignore.io/api/clion,cmake,scons

demo/.godot
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "godot-cpp"]
path = godot-cpp
url = https://github.com/godotengine/godot-cpp
41 changes: 22 additions & 19 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# FMOD Studio integration for Godot using GDNative
![logo](.README/fmod-gdextension-logo.png)

A Godot C++ GDNative that provides an integration for the FMOD Studio API.
Godot C++ GDExtension for Godot 4 that provides an integration for the FMOD Studio API.

FMOD is an audio engine and middleware solution for interactive audio in games. It has been the audio engine behind many
titles such as Transistor, Into the Breach and Celeste. [More on FMOD's website](https://www.fmod.com/).

This GDNative exposes most of the Studio API functions to Godot's GDScript and also provides helpers for performing
This GDExtension exposes most of the Studio API functions to Godot's GDScript and also provides helpers for performing
common functions like attaching Studio events to Godot nodes and playing 3D/positional audio. _It is still very much a
work in progress and some API functions are not yet exposed._ Feel free to tweak/extend it based on your project's needs.

Expand All @@ -31,25 +31,27 @@ This project uses [SEMVER](https://semver.org/).

#### OS Compatibility matrix :

| Driver Version | Windows | Linux | OSX | Android | iOS |
|----------------|---------|-------|-----|---------|-----|
| 0.0.0 | X | X | X | | |
| 1.0.0 | X | X | X | X | X |
| 2.0.0 | X | X | X | X | X |
| 2.0.1 | X | X | X | X | X |
| 2.0.2 | X | X | X | X | X |
| 3.x.x | X | X | X | X | X |
| Driver Version | Windows | Linux | OSX | Android | iOS | Web (HTML5) |
|----------------|---------|-------|-----|---------|-----|-------------|
| 0.0.0 | X | X | X | | | |
| 1.0.0 | X | X | X | X | X | |
| 2.0.0 | X | X | X | X | X | |
| 2.0.1 | X | X | X | X | X | |
| 2.0.2 | X | X | X | X | X | |
| 3.x.x | X | X | X | X | X | |
| 4.x.x | X | X | X | X | X | |

#### Godot compatibility matrix

| Driver Version | Godot 3.0 | Godot 3.1 | Godot 3.2 | Godot 3.3 | Godot 3.4 |
|----------------|-----------|-----------|-----------|-----------|-----------|
| 0.0.0 | | X | | | |
| 1.0.0 | | X | | | |
| 2.0.0 | | X | | | |
| 2.0.1 | | X | | | |
| 2.0.2 | | X | | | |
| 3.x.x | | X | X | X | X |
| Driver Version | Godot 3.0 | Godot 3.1 | Godot 3.2 | Godot 3.3 | Godot 3.4 | Godot 4.0 |
|----------------|-----------|-----------|-----------|-----------|-----------|-----------|
| 0.0.0 | | X | | | | |
| 1.0.0 | | X | | | | |
| 2.0.0 | | X | | | | |
| 2.0.1 | | X | | | | |
| 2.0.2 | | X | | | | |
| 3.x.x | | X | X | X | X | |
| 4.x.x | | | | | | X |

#### Fmod compatibility matrix

Expand All @@ -62,6 +64,7 @@ This project uses [SEMVER](https://semver.org/).
| 2.0.2 | X | | |
| 3.0.0 | | X | |
| 3.x.x | | | X |
| 4.x.x | | | X |

## Installing the plugin in your project

Expand Down
Loading