From c12737ed375816e76c81f734fa137169e0a1d4c2 Mon Sep 17 00:00:00 2001
From: bitbrain <miguel-gonzalez@gmx.de>
Date: Sun, 12 Nov 2023 16:21:18 +0000
Subject: [PATCH 1/3] fix icons

---
 demo/addons/fmod/fmod.gdextension             |  6 +-
 demo/addons/fmod/icons/FmodEventEmitter2D.svg | 69 -------------------
 demo/addons/fmod/icons/bank_icon.svg.import   | 38 ++++++++++
 demo/addons/fmod/icons/bus_icon.svg.import    | 38 ++++++++++
 .../fmod/icons/c_parameter_icon.svg.import    | 38 ++++++++++
 .../fmod/icons/d_parameter_icon.svg.import    | 38 ++++++++++
 demo/addons/fmod/icons/event_icon.svg.import  | 38 ++++++++++
 .../addons/fmod/icons/fmod_emitter.png.import | 34 +++++++++
 demo/addons/fmod/icons/fmod_icon.svg.import   | 38 ++++++++++
 .../fmod/icons/snapshot_icon.svg.import       | 38 ++++++++++
 demo/addons/fmod/icons/vca_icon.svg.import    | 38 ++++++++++
 godot-cpp                                     |  2 +-
 12 files changed, 344 insertions(+), 71 deletions(-)
 delete mode 100644 demo/addons/fmod/icons/FmodEventEmitter2D.svg
 create mode 100644 demo/addons/fmod/icons/bank_icon.svg.import
 create mode 100644 demo/addons/fmod/icons/bus_icon.svg.import
 create mode 100644 demo/addons/fmod/icons/c_parameter_icon.svg.import
 create mode 100644 demo/addons/fmod/icons/d_parameter_icon.svg.import
 create mode 100644 demo/addons/fmod/icons/event_icon.svg.import
 create mode 100644 demo/addons/fmod/icons/fmod_emitter.png.import
 create mode 100644 demo/addons/fmod/icons/fmod_icon.svg.import
 create mode 100644 demo/addons/fmod/icons/snapshot_icon.svg.import
 create mode 100644 demo/addons/fmod/icons/vca_icon.svg.import

diff --git a/demo/addons/fmod/fmod.gdextension b/demo/addons/fmod/fmod.gdextension
index 494125f0..aaab2b27 100644
--- a/demo/addons/fmod/fmod.gdextension
+++ b/demo/addons/fmod/fmod.gdextension
@@ -19,7 +19,11 @@ android.release.arm64 = "res://addons/fmod/libs/android/arm64/libGodotFmod.andro
 ios.debug  = "res://addons/fmod/libs/ios/libGodotFmod.ios.template_debug.universal.dylib"
 ios.release  = "res://addons/fmod/libs/ios/libGodotFmod.ios.template_release.universal.dylib"
 
