diff --git a/hwanyoung2/.vsconfig b/hwanyoung2/.vsconfig index b9be5257..1a9d7180 100644 --- a/hwanyoung2/.vsconfig +++ b/hwanyoung2/.vsconfig @@ -1,17 +1,13 @@ -{ +{ "version": "1.0", "components": [ "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.Windows10SDK", + "Microsoft.VisualStudio.Component.Windows10SDK.22000", "Microsoft.VisualStudio.Workload.CoreEditor", "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Workload.NativeCrossPlat", "Microsoft.VisualStudio.Workload.NativeDesktop", - "Microsoft.VisualStudio.Workload.NativeGame", - "Microsoft.VisualStudio.Workload.Universal" + "Microsoft.VisualStudio.Workload.NativeGame" ] } diff --git a/hwanyoung2/Content/Haena_v02/Texture/Bodies/Body/T_Haena_Body_SPEC.uasset b/hwanyoung2/Content/Haena_v02/Texture/Bodies/Body/T_Haena_Body_SPEC.uasset new file mode 100644 index 00000000..a617e59f --- /dev/null +++ b/hwanyoung2/Content/Haena_v02/Texture/Bodies/Body/T_Haena_Body_SPEC.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a82943d0fec57ad3c2d8e219d160d2341a90b3a9329a068a0739cb1c1a0cf2e +size 8394959 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset index 26cf5ffd..a950b617 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86f9ec81d2ca298a9e6d07e018a7b6d8c0bc73720d05f8be533f464951680519 -size 92698 +oid sha256:9de208198b58ee8da3ab0fe1bc7f58bed869b5f5042a9630ce27b882ff003724 +size 102421 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset index 7f19e00a..5bf8031f 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fcc4f5049c1e55a213ade591cb7f129044a60620f1ccd979db2ed6c3d3a550d -size 64086 +oid sha256:00cd6da98a126b0d8165fa3cbf504188720e375412baa26717f9178e8074ca74 +size 93599 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset index 43893ff2..f48e7c07 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2794a4e212ab37eb8313fea58823b7c88335e23d0e719adc330e483870dfbdff -size 162610 +oid sha256:9f57870a122493a92f43df142c186f7f24c442d34e1fed719b6e5967201ee527 +size 161504 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset index 89d5510c..2f2d49db 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86943ab62f565a43ecdec981d9fdb7bed06b318b0cb9f39060d5cf8255611309 -size 646368 +oid sha256:8abd619b6530e6720edf98cc8eeecc8c4cd24a4870910274330b6ab5eb51df9e +size 652053 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset index 5337de86..62a0711e 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4631eca015b4971d23b543d605c1f3dffd5d71dc35e9edde0842cf4e67338c3 -size 60305 +oid sha256:91e81117c8db10fceacf29d85d0988f8e22bb11a47049cfe9c8cc50666483383 +size 60411 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset index 9313c5de..7384517e 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6396d0e32e568116c41a48c7dc679312e2e246d9aa8fa121e49b634f418af861 -size 33266 +oid sha256:13e59e4d1386d8a3502562ff4a31c61927ca0ebecfe759ccd7f0cf4c3ef7b070 +size 39269 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660.uasset new file mode 100644 index 00000000..b8e9df3d --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a08466466e2c47ff6f0f1776469b9b72b7c0958b97e47e5af279a250d263f28 +size 2737858 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_2.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_2.uasset new file mode 100644 index 00000000..869270fb --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3587d068882e39aa71acc1bf73db4269e5e65a4dad8132c878173174c334354 +size 654158 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Attack1.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Attack1.uasset new file mode 100644 index 00000000..e9214e66 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Attack1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ee3fd0283ddab8d56680a20b9b9e9458370d47e127eb4511ea434984324a49f +size 788506 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Guard.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Guard.uasset new file mode 100644 index 00000000..f1f8971d --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Guard.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec4bd34d57e5dc3b7df34fe2b9f3f93cabf7bc2955eae701a03a679382c08f76 +size 614499 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill1.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill1.uasset new file mode 100644 index 00000000..47ec3a6c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eee8703ec89979bdcafca366523858fee5818ea491c8ef6611e13cc30bc0b08 +size 1294581 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill2.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill2.uasset new file mode 100644 index 00000000..a216f730 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d9b1be660bdb623784d75d3457a42a0900fa72c778d58d2e7453860f2f66ed3 +size 1222485 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_PhysicsAsset.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_PhysicsAsset.uasset new file mode 100644 index 00000000..a06b45cd --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d9099797ffc71fa6e888cfdff4f0b0f21093e3f873941447e9c84a8e0eca994 +size 10577 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Skeleton.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Skeleton.uasset new file mode 100644 index 00000000..32f9bb53 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c436666f0b32f18cf0e5040b9bb0eeb5df63bbce616c9659b332fa913743102c +size 25501 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_SlashLightRim.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_SlashLightRim.uasset new file mode 100644 index 00000000..fba8a381 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_SlashLightRim.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3a154dadff8dfb2e236d9ebb922c6814a54325dbe6f2fa882a119ada2dff504 +size 14076 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_mask.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_mask.uasset new file mode 100644 index 00000000..a3529dd1 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_mask.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73e5db4072b39096565bf88f1c2cc734be3d5c7868872080606cbd44564cb449 +size 365726 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660out0_tex00.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660out0_tex00.uasset new file mode 100644 index 00000000..941aa450 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660out0_tex00.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32dcf797c8ce6e2dbb522c2ed0c34f82ed16f8e4cc553a4494d9c9fe3907445b +size 657587 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset index e1c4ec65..26a99ca6 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5e9d65d8c12c0ec0c0299de39d4d546b8e9d14f50d4e9b81570fb6bab69ef79 -size 23866 +oid sha256:561ad5435b4bec0461fddaa3ce1a10ebf06a48d8a354de3347c8a73211070730 +size 38972 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset index 25a98e40..0a327549 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78316665d5a024971ddbba76c8f6dddd0ff9f017dd9fea25537b6eb713208992 -size 935122 +oid sha256:15e3c5d4d03c2cacd7664ac36b49081aae0fe3e71cb2ed55e915398469a53c00 +size 957821 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset index 0b0194b3..7da3d5e5 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab7dcb4a119318020238d7d41dd67c9ef0f9fdfe8db50144bb27d7df35802bd7 -size 250752 +oid sha256:40257490376214f1d2ba35d96bc9b7b301a0c788f240050a7999f048dc50a747 +size 250813 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index fbf5339d..461522dc 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82b58a73480463f2a8dda7c6d3909bfa69f8b9b0c829dce9bf997def5d6d585a -size 390531 +oid sha256:6c4860bcad6a7743df6b51846666efb119ddf58f605cf64b088852cb1f28df6c +size 390102 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/IKRig/IK_RIVERSPIRIT_M_01.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/IKRig/IK_RIVERSPIRIT_M_01.uasset new file mode 100644 index 00000000..52b9a87b --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/IKRig/IK_RIVERSPIRIT_M_01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0276c391c50d71ce1712424c791351c729a58e125a1fea1b5beb7548c2806353 +size 171059 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset index 1b51fe59..efae4b73 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bda5e4907c8e98c0bbac1ca0803072d83177283e0e9fc5264cab2026f568259f -size 9753 +oid sha256:7aa121ace66c391c00aac3e52b98425f6777be767fa111a915689e3429cd7d0f +size 9744 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset index 839e0114..a58d7203 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c590b7e4dde73eb4fd85c6bcf9aaee57fc733a078da1cbe418c1fbbc6b098fed +oid sha256:1a5078fe0e94c3ecdb9aa1b29618be40e35851251b3038fec9c4713e4b6b0a4a size 643834 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset index 0a7c77f4..b68132c0 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e94135fe2c8bfcf7464c570d090be21d7a79122164cb88da4c20276ea604bad -size 1487820 +oid sha256:ddcf726c452429b6efbaed2be5371f069528e422309564e51ed78ab25f5d13ca +size 1490360 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset index 12245ed5..3e6361bf 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:488402798ee4033f9a94bd4c1c7448cbb6721d3038e622d8f4745e8893fcc0af -size 106216 +oid sha256:8648b3fe7cd9a4c21fe45cb9a5fa3cef2bd6c0a8581919159478052a98d63671 +size 107338 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset index 2aae445a..15977141 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fd2da3c7a369e54ad2521a54807196c2e0388e62cbf8997f2b91f016eb09915 -size 412213 +oid sha256:caaada160accb281377d1d203165e9f2b7850ea04658b0650bcab3336c96da66 +size 419072 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset index 196b8558..ecc178ee 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a402b8cfc0193996f9dad1c10351369e427c810a02a830ab28c36ea973b902ba -size 40472 +oid sha256:af393ae24747fa87fa17971ec654ee0acae38f2f89c4c98bab2e918562bd176b +size 67250 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset index 0ca3750e..2afa0d95 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af6c9205b5aa3ddd07290c4c2ae7f50aa8838b3d25ec1c6d175261908b0d911c -size 114303 +oid sha256:6db374550f4c4074b477c4b63f37d783843140630a62dce0018398c1c18009b4 +size 128624 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset index 4b46c266..a0491202 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:722c1b716aaa120134d440071d5ceba7c967aec9b524947de28384df9b6080e2 -size 159841 +oid sha256:43f5f0580d595b0fb4fd113f690005530bc39fda7c1d2652e3582a61c31ab313 +size 158611 diff --git a/hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset b/hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset index ee6ecb83..34499bac 100644 --- a/hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset +++ b/hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9693ef62a519fb936c351eeacbe7f226520209a9fd5708afa5925825c70d1328 -size 41551 +oid sha256:bdfefb6a4a182b44b8ad96d6cd207a3225928c1695f950951b03df06a3427691 +size 41249 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap b/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap index 2999fdb8..d69746a7 100644 --- a/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap +++ b/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e24a79627d5e70628b0f15cede9c9121ebddab5139ca63230bee1cf0c23814b1 -size 3541919 +oid sha256:fc12d51d22ebebb157c13facdfd5a8627c8eeb3f4c8f1837e0cd97667b5868ac +size 3541584 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap index 01b82fcc..48129649 100644 --- a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap +++ b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f31277744c20ee1b794a436076a11df59efb0f4dca27b89db9e152886883b9d4 -size 16708441 +oid sha256:c2cfc246647bdc7ea9778f6f4d78307178714406eaa589d18cbea621c3c5aa2b +size 17006391 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset index 66df130a..2f5a16cf 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2353c62ac04de6cba4291920d2ca53c4881a45e60a52193a01d93a25751c97c -size 93235 +oid sha256:50f8c1db5874192f80cbfebe161c7f77f3f1aec4daa24419a9f421fb8948a334 +size 95009 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset index 6d8c1081..30a026a4 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cefdddcc6ddc414f635a72c572866f379288ef078c7e6f1b11f88244672189a -size 61141 +oid sha256:47bbda6dc18cf546bcbbfa18380cef3cb6de8d4857818fcb525c6f0522d28de8 +size 61345 diff --git a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_16.uasset b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_16.uasset index 75442994..f155d08e 100644 --- a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_16.uasset +++ b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_16.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5025d23bcb4ea4164a456b53a42383424cb96fcb352a4ecfd5bbc8acc7b77972 -size 2117750 +oid sha256:2d0c6075643cd3e78b43f30f67dd1c8c57339b1ba69b3f0499d39b8f45d7daeb +size 2117923 diff --git a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_23.uasset b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_23.uasset index 70c36b7b..d71cf662 100644 --- a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_23.uasset +++ b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_23.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7c1235a5aa4c6d648e6ba414b7bb99497fcb12382cc391dc371f0c3d2a6d36a -size 3168687 +oid sha256:bf561c0a1ecdc88d2ff16216af030762cef02ee9871eec8afcd9b735ce169a07 +size 1902954 diff --git a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_9.uasset b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_9.uasset index becd25f2..4320578b 100644 --- a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_9.uasset +++ b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_9.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:437be691b845dab27540308c3edad40612f06e0862757314c6541d3d05ad62fd -size 3595893 +oid sha256:5cce41a8262a4905b807edb00a294792acc72fc2626b8aad5b7b94531062230a +size 3153062 diff --git a/hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp b/hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp index 7f5ac57d..672f9623 100644 --- a/hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp +++ b/hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp @@ -1,3 +1,4 @@ +<<<<<<< HEAD C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAIController.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\CraftingInfo.h @@ -15,3 +16,22 @@ C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hw C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2Character.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYPlayerCharacController.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\InventoryItem.h +======= +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\CraftingInfo.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2Character.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2GameMode.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAIController.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYGameStateBase.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAttackComponent.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAutomaticPickUp.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYManualPickUp.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYEnemyBase.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYInteractableActor.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYMoneyAutoPickUp.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYProjectileAttackComponent.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\InventoryItem.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYSaveGameActor.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYPlayerCharacController.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYConsumableItem.h +>>>>>>> main diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-afmodambientsound.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-afmodambientsound.html index 3d223d6c..170d7c83 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-afmodambientsound.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-afmodambientsound.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-common.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-common.html index 3fa1517b..47333fa1 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-common.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-common.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ifmodstudiomodule.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ifmodstudiomodule.html index 1293606c..bdd60235 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ifmodstudiomodule.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ifmodstudiomodule.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodanimnotifyplay.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodanimnotifyplay.html index 976a857c..12467ff2 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodanimnotifyplay.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodanimnotifyplay.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodasset.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodasset.html index 40f565ad..c2c83143 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodasset.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodasset.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodaudiocomponent.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodaudiocomponent.html index 3371c3bc..a174e566 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodaudiocomponent.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodaudiocomponent.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

-
FMOD_RESULT F_CALLBACK UFMODAudioComponent_EventCallback(
+
FMOD_RESULT F_CALL UFMODAudioComponent_EventCallback(
     FMOD_STUDIO_EVENT_CALLBACK_TYPE type,
     FMOD_STUDIO_EVENTINSTANCE *event,
     void *parameters
@@ -166,7 +166,7 @@
 
Information about the callback.

This is called if the UFMODAudioComponent::bEnableTimelineCallbacks is true or UFMODAudioComponent::ProgrammerSoundName is not empty.

-

See Also: FMOD_STUDIO_EVENT_CALLBACK_TYPE

+

See Also: FMOD_STUDIO_EVENT_CALLBACK_TYPE

UFMODAudioComponent::OcclusionDetails

FMOD Custom Occlusion Details.

@@ -257,7 +257,7 @@

Sound
User created sound to use.
-

See Also: FMOD::Sound

+

See Also: FMOD::Sound

UFMODAudioComponent::StudioInstance

Actual Studio instance handle.

@@ -268,7 +268,7 @@

FMOD::Studio::EventInstance *StudioInstance;
 
- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodbank.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodbank.html index 3849cb68..8af9ea84 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodbank.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodbank.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodblueprintstatics.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodblueprintstatics.html index 723b3e05..01144ea2 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodblueprintstatics.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodblueprintstatics.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodbus.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodbus.html index 705f1846..74f95298 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodbus.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodbus.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodevent.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodevent.html index c012fbd3..809b452f 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodevent.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodevent.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodport.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodport.html index 93a56334..ea04fd28 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodport.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodport.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsettings.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsettings.html index a0430a01..c27b4ffc 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsettings.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsettings.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsnapshot.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsnapshot.html index 6490767f..c1beb70e 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsnapshot.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsnapshot.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsnapshotreverb.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsnapshotreverb.html index ea959dd0..864d9612 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsnapshotreverb.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodsnapshotreverb.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodvca.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodvca.html index 51443424..c83e6899 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodvca.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-ufmodvca.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference.html index 1bd7e3ef..fea034ec 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/audiolink.html b/hwanyoung2/Plugins/FMODStudio/Docs/audiolink.html index 0777baac..e6c300ad 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/audiolink.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/audiolink.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

  • Welcome to FMOD for Unreal
  • User Guide
  • @@ -40,7 +40,7 @@

    AudioLink is an API that connects Unreal Audio Engine to external software, allowing Audio to be passed from Unreal to FMOD. By using hardware abstraction, AudioLink bypasses the need for direct hardware access and provides the strengths of both Unreal Audio Engine and FMOD.

    This section will assume a basic understanding of the Unreal AudioLink system and will focus on the FMOD specific information.

    10.0.1 Linking with your Studio Project

    -

    The FMOD for Unreal AudioLink module assumes the Event linked contains a Programmer Instrument, this is what it uses to pass the sound data from Unreal to FMOD.

    +

    The FMOD for Unreal AudioLink module assumes the Event linked contains a Programmer Instrument, this is what it uses to pass the sound data from Unreal to FMOD.

    Programmer sound event
    Generally you will want an Event that has a looping async programmer sound, because we may not know the length of the sounds being played from Unreal (ie. submixes are generally alive from startup to shutdown).

    @@ -129,7 +129,7 @@ Create a new FMODAudioLinkSettings asset and leave the Link Event e
  • FMOD Studio Profiler can now be used to track and manage events using Live Update.
- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-asynchronous-loading.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-asynchronous-loading.html index 21da2eb0..8086074a 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-asynchronous-loading.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-asynchronous-loading.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-bus.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-bus.html index 5f6075e9..06eee963 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-bus.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-bus.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

+

See Also: FMOD_STUDIO_STOP_MODE

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-common.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-common.html index f71c0d55..1ff4daf3 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-common.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-common.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

  • Welcome to FMOD for Unreal
  • User Guide
  • @@ -147,6 +147,7 @@
    Name of the parameter.

    Will be deprecated in FMOD 2.01, use Get Global Parameter Value By Name instead.

    +

    Lookups using the full names of parameters (i.e. "parameter:/MyFolder/MyParameter") will only succeed if the strings bank is loaded. Shortened names (i.e. "MyParameter") do not require the strings bank to be loaded.

    See Also: Set Global Parameter By Name

    Get Global Parameter Value By Name

    Get a global parameter value from the System.

    @@ -171,6 +172,7 @@
    FinalValue
    Final combined parameter value.
    +

    Lookups using the full names of parameters (i.e. "parameter:/MyFolder/MyParameter") will only succeed if the strings bank is loaded. Shortened names (i.e. "MyParameter") do not require the strings bank to be loaded.

    Get Output Drivers

    List all output device names.

    Get Output Drivers

    @@ -397,6 +399,7 @@ The sound does not travel with any actor.

    Value
    Value to apply to the parameter.
    +

    Lookups using the full names of parameters (i.e. "parameter:/MyFolder/MyParameter") will only succeed if the strings bank is loaded. Shortened names (i.e. "MyParameter") do not require the strings bank to be loaded.

    Set Locale

    Set the active locale for subsequent bank loads.

    Set Locale

    @@ -519,7 +522,7 @@ The sound does not travel with any actor.

    Volume value.
- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-component.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-component.html index 106fe823..d2758168 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-component.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-component.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-enums.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-enums.html index 12203b2b..3f4c1fe1 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-enums.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-enums.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

+

See Also: EFMOD_STUDIO_STOP_MODE.

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-eventinstance.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-eventinstance.html index ca69b8ab..cce8fae9 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-eventinstance.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-eventinstance.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-structs.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-structs.html index cbe56753..884ffe91 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-structs.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-structs.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-utilities.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-utilities.html index ed2b11f8..7191a946 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-utilities.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference-utilities.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference.html b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference.html index 496fe051..b2d88776 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/blueprint-reference.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/glossary.html b/hwanyoung2/Plugins/FMODStudio/Docs/glossary.html index 2d0c5212..3b10a293 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/glossary.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/glossary.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

  • Welcome to FMOD for Unreal
  • User Guide
  • @@ -69,7 +69,7 @@

    Major versions contain significant changes, add new features, and may affect bank compatibility. Updating to a new major version usually requires project migration. New major versions may change playback behavior in some cases.

    Minor versions, also known as patch versions, contain bug fixes and smaller workflow improvements.

- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/images/add-cpp-class-4.png b/hwanyoung2/Plugins/FMODStudio/Docs/images/add-cpp-class-4.png new file mode 100644 index 00000000..3e8cf306 --- /dev/null +++ b/hwanyoung2/Plugins/FMODStudio/Docs/images/add-cpp-class-4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e473953ea439a4a90159bb948cedfa1dc1e1a46820f0438d7c2f6640fce57b05 +size 53711 diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/images/add-cpp-class-5.png b/hwanyoung2/Plugins/FMODStudio/Docs/images/add-cpp-class-5.png new file mode 100644 index 00000000..6abf3133 --- /dev/null +++ b/hwanyoung2/Plugins/FMODStudio/Docs/images/add-cpp-class-5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ae76143047d4c2042c763c937615dccd2ab4a5e19c3215d347f1ec4bd6a47c4 +size 33449 diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/images/add-new-cpp-class-4.png b/hwanyoung2/Plugins/FMODStudio/Docs/images/add-new-cpp-class-4.png new file mode 100644 index 00000000..0b318dc6 --- /dev/null +++ b/hwanyoung2/Plugins/FMODStudio/Docs/images/add-new-cpp-class-4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:633f7eef6ffea1c9424b38943c3e052a39b38a6ccddad202e51c946413ebba6e +size 35143 diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/images/add-new-cpp-class-5.png b/hwanyoung2/Plugins/FMODStudio/Docs/images/add-new-cpp-class-5.png new file mode 100644 index 00000000..e85e3988 --- /dev/null +++ b/hwanyoung2/Plugins/FMODStudio/Docs/images/add-new-cpp-class-5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3299f64042861d96e014f2f90f9932b7d0f51430e2a28bbcac2fe9221c2606be +size 42063 diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/images/new-sln-file.png b/hwanyoung2/Plugins/FMODStudio/Docs/images/new-sln-file.png new file mode 100644 index 00000000..5b719b3f --- /dev/null +++ b/hwanyoung2/Plugins/FMODStudio/Docs/images/new-sln-file.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d98b6761242ddd2ede0a0f185e668061eded44cb624203eac2dc0c4cd77d556 +size 7742 diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/images/source-control.png b/hwanyoung2/Plugins/FMODStudio/Docs/images/source-control.png new file mode 100644 index 00000000..dda28b62 --- /dev/null +++ b/hwanyoung2/Plugins/FMODStudio/Docs/images/source-control.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7221fe207013a6d251dda74ccc78e6f4b372aee1b2005f9a203bfd018c9bce1 +size 43069 diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/niagara.html b/hwanyoung2/Plugins/FMODStudio/Docs/niagara.html index ee2ae746..3cfc7327 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/niagara.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/niagara.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

  • Welcome to FMOD for Unreal
  • User Guide
  • @@ -220,7 +220,7 @@ You can have multiple of these if you need to control multiple parameters.

  • Add your emitter to the scene and press play to hear it in action.
- + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/platform-specifics.html b/hwanyoung2/Plugins/FMODStudio/Docs/platform-specifics.html index 88bc02e2..279de779 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/platform-specifics.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/platform-specifics.html @@ -7,7 +7,7 @@
-

Unreal Integration 2.02

+

Unreal Integration 2.03

-
  • Xbox One -
  • Troubleshooting
  • @@ -461,115 +452,9 @@ AudioMixerModuleName=

    If Live Update has been enabled in the FMOD for Unreal Settings, the integration will attempt to open a port on the Dev Kit for FMOD Studio to connect to.

    If the integration is unsuccessful it will print out the reason to the logs, otherwise you will see the IP address used in the log:

    IP address: 192.168.1.189
    -
    +
    -

    8.10 Xbox One

    -

    8.10.1 Enabling XboxOne Microphone Input

    -

    To enable FMOD Studio the use of any microphone input, including Kinect, on the Xbox One. The Engine ini file specific for the platform, located in /Config/XboxOne/XboxOneEngine.ini, needs to have the following lines added:

    -
    [AppxManifest]
    -Package.Capabilities.mx:Capability[0].Name=kinectAudio
    -Package.Capabilities.mx:Capability[1].Name=kinectGamechat
    -
    - -

    8.10.2 Enabling Live Update

    -

    To enable Live Update the Unreal Xbox One project settings must be modified to allow FMOD to open the Live Update port from the running game. Access the settings by opening the Project Settings editor from the Edit menu, then navigate to Xbox One platform settings. Under the Network category, add the following entries to the Secure Socket Descriptions and Secure Socket Associations settings:
    -Settings

    -

    8.10.3 Packaging

    -

    Banks for the Xbox One are expected to be located in the XboxOne sub-directory of the Studio built banks output directory. This sub-directory name is hardcoded in the integration so if you want to use a different location you would need to modify the integration source code.

    -

    To package the Xbox One specific banks add these lines to Platforms\XboxOne\Config\XboxOneGame.ini:

    -
    [/Script/UnrealEd.ProjectPackagingSettings]
    --DirectoriesToAlwaysStageAsNonUFS=(Path="FMOD/Desktop")
    -+DirectoriesToAlwaysStageAsNonUFS=(Path="FMOD/XboxOne")
    -
    - -

    8.10.4 Disabling the Unreal Audio Device

    -

    FMOD will not work with inbuilt Unreal audio on Xbox One. You will need to disable the Unreal Audio Device by creating a new file Config\XboxOne\XboxOneEngine.ini with this section:

    -
    [Audio]
    -AudioDeviceModuleName=
    -AudioMixerModuleName=
    -
    - -

    8.10.5 Copying dll's to build

    -
    -

    This has been solved in 2.01.07, you only need to follow these steps if you are using an older version.

    -
    -

    Add the following to GetFilesToDeployOrStage in XboxOnePlatform.Automation.cs, before the end of the function:

    -
    // FMOD code start
    -DirectoryReference FMODDLLPath = null;
    -if (Directory.Exists(Path.Combine(SC.ProjectRoot.ToString(), "Plugins/FMODStudio")))
    -{
    -    FMODDLLPath = DirectoryReference.Combine(SC.ProjectRoot, "Plugins/FMODStudio/Binaries/XBoxOne/");
    -}
    -else if (Directory.Exists(Path.Combine(SC.LocalRoot.ToString(), "Engine/Plugins/FMODStudio")))
    -{
    -    FMODDLLPath = DirectoryReference.Combine(SC.LocalRoot, "Engine/Plugins/FMODStudio/Binaries/XBoxOne/");
    -}
    -else
    -{
    -    LogError("Failed to find FMODStudio plugin in game or engine directory");
    -}
    -if (FMODDLLPath != null)
    -{
    -    Log.TraceInformation("Copying FMOD dlls to loose directory: " + RelativeBinPath);
    -    StagedDirectoryReference RelativeBinPathRef = new StagedDirectoryReference(RelativeBinPath);
    -    StageFileIfExists(StagedFileType.NonUFS, FileReference.Combine(FMODDLLPath, "fmod.dll"), RelativeBinPathRef, SC);
    -    StageFileIfExists(StagedFileType.NonUFS, FileReference.Combine(FMODDLLPath, "fmodL.dll"), RelativeBinPathRef, SC);
    -    StageFileIfExists(StagedFileType.NonUFS, FileReference.Combine(FMODDLLPath, "fmodstudio.dll"), RelativeBinPathRef, SC);
    -    StageFileIfExists(StagedFileType.NonUFS, FileReference.Combine(FMODDLLPath, "fmodstudioL.dll"), RelativeBinPathRef, SC);
    -}
    -// FMOD code end
    -
    - -

    Add the following to PrepTargetForDeployment in XboxOneDeploy.cs, in the same scope as 'DestDir':

    -
    // FMOD code start
    -string FMODDLLPath = null;
    -if (Directory.Exists(Path.Combine(ProjectDirectory.FullName, "Plugins/FMODStudio")))
    -{
    -    FMODDLLPath = Path.Combine(ProjectDirectory.FullName, "Plugins/FMODStudio/Binaries/XBoxOne/");
    -}
    -else if (Directory.Exists(Path.Combine(RelativeEnginePath, "Plugins/FMODStudio")))
    -{
    -    FMODDLLPath = Path.Combine(RelativeEnginePath, "Plugins/FMODStudio/Binaries/XBoxOne/");
    -}
    -else
    -{
    -    Log.TraceWarning("Failed to find FMODStudio plugin in game or engine directory");
    -}
    -if (FMODDLLPath != null)
    -{
    -    Log.TraceInformation("...copying the FMOD dlls...");
    -    string FMODDLLName = "fmod.dll";
    -    Log.TraceInformation("\tcopying " + FMODDLLPath + FMODDLLName + " to " + DestDir + "/" + FMODDLLName);
    -    CopyFile(FMODDLLPath + FMODDLLName, DestDir + "/" + FMODDLLName, true);
    -    FMODDLLName = "fmodL.dll";
    -    Log.TraceInformation("\tcopying " + FMODDLLPath + FMODDLLName + " to " + DestDir + "/" + FMODDLLName);
    -    CopyFile(FMODDLLPath + FMODDLLName, DestDir + "/" + FMODDLLName, true);
    -    FMODDLLName = "fmodstudio.dll";
    -    Log.TraceInformation("\tcopying " + FMODDLLPath + FMODDLLName + " to " + DestDir + "/" + FMODDLLName);
    -    CopyFile(FMODDLLPath + FMODDLLName, DestDir + "/" + FMODDLLName, true);
    -    FMODDLLName = "fmodstudioL.dll";
    -    Log.TraceInformation("\tcopying " + FMODDLLPath + FMODDLLName + " to " + DestDir + "/" + FMODDLLName);
    -    CopyFile(FMODDLLPath + FMODDLLName, DestDir + "/" + FMODDLLName, true);
    -}
    -// FMOD code end
    -
    - -

    8.10.6 Submission Validator

    -

    The XboxOne validaition tool uses _NT_SYMBOL_PATH environment variable to know where to look for PDBs.
    -In 'XboxOnePlatform.Automation.cs' is where Unreal overrides _NT_SYMBOL_PATH:

    -
    EnvironmentVariables.Add("_NT_SYMBOL_PATH", Params.GetProjectBinariesPathForPlatform(UnrealTargetPlatform.XboxOne).ToString());
    -
    - -

    We want to change this to add to it:

    -
    string SymbolPath = Params.GetProjectBinariesPathForPlatform(UnrealTargetPlatform.XboxOne).ToString() + ";" + CommandUtils.GetEnvVar("_NT_SYMBOL_PATH");
    -EnvironmentVariables.Add("_NT_SYMBOL_PATH", SymbolPath);
    -
    - -

    Now it keeps the original value as well as adding its own path.

    -

    Then, on your build machine you need to set the value of _NT_SYMBOL_PATH to where the FMOD PDBs will be.
    -Eg. "[MyGame]\Plugins\FMODStudio\Binaries\XBoxOne" or "[MyGame]\Platforms\XboxOne\Plugins\FMODStudio\Binaries".

    - - + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/plugins.html b/hwanyoung2/Plugins/FMODStudio/Docs/plugins.html index a4c28b28..32379f49 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/plugins.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/plugins.html @@ -7,7 +7,7 @@
    -

    Unreal Integration 2.02

    +

    Unreal Integration 2.03

    - + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/settings.html b/hwanyoung2/Plugins/FMODStudio/Docs/settings.html index b7fd7bdc..667677c6 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/settings.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/settings.html @@ -7,7 +7,7 @@
    -

    Unreal Integration 2.02

    +

    Unreal Integration 2.03

  • Advanced
  • @@ -134,11 +135,11 @@

    When loading banks, banks which correspond to the active locale are loaded while banks which correspond to any other recognized locale are skipped.

    3.3 Init

    3.3.1 Vol 0 Virtual Level

    -

    Sets the signal level at which Channels are virtualized. This corresponds directly to the vol0virtual member of FMOD_ADVANCED_SETTINGS in the Core API.

    +

    Sets the signal level at which Channels are virtualized. This corresponds directly to the vol0virtual member of FMOD_ADVANCED_SETTINGS in the Core API.

    Default: 0.0001
     

    3.3.2 Sample Rate

    -

    The sample rate for the FMOD mixer. This corresponds to the samplerate parameter of FMOD::System::setSoftwareFormat in the Core API.

    +

    The sample rate for the FMOD mixer. This corresponds to the samplerate parameter of FMOD::System::setSoftwareFormat in the Core API.

    Default: 0 (uses the default sample rate for the platform)
     

    3.3.3 Match Hardware Sample Rate

    @@ -146,29 +147,29 @@
    Default: Enabled
     

    3.3.4 Real Channel Count

    -

    The maximum number of active Channels. This corresponds to the numsoftwarechannels parameter of FMOD::System::setSoftwareChannels in the Core API.

    +

    The maximum number of active Channels. This corresponds to the numsoftwarechannels parameter of FMOD::System::setSoftwareChannels in the Core API.

    Default: 64
     

    3.3.5 Total Channel Count

    -

    The maximum number of Channels to be used in FMOD. This corresponds to the maxchannels parameter of FMOD::Studio::System::initialize in the Studio API.

    +

    The maximum number of Channels to be used in FMOD. This corresponds to the maxchannels parameter of FMOD::Studio::System::initialize in the Studio API.

    Default: 512
     

    3.3.6 DSP Buffer Length

    -

    The mixer block length for the FMOD mixer. This corresponds to the bufferlength parameter of FMOD::System::setDSPBufferSize in the Core API.

    +

    The mixer block length for the FMOD mixer. This corresponds to the bufferlength parameter of FMOD::System::setDSPBufferSize in the Core API.

    Units: samples
     Default: 0 (uses the default DSP buffer length for the platform)
     

    3.3.7 DSP Buffer Count

    -

    The number of mixer blocks for the FMOD mixer to use. This corresponds to the numbuffers parameter of FMOD::System::setDSPBufferSize in the Core API.

    +

    The number of mixer blocks for the FMOD mixer to use. This corresponds to the numbuffers parameter of FMOD::System::setDSPBufferSize in the Core API.

    Default: 0 (uses the default DSP buffer count for the platform)
     

    3.3.8 File Buffer Size

    -

    File buffering chunk size. This corresponds to the blockalign parameter of FMOD::System::setFileSystem in the Core API.

    +

    File buffering chunk size. This corresponds to the blockalign parameter of FMOD::System::setFileSystem in the Core API.

    Units: bytes
     Default: 2048
     

    3.3.9 Studio Update Period

    -

    Update period of FMOD Studio. This corresponds to the studioupdateperiod member of FMOD_STUDIO_ADVANCEDSETTINGS in the Studio API.

    +

    Update period of FMOD Studio. This corresponds to the studioupdateperiod member of FMOD_STUDIO_ADVANCEDSETTINGS in the Studio API.

    Units: milliseconds
     Default: 0 (uses the default update period for FMOD Studio)
     
    @@ -180,11 +181,13 @@ Default: 0 (uses the default update period for FMOD Studio)

    When enabled all buses in the global mixer are locked when the master bank is loaded. This ensures that all buses in the global mixer are created.

    Default: Disabled
     
    -

    3.3.12 Memory Pool Sizes

    -

    Size of memory pool to use on each platform. When this is set to a value other than zero a memory pool of the requested size is allocated using the Unreal memory system and all FMOD memory allocations are made from the pool. Otherwise FMOD memory allocations directly use the Unreal memory system.

    +

    3.3.12 Memory Pool Size

    +

    Size of memory pool to use. When this is set to a value other than zero a memory pool of the requested size is allocated using the Unreal memory system and all FMOD memory allocations are made from the pool. Otherwise FMOD memory allocations directly use the Unreal memory system.

    Units: bytes
     Default: 0
     
    +

    3.3.13 Codecs

    +

    Specifying one or more of the codec maximums will help determine the maximum CPU usage of playing FMOD_CREATECOMPRESSEDSAMPLE Sounds of that type as well as the memory requirements.

    3.4 Advanced

    3.4.1 Live Update Port

    TCP port to listen on for FMOD Studio Live Update connections when running non-final builds of the game.

    @@ -204,7 +207,7 @@ Default: 5
    Default: Disabled
     

    3.4.5 Enable Memory Tracking

    -

    Enables FMOD's detailed memory tracking for non-final builds. This corresponds to setting the FMOD_STUDIO_INIT_MEMORY_TRACKING flag into the studioflags when initializing the Studio API.

    +

    Enables FMOD's detailed memory tracking for non-final builds. This corresponds to setting the FMOD_STUDIO_INIT_MEMORY_TRACKING flag into the studioflags when initializing the Studio API.

    Default: Disabled
     

    3.4.6 Plugin Files

    @@ -226,13 +229,13 @@ Default: 5
    Default: Empty
     

    3.4.11 Encryption Key

    -

    Key for loading encrypted banks. This corresponds to the encryptionkey member of FMOD_STUDIO_ADVANCEDSETTINGS in the Studio API.

    +

    Key for loading encrypted banks. This corresponds to the encryptionkey member of FMOD_STUDIO_ADVANCEDSETTINGS in the Studio API.

    3.4.12 Wav Writer Path

    -

    File name that the wav writer will output to. If this is not empty then the runtime FMOD Studio system will use FMOD_OUTPUTTYPE_WAVWRITER and the mixed audio produced by FMOD will be sent to the specified file. There will be no audible output when using this setting.

    +

    File name that the wav writer will output to. If this is not empty then the runtime FMOD Studio system will use FMOD_OUTPUTTYPE_WAVWRITER and the mixed audio produced by FMOD will be sent to the specified file. There will be no audible output when using this setting.

    Default: Empty
     

    3.4.13 Logging Level

    -

    Logging level for non-final builds. The logging levels correspond to the similarly named FMOD_DEBUG_LEVEL_XXX flags used by the FMOD::Debug_Initialize function in the Core API.

    +

    Logging level for non-final builds. The logging levels correspond to the similarly named FMOD_DEBUG_LEVEL_XXX flags used by the FMOD::Debug_Initialize function in the Core API.

    Default: LEVEL NONE
     

    3.4.14 Occlusion Parameter

    @@ -252,11 +255,11 @@ Default: 5

    3.5.1 Platform

    Name of the platform.

    Real Channel Count

    -

    The maximum number of active channels. This corresponds to the numsoftwarechannels parameter of FMOD::System::setSoftwareChannels in the Core API.

    +

    The maximum number of active channels. This corresponds to the numsoftwarechannels parameter of FMOD::System::setSoftwareChannels in the Core API.

    Default: 64
     

    Sample Rate

    -

    The sample rate for the FMOD mixer. This corresponds to the samplerate parameter of FMOD::System::setSoftwareFormat in the Core API.

    +

    The sample rate for the FMOD mixer. This corresponds to the samplerate parameter of FMOD::System::setSoftwareFormat in the Core API.

    Default: 0 (uses the default sample rate for the platform)
     

    Speaker Mode

    @@ -267,17 +270,17 @@ Default: 5

    Built-in output types that can be used to run the mixer.

    Default: TYPE_AUTODETECT
     
    -

    Custom Pool Size

    +

    Memory Pool Size

    Size of memory pool to use. When this is set to a value other than zero a memory pool of the requested size is allocated using the Unreal memory system and all FMOD memory allocations are made from the pool. Otherwise FMOD memory allocations directly use the Unreal memory system.

    Units: bytes
     Default: 0
     
    -

    Codecs

    +

    Codecs

    Specifying one or more of the codec maximums will help determine the maximum CPU usage of playing FMOD_CREATECOMPRESSEDSAMPLE Sounds of that type as well as the memory requirements.

    3.6 Packaging

    As well as settings exposed by FMOD For Unreal you will need to add the directory containing the FMOD bank files to the Additional Non-asset Directory To Copy setting in Unreal's Project - Packaging settings. The FMOD Studio settings UI will prompt you to update this setting if it is not correctly configured. See Packaging banks in the user guide for more information.

    - + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/troubleshooting.html b/hwanyoung2/Plugins/FMODStudio/Docs/troubleshooting.html index 423c5c55..653f4fa1 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/troubleshooting.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/troubleshooting.html @@ -7,7 +7,7 @@
    -

    Unreal Integration 2.02

    +

    Unreal Integration 2.03

  • AudioLink
  • @@ -66,7 +67,40 @@ However any such changes aren't going to change the underlying Studio project, s
    "Plugin 'FMODStudio' failed to load because module 'FMODStudio' could not be found.
     
    -

    The only way to work around this is to add a blank code class to the project and build the resulting solution before packaging again.
    +

    The only way to work around this is to add a C++ class to the project and build the resulting solution before packaging again.

    +

    Add an empty class from the File menu in 4.27 or Tools menu in 5+.

    + + + + + + + + + + + + + +
    4.275+
    New CPP Class 4New CPP Class 5
    +

    Select any option.

    + + + + + + + + + + + + + +
    4.275+
    Add CPP Class 4Add CPP Class
    +

    Wait for UE to finish setting up the .sln and Source files.
    +New SLN File

    +

    Attempt to repackage the project.
    This is mentioned by Epic on their forum: Unable to run plugins when packaged.

    9.8 Audio not muted when game loses focus

    FMOD will not automatically mute its audio output when your game loses focus due to the user hitting alt-tab or switching to a different app. If you would like to mute FMOD audio when your game loses focus, make an OnApplicationActivationStateChanged callback and write code to mute the FMOD master bus. Here is an example :

    @@ -91,7 +125,7 @@ This is mentioned by Epic on their forum: 9.9 EndPlay with Play-In-Editor -

    Normally cleaning up in EndPlay() is valid and safe to do for your game, but during Play-In-Editor EndPlay doesn't get triggered until after the FMODStudio Module has already been shutdown. This isn't such an issue with Studio API, as when the System gets released it cleans up all of it's managed handles. The issue is when using the Core API because you need to manage it's objects yourself.

    +

    Normally cleaning up in EndPlay() is valid and safe to do for your game, but during Play-In-Editor EndPlay doesn't get triggered until after the FMODStudio Module has already been shutdown. This isn't such an issue with Studio API, as when the System gets released it cleans up all of it's managed handles. The issue is when using the Core API because you need to manage it's objects yourself.

    We have a delegate that you can hook into, which will fire off a function before the FMOD System has been shutdown. You can access the delegate using IFMODStudioModule::Get().PreEndPIEEvent().

    Eg.

    void AMyActor::BeginPlay()
    @@ -121,9 +155,12 @@ void AMyActor::ShutdownFunction()
             sound->release();
         }
     }
    -
    +
    - +

    9.10 Cannot Find Events or Buses with Strings

    +

    This usually happens because the strings bank file has not been loaded. The strings bank is denoted with the file type .strings.bank, and includes all the metadata required to look up events, buses, snapshots, and VCAs by their paths during runtime. In the event that a path lookup is performed while the strings bank isn't loaded, the error FMOD_ERR_EVENT_NOTFOUND will occur, which will either be logged to the Unreal Console, or directly returned from the Studio API function being called.

    + + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/user-guide.html b/hwanyoung2/Plugins/FMODStudio/Docs/user-guide.html index 24f4e37a..597e1b41 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/user-guide.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/user-guide.html @@ -7,7 +7,7 @@
    -

    Unreal Integration 2.02

    +

    Unreal Integration 2.03

    • Welcome to FMOD for Unreal
    • User Guide @@ -164,8 +163,6 @@

      Install the PS4 plugin following the instructions for Platform Specific Integrations. Additional setup is required for this platform, please see the Platform Specifics | PS4 section for more information.

      PS5

      Install the PS5 plugin following the instructions for Platform Specific Integrations. Additional setup is required for this platform, please see the Platform Specifics | PS5 section for more information.

      -

      XBox One

      -

      Install the Xbox One plugin following the instructions for Platform Specific Integrations. Additional setup is required for this platform, please see the Platform Specifics | Xbox One section for more information.

      XBox Series X|S

      Install the XBox Series X|S plugin following the instructions for Platform Specific Integrations. Additional setup is required for this platform, please see the Platform Specifics | Xbos Series X|S section for more information.

      Switch

      @@ -309,7 +306,7 @@ You can disable occlusion, per instance, and adjust the Trace Channel in the Com

      2.8.1 Snapshot Reverb Effects

      The workflow to use reverb zones is to set up snapshots in FMOD Studio. Snapshots can modify global reverb effects, change any bus volume, and modify any DSP value. To help trigger snapshots for reverb effects, the integration exports all snapshots as reverb effects in the FMOD/Reverbs folder.

      Reverb assets

      -

      These reverb effects can be dragged into audio volume Reverb Settings panel to be triggered when the audio listener enters the audio volume. It uses the same logic as the inbuilt Unreal audio system to determine which audio volume should be enabled, based on the priority of all the audio volumes the audio listener is within. The Snapshot priority, which is used to resolve conflicting property values when mutliple snapshots are active, is unrelated to audio volume priority and not a factor in determining which audio volume will be enabled. In the case of nested audio volumes you must set distinct priorities because audio volumes with the same priority may not become enabled.

      +

      These reverb effects can be dragged into audio volume Reverb Settings panel to be triggered when the audio listener enters the audio volume. It uses the same logic as the inbuilt Unreal audio system to determine which audio volume should be enabled, based on the priority of all the audio volumes the audio listener is within. The Snapshot priority, which is used to resolve conflicting property values when mutliple snapshots are active, is unrelated to audio volume priority and not a factor in determining which audio volume will be enabled. In the case of nested audio volumes you must set distinct priorities because audio volumes with the same priority may not become enabled.

      Reverb settings

      By default, snapshots apply instantly. To have a snapshot fade in, one of two things can be done. The first is by adding an AHDSR modulation to the intensity dial. The second way is to expose the intensity as a parameter, which allows it to be driven from the integration.

      Reverb snapshot intensity

      @@ -334,7 +331,7 @@ You will need to add these parameter names to the integration settings.

      2.10 Localization

      Localized audio tables are a special kind of audio table with features that facilitate localization. We recommend using localized audio tables if your game supports multiple spoken languages, or if you intend to add support for additional languages in a future patch.

      2.10.1 Setting up Audio Tables

      -

      Audio Tables are lists of audio files stored outside your FMOD Studio project's asset folder. You can use audio tables to control localized sounds. See the Dialogue and Localization section of the FMOD Studio Docs on how to set up an audio table in your project.

      +

      Audio Tables are lists of audio files stored outside your FMOD Studio project's asset folder. You can use audio tables to control localized sounds. See the Dialogue and Localization section of the FMOD Studio Docs on how to set up an audio table in your project.

      Audio Table

      2.10.2 Loading Localized Banks

      Audio tables are assigned to an associated bank, this means that in order to change the currently loaded audio table you will need to change the bank. Only one localized bank should be loaded at a time, otherwise just the first one to be loaded will be used.

      @@ -353,11 +350,11 @@ You will need to add these parameter names to the integration settings.

      -

      If you are updating to a newer minor version of FMOD no additional steps are required unless specified in the revision history.

      +

      If you are updating to a newer minor version of FMOD no additional steps are required unless specified in the revision history.

      Upgrading to a newer major version of FMOD is usually only recommend for projects at or near the beginning of development, because new major versions may introduce behavioral and breaking changes. If you are upgrading to a new major version, you will need to read over:

      These will describe specific changes that might need to be made to your project.

      2.11.1 Updating to UE4 4.26

      @@ -434,7 +431,7 @@ You will need to add these parameter names to the integration settings.

      For further documentation, see:
      - Integration API Reference
      - Integration Blueprint Reference
      -- FMOD API Reference.

      +- FMOD API Reference.

      2.14 Programmer Sounds

      FMOD Studio events can include programmer sound modules that are controlled at runtime. There are a few different ways of hooking them up.

      2.14.1 Programmer Sounds via Audio Tables

      @@ -533,7 +530,7 @@ Add the Actor the level:
      // Fill out your copyright notice in the Description page of Project Settings.
       #include "ProgrammerExample.h"
       
      -FMOD_RESULT F_CALLBACK StaticDialogueEventCallback(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE* event, void* parameters);
      +FMOD_RESULT F_CALL StaticDialogueEventCallback(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE* event, void* parameters);
       
       AProgrammerExample::AProgrammerExample()
       {
      @@ -557,7 +554,7 @@ Add the Actor the level:
      dialogueInstance->release(); } -FMOD_RESULT F_CALLBACK StaticDialogueEventCallback(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE* event, void* parameters) +FMOD_RESULT F_CALL StaticDialogueEventCallback(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE* event, void* parameters) { // Retrieving the instance FMOD::Studio::EventInstance* instance = (FMOD::Studio::EventInstance*)event; @@ -732,7 +729,7 @@ AudioMixerModuleName=

    This can be especially useful for build machines that don't normally run the Editor at all, which is what normally triggers the assets to be built, and does not require the generated assets to be checked in to source control.

    - + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-200.html b/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-200.html index de722ec0..f6849437 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-200.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-200.html @@ -7,9 +7,9 @@

    What's New in 2.00?

    -

    This section describes the major features introduced in the 2.00 release. See the Detailed Revision History for information regarding each patch release.

    -

    General runtime features and improvements, including any API changes relevant to scripting are documented in the API what's new page.

    +

    This section describes the major features introduced in the 2.00 release. See the Detailed Revision History for information regarding each patch release.

    +

    General runtime features and improvements, including any API changes relevant to scripting are documented in the API what's new page.

    Global Parameters

    The Studio API now supports global parameters. These parameters are controlled via the System parameter API and have a single value that is shared between all instances.

    -

    See the Global Parameters chapter of the FMOD API User Manual for more information.

    +

    See the Global Parameters chapter of the FMOD API User Manual for more information.

    New blueprint nodes can be found for getting and setting Global Parameters:

    GetGlobalParameterByName SetGlobalParameterByName

    Sample Data Encryption

    Bank sample data can now be encrypted using FMOD Studio. This implementation is an extension of the Core API FSB encryption feature.

    -

    See the Sample Data Encryption chapter of the FMOD API User Manual for more information.

    -

    To allow bank loading when used with the Studio API, set the key via FMOD_STUDIO_ADVANCEDSETTINGS::encryptionkey. Then if some banks are unencrypted you can use the FMOD_STUDIO_LOAD_BANK_UNENCRYPTED load flag to ignore the given key.

    +

    See the Sample Data Encryption chapter of the FMOD API User Manual for more information.

    +

    To allow bank loading when used with the Studio API, set the key via FMOD_STUDIO_ADVANCEDSETTINGS::encryptionkey. Then if some banks are unencrypted you can use the FMOD_STUDIO_LOAD_BANK_UNENCRYPTED load flag to ignore the given key.

    The FMOD for Unreal settings now have an added field for bank loading, Bank Encryption Key, which will set the FMOD_STUDIO_ADVANCEDSETTINGS::encryptionkey for you.

    Encryption Key

    Occlusion & Ambient Changes

    @@ -60,7 +60,7 @@

    The default Master Bank name has changed from "Master Bank.bank" to "Master.bank". If you are upgrading from an older version or you are using a different name, this will need to be updated in the Master Bank Name field of the FMOD Unreal Settings so that the integration can find it.

    Master Bank Name

    - + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-201.html b/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-201.html index d4e86c17..64a6edbe 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-201.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-201.html @@ -7,9 +7,9 @@

    What's New in 2.01?

    -

    This section describes the major features introduced in the 2.01 release. See the Detailed Revision History for information regarding each patch release.

    -

    General runtime features and improvements, including any API changes relevant to scripting are documented in the API what's new page.

    +

    This section describes the major features introduced in the 2.01 release. See the Detailed Revision History for information regarding each patch release.

    +

    General runtime features and improvements, including any API changes relevant to scripting are documented in the API what's new page.

    Performance Improvements and Fixes

    This release focused on improving general performance and fixing bugs with no significant changes to the FMOD for Unreal plugin.

    What's New Since 2.00 Initial Release?

    @@ -49,7 +49,7 @@

    Supported Platforms

    Added support for Stadia, tvOS and Android x86_64.

    - + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-202.html b/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-202.html index 29986b1d..cc718c96 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-202.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-202.html @@ -7,9 +7,9 @@

    What's New in 2.02?

    -

    This section describes the major features introduced in the 2.02 release. See the Detailed Revision History for information regarding each patch release.

    -

    General runtime features and improvements, including any API changes relevant to scripting are documented in the API what's new page.

    +

    This section describes the major features introduced in the 2.02 release. See the Detailed Revision History for information regarding each patch release.

    +

    General runtime features and improvements, including any API changes relevant to scripting are documented in the API what's new page.

    Performance Improvements and Fixes

    This release focused on improving general performance and fixing bugs with no significant changes to the FMOD for Unreal plugin.

    What's New Since 2.01 Initial Release?

    @@ -50,7 +50,7 @@

    Supported Platforms

    Added support for PS5 and Game Core.

    - + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-203.html b/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-203.html index e95eba3b..ea783354 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-203.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/welcome-whats-new-203.html @@ -68,7 +68,7 @@ If you were previously using these settings you will need to manually transfer t
    - + diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/welcome.html b/hwanyoung2/Plugins/FMODStudio/Docs/welcome.html index d52c75e6..a61935ae 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/welcome.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/welcome.html @@ -7,9 +7,9 @@
    -

    Unreal Integration 2.02

    +

    Unreal Integration 2.03

    - + diff --git a/hwanyoung2/Plugins/FMODStudio/FMODStudio.uplugin b/hwanyoung2/Plugins/FMODStudio/FMODStudio.uplugin index b1dccfa4..da429603 100644 --- a/hwanyoung2/Plugins/FMODStudio/FMODStudio.uplugin +++ b/hwanyoung2/Plugins/FMODStudio/FMODStudio.uplugin @@ -2,8 +2,8 @@ "FileVersion" : 3, "FriendlyName" : "FMOD Studio Integration", - "Version" : 20226, - "VersionName" : "2.02.26", + "Version" : 20307, + "VersionName" : "2.03.07", "CreatedBy" : "Firelight Technologies", "CreatedByURL" : "http://fmod.com", "Description" : "FMOD Studio Integration.", diff --git a/hwanyoung2/Plugins/FMODStudio/Intermediate/Build/Win64/UnrealEditor/Inc/FMODStudio/UHT/Timestamp b/hwanyoung2/Plugins/FMODStudio/Intermediate/Build/Win64/UnrealEditor/Inc/FMODStudio/UHT/Timestamp index 23d4c0a6..0a76ca81 100644 --- a/hwanyoung2/Plugins/FMODStudio/Intermediate/Build/Win64/UnrealEditor/Inc/FMODStudio/UHT/Timestamp +++ b/hwanyoung2/Plugins/FMODStudio/Intermediate/Build/Win64/UnrealEditor/Inc/FMODStudio/UHT/Timestamp @@ -1,3 +1,4 @@ +<<<<<<< HEAD C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBus.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshot.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h @@ -21,3 +22,28 @@ C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Plugins\F C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSectionTemplate.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLinkEditor\Private\FMODAudioLinkSettingsFactory.h +======= +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAmbientSound.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAsset.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAudioComponent.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBank.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBlueprintStatics.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBus.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODEvent.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODPort.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSettings.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshot.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODVCA.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshotReverb.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkComponent.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkSettings.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODAssetLookup.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODBankLookup.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSection.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSectionTemplate.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterTrack.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLinkEditor\Private\FMODAudioLinkSettingsFactory.h +>>>>>>> main diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/FMODAudioLink.Build.cs b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/FMODAudioLink.Build.cs index 991fc0e0..08a87e7d 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/FMODAudioLink.Build.cs +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/FMODAudioLink.Build.cs @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. using UnrealBuildTool; using System.IO; diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLink.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLink.h index 53b64754..1e70068b 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLink.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLink.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkComponent.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkComponent.cpp index 0f006b80..d99abe09 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkComponent.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkComponent.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #include "FMODAudioLinkComponent.h" #include "FMODAudioLinkFactory.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkFactory.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkFactory.cpp index 559d38f9..f425a5c1 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkFactory.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkFactory.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #include "FMODAudioLinkFactory.h" #include "FMODAudioLinkSynchronizer.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkFactory.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkFactory.h index 766d7002..f06bcb81 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkFactory.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkFactory.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkInputClient.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkInputClient.cpp index dcd1ab40..8fe7fda9 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkInputClient.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkInputClient.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #include "FMODAudioLinkInputClient.h" #include "FMODAudioLinkLog.h" @@ -98,7 +98,7 @@ FFMODAudioLinkInputClient::~FFMODAudioLinkInputClient() Unregister(); } -FMOD_RESULT F_CALLBACK pcmreadcallback(FMOD_SOUND* inSound, void* data, unsigned int datalen) +FMOD_RESULT F_CALL pcmreadcallback(FMOD_SOUND* inSound, void* data, unsigned int datalen) { FMOD::Sound* sound = (FMOD::Sound*)inSound; FFMODAudioLinkInputClient* ConsumerSP; @@ -109,7 +109,7 @@ FMOD_RESULT F_CALLBACK pcmreadcallback(FMOD_SOUND* inSound, void* data, unsigned return FMOD_OK; } -FMOD_RESULT F_CALLBACK SoundCallback(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE* event, void* parameters) +FMOD_RESULT F_CALL SoundCallback(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE* event, void* parameters) { FMOD_RESULT result = FMOD_OK; FMOD::Studio::EventInstance* eventInstance = (FMOD::Studio::EventInstance*)event; @@ -202,7 +202,20 @@ void FFMODAudioLinkInputClient::Start(USceneComponent* InComponent) InputClientRef* callbackMemory = new InputClientRef(SelfSP); EventInst->setUserData(callbackMemory); - EventInst->start(); + + bool bIs3d = 0; + EventDesc->is3D(&bIs3d); + if (bIs3d) + { + // delay start + SelfSP->bShouldDelayStart = true; + UE_LOG(LogFMODAudioLink, Verbose, TEXT("FFMODAudioLinkInputClient::Start: Delaying start of 3D EventInstance.")); + } + else + { + SelfSP->bShouldDelayStart = false; + EventInst->start(); + } } } }; @@ -240,6 +253,12 @@ void FFMODAudioLinkInputClient::UpdateWorldState(const FWorldState& InParams) // TODO: velocity EventInstance->set3DAttributes(&attr); + if (bShouldDelayStart) + { + EventInstance->start(); + UE_LOG(LogFMODAudioLink, Verbose, TEXT("FFMODAudioLinkInputClient::UpdateWorldState: Starting EventInstance.")); + bShouldDelayStart = false; + } } } diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkInputClient.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkInputClient.h index 3a203926..df6582ef 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkInputClient.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkInputClient.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #pragma once @@ -40,6 +40,7 @@ public: FName GetProducerName() const { return ProducerName; } FMOD::Studio::EventInstance* EventInstance; + bool bShouldDelayStart = 0; private: void Register(const FName& NameOfProducingSource); diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkLog.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkLog.cpp index f340095d..0be85ef7 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkLog.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkLog.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #include "FMODAudioLinkLog.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSettings.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSettings.cpp index 22c34ee2..816c11cb 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSettings.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSettings.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #include "FMODAudioLinkSettings.h" #include "FMODAudioLinkFactory.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSourcePushed.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSourcePushed.cpp index 9e86be78..7cae449a 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSourcePushed.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSourcePushed.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #include "FMODAudioLinkSourcePushed.h" #include "FMODAudioLinkSettings.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSourcePushed.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSourcePushed.h index 7eae52a6..327215c4 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSourcePushed.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSourcePushed.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #pragma once #include "FMODAudioLinkInputClient.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSynchronizer.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSynchronizer.cpp index dac735a3..1841ee71 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSynchronizer.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSynchronizer.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #include "FMODAudioLinkSynchronizer.h" #include "fmod_studio.hpp" @@ -7,7 +7,7 @@ #include "AudioDeviceManager.h" -FMOD_RESULT F_CALLBACK MixCallback(FMOD_SYSTEM* system, FMOD_SYSTEM_CALLBACK_TYPE type, void* commanddata1, void* commanddata2, void* userdata) +FMOD_RESULT F_CALL MixCallback(FMOD_SYSTEM* system, FMOD_SYSTEM_CALLBACK_TYPE type, void* commanddata1, void* commanddata2, void* userdata) { FFMODAudioLinkSynchronizer *Synchro = static_cast(userdata); if (Synchro) diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSynchronizer.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSynchronizer.h index 29f12578..b776f189 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSynchronizer.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODAudioLink/Private/FMODAudioLinkSynchronizer.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025-2025. #pragma once @@ -54,5 +54,5 @@ struct FFMODAudioLinkSynchronizer : IAudioLinkSynchronizer, TSharedFromThis, int32> Codecs; + FFMODPlatformSettings() : RealChannelCount(64) , SampleRate(0) @@ -193,6 +166,7 @@ struct FFMODProjectLocale */ UPROPERTY(config, EditAnywhere, Category = Localization) bool bDefault; + FFMODProjectLocale() : bDefault(false) {} @@ -330,8 +304,14 @@ public: * Use specified memory pool size for platform, units in bytes. Disabled by default. * FMOD may become unstable if the limit is exceeded! */ - UPROPERTY(config, EditAnywhere, Category = InitSettings) - FCustomPoolSizes MemoryPoolSizes; + UPROPERTY(config, EditAnywhere, Category = InitSettings, meta = (ClampMin = "0")) + int32 MemoryPoolSize; + + /** + * Codecs + */ + UPROPERTY(config, EditAnywhere, Category = InitSettings, meta = (ClampMin = "0")) + TMap, int32> Codecs; /** * Live update port to use, or 0 for default. @@ -480,7 +460,7 @@ private: int32 GetRealChannelCount() const; /** Set the maximum codecs for the current platform. */ - bool SetCodecs(FMOD_ADVANCEDSETTINGS& advSettings) const; + TMap, int32> GetCodecs() const; /** List of generated folder names that contain FMOD uassets. */ TArray GeneratedFolders = { diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODSnapshot.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODSnapshot.h index b770b4f7..5f5c85b3 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODSnapshot.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODSnapshot.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODSnapshotReverb.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODSnapshotReverb.h index 6eab210c..01b9c8f5 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODSnapshotReverb.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODSnapshotReverb.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODVCA.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODVCA.h index 9fc5b6e4..94bf32e2 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODVCA.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Classes/FMODVCA.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs index a3dab514..a9a4d85f 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. using UnrealBuildTool; using System; using System.IO; diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAmbientSound.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAmbientSound.cpp index 85a22b16..909e9ba5 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAmbientSound.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAmbientSound.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODAmbientSound.h" #include "FMODEvent.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAsset.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAsset.cpp index 1299231c..4863ba1c 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAsset.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAsset.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODAsset.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAssetTable.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAssetTable.cpp index e4736763..e64ef31a 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAssetTable.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAssetTable.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODAssetTable.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAssetTable.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAssetTable.h index ad1ce8e4..ecfe4450 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAssetTable.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAssetTable.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAudioComponent.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAudioComponent.cpp index 83a7a6c1..e0137a32 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAudioComponent.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODAudioComponent.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODAudioComponent.h" #include "FMODStudioModule.h" @@ -532,7 +532,7 @@ void UFMODAudioComponent::Deactivate() Super::Deactivate(); } -FMOD_RESULT F_CALLBACK UFMODAudioComponent_EventCallback(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE *event, void *parameters) +FMOD_RESULT F_CALL UFMODAudioComponent_EventCallback(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE *event, void *parameters) { UFMODAudioComponent *Component = nullptr; FMOD::Studio::EventInstance *Instance = (FMOD::Studio::EventInstance *)event; @@ -572,7 +572,7 @@ void UFMODAudioComponent_ReleaseProgrammerSound(FMOD_STUDIO_PROGRAMMER_SOUND_PRO } } -FMOD_RESULT F_CALLBACK UFMODAudioComponent_EventCallbackDestroyProgrammerSound(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE *event, void *parameters) +FMOD_RESULT F_CALL UFMODAudioComponent_EventCallbackDestroyProgrammerSound(FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE *event, void *parameters) { UFMODAudioComponent_ReleaseProgrammerSound((FMOD_STUDIO_PROGRAMMER_SOUND_PROPERTIES *)parameters); return FMOD_OK; diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBank.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBank.cpp index 01d94d14..40907a58 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBank.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBank.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODBank.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBlueprintStatics.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBlueprintStatics.cpp index 6cb4655d..b1154a63 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBlueprintStatics.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBlueprintStatics.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODBlueprintStatics.h" #include "FMODAudioComponent.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBus.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBus.cpp index e7a61bde..cf093667 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBus.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODBus.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODBus.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODEvent.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODEvent.cpp index 86295d39..fc69cb3a 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODEvent.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODEvent.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODEvent.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODFileCallbacks.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODFileCallbacks.cpp index 41e45e22..6324a5d8 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODFileCallbacks.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODFileCallbacks.cpp @@ -10,7 +10,7 @@ #include "Misc/ScopeLock.h" #include "FMODStudioPrivatePCH.h" -FMOD_RESULT F_CALLBACK FMODLogCallback(FMOD_DEBUG_FLAGS flags, const char *file, int line, const char *func, const char *message) +FMOD_RESULT F_CALL FMODLogCallback(FMOD_DEBUG_FLAGS flags, const char *file, int line, const char *func, const char *message) { if (flags & FMOD_DEBUG_LEVEL_ERROR) { @@ -43,12 +43,12 @@ FMOD_RESULT F_CALLBACK FMODLogCallback(FMOD_DEBUG_FLAGS flags, const char *file, return FMOD_OK; } -FMOD_RESULT F_CALLBACK FMODErrorCallback(FMOD_SYSTEM *system, FMOD_SYSTEM_CALLBACK_TYPE type, void *commanddata1, void* commanddata2, void *userdata) +FMOD_RESULT F_CALL FMODErrorCallback(FMOD_SYSTEM *system, FMOD_SYSTEM_CALLBACK_TYPE type, void *commanddata1, void* commanddata2, void *userdata) { FMOD_ERRORCALLBACK_INFO *callbackInfo = (FMOD_ERRORCALLBACK_INFO *)commanddata1; if ((callbackInfo->instancetype == FMOD_ERRORCALLBACK_INSTANCETYPE_CHANNEL || callbackInfo->instancetype == FMOD_ERRORCALLBACK_INSTANCETYPE_CHANNELCONTROL) - && callbackInfo->result == FMOD_ERR_INVALID_HANDLE) + && (callbackInfo->result == FMOD_ERR_INVALID_HANDLE || callbackInfo->result == FMOD_ERR_CHANNEL_STOLEN)) { return FMOD_OK; } @@ -80,10 +80,10 @@ public: { } - static FMOD_RESULT F_CALLBACK OpenCallback(const char *name, unsigned int *filesize, void **handle, void * /*userdata*/); - static FMOD_RESULT F_CALLBACK CloseCallback(void *handle, void * /*userdata*/); - static FMOD_RESULT F_CALLBACK ReadCallback(void *handle, void *buffer, unsigned int sizebytes, unsigned int *bytesread, void * /*userdata*/); - static FMOD_RESULT F_CALLBACK SeekCallback(void *handle, unsigned int pos, void * /*userdata*/); + static FMOD_RESULT F_CALL OpenCallback(const char *name, unsigned int *filesize, void **handle, void * /*userdata*/); + static FMOD_RESULT F_CALL CloseCallback(void *handle, void * /*userdata*/); + static FMOD_RESULT F_CALL ReadCallback(void *handle, void *buffer, unsigned int sizebytes, unsigned int *bytesread, void * /*userdata*/); + static FMOD_RESULT F_CALL SeekCallback(void *handle, unsigned int pos, void * /*userdata*/); static FMOD_RESULT OpenInternal(const char *name, unsigned int *filesize, void **handle); static FMOD_RESULT CloseInternal(void *handle); @@ -221,7 +221,7 @@ private: static FFMODFileSystem gFileSystem; -FMOD_RESULT F_CALLBACK FFMODFileSystem::OpenCallback(const char *name, unsigned int *filesize, void **handle, void * /*userdata*/) +FMOD_RESULT F_CALL FFMODFileSystem::OpenCallback(const char *name, unsigned int *filesize, void **handle, void * /*userdata*/) { FScopeLock lock(&gFileSystem.mCrit); gFileSystem.mName = name; @@ -249,7 +249,7 @@ FMOD_RESULT FFMODFileSystem::OpenInternal(const char *name, unsigned int *filesi return FMOD_OK; } -FMOD_RESULT F_CALLBACK FFMODFileSystem::CloseCallback(void *handle, void * /*userdata*/) +FMOD_RESULT F_CALL FFMODFileSystem::CloseCallback(void *handle, void * /*userdata*/) { FScopeLock lock(&gFileSystem.mCrit); gFileSystem.mHandleIn = handle; @@ -271,7 +271,7 @@ FMOD_RESULT FFMODFileSystem::CloseInternal(void *handle) return FMOD_OK; } -FMOD_RESULT F_CALLBACK FFMODFileSystem::ReadCallback(void *handle, void *buffer, unsigned int sizebytes, unsigned int *bytesread, void * /*userdata*/) +FMOD_RESULT F_CALL FFMODFileSystem::ReadCallback(void *handle, void *buffer, unsigned int sizebytes, unsigned int *bytesread, void * /*userdata*/) { FScopeLock lock(&gFileSystem.mCrit); gFileSystem.mHandleIn = handle; @@ -308,7 +308,7 @@ FMOD_RESULT FFMODFileSystem::ReadInternal(void *handle, void *buffer, unsigned i return FMOD_OK; } -FMOD_RESULT F_CALLBACK FFMODFileSystem::SeekCallback(void *handle, unsigned int pos, void * /*userdata*/) +FMOD_RESULT F_CALL FFMODFileSystem::SeekCallback(void *handle, unsigned int pos, void * /*userdata*/) { FScopeLock lock(&gFileSystem.mCrit); gFileSystem.mHandleIn = handle; diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODFileCallbacks.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODFileCallbacks.h index 849dd91b..e9b0ab59 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODFileCallbacks.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODFileCallbacks.h @@ -1,12 +1,12 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once #include "fmod.hpp" #include "GenericPlatform/GenericPlatform.h" -FMOD_RESULT F_CALLBACK FMODLogCallback(FMOD_DEBUG_FLAGS flags, const char *file, int line, const char *func, const char *message); -FMOD_RESULT F_CALLBACK FMODErrorCallback(FMOD_SYSTEM *system, FMOD_SYSTEM_CALLBACK_TYPE type, void *commanddata1, void *commanddata2, void *userdata); +FMOD_RESULT F_CALL FMODLogCallback(FMOD_DEBUG_FLAGS flags, const char *file, int line, const char *func, const char *message); +FMOD_RESULT F_CALL FMODErrorCallback(FMOD_SYSTEM *system, FMOD_SYSTEM_CALLBACK_TYPE type, void *commanddata1, void *commanddata2, void *userdata); void AcquireFMODFileSystem(); void ReleaseFMODFileSystem(); diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODListener.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODListener.cpp index 643e4242..5b27bef4 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODListener.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODListener.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODListener.h" #include "Misc/App.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODListener.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODListener.h index e5ce33d7..c89d799d 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODListener.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODListener.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODPlatform.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODPlatform.h index 095cf597..756025bd 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODPlatform.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODPlatform.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once #include "Containers/UnrealString.h" @@ -11,10 +11,6 @@ EFMODPlatforms::Type FMODPlatform_CurrentPlatform(); FString FMODPlatform_PlatformName(); -void FMODPlatform_SetRealChannelCount(FMOD_ADVANCEDSETTINGS* advSettings); - -int FMODPlatform_MemoryPoolSize(); - #ifdef FMOD_PLATFORM_LOAD_DLL void* FMODPlatformLoadDll(const TCHAR* LibToLoad); #endif diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODPort.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODPort.cpp index a3a81963..9eea8c4c 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODPort.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODPort.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODPort.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSettings.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSettings.cpp index 7fd23378..81a94bdd 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSettings.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSettings.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODSettings.h" #include "Misc/Paths.h" @@ -257,7 +257,7 @@ int32 UFMODSettings::GetSampleRate() const int32 UFMODSettings::GetMemoryPoolSize() const { - return (Platforms.Contains(CurrentPlatform()) ? Platforms.Find(CurrentPlatform())->CustomPoolSize : 0); + return (Platforms.Contains(CurrentPlatform()) ? Platforms.Find(CurrentPlatform())->CustomPoolSize : MemoryPoolSize); } int32 UFMODSettings::GetRealChannelCount() const @@ -265,36 +265,7 @@ int32 UFMODSettings::GetRealChannelCount() const return Platforms.Contains(CurrentPlatform()) ? Platforms.Find(CurrentPlatform())->RealChannelCount : RealChannelCount; } -bool UFMODSettings::SetCodecs(FMOD_ADVANCEDSETTINGS& advSettings) const +TMap, int32> UFMODSettings::GetCodecs() const { - const FFMODPlatformSettings* platform = Platforms.Find(CurrentPlatform()); - if (platform == nullptr) - { - return false; - } - TMap, int32> codecList = platform->Codecs; - - for (const TPair, int32>& pair : codecList) - { - switch (pair.Key) - { - case EFMODCodec::XMA: - advSettings.maxXMACodecs = pair.Value; - break; - case EFMODCodec::AT9: - advSettings.maxAT9Codecs = pair.Value; - break; - case EFMODCodec::FADPCM: - advSettings.maxFADPCMCodecs = pair.Value; - break; - case EFMODCodec::OPUS: - advSettings.maxOpusCodecs = pair.Value; - break; - case EFMODCodec::VORBIS: - default: - advSettings.maxVorbisCodecs = pair.Value; - break; - } - } - return true; + return Platforms.Contains(CurrentPlatform()) ? Platforms.Find(CurrentPlatform())->Codecs : Codecs; } \ No newline at end of file diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSnapshot.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSnapshot.cpp index 057b72d5..df2ff334 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSnapshot.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSnapshot.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODSnapshot.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSnapshotReverb.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSnapshotReverb.cpp index 6cbf27d8..8a01f7f1 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSnapshotReverb.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODSnapshotReverb.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODSnapshotReverb.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODStudioModule.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODStudioModule.cpp index 6f8f3a53..8e49957e 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODStudioModule.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODStudioModule.cpp @@ -62,15 +62,15 @@ const TCHAR *FMODSystemContextNames[EFMODSystemContext::Max] = { TEXT("Auditioning"), TEXT("Runtime"), TEXT("Editor"), }; -void *F_CALLBACK FMODMemoryAlloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr) +void *F_CALL FMODMemoryAlloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr) { return FMemory::Malloc(size); } -void *F_CALLBACK FMODMemoryRealloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr) +void *F_CALL FMODMemoryRealloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr) { return FMemory::Realloc(ptr, size); } -void F_CALLBACK FMODMemoryFree(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr) +void F_CALL FMODMemoryFree(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr) { FMemory::Free(ptr); } @@ -168,7 +168,6 @@ public: , bUseSound(true) , bListenerMoved(true) , bAllowLiveUpdate(true) - , bBanksLoaded(false) , LowLevelLibHandle(nullptr) , StudioLibHandle(nullptr) , bMixerPaused(false) @@ -177,6 +176,7 @@ public: for (int i = 0; i < EFMODSystemContext::Max; ++i) { StudioSystem[i] = nullptr; + bBanksLoaded[i] = false; } } @@ -320,7 +320,7 @@ public: /** True if we allow live update */ bool bAllowLiveUpdate; - bool bBanksLoaded; + bool bBanksLoaded[EFMODSystemContext::Max]; /** Dynamic library */ FString BaseLibPath; @@ -463,7 +463,7 @@ void FFMODStudioModule::StartupModule() if (FParse::Param(FCommandLine::Get(), TEXT("nosound")) || FApp::IsBenchmarking() || IsRunningDedicatedServer() || IsRunningCommandlet()) { bUseSound = false; - UE_LOG(LogFMOD, Log, TEXT("Running in nosound mode")); + UE_LOG(LogFMOD, Log, TEXT("Disabling FMOD Runtime.")); } if (FParse::Param(FCommandLine::Get(), TEXT("noliveupdate"))) @@ -476,20 +476,8 @@ void FFMODStudioModule::StartupModule() verifyfmod(FMOD::Debug_Initialize(FMOD_DEBUG_LEVEL_WARNING, FMOD_DEBUG_MODE_CALLBACK, FMODLogCallback)); const UFMODSettings &Settings = *GetDefault(); - int32 size = Settings.GetMemoryPoolSize(); - if (size == 0) - { -#if defined(FMOD_PLATFORM_HEADER) - size = FMODPlatform_MemoryPoolSize(); -#elif PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_ANDROID - size = Settings.MemoryPoolSizes.Mobile; -#else - size = Settings.MemoryPoolSizes.Desktop; -#endif - } - if (!GIsEditor && size > 0) { MemPool = FMemory::Malloc(size); @@ -702,16 +690,12 @@ void FFMODStudioModule::CreateStudioSystem(EFMODSystemContext::Type Type) advSettings.cbSize = sizeof(FMOD_ADVANCEDSETTINGS); advSettings.vol0virtualvol = Settings.Vol0VirtualLevel; - if (!Settings.SetCodecs(advSettings)) - { -#if defined(FMOD_PLATFORM_HEADER) - FMODPlatform_SetRealChannelCount(&advSettings); -#elif PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_ANDROID - advSettings.maxFADPCMCodecs = Settings.RealChannelCount; -#else - advSettings.maxVorbisCodecs = Settings.RealChannelCount; -#endif - } + TMap, int32> Codecs = Settings.GetCodecs(); + advSettings.maxXMACodecs = Codecs.Contains(EFMODCodec::XMA) ? Codecs[EFMODCodec::XMA] : 0; + advSettings.maxVorbisCodecs = Codecs.Contains(EFMODCodec::VORBIS) ? Codecs[EFMODCodec::VORBIS] : 0; + advSettings.maxAT9Codecs = Codecs.Contains(EFMODCodec::AT9) ? Codecs[EFMODCodec::AT9] : 0; + advSettings.maxFADPCMCodecs = Codecs.Contains(EFMODCodec::FADPCM) ? Codecs[EFMODCodec::FADPCM] : 0; + advSettings.maxOpusCodecs = Codecs.Contains(EFMODCodec::OPUS) ? Codecs[EFMODCodec::OPUS] : 0; if (Type == EFMODSystemContext::Runtime) { @@ -809,20 +793,8 @@ void FFMODStudioModule::UnloadBanks(EFMODSystemContext::Type Type) { if (StudioSystem[Type]) { - int bankCount; - verifyfmod(StudioSystem[Type]->getBankCount(&bankCount)); - if (bankCount > 0) - { - TArray bankArray; - - bankArray.SetNumUninitialized(bankCount, false); - verifyfmod(StudioSystem[Type]->getBankList(bankArray.GetData(), bankCount, &bankCount)); - - for (int i = 0; i < bankCount; i++) - { - verifyfmod(bankArray[i]->unload()); - } - } + verifyfmod(StudioSystem[Type]->unloadAll()); + bBanksLoaded[Type] = false; } } @@ -1300,7 +1272,14 @@ struct NamedBankEntry bool FFMODStudioModule::AreBanksLoaded() { - return bBanksLoaded; + for (int i = 0; i < EFMODSystemContext::Max; ++i) + { + if (bBanksLoaded[i]) + { + return true; + } + } + return false; } bool FFMODStudioModule::SetLocale(const FString& LocaleName) @@ -1488,22 +1467,37 @@ void FFMODStudioModule::LoadBanks(EFMODSystemContext::Type Type) } } - bBanksLoaded = true; + bBanksLoaded[Type] = true; } #if WITH_EDITOR void FFMODStudioModule::ReloadBanks() { UE_LOG(LogFMOD, Verbose, TEXT("Refreshing auditioning system")); - - StopAuditioningInstance(); - UnloadBanks(EFMODSystemContext::Auditioning); - DestroyStudioSystem(EFMODSystemContext::Editor); + bool bReloadAuditioningBanks = 0; + bool bReloadEditorBanks = 0; + if (bBanksLoaded[EFMODSystemContext::Auditioning]) + { + StopAuditioningInstance(); + UnloadBanks(EFMODSystemContext::Auditioning); + bReloadAuditioningBanks = true; + } + if (bBanksLoaded[EFMODSystemContext::Editor]) + { + UnloadBanks(EFMODSystemContext::Editor); + bReloadEditorBanks = true; + } AssetTable.Load(); - LoadBanks(EFMODSystemContext::Auditioning); - CreateStudioSystem(EFMODSystemContext::Editor); + if (bReloadAuditioningBanks) + { + LoadBanks(EFMODSystemContext::Auditioning); + } + if (bReloadEditorBanks) + { + LoadBanks(EFMODSystemContext::Editor); + } } void FFMODStudioModule::LoadEditorBanks() diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODStudioPrivatePCH.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODStudioPrivatePCH.h index aecd2f4a..094e53ef 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODStudioPrivatePCH.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODStudioPrivatePCH.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once #include "CoreMinimal.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODVCA.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODVCA.cpp index 7821fb79..97aea06e 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODVCA.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/FMODVCA.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODVCA.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSection.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSection.cpp index fa5c61a9..1088a8d5 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSection.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSection.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODEventControlSection.h" #include "Channels/MovieSceneChannelProxy.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSection.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSection.h index 29ad2c8b..65aa1442 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSection.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSection.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSectionTemplate.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSectionTemplate.cpp index 432b28e6..10611ebf 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSectionTemplate.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSectionTemplate.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODEventControlSectionTemplate.h" #include "FMODAmbientSound.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSectionTemplate.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSectionTemplate.h index b4043481..7e2e611a 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSectionTemplate.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlSectionTemplate.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlTrack.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlTrack.cpp index b2f8f119..8150d573 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlTrack.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlTrack.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODEventControlTrack.h" #include "FMODEventControlSection.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlTrack.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlTrack.h index d8fe05b4..224474e1 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlTrack.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventControlTrack.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterSectionTemplate.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterSectionTemplate.h index 574ce18e..d955a90f 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterSectionTemplate.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterSectionTemplate.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterTrack.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterTrack.cpp index 3fe4b46a..2c2ba2ad 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterTrack.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterTrack.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODEventParameterTrack.h" #include "FMODEventParameterSectionTemplate.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterTrack.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterTrack.h index 63e6658e..dea48af2 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterTrack.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Private/Sequencer/FMODEventParameterTrack.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod.h index 7ce3a622..a72e0b50 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod.h @@ -1,12 +1,12 @@ /* ======================================================================================== */ /* FMOD Core API - C header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* Use this header in conjunction with fmod_common.h (which contains all the constants / */ /* callbacks) to develop using the C interface */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/core-api.html */ +/* https://fmod.com/docs/2.03/api/core-api.html */ /* ======================================================================================== */ #ifndef _FMOD_H @@ -98,7 +98,7 @@ FMOD_RESULT F_API FMOD_System_GetDefaultMixMatrix (FMOD_SYSTEM *system, FM FMOD_RESULT F_API FMOD_System_GetSpeakerModeChannels (FMOD_SYSTEM *system, FMOD_SPEAKERMODE mode, int *channels); /* System information functions. */ -FMOD_RESULT F_API FMOD_System_GetVersion (FMOD_SYSTEM *system, unsigned int *version); +FMOD_RESULT F_API FMOD_System_GetVersion (FMOD_SYSTEM *system, unsigned int *version, unsigned int *buildnumber); FMOD_RESULT F_API FMOD_System_GetOutputHandle (FMOD_SYSTEM *system, void **handle); FMOD_RESULT F_API FMOD_System_GetChannelsPlaying (FMOD_SYSTEM *system, int *channels, int *realchannels); FMOD_RESULT F_API FMOD_System_GetCPUUsage (FMOD_SYSTEM *system, FMOD_CPU_USAGE *usage); diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod.hpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod.hpp index 8def4e09..800129ca 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod.hpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod.hpp @@ -1,12 +1,12 @@ /* ======================================================================================== */ /* FMOD Core API - C++ header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* Use this header in conjunction with fmod_common.h (which contains all the constants / */ /* callbacks) to develop using the C++ language. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/core-api.html */ +/* https://fmod.com/docs/2.03/api/core-api.html */ /* ======================================================================================== */ #ifndef _FMOD_HPP #define _FMOD_HPP @@ -120,7 +120,7 @@ namespace FMOD FMOD_RESULT F_API getSpeakerModeChannels (FMOD_SPEAKERMODE mode, int *channels); // System information functions. - FMOD_RESULT F_API getVersion (unsigned int *version); + FMOD_RESULT F_API getVersion (unsigned int *version, unsigned int *buildnumber = 0); FMOD_RESULT F_API getOutputHandle (void **handle); FMOD_RESULT F_API getChannelsPlaying (int *channels, int *realchannels = 0); FMOD_RESULT F_API getCPUUsage (FMOD_CPU_USAGE *usage); diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_codec.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_codec.h index 3c31c7cf..2a00f00e 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_codec.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_codec.h @@ -1,6 +1,6 @@ /* ======================================================================================== */ /* FMOD Core API - Codec development header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* Use this header if you are wanting to develop your own file format plugin to use with */ /* FMOD's codec system. With this header you can make your own fileformat plugin that FMOD */ @@ -8,7 +8,7 @@ /* plugin. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/core-api.html */ +/* https://fmod.com/docs/2.03/api/core-api.html */ /* ======================================================================================== */ #ifndef _FMOD_CODEC_H #define _FMOD_CODEC_H @@ -32,27 +32,27 @@ typedef int FMOD_CODEC_SEEK_METHOD; /* Codec callbacks */ -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_OPEN_CALLBACK) (FMOD_CODEC_STATE *codec_state, FMOD_MODE usermode, FMOD_CREATESOUNDEXINFO *userexinfo); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_CLOSE_CALLBACK) (FMOD_CODEC_STATE *codec_state); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_READ_CALLBACK) (FMOD_CODEC_STATE *codec_state, void *buffer, unsigned int samples_in, unsigned int *samples_out); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_GETLENGTH_CALLBACK) (FMOD_CODEC_STATE *codec_state, unsigned int *length, FMOD_TIMEUNIT lengthtype); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_SETPOSITION_CALLBACK) (FMOD_CODEC_STATE *codec_state, int subsound, unsigned int position, FMOD_TIMEUNIT postype); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_GETPOSITION_CALLBACK) (FMOD_CODEC_STATE *codec_state, unsigned int *position, FMOD_TIMEUNIT postype); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_SOUNDCREATE_CALLBACK) (FMOD_CODEC_STATE *codec_state, int subsound, FMOD_SOUND *sound); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_GETWAVEFORMAT_CALLBACK)(FMOD_CODEC_STATE *codec_state, int index, FMOD_CODEC_WAVEFORMAT *waveformat); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_OPEN_CALLBACK) (FMOD_CODEC_STATE *codec_state, FMOD_MODE usermode, FMOD_CREATESOUNDEXINFO *userexinfo); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_CLOSE_CALLBACK) (FMOD_CODEC_STATE *codec_state); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_READ_CALLBACK) (FMOD_CODEC_STATE *codec_state, void *buffer, unsigned int samples_in, unsigned int *samples_out); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_GETLENGTH_CALLBACK) (FMOD_CODEC_STATE *codec_state, unsigned int *length, FMOD_TIMEUNIT lengthtype); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_SETPOSITION_CALLBACK) (FMOD_CODEC_STATE *codec_state, int subsound, unsigned int position, FMOD_TIMEUNIT postype); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_GETPOSITION_CALLBACK) (FMOD_CODEC_STATE *codec_state, unsigned int *position, FMOD_TIMEUNIT postype); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_SOUNDCREATE_CALLBACK) (FMOD_CODEC_STATE *codec_state, int subsound, FMOD_SOUND *sound); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_GETWAVEFORMAT_CALLBACK)(FMOD_CODEC_STATE *codec_state, int index, FMOD_CODEC_WAVEFORMAT *waveformat); /* Codec functions */ -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_METADATA_FUNC) (FMOD_CODEC_STATE *codec_state, FMOD_TAGTYPE tagtype, char *name, void *data, unsigned int datalen, FMOD_TAGDATATYPE datatype, int unique); -typedef void * (F_CALLBACK *FMOD_CODEC_ALLOC_FUNC) (unsigned int size, unsigned int align, const char *file, int line); -typedef void (F_CALLBACK *FMOD_CODEC_FREE_FUNC) (void *ptr, const char *file, int line); -typedef void (F_CALLBACK *FMOD_CODEC_LOG_FUNC) (FMOD_DEBUG_FLAGS level, const char *file, int line, const char *function, const char *string, ...); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_METADATA_FUNC) (FMOD_CODEC_STATE *codec_state, FMOD_TAGTYPE tagtype, char *name, void *data, unsigned int datalen, FMOD_TAGDATATYPE datatype, int unique); +typedef void * (F_CALL *FMOD_CODEC_ALLOC_FUNC) (unsigned int size, unsigned int align, const char *file, int line); +typedef void (F_CALL *FMOD_CODEC_FREE_FUNC) (void *ptr, const char *file, int line); +typedef void (F_CALL *FMOD_CODEC_LOG_FUNC) (FMOD_DEBUG_FLAGS level, const char *file, int line, const char *function, const char *string, ...); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_FILE_READ_FUNC) (FMOD_CODEC_STATE *codec_state, void *buffer, unsigned int sizebytes, unsigned int *bytesread); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_FILE_SEEK_FUNC) (FMOD_CODEC_STATE *codec_state, unsigned int pos, FMOD_CODEC_SEEK_METHOD method); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_FILE_TELL_FUNC) (FMOD_CODEC_STATE *codec_state, unsigned int *pos); -typedef FMOD_RESULT (F_CALLBACK *FMOD_CODEC_FILE_SIZE_FUNC) (FMOD_CODEC_STATE *codec_state, unsigned int *size); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_FILE_READ_FUNC) (FMOD_CODEC_STATE *codec_state, void *buffer, unsigned int sizebytes, unsigned int *bytesread); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_FILE_SEEK_FUNC) (FMOD_CODEC_STATE *codec_state, unsigned int pos, FMOD_CODEC_SEEK_METHOD method); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_FILE_TELL_FUNC) (FMOD_CODEC_STATE *codec_state, unsigned int *pos); +typedef FMOD_RESULT (F_CALL *FMOD_CODEC_FILE_SIZE_FUNC) (FMOD_CODEC_STATE *codec_state, unsigned int *size); /* Codec structures @@ -121,7 +121,7 @@ struct FMOD_CODEC_STATE #define FMOD_CODEC_FREE(_state, _ptr) \ (_state)->functions->free(_ptr, __FILE__, __LINE__) #define FMOD_CODEC_LOG(_state, _level, _location, _format, ...) \ - (_state)->functions->log(_level, __FILE__, __LINE__, _location, _format, __VA_ARGS__) + (_state)->functions->log(_level, __FILE__, __LINE__, _location, _format, ##__VA_ARGS__) #define FMOD_CODEC_FILE_READ(_state, _buffer, _sizebytes, _bytesread) \ (_state)->functions->read(_state, _buffer, _sizebytes, _bytesread) #define FMOD_CODEC_FILE_SEEK(_state, _pos, _method) \ diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_common.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_common.h index 6df1484b..d289558c 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_common.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_common.h @@ -1,11 +1,11 @@ /* ======================================================================================== */ /* FMOD Core API - Common C/C++ header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* This header is included by fmod.hpp (C++ interface) and fmod.h (C interface) */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/core-api-common.html */ +/* https://fmod.com/docs/2.03/api/core-api-common.html */ /* ======================================================================================== */ #ifndef _FMOD_COMMON_H #define _FMOD_COMMON_H @@ -33,8 +33,6 @@ #define F_API F_CALL #endif -#define F_CALLBACK F_CALL - /* FMOD core types */ @@ -56,7 +54,8 @@ typedef struct FMOD_ASYNCREADINFO FMOD_ASYNCREADINFO; /* FMOD constants */ -#define FMOD_VERSION 0x00020226 /* 0xaaaabbcc -> aaaa = product version, bb = major version, cc = minor version.*/ +#define FMOD_VERSION 0x00020307 /* 0xaaaabbcc -> aaaa = product version, bb = major version, cc = minor version.*/ +#define FMOD_BUILDNUMBER 150747 typedef unsigned int FMOD_DEBUG_FLAGS; #define FMOD_DEBUG_LEVEL_NONE 0x00000000 @@ -120,15 +119,14 @@ typedef unsigned int FMOD_SYSTEM_CALLBACK_TYPE; #define FMOD_SYSTEM_CALLBACK_PREMIX 0x00000020 #define FMOD_SYSTEM_CALLBACK_POSTMIX 0x00000040 #define FMOD_SYSTEM_CALLBACK_ERROR 0x00000080 -#define FMOD_SYSTEM_CALLBACK_MIDMIX 0x00000100 -#define FMOD_SYSTEM_CALLBACK_THREADDESTROYED 0x00000200 -#define FMOD_SYSTEM_CALLBACK_PREUPDATE 0x00000400 -#define FMOD_SYSTEM_CALLBACK_POSTUPDATE 0x00000800 -#define FMOD_SYSTEM_CALLBACK_RECORDLISTCHANGED 0x00001000 -#define FMOD_SYSTEM_CALLBACK_BUFFEREDNOMIX 0x00002000 -#define FMOD_SYSTEM_CALLBACK_DEVICEREINITIALIZE 0x00004000 -#define FMOD_SYSTEM_CALLBACK_OUTPUTUNDERRUN 0x00008000 -#define FMOD_SYSTEM_CALLBACK_RECORDPOSITIONCHANGED 0x00010000 +#define FMOD_SYSTEM_CALLBACK_THREADDESTROYED 0x00000100 +#define FMOD_SYSTEM_CALLBACK_PREUPDATE 0x00000200 +#define FMOD_SYSTEM_CALLBACK_POSTUPDATE 0x00000400 +#define FMOD_SYSTEM_CALLBACK_RECORDLISTCHANGED 0x00000800 +#define FMOD_SYSTEM_CALLBACK_BUFFEREDNOMIX 0x00001000 +#define FMOD_SYSTEM_CALLBACK_DEVICEREINITIALIZE 0x00002000 +#define FMOD_SYSTEM_CALLBACK_OUTPUTUNDERRUN 0x00004000 +#define FMOD_SYSTEM_CALLBACK_RECORDPOSITIONCHANGED 0x00008000 #define FMOD_SYSTEM_CALLBACK_ALL 0xFFFFFFFF typedef unsigned int FMOD_MODE; @@ -184,7 +182,6 @@ typedef unsigned int FMOD_CHANNELMASK; typedef unsigned long long FMOD_PORT_INDEX; #define FMOD_PORT_INDEX_NONE 0xFFFFFFFFFFFFFFFF -#define FMOD_PORT_INDEX_FLAG_VR_CONTROLLER 0x1000000000000000 typedef int FMOD_THREAD_PRIORITY; /* Platform specific priority range */ @@ -701,6 +698,8 @@ typedef enum FMOD_PORT_TYPE FMOD_PORT_TYPE_PERSONAL, FMOD_PORT_TYPE_VIBRATION, FMOD_PORT_TYPE_AUX, + FMOD_PORT_TYPE_PASSTHROUGH, + FMOD_PORT_TYPE_VR_VIBRATION, FMOD_PORT_TYPE_MAX, FMOD_PORT_TYPE_FORCEINT = 65536 @@ -781,7 +780,7 @@ typedef struct FMOD_ADVANCEDSETTINGS int maxVorbisCodecs; int maxAT9Codecs; int maxFADPCMCodecs; - int maxPCMCodecs; + int maxOpusCodecs; int ASIONumChannels; char **ASIOChannelList; FMOD_SPEAKER *ASIOSpeakerList; @@ -795,7 +794,6 @@ typedef struct FMOD_ADVANCEDSETTINGS FMOD_DSP_RESAMPLER resamplerMethod; unsigned int randomSeed; int maxConvolutionThreads; - int maxOpusCodecs; int maxSpatialObjects; } FMOD_ADVANCEDSETTINGS; diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_dsp.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_dsp.h index 4719699c..b20dda25 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_dsp.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_dsp.h @@ -1,13 +1,13 @@ /* ======================================================================================== */ /* FMOD Core API - DSP header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* Use this header if you are wanting to develop your own DSP plugin to use with FMODs */ /* dsp system. With this header you can make your own DSP plugin that FMOD can */ /* register and use. See the documentation and examples on how to make a working plugin. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/plugin-api-dsp.html */ +/* https://fmod.com/docs/2.03/api/plugin-api-dsp.html */ /* =========================================================================================*/ #ifndef _FMOD_DSP_H #define _FMOD_DSP_H @@ -67,6 +67,7 @@ typedef enum FMOD_DSP_PARAMETER_DATA_TYPE_FFT = -4, FMOD_DSP_PARAMETER_DATA_TYPE_3DATTRIBUTES_MULTI = -5, FMOD_DSP_PARAMETER_DATA_TYPE_ATTENUATION_RANGE = -6, + FMOD_DSP_PARAMETER_DATA_TYPE_DYNAMIC_RESPONSE = -7, } FMOD_DSP_PARAMETER_DATA_TYPE; /* @@ -226,6 +227,12 @@ typedef struct FMOD_DSP_PARAMETER_FFT float *spectrum[32]; } FMOD_DSP_PARAMETER_FFT; +typedef struct FMOD_DSP_PARAMETER_DYNAMIC_RESPONSE +{ + int numchannels; + float rms[32]; +} FMOD_DSP_PARAMETER_DYNAMIC_RESPONSE; + typedef struct FMOD_DSP_DESCRIPTION { unsigned int pluginsdkversion; @@ -387,7 +394,7 @@ typedef struct FMOD_DSP_METERING_INFO #define FMOD_DSP_FREE(_state, _ptr) \ (_state)->functions->free(_ptr, FMOD_MEMORY_NORMAL, __FILE__) #define FMOD_DSP_LOG(_state, _level, _location, _format, ...) \ - (_state)->functions->log(_level, __FILE__, __LINE__, _location, _format, __VA_ARGS__) + (_state)->functions->log(_level, __FILE__, __LINE__, _location, _format, ##__VA_ARGS__) #define FMOD_DSP_GETSAMPLERATE(_state, _rate) \ (_state)->functions->getsamplerate(_state, _rate) #define FMOD_DSP_GETBLOCKSIZE(_state, _blocksize) \ diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_dsp_effects.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_dsp_effects.h index 2374a1aa..e7408a9b 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_dsp_effects.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_dsp_effects.h @@ -1,12 +1,12 @@ /* ============================================================================================================= */ /* FMOD Core API - Built-in effects header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* In this header you can find parameter structures for FMOD system registered DSP effects */ /* and generators. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/core-api-common-dsp-effects.html#fmod_dsp_type */ +/* https://fmod.com/docs/2.03/api/core-api-common-dsp-effects.html#fmod_dsp_type */ /* ============================================================================================================= */ #ifndef _FMOD_DSP_EFFECTS_H @@ -29,15 +29,12 @@ typedef enum FMOD_DSP_TYPE_PARAMEQ, FMOD_DSP_TYPE_PITCHSHIFT, FMOD_DSP_TYPE_CHORUS, - FMOD_DSP_TYPE_VSTPLUGIN, - FMOD_DSP_TYPE_WINAMPPLUGIN, FMOD_DSP_TYPE_ITECHO, FMOD_DSP_TYPE_COMPRESSOR, FMOD_DSP_TYPE_SFXREVERB, FMOD_DSP_TYPE_LOWPASS_SIMPLE, FMOD_DSP_TYPE_DELAY, FMOD_DSP_TYPE_TREMOLO, - FMOD_DSP_TYPE_LADSPAPLUGIN, FMOD_DSP_TYPE_SEND, FMOD_DSP_TYPE_RETURN, FMOD_DSP_TYPE_HIGHPASS_SIMPLE, @@ -45,12 +42,12 @@ typedef enum FMOD_DSP_TYPE_THREE_EQ, FMOD_DSP_TYPE_FFT, FMOD_DSP_TYPE_LOUDNESS_METER, - FMOD_DSP_TYPE_ENVELOPEFOLLOWER, FMOD_DSP_TYPE_CONVOLUTIONREVERB, FMOD_DSP_TYPE_CHANNELMIX, FMOD_DSP_TYPE_TRANSCEIVER, FMOD_DSP_TYPE_OBJECTPAN, FMOD_DSP_TYPE_MULTIBAND_EQ, + FMOD_DSP_TYPE_MULTIBAND_DYNAMICS, FMOD_DSP_TYPE_MAX, FMOD_DSP_TYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit. */ @@ -98,10 +95,19 @@ typedef enum FMOD_DSP_ECHO_DELAY, FMOD_DSP_ECHO_FEEDBACK, FMOD_DSP_ECHO_DRYLEVEL, - FMOD_DSP_ECHO_WETLEVEL + FMOD_DSP_ECHO_WETLEVEL, + FMOD_DSP_ECHO_DELAYCHANGEMODE } FMOD_DSP_ECHO; +typedef enum +{ + FMOD_DSP_ECHO_DELAYCHANGEMODE_FADE, + FMOD_DSP_ECHO_DELAYCHANGEMODE_LERP, + FMOD_DSP_ECHO_DELAYCHANGEMODE_NONE +} FMOD_DSP_ECHO_DELAYCHANGEMODE_TYPE; + + typedef enum FMOD_DSP_FADER { FMOD_DSP_FADER_GAIN, @@ -188,9 +194,54 @@ typedef enum FMOD_DSP_MULTIBAND_EQ_FILTER_TYPE FMOD_DSP_MULTIBAND_EQ_FILTER_BANDPASS, FMOD_DSP_MULTIBAND_EQ_FILTER_NOTCH, FMOD_DSP_MULTIBAND_EQ_FILTER_ALLPASS, + FMOD_DSP_MULTIBAND_EQ_FILTER_LOWPASS_6DB, + FMOD_DSP_MULTIBAND_EQ_FILTER_HIGHPASS_6DB, } FMOD_DSP_MULTIBAND_EQ_FILTER_TYPE; +typedef enum FMOD_DSP_MULTIBAND_DYNAMICS +{ + FMOD_DSP_MULTIBAND_DYNAMICS_LOWER_FREQUENCY, + FMOD_DSP_MULTIBAND_DYNAMICS_UPPER_FREQUENCY, + FMOD_DSP_MULTIBAND_DYNAMICS_LINKED, + FMOD_DSP_MULTIBAND_DYNAMICS_USE_SIDECHAIN, + FMOD_DSP_MULTIBAND_DYNAMICS_A_MODE, + FMOD_DSP_MULTIBAND_DYNAMICS_A_GAIN, + FMOD_DSP_MULTIBAND_DYNAMICS_A_THRESHOLD, + FMOD_DSP_MULTIBAND_DYNAMICS_A_RATIO, + FMOD_DSP_MULTIBAND_DYNAMICS_A_ATTACK, + FMOD_DSP_MULTIBAND_DYNAMICS_A_RELEASE, + FMOD_DSP_MULTIBAND_DYNAMICS_A_GAIN_MAKEUP, + FMOD_DSP_MULTIBAND_DYNAMICS_A_RESPONSE_DATA, + FMOD_DSP_MULTIBAND_DYNAMICS_B_MODE, + FMOD_DSP_MULTIBAND_DYNAMICS_B_GAIN, + FMOD_DSP_MULTIBAND_DYNAMICS_B_THRESHOLD, + FMOD_DSP_MULTIBAND_DYNAMICS_B_RATIO, + FMOD_DSP_MULTIBAND_DYNAMICS_B_ATTACK, + FMOD_DSP_MULTIBAND_DYNAMICS_B_RELEASE, + FMOD_DSP_MULTIBAND_DYNAMICS_B_GAIN_MAKEUP, + FMOD_DSP_MULTIBAND_DYNAMICS_B_RESPONSE_DATA, + FMOD_DSP_MULTIBAND_DYNAMICS_C_MODE, + FMOD_DSP_MULTIBAND_DYNAMICS_C_GAIN, + FMOD_DSP_MULTIBAND_DYNAMICS_C_THRESHOLD, + FMOD_DSP_MULTIBAND_DYNAMICS_C_RATIO, + FMOD_DSP_MULTIBAND_DYNAMICS_C_ATTACK, + FMOD_DSP_MULTIBAND_DYNAMICS_C_RELEASE, + FMOD_DSP_MULTIBAND_DYNAMICS_C_GAIN_MAKEUP, + FMOD_DSP_MULTIBAND_DYNAMICS_C_RESPONSE_DATA, +} FMOD_DSP_MULTIBAND_DYNAMICS; + + +typedef enum FMOD_DSP_MULTIBAND_DYNAMICS_MODE_TYPE +{ + FMOD_DSP_MULTIBAND_DYNAMICS_MODE_DISABLED, + FMOD_DSP_MULTIBAND_DYNAMICS_MODE_COMPRESS_UP, + FMOD_DSP_MULTIBAND_DYNAMICS_MODE_COMPRESS_DOWN, + FMOD_DSP_MULTIBAND_DYNAMICS_MODE_EXPAND_UP, + FMOD_DSP_MULTIBAND_DYNAMICS_MODE_EXPAND_DOWN +} FMOD_DSP_MULTIBAND_DYNAMICS_MODE_TYPE; + + typedef enum { FMOD_DSP_PITCHSHIFT_PITCH, @@ -395,15 +446,28 @@ typedef enum FMOD_DSP_FFT_WINDOW_HANNING, FMOD_DSP_FFT_WINDOW_BLACKMAN, FMOD_DSP_FFT_WINDOW_BLACKMANHARRIS -} FMOD_DSP_FFT_WINDOW; +} FMOD_DSP_FFT_WINDOW_TYPE; + + +typedef enum +{ + FMOD_DSP_FFT_DOWNMIX_NONE, + FMOD_DSP_FFT_DOWNMIX_MONO, +} FMOD_DSP_FFT_DOWNMIX_TYPE; typedef enum { FMOD_DSP_FFT_WINDOWSIZE, - FMOD_DSP_FFT_WINDOWTYPE, + FMOD_DSP_FFT_WINDOW, + FMOD_DSP_FFT_BAND_START_FREQ, + FMOD_DSP_FFT_BAND_STOP_FREQ, FMOD_DSP_FFT_SPECTRUMDATA, - FMOD_DSP_FFT_DOMINANT_FREQ + FMOD_DSP_FFT_RMS, + FMOD_DSP_FFT_SPECTRAL_CENTROID, + FMOD_DSP_FFT_IMMEDIATE_MODE, + FMOD_DSP_FFT_DOWNMIX, + FMOD_DSP_FFT_CHANNEL, } FMOD_DSP_FFT; #define FMOD_DSP_LOUDNESS_METER_HISTOGRAM_SAMPLES 66 @@ -442,15 +506,6 @@ typedef struct FMOD_DSP_LOUDNESS_METER_WEIGHTING_TYPE float channelweight[32]; } FMOD_DSP_LOUDNESS_METER_WEIGHTING_TYPE; - -typedef enum -{ - FMOD_DSP_ENVELOPEFOLLOWER_ATTACK, - FMOD_DSP_ENVELOPEFOLLOWER_RELEASE, - FMOD_DSP_ENVELOPEFOLLOWER_ENVELOPE, - FMOD_DSP_ENVELOPEFOLLOWER_USESIDECHAIN -} FMOD_DSP_ENVELOPEFOLLOWER; - typedef enum { FMOD_DSP_CONVOLUTION_REVERB_PARAM_IR, diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_errors.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_errors.h index 2c158bfc..de0ce783 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_errors.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_errors.h @@ -1,12 +1,12 @@ /* ============================================================================================== */ /* FMOD Core / Studio API - Error string header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* Use this header if you want to store or display a string version / english explanation */ /* of the FMOD error codes. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/core-api-common.html#fmod_result */ +/* https://fmod.com/docs/2.03/api/core-api-common.html#fmod_result */ /* =============================================================================================== */ #ifndef _FMOD_ERRORS_H #define _FMOD_ERRORS_H diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_output.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_output.h index 61e1d8e6..95b37144 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_output.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_output.h @@ -1,6 +1,6 @@ /* ======================================================================================== */ /* FMOD Core API - output development header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* Use this header if you are wanting to develop your own output plugin to use with */ /* FMOD's output system. With this header you can make your own output plugin that FMOD */ @@ -8,7 +8,7 @@ /* plugin. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/plugin-api-output.html */ +/* https://fmod.com/docs/2.03/api/plugin-api-output.html */ /* ======================================================================================== */ #ifndef _FMOD_OUTPUT_H #define _FMOD_OUTPUT_H diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio.h index 54c58d12..bcad31a7 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio.h @@ -1,12 +1,12 @@ /* ======================================================================================== */ /* FMOD Studio API - C header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* Use this header in conjunction with fmod_studio_common.h (which contains all the */ /* constants / callbacks) to develop using the C language. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/studio-api.html */ +/* https://fmod.com/docs/2.03/api/studio-api.html */ /* ======================================================================================== */ #ifndef FMOD_STUDIO_H #define FMOD_STUDIO_H @@ -126,6 +126,7 @@ FMOD_RESULT F_API FMOD_Studio_EventDescription_SetUserData(FMOD_STUDIO_EVENTDESC */ FMOD_BOOL F_API FMOD_Studio_EventInstance_IsValid(FMOD_STUDIO_EVENTINSTANCE *eventinstance); FMOD_RESULT F_API FMOD_Studio_EventInstance_GetDescription(FMOD_STUDIO_EVENTINSTANCE *eventinstance, FMOD_STUDIO_EVENTDESCRIPTION **description); +FMOD_RESULT F_API FMOD_Studio_EventInstance_GetSystem(FMOD_STUDIO_EVENTINSTANCE *eventinstance, FMOD_STUDIO_SYSTEM **system); FMOD_RESULT F_API FMOD_Studio_EventInstance_GetVolume(FMOD_STUDIO_EVENTINSTANCE *eventinstance, float *volume, float *finalvolume); FMOD_RESULT F_API FMOD_Studio_EventInstance_SetVolume(FMOD_STUDIO_EVENTINSTANCE *eventinstance, float volume); FMOD_RESULT F_API FMOD_Studio_EventInstance_GetPitch(FMOD_STUDIO_EVENTINSTANCE *eventinstance, float *pitch, float *finalpitch); diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio.hpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio.hpp index 5fb071b2..acc15c4e 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio.hpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio.hpp @@ -1,12 +1,12 @@ /* ======================================================================================== */ /* FMOD Studio API - C++ header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* Use this header in conjunction with fmod_studio_common.h (which contains all the */ /* constants / callbacks) to develop using the C++ language. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/studio-api.html */ +/* https://fmod.com/docs/2.03/api/studio-api.html */ /* ======================================================================================== */ #ifndef FMOD_STUDIO_HPP #define FMOD_STUDIO_HPP @@ -194,6 +194,7 @@ namespace Studio // Property access FMOD_RESULT F_API getDescription(EventDescription **description) const; + FMOD_RESULT F_API getSystem(System **system) const; // Playback control FMOD_RESULT F_API getVolume(float *volume, float *finalvolume = 0) const; diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio_common.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio_common.h index 3be46a03..489c7234 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio_common.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMOD/fmod_studio_common.h @@ -1,12 +1,12 @@ /* ======================================================================================== */ /* FMOD Studio API - Common C/C++ header file. */ -/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2024. */ +/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2025. */ /* */ /* This header defines common enumerations, structs and callbacks that are shared between */ /* the C and C++ interfaces. */ /* */ /* For more detail visit: */ -/* https://fmod.com/docs/2.02/api/studio-api.html */ +/* https://fmod.com/docs/2.03/api/studio-api.html */ /* ======================================================================================== */ #ifndef FMOD_STUDIO_COMMON_H #define FMOD_STUDIO_COMMON_H @@ -327,10 +327,10 @@ typedef struct FMOD_STUDIO_MEMORY_USAGE /* FMOD Studio callbacks. */ -typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_SYSTEM_CALLBACK) (FMOD_STUDIO_SYSTEM *system, FMOD_STUDIO_SYSTEM_CALLBACK_TYPE type, void *commanddata, void *userdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_EVENT_CALLBACK) (FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE *event, void *parameters); -typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_COMMANDREPLAY_FRAME_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, float currenttime, void *userdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_COMMANDREPLAY_LOAD_BANK_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, const FMOD_GUID *bankguid, const char *bankfilename, FMOD_STUDIO_LOAD_BANK_FLAGS flags, FMOD_STUDIO_BANK **bank, void *userdata); -typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_COMMANDREPLAY_CREATE_INSTANCE_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, FMOD_STUDIO_EVENTDESCRIPTION *eventdescription, FMOD_STUDIO_EVENTINSTANCE **instance, void *userdata); +typedef FMOD_RESULT (F_CALL *FMOD_STUDIO_SYSTEM_CALLBACK) (FMOD_STUDIO_SYSTEM *system, FMOD_STUDIO_SYSTEM_CALLBACK_TYPE type, void *commanddata, void *userdata); +typedef FMOD_RESULT (F_CALL *FMOD_STUDIO_EVENT_CALLBACK) (FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE *event, void *parameters); +typedef FMOD_RESULT (F_CALL *FMOD_STUDIO_COMMANDREPLAY_FRAME_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, float currenttime, void *userdata); +typedef FMOD_RESULT (F_CALL *FMOD_STUDIO_COMMANDREPLAY_LOAD_BANK_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, const FMOD_GUID *bankguid, const char *bankfilename, FMOD_STUDIO_LOAD_BANK_FLAGS flags, FMOD_STUDIO_BANK **bank, void *userdata); +typedef FMOD_RESULT (F_CALL *FMOD_STUDIO_COMMANDREPLAY_CREATE_INSTANCE_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, FMOD_STUDIO_EVENTDESCRIPTION *eventdescription, FMOD_STUDIO_EVENTINSTANCE **instance, void *userdata); #endif // FMOD_STUDIO_COMMON_H diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMODStudioModule.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMODStudioModule.h index 07ef710c..2d1ed372 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMODStudioModule.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMODStudioModule.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMODUtils.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMODUtils.h index c22bd133..bcf985a9 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMODUtils.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/Public/FMODUtils.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Classes/FMODAmbientSoundActorFactory.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Classes/FMODAmbientSoundActorFactory.h index db05e452..aaa12cdc 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Classes/FMODAmbientSoundActorFactory.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Classes/FMODAmbientSoundActorFactory.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs index 02a14931..fde16548 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. using System.IO; namespace UnrealBuildTool.Rules diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/AssetTypeActions_FMODEvent.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/AssetTypeActions_FMODEvent.cpp index 5377d1d9..c68a1c5c 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/AssetTypeActions_FMODEvent.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/AssetTypeActions_FMODEvent.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "AssetTypeActions_FMODEvent.h" #include "AssetTypeActions_Base.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/AssetTypeActions_FMODEvent.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/AssetTypeActions_FMODEvent.h index 6318335b..5bb23001 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/AssetTypeActions_FMODEvent.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/AssetTypeActions_FMODEvent.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAmbientSoundActorFactory.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAmbientSoundActorFactory.cpp index 48912e7d..c95cde85 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAmbientSoundActorFactory.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAmbientSoundActorFactory.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODAmbientSoundActorFactory.h" #include "FMODStudioEditorPrivatePCH.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAssetBroker.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAssetBroker.h index ed66c670..d67bd26b 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAssetBroker.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAssetBroker.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentDetails.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentDetails.cpp index 88999fe6..5b5ef86f 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentDetails.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentDetails.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODAudioComponentDetails.h" #include "Subsystems/AssetEditorSubsystem.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentDetails.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentDetails.h index 5beae5ae..b0d447c7 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentDetails.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentDetails.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentVisualizer.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentVisualizer.cpp index fd3729a3..c9c7ecaf 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentVisualizer.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentVisualizer.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODAudioComponentVisualizer.h" #include "FMODAudioComponent.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentVisualizer.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentVisualizer.h index d59f6805..aa2e395e 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentVisualizer.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODAudioComponentVisualizer.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODBankUpdateNotifier.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODBankUpdateNotifier.cpp index 61955c1e..4808a881 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODBankUpdateNotifier.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODBankUpdateNotifier.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODBankUpdateNotifier.h" #include "FMODSettings.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODBankUpdateNotifier.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODBankUpdateNotifier.h index 6b86aaec..464f0d99 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODBankUpdateNotifier.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODBankUpdateNotifier.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODEventEditor.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODEventEditor.cpp index eda21682..8106df05 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODEventEditor.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODEventEditor.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODEventEditor.h" #include "FMODEvent.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODEventEditor.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODEventEditor.h index e4fb09c0..0bb2d78b 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODEventEditor.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODEventEditor.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODSettingsCustomization.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODSettingsCustomization.cpp index 033b56f3..6454b9f5 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODSettingsCustomization.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODSettingsCustomization.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025. #include "FMODSettingsCustomization.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODSettingsCustomization.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODSettingsCustomization.h index 7f3f32f5..bd62b029 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODSettingsCustomization.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODSettingsCustomization.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioEditorModule.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioEditorModule.cpp index 84ba498e..1fa91004 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioEditorModule.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioEditorModule.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODStudioEditorModule.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioEditorPrivatePCH.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioEditorPrivatePCH.h index 6d26c7ca..2515afbd 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioEditorPrivatePCH.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioEditorPrivatePCH.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once #include "Runtime/Engine/Classes/Components/SceneComponent.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioStyle.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioStyle.cpp index 2ce285b4..c09f99a8 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioStyle.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioStyle.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODStudioStyle.h" #include "Styling/SlateStyleRegistry.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioStyle.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioStyle.h index 957e6b4a..97cdc6c0 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioStyle.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/FMODStudioStyle.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once #include "Styling/SlateStyle.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/SFMODEventEditorPanel.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/SFMODEventEditorPanel.cpp index cf9c83c9..c3373c6f 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/SFMODEventEditorPanel.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/SFMODEventEditorPanel.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "SFMODEventEditorPanel.h" #include "FMODStudioModule.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/SFMODEventEditorPanel.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/SFMODEventEditorPanel.h index cdee4d8f..30b031c7 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/SFMODEventEditorPanel.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/SFMODEventEditorPanel.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODChannelEditors.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODChannelEditors.cpp index e88acadb..b8e449c6 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODChannelEditors.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODChannelEditors.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "Sequencer/FMODChannelEditors.h" #include "ISequencerChannelInterface.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventControlTrackEditor.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventControlTrackEditor.cpp index 17f45b4b..6f9cf505 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventControlTrackEditor.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventControlTrackEditor.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODEventControlTrackEditor.h" #include "FMODAmbientSound.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventControlTrackEditor.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventControlTrackEditor.h index 76dcb9cc..881c306d 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventControlTrackEditor.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventControlTrackEditor.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventParameterTrackEditor.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventParameterTrackEditor.cpp index 5f4c300d..89aaa722 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventParameterTrackEditor.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODEventParameterTrackEditor.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODEventParameterTrackEditor.h" #include "FMODAmbientSound.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODParameterSection.cpp b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODParameterSection.cpp index 4cc87a6b..7f4c7610 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODParameterSection.cpp +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODParameterSection.cpp @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #include "FMODParameterSection.h" #include "ISectionLayoutBuilder.h" diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODParameterSection.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODParameterSection.h index d3f8fa61..b1e827d5 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODParameterSection.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Private/Sequencer/FMODParameterSection.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Public/FMODStudioEditorModule.h b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Public/FMODStudioEditorModule.h index 63e06ee0..ff423a0b 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Public/FMODStudioEditorModule.h +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/Public/FMODStudioEditorModule.h @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. #pragma once diff --git a/hwanyoung2/Plugins/FMODStudioNiagara/FMODStudioNiagara.uplugin b/hwanyoung2/Plugins/FMODStudioNiagara/FMODStudioNiagara.uplugin index e5cc627a..aa230d64 100644 --- a/hwanyoung2/Plugins/FMODStudioNiagara/FMODStudioNiagara.uplugin +++ b/hwanyoung2/Plugins/FMODStudioNiagara/FMODStudioNiagara.uplugin @@ -2,8 +2,8 @@ "FileVersion": 3, "FriendlyName": "FMOD Studio Niagara Integration", - "Version" : 20226, - "VersionName" : "2.02.26", + "Version" : 20307, + "VersionName" : "2.03.07", "CreatedBy": "Firelight Technologies", "CreatedByURL" : "http://fmod.com", "Description" : "FMOD Studio with Niagara Integration.", diff --git a/hwanyoung2/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs b/hwanyoung2/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs index 1a63bd8e..1de04277 100644 --- a/hwanyoung2/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs +++ b/hwanyoung2/Plugins/FMODStudioNiagara/Source/FMODStudioNiagara/FMODStudioNiagara.Build.cs @@ -1,4 +1,4 @@ -// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2024. +// Copyright (c), Firelight Technologies Pty, Ltd. 2012-2025. using UnrealBuildTool; using System; diff --git a/hwanyoung2/Source/hwanyoung2.Target.cs b/hwanyoung2/Source/hwanyoung2.Target.cs index 631229ff..f6e98a67 100644 --- a/hwanyoung2/Source/hwanyoung2.Target.cs +++ b/hwanyoung2/Source/hwanyoung2.Target.cs @@ -7,7 +7,10 @@ public class hwanyoung2Target : TargetRules { public hwanyoung2Target(TargetInfo Target) : base(Target) { - Type = TargetType.Game; + WindowsPlatform.Compiler = WindowsCompiler.VisualStudio2022; + WindowsPlatform.CompilerVersion = "14.34.31933"; // ¼³Ä¡µÈ Á¤È®ÇÑ ¹öÀü ¹øÈ£·Î ¹Ù²ãÁÖ¼¼¿ä + + Type = TargetType.Game; DefaultBuildSettings = BuildSettingsVersion.V2; IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; ExtraModuleNames.Add("hwanyoung2");