diff --git a/Viagg-io/Assets/Plugins/FMOD/LICENSE.txt.meta b/Viagg-io/Assets/Plugins/FMOD/LICENSE.txt.meta index 19b1ab0..0f4ed0c 100644 --- a/Viagg-io/Assets/Plugins/FMOD/LICENSE.txt.meta +++ b/Viagg-io/Assets/Plugins/FMOD/LICENSE.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1e4f622ce6fb20a46adf465f9497cb04 +guid: b73e581d836ff624db4ea85aa624bbd2 TextScriptImporter: externalObjects: {} userData: diff --git a/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index f7e8224..e5d5f2a 100644 --- a/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Viagg-io/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -670,10 +670,10 @@ MonoBehaviour: m_Name: FMODStudioSettings m_EditorClassIdentifier: switchSettingsMigration: 1 - HasSourceProject: 1 - HasPlatforms: 1 + HasSourceProject: 0 + HasPlatforms: 0 sourceProjectPath: - sourceBankPath: + sourceBankPath: ../../Audio/FMODBuild sourceBankPathUnformatted: BankRefreshCooldown: 5 ShowBankRefreshWindow: 1 @@ -694,8 +694,16 @@ MonoBehaviour: VirtualChannelSettings: [] RealChannelSettings: [] Plugins: [] - MasterBanks: [] - Banks: [] + MasterBanks: + - Master + Banks: + - Dialogue_CN + - Dialogue_EN + - Dialogue_JP + - Music + - SFX + - Vehicles + - VO BanksToLoad: [] LiveUpdatePort: 9264 EnableMemoryTracking: 0 @@ -707,7 +715,7 @@ MonoBehaviour: EnableErrorCallback: 0 SharedLibraryUpdateStage: 0 SharedLibraryTimeSinceStart: 0 - CurrentVersion: 131620 + CurrentVersion: 131621 HideSetupWizard: 1 LastEventReferenceScanVersion: 131620 Platforms: diff --git a/Viagg-io/Assets/Plugins/FMOD/addons/ResonanceAudio/Scripts/FmodResonanceAudio.cs b/Viagg-io/Assets/Plugins/FMOD/addons/ResonanceAudio/Scripts/FmodResonanceAudio.cs index 0976ee4..4365b97 100644 --- a/Viagg-io/Assets/Plugins/FMOD/addons/ResonanceAudio/Scripts/FmodResonanceAudio.cs +++ b/Viagg-io/Assets/Plugins/FMOD/addons/ResonanceAudio/Scripts/FmodResonanceAudio.cs @@ -51,7 +51,7 @@ namespace FMODUnityResonance private static readonly string listenerPluginName = "Resonance Audio Listener"; // Size of |RoomProperties| struct in bytes. - private static readonly int roomPropertiesSize = FMOD.MarshalHelper.SizeOf(typeof(RoomProperties)); + private static readonly int roomPropertiesSize = Marshal.SizeOf(); // Plugin data parameter index for the room properties. private static readonly int roomPropertiesIndex = 1; diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmod.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmod.so index 8240a09..c6e4f27 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmod.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmod.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmod.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmod.so.meta index 2644a30..d701741 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmod.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmod.so.meta @@ -1,33 +1,23 @@ -fileFormatVersion: 2 -guid: 159cb3726937c6c498fa49eb627b0d96 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: ARM64 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 1 +guid: 159cb3726937c6c498fa49eb627b0d96 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARM64 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodL.so index a01c8b7..4eeeb6c 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudio.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudio.so index 4811f6a..78f7449 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudio.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudio.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudio.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudio.so.meta index c853498..fe3f639 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudio.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudio.so.meta @@ -1,33 +1,23 @@ -fileFormatVersion: 2 -guid: e4d6c68823f34e440bfe4e4ecba4c113 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: ARM64 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 1 +guid: e4d6c68823f34e440bfe4e4ecba4c113 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARM64 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudioL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudioL.so index 212f6db..708c291 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudioL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/arm64-v8a/libfmodstudioL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmod.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmod.so index a7f3a1c..8413348 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmod.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmod.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmod.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmod.so.meta index 91f9d5a..a5d9796 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmod.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmod.so.meta @@ -1,33 +1,23 @@ -fileFormatVersion: 2 -guid: f71c8f89be7646142baed6d482d5e89c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: f71c8f89be7646142baed6d482d5e89c +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARMv7 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodL.so index fa9953e..a1129e0 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudio.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudio.so index 53b9c35..2b159d0 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudio.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudio.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudio.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudio.so.meta index 76b3e58..32a556f 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudio.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudio.so.meta @@ -1,33 +1,23 @@ -fileFormatVersion: 2 -guid: cf01ad74bd6e5df46996c61b81ba590c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: cf01ad74bd6e5df46996c61b81ba590c +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARMv7 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudioL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudioL.so index 2f92d78..ca7a47c 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudioL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/armeabi-v7a/libfmodstudioL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/fmod.jar b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/fmod.jar index c04d476..dbefafb 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/fmod.jar and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/fmod.jar differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmod.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmod.so index ccb3953..f07c1fa 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmod.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmod.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmod.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmod.so.meta index d4ccd76..01a0984 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmod.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmod.so.meta @@ -1,33 +1,23 @@ -fileFormatVersion: 2 -guid: 099e80baee62d0c439475fae45e69f4e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: x86 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 099e80baee62d0c439475fae45e69f4e +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: x86 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodL.so index b0ddcea..f309e57 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudio.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudio.so index 75e6da6..318449c 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudio.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudio.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudio.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudio.so.meta index 6bb07b8..6845b41 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudio.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudio.so.meta @@ -1,33 +1,23 @@ -fileFormatVersion: 2 -guid: a20d361b085100b4997c4e5b0b83af31 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: x86 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: a20d361b085100b4997c4e5b0b83af31 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: x86 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudioL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudioL.so index 94c6117..4611f26 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudioL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86/libfmodstudioL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmod.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmod.so index a220bad..86b9b07 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmod.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmod.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmod.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmod.so.meta index 5392569..bb9b46e 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmod.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmod.so.meta @@ -1,33 +1,23 @@ -fileFormatVersion: 2 -guid: 7b1a5b0e7617bcf49885fb2dd09d7085 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7b1a5b0e7617bcf49885fb2dd09d7085 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: x86_64 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodL.so index 1332fdd..0baeda9 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudio.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudio.so index bff034b..570523f 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudio.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudio.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudio.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudio.so.meta index e911fcf..959af8c 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudio.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudio.so.meta @@ -1,33 +1,23 @@ -fileFormatVersion: 2 -guid: 8c078c4748d95c2489bb3b82aa144194 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 8c078c4748d95c2489bb3b82aa144194 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: x86_64 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudioL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudioL.so index 1ee9805..279eeed 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudioL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/android/lib/x86_64/libfmodstudioL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/2.0.19/libfmodstudio.a b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/2.0.19/libfmodstudio.a index 04cbc92..a85f0f6 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/2.0.19/libfmodstudio.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/2.0.19/libfmodstudio.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/2.0.19/libfmodstudioL.a b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/2.0.19/libfmodstudioL.a index 0e3defd..bda26c2 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/2.0.19/libfmodstudioL.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/2.0.19/libfmodstudioL.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39.meta new file mode 100644 index 0000000..19a5b91 --- /dev/null +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7959e64b0c3130b46bf491f58fdfd6c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudio.a b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudio.a new file mode 100644 index 0000000..82b0f7c Binary files /dev/null and b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudio.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudio.a.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudio.a.meta new file mode 100644 index 0000000..44f4f36 --- /dev/null +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudio.a.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: c74d44e6ba102764fb85c6dc1e6d4168 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + WebGL: WebGL + second: + enabled: 0 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudioL.a b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudioL.a new file mode 100644 index 0000000..751bf1f Binary files /dev/null and b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudioL.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudioL.a.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudioL.a.meta new file mode 100644 index 0000000..da7e310 --- /dev/null +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.39/libfmodstudioL.a.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: aa0ee2b898faebd44b3b1def99fb7ab4 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + WebGL: WebGL + second: + enabled: 0 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8.meta new file mode 100644 index 0000000..47e55fd --- /dev/null +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76b6a358cc688fb4eb30cf7da58ae388 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudio.a b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudio.a new file mode 100644 index 0000000..d8129f1 Binary files /dev/null and b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudio.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudio.a.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudio.a.meta new file mode 100644 index 0000000..a7abc35 --- /dev/null +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudio.a.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: e52d91a08688cb04695051b8a87a82bd +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + WebGL: WebGL + second: + enabled: 0 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudioL.a b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudioL.a new file mode 100644 index 0000000..2dac86f Binary files /dev/null and b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudioL.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudioL.a.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudioL.a.meta new file mode 100644 index 0000000..6f6fc7f --- /dev/null +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/3.1.8/libfmodstudioL.a.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 8ba5025cbb9d0bf499e12351728e7679 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + WebGL: WebGL + second: + enabled: 0 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/libfmodstudiounityplugin.bc b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/libfmodstudiounityplugin.bc index f2ef188..3260c40 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/libfmodstudiounityplugin.bc and b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/libfmodstudiounityplugin.bc differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/libfmodstudiounitypluginL.bc b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/libfmodstudiounitypluginL.bc index b08c4cb..eb0aa80 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/libfmodstudiounitypluginL.bc and b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/lib/libfmodstudiounitypluginL.bc differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/src/PlatformWebGL.cs b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/src/PlatformWebGL.cs index ab3cbed..5dabc0f 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/html5/src/PlatformWebGL.cs +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/html5/src/PlatformWebGL.cs @@ -55,18 +55,37 @@ namespace FMODUnity protected override IEnumerable GetBinaryFiles(BuildTarget buildTarget, bool allVariants, string suffix) { - #if UNITY_2021_2_OR_NEWER - bool useWASM = true; - #else - bool useWASM = false; - #endif + bool emVer_1_38_11 = false; + bool emVer_2_0_19 = false; + bool emVer_3_1_8 = false; + bool emVer_3_1_39 = false; - if (allVariants || useWASM) +#if UNITY_6000_0_OR_NEWER + emVer_3_1_39 = true; +#elif UNITY_2022_3_OR_NEWER + emVer_3_1_8 = true; +#elif UNITY_2021_2_OR_NEWER + emVer_2_0_19 = true; +#else + emVer_1_38_11 = true; +#endif + + if (allVariants || emVer_3_1_39) + { + yield return new FileRecord(string.Format("3.1.39/libfmodstudio{0}.a", suffix)); + } + + if (allVariants || emVer_3_1_8) + { + yield return new FileRecord(string.Format("3.1.8/libfmodstudio{0}.a", suffix)); + } + + if (allVariants || emVer_2_0_19) { yield return new FileRecord(string.Format("2.0.19/libfmodstudio{0}.a", suffix)); } - if (allVariants || !useWASM) + if (allVariants || emVer_1_38_11) { yield return new FileRecord(string.Format("libfmodstudiounityplugin{0}.bc", suffix)); } diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounityplugin.a b/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounityplugin.a index b63e18e..49e57b1 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounityplugin.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounityplugin.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginL.a b/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginL.a index f8d9a5c..1ff58fb 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginL.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginL.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginsimulator.a b/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginsimulator.a index 477a136..504ddc8 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginsimulator.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginsimulator.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginsimulatorL.a b/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginsimulatorL.a index 507290d..3a5c4ca 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginsimulatorL.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/ios/lib/libfmodstudiounitypluginsimulatorL.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudio.so b/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudio.so index 037bd1a..8c92763 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudio.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudio.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudioL.so b/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudioL.so index 469c1ea..bbf5f5a 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudioL.so and b/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudioL.so differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudioL.so.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudioL.so.meta index c42f5c0..a6e5651 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudioL.so.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/linux/lib/x86_64/libfmodstudioL.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bad0ac5e8fb6a4a5491bb4faaad2248c +guid: 597d50bd5095f402b8bc3cc8910f1ba5 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudio.bundle/Contents/MacOS/fmodstudio b/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudio.bundle/Contents/MacOS/fmodstudio index 99c52e7..49350b9 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudio.bundle/Contents/MacOS/fmodstudio and b/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudio.bundle/Contents/MacOS/fmodstudio differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle.meta index a594ab1..10ff882 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4224da8f72f9e4ab3abd4b3bf5c1fa1d +guid: 3ec8bec8785ec45edad3ef0d825a8bf9 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle/Contents/MacOS/fmodstudioL b/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle/Contents/MacOS/fmodstudioL index 4cca6b6..fae1362 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle/Contents/MacOS/fmodstudioL and b/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle/Contents/MacOS/fmodstudioL differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/resonanceaudio.bundle/Contents/MacOS/resonanceaudio b/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/resonanceaudio.bundle/Contents/MacOS/resonanceaudio index becacd8..1666b3a 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/resonanceaudio.bundle/Contents/MacOS/resonanceaudio and b/Viagg-io/Assets/Plugins/FMOD/platforms/mac/lib/resonanceaudio.bundle/Contents/MacOS/resonanceaudio differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounityplugin.a b/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounityplugin.a index 0a67d81..f55e6e3 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounityplugin.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounityplugin.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginL.a b/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginL.a index 0d6422d..5562ff6 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginL.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginL.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginsimulator.a b/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginsimulator.a index d1a92b1..2a5472b 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginsimulator.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginsimulator.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginsimulatorL.a b/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginsimulatorL.a index a571f0f..f5a4b1c 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginsimulatorL.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/tvos/lib/libfmodstudiounitypluginsimulatorL.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmod.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmod.dll index 5ef5893..b36cd2e 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmod.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmod.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodL.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodL.dll index 0267563..1f26dfd 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodL.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodL.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodstudio.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodstudio.dll index e4976d2..b5c3faf 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodstudio.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodstudio.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodstudioL.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodstudioL.dll index 0437952..91d5fd0 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodstudioL.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/arm/fmodstudioL.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmod.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmod.dll index 25baf24..096db29 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmod.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmod.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodL.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodL.dll index b0ff306..70fd89f 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodL.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodL.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodstudio.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodstudio.dll index dadc95b..5a0f6cc 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodstudio.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodstudio.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodstudioL.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodstudioL.dll index 830e340..d613676 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodstudioL.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x64/fmodstudioL.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmod.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmod.dll index 5074cd8..6e7a7b4 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmod.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmod.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodL.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodL.dll index 83f016e..fd8cbc6 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodL.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodL.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodstudio.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodstudio.dll index 4f3dc04..333e57c 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodstudio.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodstudio.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodstudioL.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodstudioL.dll index 5588b79..fc2f134 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodstudioL.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/uwp/lib/x86/fmodstudioL.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudioL_xros.a b/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudioL_xros.a index a4b13b7..f925ae6 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudioL_xros.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudioL_xros.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudioL_xrsimulator.a b/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudioL_xrsimulator.a index 46f4e84..c3d67ab 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudioL_xrsimulator.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudioL_xrsimulator.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudio_xros.a b/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudio_xros.a index 9ad42d6..182516b 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudio_xros.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudio_xros.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudio_xrsimulator.a b/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudio_xrsimulator.a index 2666f40..27ab861 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudio_xrsimulator.a and b/Viagg-io/Assets/Plugins/FMOD/platforms/visionos/lib/libfmodstudio_xrsimulator.a differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudio.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudio.dll index 32f6814..3a9a9a7 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudio.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudio.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll index 3acdd4f..309e35c 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll.meta index e3a4d90..f327e78 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86/fmodstudioL.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e1c523081229477e99ec128c53318c6 +guid: 1d0990c72c66745b0bf9e95da7a9ef56 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll index b694dd9..9ac71fb 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll index e5f837a..6c10bdd 100644 Binary files a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll and b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll differ diff --git a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta index 87aa9db..16bd817 100644 --- a/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta +++ b/Viagg-io/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 189f8fecd1aca4383b870da65aa76d5b +guid: a2bf8e7e3a64b472b91a1dcf8ba5d62a PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Viagg-io/Assets/Plugins/FMOD/src/Editor/SettingsEditor.cs b/Viagg-io/Assets/Plugins/FMOD/src/Editor/SettingsEditor.cs index e16436b..2221224 100644 --- a/Viagg-io/Assets/Plugins/FMOD/src/Editor/SettingsEditor.cs +++ b/Viagg-io/Assets/Plugins/FMOD/src/Editor/SettingsEditor.cs @@ -874,7 +874,7 @@ namespace FMODUnity private GUIContent subdirectoryHeader = new GUIContent("Output sub-directory:"); private GUIContent speakerModeHeader = new GUIContent("Surround speaker mode:"); - private const string HelpText = "Select the output sub-directory and speaker mode that match the project " + + private const string HelpText = "Select the output sub-directory and surround speaker mode that match the project " + "platform settings in the FMOD Studio build preferences."; private const string UndoText = "Edit FMOD Platform Settings"; diff --git a/Viagg-io/Assets/Plugins/FMOD/src/RuntimeManager.cs b/Viagg-io/Assets/Plugins/FMOD/src/RuntimeManager.cs index c2bc25f..887dfc9 100644 --- a/Viagg-io/Assets/Plugins/FMOD/src/RuntimeManager.cs +++ b/Viagg-io/Assets/Plugins/FMOD/src/RuntimeManager.cs @@ -117,7 +117,7 @@ namespace FMODUnity [AOT.MonoPInvokeCallback(typeof(FMOD.SYSTEM_CALLBACK))] private static FMOD.RESULT ERROR_CALLBACK(IntPtr system, FMOD.SYSTEM_CALLBACK_TYPE type, IntPtr commanddata1, IntPtr commanddata2, IntPtr userdata) { - FMOD.ERRORCALLBACK_INFO callbackInfo = (FMOD.ERRORCALLBACK_INFO)FMOD.MarshalHelper.PtrToStructure(commanddata1, typeof(FMOD.ERRORCALLBACK_INFO)); + FMOD.ERRORCALLBACK_INFO callbackInfo = Marshal.PtrToStructure(commanddata1); // Filter out benign expected errors. if ((callbackInfo.instancetype == FMOD.ERRORCALLBACK_INSTANCETYPE.CHANNEL || callbackInfo.instancetype == FMOD.ERRORCALLBACK_INSTANCETYPE.CHANNELCONTROL) diff --git a/Viagg-io/Assets/Plugins/FMOD/src/fmod.cs b/Viagg-io/Assets/Plugins/FMOD/src/fmod.cs index 295ba19..efecd6c 100644 --- a/Viagg-io/Assets/Plugins/FMOD/src/fmod.cs +++ b/Viagg-io/Assets/Plugins/FMOD/src/fmod.cs @@ -19,7 +19,7 @@ namespace FMOD */ public partial class VERSION { - public const int number = 0x00020224; + public const int number = 0x00020225; #if !UNITY_2019_4_OR_NEWER public const string dll = "fmod"; #endif @@ -701,47 +701,47 @@ namespace FMOD public SOUND_PCMREAD_CALLBACK pcmreadcallback { set { pcmreadcallback_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return pcmreadcallback_internal == IntPtr.Zero ? null : (SOUND_PCMREAD_CALLBACK)Marshal.GetDelegateForFunctionPointer(pcmreadcallback_internal, typeof(SOUND_PCMREAD_CALLBACK)); } + get { return pcmreadcallback_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(pcmreadcallback_internal); } } public SOUND_PCMSETPOS_CALLBACK pcmsetposcallback { set { pcmsetposcallback_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return pcmsetposcallback_internal == IntPtr.Zero ? null : (SOUND_PCMSETPOS_CALLBACK)Marshal.GetDelegateForFunctionPointer(pcmsetposcallback_internal, typeof(SOUND_PCMSETPOS_CALLBACK)); } + get { return pcmsetposcallback_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(pcmsetposcallback_internal); } } public SOUND_NONBLOCK_CALLBACK nonblockcallback { set { nonblockcallback_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return nonblockcallback_internal == IntPtr.Zero ? null : (SOUND_NONBLOCK_CALLBACK)Marshal.GetDelegateForFunctionPointer(nonblockcallback_internal, typeof(SOUND_NONBLOCK_CALLBACK)); } + get { return nonblockcallback_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(nonblockcallback_internal); } } public FILE_OPEN_CALLBACK fileuseropen { set { fileuseropen_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return fileuseropen_internal == IntPtr.Zero ? null : (FILE_OPEN_CALLBACK)Marshal.GetDelegateForFunctionPointer(fileuseropen_internal, typeof(FILE_OPEN_CALLBACK)); } + get { return fileuseropen_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(fileuseropen_internal); } } public FILE_CLOSE_CALLBACK fileuserclose { set { fileuserclose_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return fileuserclose_internal == IntPtr.Zero ? null : (FILE_CLOSE_CALLBACK)Marshal.GetDelegateForFunctionPointer(fileuserclose_internal, typeof(FILE_CLOSE_CALLBACK)); } + get { return fileuserclose_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(fileuserclose_internal); } } public FILE_READ_CALLBACK fileuserread { set { fileuserread_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return fileuserread_internal == IntPtr.Zero ? null : (FILE_READ_CALLBACK)Marshal.GetDelegateForFunctionPointer(fileuserread_internal, typeof(FILE_READ_CALLBACK)); } + get { return fileuserread_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(fileuserread_internal); } } public FILE_SEEK_CALLBACK fileuserseek { set { fileuserseek_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return fileuserseek_internal == IntPtr.Zero ? null : (FILE_SEEK_CALLBACK)Marshal.GetDelegateForFunctionPointer(fileuserseek_internal, typeof(FILE_SEEK_CALLBACK)); } + get { return fileuserseek_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(fileuserseek_internal); } } public FILE_ASYNCREAD_CALLBACK fileuserasyncread { set { fileuserasyncread_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return fileuserasyncread_internal == IntPtr.Zero ? null : (FILE_ASYNCREAD_CALLBACK)Marshal.GetDelegateForFunctionPointer(fileuserasyncread_internal, typeof(FILE_ASYNCREAD_CALLBACK)); } + get { return fileuserasyncread_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(fileuserasyncread_internal); } } public FILE_ASYNCCANCEL_CALLBACK fileuserasynccancel { set { fileuserasynccancel_internal = (value == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(value)); } - get { return fileuserasynccancel_internal == IntPtr.Zero ? null : (FILE_ASYNCCANCEL_CALLBACK)Marshal.GetDelegateForFunctionPointer(fileuserasynccancel_internal, typeof(FILE_ASYNCCANCEL_CALLBACK)); } + get { return fileuserasynccancel_internal == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(fileuserasynccancel_internal); } } } @@ -1114,12 +1114,12 @@ namespace FMOD } public RESULT setAdvancedSettings(ref ADVANCEDSETTINGS settings) { - settings.cbSize = MarshalHelper.SizeOf(typeof(ADVANCEDSETTINGS)); + settings.cbSize = Marshal.SizeOf(); return FMOD5_System_SetAdvancedSettings(this.handle, ref settings); } public RESULT getAdvancedSettings(ref ADVANCEDSETTINGS settings) { - settings.cbSize = MarshalHelper.SizeOf(typeof(ADVANCEDSETTINGS)); + settings.cbSize = Marshal.SizeOf(); return FMOD5_System_GetAdvancedSettings(this.handle, ref settings); } public RESULT setCallback(SYSTEM_CALLBACK callback, SYSTEM_CALLBACK_TYPE callbackmask = SYSTEM_CALLBACK_TYPE.ALL) @@ -1321,7 +1321,7 @@ namespace FMOD public RESULT createSound(string name, MODE mode, out Sound sound) { CREATESOUNDEXINFO exinfo = new CREATESOUNDEXINFO(); - exinfo.cbsize = MarshalHelper.SizeOf(typeof(CREATESOUNDEXINFO)); + exinfo.cbsize = Marshal.SizeOf(); return createSound(name, mode, ref exinfo, out sound); } @@ -1343,7 +1343,7 @@ namespace FMOD public RESULT createStream(string name, MODE mode, out Sound sound) { CREATESOUNDEXINFO exinfo = new CREATESOUNDEXINFO(); - exinfo.cbsize = MarshalHelper.SizeOf(typeof(CREATESOUNDEXINFO)); + exinfo.cbsize = Marshal.SizeOf(); return createStream(name, mode, ref exinfo, out sound); } @@ -3385,7 +3385,7 @@ namespace FMOD { IntPtr descPtr; RESULT result = FMOD5_DSP_GetParameterInfo(this.handle, index, out descPtr); - desc = (DSP_PARAMETER_DESC)MarshalHelper.PtrToStructure(descPtr, typeof(DSP_PARAMETER_DESC)); + desc = (DSP_PARAMETER_DESC)Marshal.PtrToStructure(descPtr); return result; } public RESULT getDataParameterIndex(int datatype, out int index) @@ -4063,22 +4063,5 @@ namespace FMOD } } - // Some of the Marshal functions were marked as deprecated / obsolete, however that decision was reversed: https://github.com/dotnet/corefx/pull/10541 - // Use the old syntax (non-generic) to ensure maximum compatibility (especially with Unity) ignoring the warnings - public static class MarshalHelper - { -#pragma warning disable 618 - public static int SizeOf(Type t) - { - return Marshal.SizeOf(t); // Always use Type version, never Object version as it boxes causes GC allocations - } - - public static object PtrToStructure(IntPtr ptr, Type structureType) - { - return Marshal.PtrToStructure(ptr, structureType); - } -#pragma warning restore 618 - } - #endregion } diff --git a/Viagg-io/Assets/Plugins/FMOD/src/fmod_dsp.cs b/Viagg-io/Assets/Plugins/FMOD/src/fmod_dsp.cs index 28014c2..c8e8e7f 100644 --- a/Viagg-io/Assets/Plugins/FMOD/src/fmod_dsp.cs +++ b/Viagg-io/Assets/Plugins/FMOD/src/fmod_dsp.cs @@ -20,10 +20,46 @@ namespace FMOD public struct DSP_BUFFER_ARRAY { public int numbuffers; - public int[] buffernumchannels; - public CHANNELMASK[] bufferchannelmask; - public IntPtr[] buffers; + public IntPtr buffernumchannels; + public IntPtr bufferchannelmask; + public IntPtr buffers; public SPEAKERMODE speakermode; + + /* + These properties take advantage of the fact that numbuffers is always zero or one + */ + + public int numchannels + { + get + { + if (buffernumchannels != IntPtr.Zero && numbuffers != 0) + return Marshal.ReadInt32(buffernumchannels); + + return 0; + } + set + { + if (buffernumchannels != IntPtr.Zero && numbuffers != 0) + Marshal.WriteInt32(buffernumchannels, value); + } + } + + public IntPtr buffer + { + get + { + if (buffers != IntPtr.Zero && numbuffers != 0) + return Marshal.ReadIntPtr(buffers); + + return IntPtr.Zero; + } + set + { + if (buffers != IntPtr.Zero && numbuffers != 0) + Marshal.WriteIntPtr(buffers, value); + } + } } public enum DSP_PROCESS_OPERATION diff --git a/Viagg-io/Assets/Plugins/FMOD/src/fmod_studio.cs b/Viagg-io/Assets/Plugins/FMOD/src/fmod_studio.cs index 39d1df4..1c1f8e4 100644 --- a/Viagg-io/Assets/Plugins/FMOD/src/fmod_studio.cs +++ b/Viagg-io/Assets/Plugins/FMOD/src/fmod_studio.cs @@ -395,7 +395,7 @@ namespace FMOD.Studio } public RESULT setAdvancedSettings(ADVANCEDSETTINGS settings) { - settings.cbsize = MarshalHelper.SizeOf(typeof(ADVANCEDSETTINGS)); + settings.cbsize = Marshal.SizeOf(); return FMOD_Studio_System_SetAdvancedSettings(this.handle, ref settings); } public RESULT setAdvancedSettings(ADVANCEDSETTINGS settings, string encryptionKey) @@ -411,7 +411,7 @@ namespace FMOD.Studio } public RESULT getAdvancedSettings(out ADVANCEDSETTINGS settings) { - settings.cbsize = MarshalHelper.SizeOf(typeof(ADVANCEDSETTINGS)); + settings.cbsize = Marshal.SizeOf(); return FMOD_Studio_System_GetAdvancedSettings(this.handle, out settings); } public RESULT initialize(int maxchannels, INITFLAGS studioflags, FMOD.INITFLAGS flags, IntPtr extradriverdata) @@ -679,7 +679,7 @@ namespace FMOD.Studio } public RESULT loadBankCustom(BANK_INFO info, LOAD_BANK_FLAGS flags, out Bank bank) { - info.size = MarshalHelper.SizeOf(typeof(BANK_INFO)); + info.size = Marshal.SizeOf(); return FMOD_Studio_System_LoadBankCustom(this.handle, ref info, flags, out bank.handle); } public RESULT unloadAll()