-
+[icons]
+FmodEventEmitter2D = "res://addons/fmod/icons/fmod_icon.svg"
+FmodEventEmitter3D = "res://addons/fmod/icons/fmod_icon.svg"
+FmodListener2D = "res://addons/fmod/icons/fmod_icon.svg"
+FmodListener3D = "res://addons/fmod/icons/fmod_icon.svg"
 
 [dependencies]
 windows.editor.x86_64 = {
diff --git a/demo/addons/fmod/icons/FmodEventEmitter2D.svg b/demo/addons/fmod/icons/FmodEventEmitter2D.svg
deleted file mode 100644
index 08097af2..00000000
--- a/demo/addons/fmod/icons/FmodEventEmitter2D.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="16"
-   viewBox="0 0 16 16"
-   width="16"
-   version="1.1"
-   id="svg15"
-   sodipodi:docname="FmodEventEmitter2D.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs19" />
-  <sodipodi:namedview
-     id="namedview17"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="5.6171875"
-     inkscape:cx="-44.951321"
-     inkscape:cy="6.0528512"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-6"
-     inkscape:window-y="-6"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g13" />
-  <linearGradient
-     id="a"
-     gradientUnits="userSpaceOnUse"
-     x1="8"
-     x2="8"
-     y1="1"
-     y2="15">
-    <stop
-       offset="0"
-       stop-color="#ff5f5f"
-       id="stop2" />
-    <stop
-       offset=".5"
-       stop-color="#e1da5b"
-       id="stop4" />
-    <stop
-       offset="1"
-       stop-color="#5fff97"
-       id="stop6" />
-  </linearGradient>
-  <g
-     transform="translate(0 -1036.4)"
-     id="g13">
-    <path
-       d="m10.023 1044.4c-.56139-.013-1.0235.4264-1.0234.9724v5.0542c.0006911.7482.83361 1.2154 1.5.8414l4-2.5262c.66694-.3743.66694-1.3104 0-1.6847l-4-2.5261c-.14505-.082-.30893-.1269-.47656-.131z"
-       fill="#8da5f3"
-       id="path9"
-       style="fill:#2894ff;fill-opacity:1" />
-    <path
-       d="m11.971 1.002a1.0001 1.0001 0 0 0 -.24609.037109l-7 2a1.0001 1.0001 0 0 0 -.72461.96094v5.5508a2.5 2.5 0 0 0 -.5-.050781 2.5 2.5 0 0 0 -2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.4961-2.4121 1.0001 1.0001 0 0 0 .0039062-.087891v-7.2441l5-1.4277v3.1719l2-1v-3.5a1.0001 1.0001 0 0 0 -1.0293-.99805z"
-       fill="url(#a)"
-       transform="translate(0 1036.4)"
-       id="path11"
-       style="fill:#78e9ff;fill-opacity:1" />
-  </g>
-</svg>
diff --git a/demo/addons/fmod/icons/bank_icon.svg.import b/demo/addons/fmod/icons/bank_icon.svg.import
new file mode 100644
index 00000000..7959a54f
--- /dev/null
+++ b/demo/addons/fmod/icons/bank_icon.svg.import
@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://o2chsr07oeqs"
+path="res://.godot/imported/bank_icon.svg-8de6c7bff09a67352e162b3c61b601de.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/bank_icon.svg"
+dest_files=["res://.godot/imported/bank_icon.svg-8de6c7bff09a67352e162b3c61b601de.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true
diff --git a/demo/addons/fmod/icons/bus_icon.svg.import b/demo/addons/fmod/icons/bus_icon.svg.import
new file mode 100644
index 00000000..904ef45e
--- /dev/null
+++ b/demo/addons/fmod/icons/bus_icon.svg.import
@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dj1kag4aeg58t"
+path="res://.godot/imported/bus_icon.svg-f536ffd3c4893e79a9d3cb9a1b4fb50c.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/bus_icon.svg"
+dest_files=["res://.godot/imported/bus_icon.svg-f536ffd3c4893e79a9d3cb9a1b4fb50c.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true
diff --git a/demo/addons/fmod/icons/c_parameter_icon.svg.import b/demo/addons/fmod/icons/c_parameter_icon.svg.import
new file mode 100644
index 00000000..09f585b1
--- /dev/null
+++ b/demo/addons/fmod/icons/c_parameter_icon.svg.import
@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cmvcqfsl167te"
+path="res://.godot/imported/c_parameter_icon.svg-04115c2482c9a6874356ffdc09c41db0.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/c_parameter_icon.svg"
+dest_files=["res://.godot/imported/c_parameter_icon.svg-04115c2482c9a6874356ffdc09c41db0.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true
diff --git a/demo/addons/fmod/icons/d_parameter_icon.svg.import b/demo/addons/fmod/icons/d_parameter_icon.svg.import
new file mode 100644
index 00000000..d5ef9cf6
--- /dev/null
+++ b/demo/addons/fmod/icons/d_parameter_icon.svg.import
@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dgna04txtwnyb"
+path="res://.godot/imported/d_parameter_icon.svg-d339e4e3f950ae8593b999ef51579136.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/d_parameter_icon.svg"
+dest_files=["res://.godot/imported/d_parameter_icon.svg-d339e4e3f950ae8593b999ef51579136.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true
diff --git a/demo/addons/fmod/icons/event_icon.svg.import b/demo/addons/fmod/icons/event_icon.svg.import
new file mode 100644
index 00000000..fd49058f
--- /dev/null
+++ b/demo/addons/fmod/icons/event_icon.svg.import
@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cmpgmbn3y4svl"
+path="res://.godot/imported/event_icon.svg-4e6e2103d076f95b7bef82f079e433e6.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/event_icon.svg"
+dest_files=["res://.godot/imported/event_icon.svg-4e6e2103d076f95b7bef82f079e433e6.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true
diff --git a/demo/addons/fmod/icons/fmod_emitter.png.import b/demo/addons/fmod/icons/fmod_emitter.png.import
new file mode 100644
index 00000000..b12e6e89
--- /dev/null
+++ b/demo/addons/fmod/icons/fmod_emitter.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cotpb54utx6d6"
+path="res://.godot/imported/fmod_emitter.png-6783a287e298e2a04e64a6deaa6fe366.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/fmod_emitter.png"
+dest_files=["res://.godot/imported/fmod_emitter.png-6783a287e298e2a04e64a6deaa6fe366.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/demo/addons/fmod/icons/fmod_icon.svg.import b/demo/addons/fmod/icons/fmod_icon.svg.import
new file mode 100644
index 00000000..cd78f8ba
--- /dev/null
+++ b/demo/addons/fmod/icons/fmod_icon.svg.import
@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bwqq5q7kodk40"
+path="res://.godot/imported/fmod_icon.svg-cca7eb13231881fafaea0d598d407ea3.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/fmod_icon.svg"
+dest_files=["res://.godot/imported/fmod_icon.svg-cca7eb13231881fafaea0d598d407ea3.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true
diff --git a/demo/addons/fmod/icons/snapshot_icon.svg.import b/demo/addons/fmod/icons/snapshot_icon.svg.import
new file mode 100644
index 00000000..f06df824
--- /dev/null
+++ b/demo/addons/fmod/icons/snapshot_icon.svg.import
@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b4jxbh86chubi"
+path="res://.godot/imported/snapshot_icon.svg-7b517248819b3685844766808fbce2a5.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/snapshot_icon.svg"
+dest_files=["res://.godot/imported/snapshot_icon.svg-7b517248819b3685844766808fbce2a5.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true
diff --git a/demo/addons/fmod/icons/vca_icon.svg.import b/demo/addons/fmod/icons/vca_icon.svg.import
new file mode 100644
index 00000000..fb5c289c
--- /dev/null
+++ b/demo/addons/fmod/icons/vca_icon.svg.import
@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://crsj4jjaeq87a"
+path="res://.godot/imported/vca_icon.svg-def43f27fe148a7a0b18c7dcaab20c79.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/fmod/icons/vca_icon.svg"
+dest_files=["res://.godot/imported/vca_icon.svg-def43f27fe148a7a0b18c7dcaab20c79.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true
diff --git a/godot-cpp b/godot-cpp
index 48b92acf..1009da4d 160000
--- a/godot-cpp
+++ b/godot-cpp
@@ -1 +1 @@
-Subproject commit 48b92acf8c1de8ab39aab0d5f0f83b7fe4895ee9
+Subproject commit 1009da4d7e395abadfdb454cff6623e9456181c4

From e302295f1c29dc5f055ca71773f82ce4558b3f85 Mon Sep 17 00:00:00 2001
From: bitbrain <miguel-gonzalez@gmx.de>
Date: Sun, 12 Nov 2023 16:26:31 +0000
Subject: [PATCH 2/3] :ok_hand: add FmodBankLoader

---
 demo/addons/fmod/fmod.gdextension | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/addons/fmod/fmod.gdextension b/demo/addons/fmod/fmod.gdextension
index aaab2b27..ea9ee54b 100644
--- a/demo/addons/fmod/fmod.gdextension
+++ b/demo/addons/fmod/fmod.gdextension
@@ -24,6 +24,7 @@ FmodEventEmitter2D = "res://addons/fmod/icons/fmod_icon.svg"
 FmodEventEmitter3D = "res://addons/fmod/icons/fmod_icon.svg"
 FmodListener2D = "res://addons/fmod/icons/fmod_icon.svg"
 FmodListener3D = "res://addons/fmod/icons/fmod_icon.svg"
+FmodBankLoader = "res://addons/fmod/icons/fmod_icon.svg"
 
 [dependencies]
 windows.editor.x86_64 = {

From 2f5c8863775a964a2f8ee2769caa913b711ad113 Mon Sep 17 00:00:00 2001
From: bitbrain <miguel-gonzalez@gmx.de>
Date: Mon, 13 Nov 2023 16:54:25 +0000
Subject: [PATCH 3/3] use correct godot-cpp

---
 godot-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/godot-cpp b/godot-cpp
index 1009da4d..48b92acf 160000
--- a/godot-cpp
+++ b/godot-cpp
@@ -1 +1 @@
-Subproject commit 1009da4d7e395abadfdb454cff6623e9456181c4
+Subproject commit 48b92acf8c1de8ab39aab0d5f0f83b7fe4895ee9