diff --git a/.idea/.idea.RESIDENCY_POC/.idea/.gitignore b/.idea/.idea.RESIDENCY_POC/.idea/.gitignore new file mode 100644 index 00000000..0286b1a5 --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/modules.xml +/projectSettingsUpdater.xml +/contentModel.xml +/.idea.RESIDENCY_POC.iml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.RESIDENCY_POC/.idea/encodings.xml b/.idea/.idea.RESIDENCY_POC/.idea/encodings.xml new file mode 100644 index 00000000..df87cf95 --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.RESIDENCY_POC/.idea/indexLayout.xml b/.idea/.idea.RESIDENCY_POC/.idea/indexLayout.xml new file mode 100644 index 00000000..7b08163c --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.RESIDENCY_POC/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.RESIDENCY_POC/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..c90badcc --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.RESIDENCY_POC/.idea/vcs.xml b/.idea/.idea.RESIDENCY_POC/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/.idea.RESIDENCY_POC/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat b/Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat index 3ab211a3..7709609e 100644 --- a/Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat +++ b/Assets/OctoDemo/Models/Furnitures/Sources/Materials/standardSurface1.mat @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6903748558977870173 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion - version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -21,18 +8,23 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: standardSurface1 - m_Shader: {fileID: -6465566751694194690, guid: 5083f469efbb78d4e912bb6fdfac72cd, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -41,10 +33,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _BaseTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -121,7 +109,6 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0 @@ -141,3 +128,16 @@ Material: - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 +--- !u!114 &664176129752491456 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx index 9f0bcc26..d1b918aa 100644 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx and b/Assets/OctoDemo/Models/Furnitures/Sources/armchair_A.fbx differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx index 4f59656e..ace4688d 100644 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx and b/Assets/OctoDemo/Models/Furnitures/Sources/bin_A.fbx differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx index 4f1849c4..f95a3a33 100644 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx and b/Assets/OctoDemo/Models/Furnitures/Sources/boiler.fbx differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx index f74e59b8..465d77ec 100644 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx and b/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx.meta b/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx.meta index a96e0316..2cd03347 100644 --- a/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx.meta +++ b/Assets/OctoDemo/Models/Furnitures/Sources/ceilingScreen_A.fbx.meta @@ -1,14 +1,9 @@ fileFormatVersion: 2 -guid: df955fddcea22c44ba108674c3613cf5 +guid: beb7149d0c9a97245aa4abfb393c7069 ModelImporter: serializedVersion: 24200 internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: standardSurface1 - second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} + externalObjects: {} materials: materialImportMode: 2 materialName: 1 diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx index 578911b8..43e52d98 100644 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx and b/Assets/OctoDemo/Models/Furnitures/Sources/chair_A.fbx differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx index 564ccc0f..4cb5d940 100644 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx and b/Assets/OctoDemo/Models/Furnitures/Sources/intercom_A.fbx differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx index 0ed18883..34269e95 100644 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx and b/Assets/OctoDemo/Models/Furnitures/Sources/lowTable_A.fbx differ diff --git a/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx b/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx index 5f2bd50f..c71ce89f 100644 Binary files a/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx and b/Assets/OctoDemo/Models/Furnitures/Sources/securityCamera_A.fbx differ diff --git a/Assets/Scripts/Editor/FBXImporter/processed_fbx.txt b/Assets/Scripts/Editor/FBXImporter/processed_fbx.txt index d8f86c89..aec94c37 100644 --- a/Assets/Scripts/Editor/FBXImporter/processed_fbx.txt +++ b/Assets/Scripts/Editor/FBXImporter/processed_fbx.txt @@ -11,3 +11,4 @@ c5ffa67b650768b48a1dfee14cde0434 RobotHolo5.fbx a117ffd897689164e9b74b1b8b10f644 Diapason.fbx c1945069c65686a48a85348ceba705d4 arms.fbx 5fd19d2221bd83b45bbf93526c6b203e SpiralStairs.fbx +beb7149d0c9a97245aa4abfb393c7069 ceilingScreen_A.fbx diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A.meta new file mode 100644 index 00000000..8f50e67e --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71abe59103f5fec44bea4ef2f526d441 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Animations.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Animations.meta new file mode 100644 index 00000000..578d1409 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6efe0171c497492438c06c4c67878419 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Audio.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Audio.meta new file mode 100644 index 00000000..2db46ebb --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36a871c67c9a7a146be94f9559a26295 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials.meta new file mode 100644 index 00000000..40b6811a --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3972061d3ffb55740a74e7c8668a5a11 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat new file mode 100644 index 00000000..948ece14 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Material + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &8849053000539795 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat.meta new file mode 100644 index 00000000..04f1b781 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Materials/Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 544786bd7f067364b9aab71ba9f0c6a6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs.meta new file mode 100644 index 00000000..afc9d4bf --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b1e2f1b744cdf0e46832350fa8617e6a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab new file mode 100644 index 00000000..4516d488 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab @@ -0,0 +1,183 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5597709404049308156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4020561076403134853} + - component: {fileID: 8189770915968391568} + - component: {fileID: 6236338361379681967} + m_Layer: 0 + m_Name: screen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4020561076403134853 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597709404049308156} + serializedVersion: 2 + m_LocalRotation: {x: 0.20080625, y: 0.18398775, z: -0.029575542, w: 0.9617436} + m_LocalPosition: {x: 0.1614288, y: -0.57486486, z: -0.094741866} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5030597752041218194} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8189770915968391568 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597709404049308156} + m_Mesh: {fileID: 6244854566930169998, guid: df955fddcea22c44ba108674c3613cf5, type: 3} +--- !u!23 &6236338361379681967 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597709404049308156} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 544786bd7f067364b9aab71ba9f0c6a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6168612833107812208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5030597752041218194} + - component: {fileID: 2115140119952999807} + - component: {fileID: 5538990238889542783} + m_Layer: 0 + m_Name: ceilingScreen_A + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5030597752041218194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6168612833107812208} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4020561076403134853} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2115140119952999807 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6168612833107812208} + m_Mesh: {fileID: -8544068785584307103, guid: df955fddcea22c44ba108674c3613cf5, type: 3} +--- !u!23 &5538990238889542783 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6168612833107812208} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 544786bd7f067364b9aab71ba9f0c6a6, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab.meta new file mode 100644 index 00000000..23ec25bf --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Prefabs/ceilingScreen_A.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7b5c3f0bcdc77fe45a123b72fb77d6eb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources.meta new file mode 100644 index 00000000..fedecd74 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b6def8dd36fda14288432972fcafd99 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx new file mode 100644 index 00000000..465d77ec --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0300cd9585d950578f84ed87f247e8fe3f132a64a82bb98d125d856177b7fdf9 +size 54064 diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx.meta new file mode 100644 index 00000000..a96e0316 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Sources/ceilingScreen_A.fbx.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: df955fddcea22c44ba108674c3613cf5 +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: standardSurface1 + second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2} + materials: + materialImportMode: 2 + materialName: 1 + materialSearch: 1 + materialLocation: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 0 + importLights: 0 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/Textures.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Textures.meta new file mode 100644 index 00000000..858f0eb1 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73a19429c2ab25e4398ce32f0d20b819 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Content/ceilingScreen_A/VFX.meta b/Assets/Unheimlich_POC/Content/ceilingScreen_A/VFX.meta new file mode 100644 index 00000000..5fe1b0f6 --- /dev/null +++ b/Assets/Unheimlich_POC/Content/ceilingScreen_A/VFX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 067fe3c7873794745a024d7b33251e3d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Scenes/Sound Design Test/Alex/AlexTestScene.unity b/Assets/Unheimlich_POC/Scenes/Sound Design Test/Alex/AlexTestScene.unity index 961a07c7..f9bd0fdb 100644 --- a/Assets/Unheimlich_POC/Scenes/Sound Design Test/Alex/AlexTestScene.unity +++ b/Assets/Unheimlich_POC/Scenes/Sound Design Test/Alex/AlexTestScene.unity @@ -6808,51 +6808,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 817991563840346717, guid: b3d5e59592bfef844943b9f2e18aabf9, type: 3} m_PrefabInstance: {fileID: 295686348} m_PrefabAsset: {fileID: 0} ---- !u!1 &296588576 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5575782855984327677, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} - m_PrefabInstance: {fileID: 1930280930} - m_PrefabAsset: {fileID: 0} ---- !u!114 &296588579 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296588576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a835ee92b0863c9459a0f816c5ff62ac, type: 3} - m_Name: - m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAudioListener - isDefaultListener: 1 - bOverrideScalingFactor: 0 - scalingFactor: -1 - listenerId: 0 ---- !u!114 &296588580 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296588576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3} - m_Name: - m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj - m_listeners: - initialListenerList: [] - useDefaultListeners: 1 - isEnvironmentAware: 1 - isStaticObject: 0 - usePositionOffsetData: 0 - m_positionOffsetData: - KeepMe: 0 - positionOffset: {x: 0, y: 0, z: 0} - scalingFactor: 1 - m_posOffsetData: {fileID: 0} - listenerMask: 1 --- !u!1001 &300398049 PrefabInstance: m_ObjectHideFlags: 0 @@ -25434,6 +25389,63 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1521570321769304301, guid: a017078f32a2c314382f7ece1ecaa822, type: 3} m_PrefabInstance: {fileID: 1386212876} m_PrefabAsset: {fileID: 0} +--- !u!1 &1391553828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1391553830} + - component: {fileID: 1391553829} + m_Layer: 0 + m_Name: WwiseGlobal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1391553829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1391553828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca8082afa1214454c828fd22641b8692, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkInitializer + InitializationSettings: {fileID: 11400000, guid: de5fd82fbf79ed247b9046e375a4b249, type: 2} + basePath: + language: + defaultPoolSize: 0 + lowerPoolSize: 0 + streamingPoolSize: 0 + memoryCutoffThreshold: 0 + monitorPoolSize: 0 + monitorQueuePoolSize: 0 + callbackManagerBufferSize: 0 + spatialAudioPoolSize: 0 + maxSoundPropagationDepth: 0 + engineLogging: 0 +--- !u!4 &1391553830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1391553828} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1392513918 PrefabInstance: m_ObjectHideFlags: 0 @@ -30388,97 +30400,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7977652778530834609, guid: 9d4ef384d30b05644add2b0f2671172d, type: 3} m_PrefabInstance: {fileID: 1638320346} m_PrefabAsset: {fileID: 0} ---- !u!1 &1646163593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1646163596} - - component: {fileID: 1646163595} - - component: {fileID: 1646163594} - m_Layer: 0 - m_Name: AkAmbient - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1646163594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646163593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d8f7c2e3a1433a142b688e469bcd2de5, type: 3} - m_Name: - m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAmbient - triggerList: f7e1664c - useOtherObject: 0 - actionOnEventType: 0 - curveInterpolation: 4 - enableActionOnEvent: 0 - data: - idInternal: 0 - valueGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: 491483834b894b14088f646760295150, type: 2} - useCallbacks: 0 - stopSoundOnDestroy: 1 - Callbacks: [] - soundEmitterObject: {fileID: 0} - transitionDuration: 0 - eventIdInternal: 0 - valueGuidInternal: - m_callbackDataInternal: {fileID: 0} - MultiPositionType: 1 - multiPositionTypeLabel: 0 - attenuationSphereColor: {r: 1, g: 0, b: 0, a: 0.1} - LargeModePositions: [] - multiPositionArray: [] ---- !u!114 &1646163595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646163593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3} - m_Name: - m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj - m_listeners: - initialListenerList: [] - useDefaultListeners: 1 - isEnvironmentAware: 1 - isStaticObject: 0 - usePositionOffsetData: 0 - m_positionOffsetData: - KeepMe: 0 - positionOffset: {x: 0, y: 0, z: 0} - scalingFactor: 1 - m_posOffsetData: {fileID: 0} - listenerMask: 1 ---- !u!4 &1646163596 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1646163593} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.484, y: 0.952, z: 5.01} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1648295832 PrefabInstance: m_ObjectHideFlags: 0 @@ -36309,16 +36230,17 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6053283114444666027, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 5575782855984327677, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} + - targetCorrespondingSourceObject: {fileID: 2101508725665932610, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} insertIndex: -1 - addedObject: {fileID: 296588580} - - targetCorrespondingSourceObject: {fileID: 5575782855984327677, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} + addedObject: {fileID: 2045371846} + - targetCorrespondingSourceObject: {fileID: 2101508725665932610, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} insertIndex: -1 - addedObject: {fileID: 296588579} + addedObject: {fileID: 2045371845} m_SourcePrefab: {fileID: 100100000, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} --- !u!1 &1931559852 GameObject: @@ -39230,6 +39152,51 @@ Transform: m_CorrespondingSourceObject: {fileID: 817991563840346717, guid: b3d5e59592bfef844943b9f2e18aabf9, type: 3} m_PrefabInstance: {fileID: 2043852463} m_PrefabAsset: {fileID: 0} +--- !u!1 &2045371837 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2101508725665932610, guid: 524ca0dabcf93844ea5f981410f44310, type: 3} + m_PrefabInstance: {fileID: 1930280930} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2045371845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2045371837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a835ee92b0863c9459a0f816c5ff62ac, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAudioListener + isDefaultListener: 1 + bOverrideScalingFactor: 0 + scalingFactor: -1 + listenerId: 0 +--- !u!114 &2045371846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2045371837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3} + m_Name: + m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj + m_listeners: + initialListenerList: [] + useDefaultListeners: 1 + isEnvironmentAware: 1 + isStaticObject: 0 + usePositionOffsetData: 0 + m_positionOffsetData: + KeepMe: 0 + positionOffset: {x: 0, y: 0, z: 0} + scalingFactor: 1 + m_posOffsetData: {fileID: 0} + listenerMask: 1 --- !u!1001 &2048959932 PrefabInstance: m_ObjectHideFlags: 0 @@ -41207,4 +41174,4 @@ SceneRoots: - {fileID: 1930280930} - {fileID: 1101670451} - {fileID: 1965767837} - - {fileID: 1646163596} + - {fileID: 1391553830} diff --git a/Assets/Wwise/ScriptableObjects/AkWwiseInitializationSettings.asset b/Assets/Wwise/ScriptableObjects/AkWwiseInitializationSettings.asset index 887fcd22..1db63ed0 100644 --- a/Assets/Wwise/ScriptableObjects/AkWwiseInitializationSettings.asset +++ b/Assets/Wwise/ScriptableObjects/AkWwiseInitializationSettings.asset @@ -73,7 +73,7 @@ MonoBehaviour: m_MaximumHardwareTimeoutMs: 1000 m_DebugOutOfRangeCheckEnabled: 0 m_DebugOutOfRangeLimit: 16 - m_SuspendAudioDuringFocusLoss: 1 + m_SuspendAudioDuringFocusLoss: 0 m_RenderDuringFocusLoss: 0 m_SoundBankPersistentDataPath: m_UseSubFoldersForGeneratedFiles: 0 diff --git a/Assets/Wwise/ScriptableObjects/Mac.asset b/Assets/Wwise/ScriptableObjects/Mac.asset index 36e79b59..bc6d9082 100644 --- a/Assets/Wwise/ScriptableObjects/Mac.asset +++ b/Assets/Wwise/ScriptableObjects/Mac.asset @@ -61,7 +61,6 @@ MonoBehaviour: - AdvancedSettings.m_MaximumHardwareTimeoutMs - AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowAttenuationFactor - AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowDegrees - - AdvancedSettings.m_SuspendAudioDuringFocusLoss - AdvancedSettings.m_RenderDuringFocusLoss - AdvancedSettings.m_SoundBankPersistentDataPath - AdvancedSettings.m_DebugOutOfRangeCheckEnabled @@ -131,7 +130,7 @@ MonoBehaviour: m_MaximumHardwareTimeoutMs: 1000 m_DebugOutOfRangeCheckEnabled: 0 m_DebugOutOfRangeLimit: 16 - m_SuspendAudioDuringFocusLoss: 1 + m_SuspendAudioDuringFocusLoss: 0 m_RenderDuringFocusLoss: 0 m_SoundBankPersistentDataPath: m_UseSubFoldersForGeneratedFiles: 0 diff --git a/Assets/Wwise/ScriptableObjects/Windows.asset b/Assets/Wwise/ScriptableObjects/Windows.asset index cef51e89..32bbeb8e 100644 --- a/Assets/Wwise/ScriptableObjects/Windows.asset +++ b/Assets/Wwise/ScriptableObjects/Windows.asset @@ -61,7 +61,6 @@ MonoBehaviour: - AdvancedSettings.m_MaximumHardwareTimeoutMs - AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowAttenuationFactor - AdvancedSettings.m_SpatialAudioSettings.m_DiffractionShadowDegrees - - AdvancedSettings.m_SuspendAudioDuringFocusLoss - AdvancedSettings.m_RenderDuringFocusLoss - AdvancedSettings.m_SoundBankPersistentDataPath - AdvancedSettings.m_DebugOutOfRangeCheckEnabled @@ -131,7 +130,7 @@ MonoBehaviour: m_MaximumHardwareTimeoutMs: 1000 m_DebugOutOfRangeCheckEnabled: 0 m_DebugOutOfRangeLimit: 16 - m_SuspendAudioDuringFocusLoss: 1 + m_SuspendAudioDuringFocusLoss: 0 m_RenderDuringFocusLoss: 0 m_SoundBankPersistentDataPath: m_UseSubFoldersForGeneratedFiles: 0 diff --git a/Assets/WwiseSettings.xml b/Assets/WwiseSettings.xml index 6568a345..8d127f9e 100644 --- a/Assets/WwiseSettings.xml +++ b/Assets/WwiseSettings.xml @@ -5,8 +5,8 @@ Audio\GeneratedSoundBanks ../RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/ true - true - true + false + false true true true diff --git a/RESIDENCY_POC_WwiseProject/Attenuations/Default Work Unit.wwu b/RESIDENCY_POC_WwiseProject/Attenuations/Default Work Unit.wwu index 12cc4c0d..ef63eedd 100644 --- a/RESIDENCY_POC_WwiseProject/Attenuations/Default Work Unit.wwu +++ b/RESIDENCY_POC_WwiseProject/Attenuations/Default Work Unit.wwu @@ -5,7 +5,7 @@ - + @@ -22,7 +22,7 @@ Log2 - 250 + 10 -200 37