diff --git a/AVVR/Assets/CubemapRoomST.mat b/AVVR/Assets/CubemapRoomST.mat index b1c5ada05b4e29d2287204c1bd229af4a4ddb36d..5009a37aa082c5009b280c7bc0c6521310b1fd8d 100644 --- a/AVVR/Assets/CubemapRoomST.mat +++ b/AVVR/Assets/CubemapRoomST.mat @@ -52,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _FrontTex: - m_Texture: {fileID: 2800000, guid: 11e97a2d26590c74ea07798cb25d4aa7, type: 3} + m_Texture: {fileID: 2800000, guid: daf09e3b6eaf4424d835cda641fa43dd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _LeftTex: diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/LR_NoVR.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/LR_NoVR.unity index baec29b5ba5bdec70e4e25d96fe21c476ac04efb..f1e5db54c4e9cc63b856908910701307dc0d94b5 100644 --- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/LR_NoVR.unity +++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/LR_NoVR.unity @@ -567,7 +567,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -628,7 +628,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.815686, g: 0.807843, b: 0.282353, a: 1} + - _Color: {r: 0.81568605, g: 0.807843, b: 0.2823529, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -640,6 +640,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1045751326925874094, guid: b530b1bba69907248a498d576cd552e1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2609880478635417835, guid: b530b1bba69907248a498d576cd552e1, type: 3} propertyPath: m_Name value: Player @@ -648,6 +652,10 @@ PrefabInstance: propertyPath: field of view value: 75 objectReference: {fileID: 0} + - target: {fileID: 6459936987347139770, guid: b530b1bba69907248a498d576cd552e1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7285903358191246061, guid: b530b1bba69907248a498d576cd552e1, type: 3} propertyPath: m_LocalPosition.x value: -0.037999988 @@ -688,6 +696,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7995836131742162648, guid: b530b1bba69907248a498d576cd552e1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8306331000483551814, guid: b530b1bba69907248a498d576cd552e1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -1389,6 +1405,57 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1332741890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1332741891} + - component: {fileID: 1332741892} + m_Layer: 0 + m_Name: RoomWrapperGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1332741891 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1332741890} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.5244153, y: -0.7448375, z: 4.7003818} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2051639696} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1332741892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1332741890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c717aa1460839b7438f003ff6d1dbaea, type: 3} + m_Name: + m_EditorClassIdentifier: + originalRoomMesh: {fileID: 1434061477} + wrapperScale: 0.95 + cubemapMaterial: {fileID: 2100000, guid: c81f544818306cd4bb23a3305568a396, type: 2} + transparency: 0.5 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineWidth: 0.005 --- !u!1 &1337541973 GameObject: m_ObjectHideFlags: 0 @@ -1538,7 +1605,7 @@ Transform: 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 814809070} @@ -1740,7 +1807,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1801,7 +1868,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.29803902, g: 0.290196, b: 0.372549, a: 1} + - _Color: {r: 0.29803887, g: 0.29019588, b: 0.37254885, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1821,7 +1888,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1886,6 +1953,89 @@ Material: - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] +--- !u!1 &2051639695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2051639696} + - component: {fileID: 2051639698} + - component: {fileID: 2051639697} + m_Layer: 0 + m_Name: RoomWrapper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2051639696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051639695} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.4841295, y: 2.1948376, z: -4.739835} + m_LocalScale: {x: 5.358001, y: 2.755, z: 4.797501} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1332741891} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2051639697 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051639695} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c81f544818306cd4bb23a3305568a396, 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: 1 + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2051639698 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051639695} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1896,3 +2046,4 @@ SceneRoots: - {fileID: 725755570} - {fileID: 572138282} - {fileID: 358248840} + - {fileID: 1332741891} diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/LR_demo.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/LR_demo.unity index f7d070c689d5f2c8a98d43617ebd7385da45bcb7..af8bd07eec83f545918211205c0c33adfe39ee6b 100644 --- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/LR_demo.unity +++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/LR_demo.unity @@ -410,6 +410,89 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &578520299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 578520300} + - component: {fileID: 578520302} + - component: {fileID: 578520301} + m_Layer: 0 + m_Name: RoomWrapper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &578520300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578520299} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.9286337, y: 1.7664249, z: 1.955729} + m_LocalScale: {x: 4.7975, y: 2.755, z: 5.358} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1672233213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &578520301 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578520299} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c81f544818306cd4bb23a3305568a396, 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: 1 + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &578520302 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578520299} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &598313331 PrefabInstance: m_ObjectHideFlags: 0 @@ -530,6 +613,26 @@ PrefabInstance: propertyPath: m_Texture value: objectReference: {fileID: 2800000, guid: 761c8a2dc52e0d6438dff8ed70edc492, type: 3} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5322325911060958663, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -558,6 +661,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146654593390, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146654593390, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6294802142791462800, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1092,12 +1215,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1145,20 +1269,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.815686, g: 0.807843, b: 0.282353, a: 1} + - _Color: {r: 0.81568605, g: 0.807843, b: 0.2823528, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1478,12 +1602,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1531,20 +1656,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.29803902, g: 0.290196, b: 0.372549, a: 1} + - _Color: {r: 0.29803878, g: 0.2901958, b: 0.37254876, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1713,6 +1838,57 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1672233211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1672233213} + - component: {fileID: 1672233212} + m_Layer: 0 + m_Name: RoomWrapperGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1672233212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1672233211} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c717aa1460839b7438f003ff6d1dbaea, type: 3} + m_Name: + m_EditorClassIdentifier: + originalRoomMesh: {fileID: 1961788797} + wrapperScale: 0.95 + cubemapMaterial: {fileID: 2100000, guid: c81f544818306cd4bb23a3305568a396, type: 2} + transparency: 0.5 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineWidth: 0.005 +--- !u!4 &1672233213 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1672233211} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.9680867, y: -0.3164248, z: -1.9960148} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 578520300} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1702024689 GameObject: m_ObjectHideFlags: 0 @@ -1861,12 +2037,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1914,20 +2091,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2118,7 +2295,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734622040} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -2203,7 +2380,7 @@ Transform: 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 178893577} @@ -2235,3 +2412,4 @@ SceneRoots: - {fileID: 1727475138} - {fileID: 859405627} - {fileID: 1734622045} + - {fileID: 1672233213} diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/MR_NoVR.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/MR_NoVR.unity index a9190bce745ed49fb4aa07fe30700c51ef6a80c4..90ebcaf2b5dd6fdb5caf4c95be771b67e5a30516 100644 --- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/MR_NoVR.unity +++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/MR_NoVR.unity @@ -302,6 +302,57 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e8704b2cb89ef5f4c900ad41600ea441, type: 3} +--- !u!1 &157571952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 157571954} + - component: {fileID: 157571953} + m_Layer: 0 + m_Name: RoomWrapperGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &157571953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157571952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c717aa1460839b7438f003ff6d1dbaea, type: 3} + m_Name: + m_EditorClassIdentifier: + originalRoomMesh: {fileID: 1241383377} + wrapperScale: 0.95 + cubemapMaterial: {fileID: 2100000, guid: 42bdaa0fab2d82148a5a8e58be91105b, type: 2} + transparency: 0.5 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineWidth: 0.005 +--- !u!4 &157571954 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157571952} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.1591018, y: -0.6534505, z: 4.102307} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1954236917} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &198470364 Mesh: m_ObjectHideFlags: 0 @@ -813,7 +864,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -982,7 +1033,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1043,7 +1094,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} + - _Color: {r: 0.39999986, g: 0.39999986, b: 0.39999986, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1278,7 +1329,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1339,7 +1390,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.062745005, g: 0.062745005, b: 0.26666704, a: 1} + - _Color: {r: 0.062744886, g: 0.062744886, b: 0.2666669, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1618,7 +1669,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1679,7 +1730,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.360784, g: 0.521569, b: 0.46666703, a: 1} + - _Color: {r: 0.36078385, g: 0.521569, b: 0.466667, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1699,7 +1750,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1760,7 +1811,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.733333, g: 0.505882, b: 0.611765, a: 1} + - _Color: {r: 0.733333, g: 0.505882, b: 0.61176497, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2002,7 +2053,7 @@ Transform: 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 799685410} @@ -2463,7 +2514,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2572,6 +2623,89 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1954236916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1954236917} + - component: {fileID: 1954236919} + - component: {fileID: 1954236918} + m_Layer: 0 + m_Name: RoomWrapper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1954236917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954236916} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.1266776, y: 1.8184505, z: -3.7637725} + m_LocalScale: {x: 4.066, y: 2.2134998, z: 5.3294997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 157571954} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1954236918 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954236916} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 42bdaa0fab2d82148a5a8e58be91105b, 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: 1 + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1954236919 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954236916} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!21 &1963477022 Material: serializedVersion: 8 @@ -2588,7 +2722,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2649,7 +2783,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.38431403, g: 0.152941, b: 0.27058798, a: 1} + - _Color: {r: 0.38431388, g: 0.15294084, b: 0.27058783, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -3388,3 +3522,4 @@ SceneRoots: - {fileID: 797615641} - {fileID: 154272090} - {fileID: 722571767} + - {fileID: 157571954} diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/MR_demo.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/MR_demo.unity index e7db93dd3289e6af7b46c603589852a11d4f8705..7634beb58b8716b9d5c2626f2264086fc7df3800 100644 --- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/MR_demo.unity +++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/MR_demo.unity @@ -139,7 +139,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -220,7 +220,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -281,7 +281,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.733333, g: 0.505882, b: 0.611765, a: 1} + - _Color: {r: 0.733333, g: 0.505882, b: 0.61176497, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -450,6 +450,89 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &150523052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 150523053} + - component: {fileID: 150523055} + - component: {fileID: 150523054} + m_Layer: 0 + m_Name: RoomWrapper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &150523053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 150523052} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.32940283, y: 0.3754623, z: -5.0281506} + m_LocalScale: {x: 5.3169594, y: 2.21996, z: 4.05536} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2090639191} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &150523054 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 150523052} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 42bdaa0fab2d82148a5a8e58be91105b, 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: 1 + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &150523055 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 150523052} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!21 &267529068 Material: serializedVersion: 8 @@ -466,7 +549,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -527,7 +610,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.360784, g: 0.521569, b: 0.46666703, a: 1} + - _Color: {r: 0.36078382, g: 0.521569, b: 0.466667, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -640,7 +723,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -701,7 +784,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.062745005, g: 0.062745005, b: 0.26666704, a: 1} + - _Color: {r: 0.06274486, g: 0.06274486, b: 0.26666686, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1112,6 +1195,26 @@ PrefabInstance: propertyPath: m_Texture value: objectReference: {fileID: 2800000, guid: 57b3a9cc46251b849bca02c5ea77ff8b, type: 3} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5322325911060958663, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1140,6 +1243,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146654593390, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146654593390, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6294802142791462800, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1722,7 +1845,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2961,7 +3084,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1316829411} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -3347,7 +3470,7 @@ Transform: 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 490499252} @@ -3431,7 +3554,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -3492,7 +3615,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.38431403, g: 0.152941, b: 0.27058798, a: 1} + - _Color: {r: 0.38431385, g: 0.15294081, b: 0.2705878, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -3618,6 +3741,57 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2090639189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2090639191} + - component: {fileID: 2090639190} + m_Layer: 0 + m_Name: RoomWrapperGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2090639190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090639189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c717aa1460839b7438f003ff6d1dbaea, type: 3} + m_Name: + m_EditorClassIdentifier: + originalRoomMesh: {fileID: 1562619126} + wrapperScale: 0.95 + cubemapMaterial: {fileID: 2100000, guid: 42bdaa0fab2d82148a5a8e58be91105b, type: 2} + transparency: 0.5 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineWidth: 0.005 +--- !u!4 &2090639191 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090639189} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.2870027, y: 0.79293776, z: 5.2857504} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 150523053} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!21 &2116610209 Material: serializedVersion: 8 @@ -3634,7 +3808,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -3695,7 +3869,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} + - _Color: {r: 0.39999983, g: 0.39999983, b: 0.39999983, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -3711,3 +3885,4 @@ SceneRoots: - {fileID: 1339999055} - {fileID: 490899796} - {fileID: 1316829416} + - {fileID: 2090639191} diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/ST_NoVR.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/ST_NoVR.unity index f227890b9c4d831e5fd4224901e13411e7f241d4..4a541482ee068ab9082e0e9eb057f31573f632ee 100644 --- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/ST_NoVR.unity +++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/ST_NoVR.unity @@ -371,12 +371,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -424,20 +425,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0.784314, a: 1} + - _Color: {r: 0, g: 0, b: 0.784314, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -452,12 +453,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -505,20 +507,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -820,12 +822,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -873,20 +876,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.815686, g: 0.807843, b: 0.282353, a: 1} + - _Color: {r: 0.81568605, g: 0.807843, b: 0.28235298, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1082,7 +1085,7 @@ Transform: 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 396294657} @@ -1331,12 +1334,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1384,20 +1388,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} + - _Color: {r: 0.39999998, g: 0.39999998, b: 0.39999998, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1566,6 +1570,89 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1001751024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1001751025} + - component: {fileID: 1001751027} + - component: {fileID: 1001751026} + m_Layer: 0 + m_Name: RoomWrapper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1001751025 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001751024} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.0653768, y: -1.0032921, z: 4.411993} + m_LocalScale: {x: 17.101828, y: 6.24, z: 16.404482} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1434268845} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1001751026 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001751024} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fdb9247c6a05d204db5e3958e521481a, 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: 1 + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1001751027 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001751024} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1063233166 GameObject: m_ObjectHideFlags: 0 @@ -2217,12 +2304,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2270,20 +2358,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.733333, g: 0.505882, b: 0.611765, a: 1} + - _Color: {r: 0.733333, g: 0.505882, b: 0.61176497, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2739,6 +2827,57 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1434268843 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1434268845} + - component: {fileID: 1434268844} + m_Layer: 0 + m_Name: RoomWrapperGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1434268844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434268843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c717aa1460839b7438f003ff6d1dbaea, type: 3} + m_Name: + m_EditorClassIdentifier: + originalRoomMesh: {fileID: 730778282} + wrapperScale: 0.96 + cubemapMaterial: {fileID: 2100000, guid: fdb9247c6a05d204db5e3958e521481a, type: 2} + transparency: 0.5 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineWidth: 0.005 +--- !u!4 &1434268845 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434268843} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.1825767, y: 4.253292, z: -4.7323933} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1001751025} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1538220202 PrefabInstance: m_ObjectHideFlags: 0 @@ -2919,12 +3058,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2972,20 +3112,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.360784, g: 0.521569, b: 0.46666703, a: 1} + - _Color: {r: 0.36078396, g: 0.521569, b: 0.466667, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2999,3 +3139,4 @@ SceneRoots: - {fileID: 759189140} - {fileID: 1538220202} - {fileID: 1741233570} + - {fileID: 1434268845} diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/ST_demo.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/ST_demo.unity index 7681022512b666778a5c0722ca427c923e50584a..c49d7288d3f14f9eb72ab942018a4acce07dce9f 100644 --- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/ST_demo.unity +++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/ST_demo.unity @@ -134,12 +134,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -187,20 +188,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} + - _Color: {r: 0.39999986, g: 0.39999986, b: 0.39999986, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -337,12 +338,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -390,20 +392,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.815686, g: 0.807843, b: 0.282353, a: 1} + - _Color: {r: 0.81568605, g: 0.807843, b: 0.28235286, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -659,7 +661,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 464769818} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -837,6 +839,26 @@ PrefabInstance: propertyPath: m_Texture value: objectReference: {fileID: 2800000, guid: 92ba4ab852634d148889cf116eecf6ca, type: 3} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5322325911060958663, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -865,6 +887,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146654593390, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146654593390, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6294802142791462800, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2027,12 +2069,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2080,20 +2123,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.733333, g: 0.505882, b: 0.611765, a: 1} + - _Color: {r: 0.733333, g: 0.505882, b: 0.61176497, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2108,12 +2151,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2161,20 +2205,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2486,6 +2530,140 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1257508248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1257508250} + - component: {fileID: 1257508249} + m_Layer: 0 + m_Name: RoomWrapperGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1257508249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257508248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c717aa1460839b7438f003ff6d1dbaea, type: 3} + m_Name: + m_EditorClassIdentifier: + originalRoomMesh: {fileID: 2006962651} + wrapperScale: 0.96 + cubemapMaterial: {fileID: 2100000, guid: fdb9247c6a05d204db5e3958e521481a, type: 2} + transparency: 0.5 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineWidth: 0.005 +--- !u!4 &1257508250 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257508248} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.9061619, y: 1.3995302, z: -0.12409924} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1337595580} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1337595579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1337595580} + - component: {fileID: 1337595582} + - component: {fileID: 1337595581} + m_Layer: 0 + m_Name: RoomWrapper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1337595580 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337595579} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.5857617, y: 1.8504698, z: 0.21969889} + m_LocalScale: {x: 16.404478, y: 6.24, z: 13.949952} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1257508250} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1337595581 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337595579} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fdb9247c6a05d204db5e3958e521481a, 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: 1 + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1337595582 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337595579} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!21 &1405789404 Material: serializedVersion: 8 @@ -2497,12 +2675,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2550,20 +2729,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.360784, g: 0.521569, b: 0.46666703, a: 1} + - _Color: {r: 0.36078385, g: 0.521569, b: 0.466667, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2578,12 +2757,13 @@ Material: m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHABLEND_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2631,20 +2811,20 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0.784314, a: 1} + - _Color: {r: 0, g: 0, b: 0.784314, a: 0.5} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -3142,7 +3322,7 @@ Transform: 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1072158691} @@ -3342,3 +3522,4 @@ SceneRoots: - {fileID: 899886280} - {fileID: 1149044092} - {fileID: 464769823} + - {fileID: 1257508250} diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_NoVR.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_NoVR.unity index 58053e166a79fbef1386d8198aefe5bb0dab4b19..5ed04bd303392bd0ef0f7644475edbcc7210cc92 100644 --- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_NoVR.unity +++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_NoVR.unity @@ -673,7 +673,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -754,7 +754,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -815,7 +815,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.815686, g: 0.807843, b: 0.282353, a: 1} + - _Color: {r: 0.81568605, g: 0.807843, b: 0.28235295, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1075,6 +1075,57 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726558570} m_CullTransparentMesh: 1 +--- !u!1 &815198020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 815198022} + - component: {fileID: 815198021} + m_Layer: 0 + m_Name: RoomWrapperGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &815198021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815198020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c717aa1460839b7438f003ff6d1dbaea, type: 3} + m_Name: + m_EditorClassIdentifier: + originalRoomMesh: {fileID: 1329933960} + wrapperScale: 0.95 + cubemapMaterial: {fileID: 2100000, guid: 08dbef9ab8a9b864c9f92a8486e4e537, type: 2} + transparency: 0.5 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineWidth: 0.005 +--- !u!4 &815198022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815198020} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.5942416, y: 0.49464893, z: 0.89853334} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1890691727} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!21 &889520853 Material: serializedVersion: 8 @@ -1091,7 +1142,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1152,7 +1203,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.458824, g: 0.83921605, b: 0.27451003, a: 1} + - _Color: {r: 0.45882386, g: 0.83921605, b: 0.27450997, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -1689,7 +1740,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1750,7 +1801,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} + - _Color: {r: 0.39999995, g: 0.39999995, b: 0.39999995, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2053,7 +2104,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2145,7 +2196,7 @@ Transform: 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1568520517} @@ -2350,7 +2401,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2411,7 +2462,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.733333, g: 0.505882, b: 0.611765, a: 1} + - _Color: {r: 0.733333, g: 0.505882, b: 0.61176497, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2746,6 +2797,89 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1890691726 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1890691727} + - component: {fileID: 1890691729} + - component: {fileID: 1890691728} + m_Layer: 0 + m_Name: RoomWrapper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1890691727 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890691726} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.9654415, y: 0.9645512, z: -0.66653323} + m_LocalScale: {x: 5.2766805, y: 2.7724802, z: 4.936961} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 815198022} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1890691728 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890691726} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 08dbef9ab8a9b864c9f92a8486e4e537, 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: 1 + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1890691729 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890691726} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!21 &1911964263 Material: serializedVersion: 8 @@ -2762,7 +2896,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2823,7 +2957,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.792157, g: 0.77647096, b: 0.564706, a: 1} + - _Color: {r: 0.792157, g: 0.77647096, b: 0.56470597, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -3368,3 +3502,4 @@ SceneRoots: - {fileID: 979507368} - {fileID: 274514926} - {fileID: 11550997} + - {fileID: 815198022} diff --git a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_demo.unity b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_demo.unity index 725cd7a3bdf36580718e07f3c6ebe1717a02dd10..f08af17ee916a5e3b9ed12d9670bdcfbff4eb59a 100644 --- a/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_demo.unity +++ b/AVVR/Assets/Scenes/SteamAudioScenes/Subjective-Evaluation-Scenes/UL_demo.unity @@ -540,7 +540,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 234662219} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -718,6 +718,26 @@ PrefabInstance: propertyPath: m_Texture value: objectReference: {fileID: 2800000, guid: 2fcdb6db8f5022d459a784409e84a0b2, type: 3} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907672992081114993, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5322325911060958663, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -746,6 +766,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146017018215, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146654593390, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6061969146654593390, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6294802142791462800, guid: 9a92d51909392834aa8dc2db232d87b8, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1461,7 +1501,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1753,7 +1793,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -1814,7 +1854,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.458824, g: 0.83921605, b: 0.27451003, a: 1} + - _Color: {r: 0.45882374, g: 0.83921605, b: 0.27450985, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2050,7 +2090,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -2111,7 +2151,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.733333, g: 0.505882, b: 0.611765, a: 1} + - _Color: {r: 0.733333, g: 0.505882, b: 0.61176497, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -2142,7 +2182,7 @@ Transform: 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 432909703} @@ -2664,6 +2704,140 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1453611404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1453611405} + - component: {fileID: 1453611407} + - component: {fileID: 1453611406} + m_Layer: 0 + m_Name: RoomWrapper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1453611405 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453611404} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.5671417, y: -0.582994, z: 5.6961813} + m_LocalScale: {x: 4.9399996, y: 2.7645004, z: 5.2915006} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1457951298} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1453611406 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453611404} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 08dbef9ab8a9b864c9f92a8486e4e537, 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: 1 + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1453611407 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453611404} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1457951296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1457951298} + - component: {fileID: 1457951297} + m_Layer: 0 + m_Name: RoomWrapperGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1457951297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1457951296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c717aa1460839b7438f003ff6d1dbaea, type: 3} + m_Name: + m_EditorClassIdentifier: + originalRoomMesh: {fileID: 1121748333} + wrapperScale: 0.95 + cubemapMaterial: {fileID: 2100000, guid: 08dbef9ab8a9b864c9f92a8486e4e537, type: 2} + transparency: 0.5 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineWidth: 0.005 +--- !u!4 &1457951298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1457951296} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.334999, y: 2.0379941, z: -5.065615} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1453611405} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!21 &1503913814 Material: serializedVersion: 8 @@ -2680,8 +2854,9 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -3092,7 +3267,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -3153,7 +3328,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} + - _Color: {r: 0.39999983, g: 0.39999983, b: 0.39999983, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -3173,8 +3348,9 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -3234,7 +3410,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.815686, g: 0.807843, b: 0.282353, a: 1} + - _Color: {r: 0.81568605, g: 0.807843, b: 0.28235283, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -3254,7 +3430,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -3315,7 +3491,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.792157, g: 0.77647096, b: 0.564706, a: 1} + - _Color: {r: 0.792157, g: 0.77647096, b: 0.56470597, a: 1} - _EmissionColor: {r: 0.05, g: 0.05, b: 0.05, a: 1} - _SpecColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] @@ -3711,3 +3887,4 @@ SceneRoots: - {fileID: 503171995} - {fileID: 769543856} - {fileID: 234662224} + - {fileID: 1457951298} diff --git a/AVVR/Assets/_Scripts/RoomWrapperGenerator.cs b/AVVR/Assets/_Scripts/RoomWrapperGenerator.cs index 6e9943c9ad9c36512a8a4ecd99d6f25dca11c1ce..b077e5123cf7315a3fc42d8cb5f4e323a3aa8605 100644 --- a/AVVR/Assets/_Scripts/RoomWrapperGenerator.cs +++ b/AVVR/Assets/_Scripts/RoomWrapperGenerator.cs @@ -8,7 +8,7 @@ using UnityEditor; public class RoomWrapperGenerator : MonoBehaviour { [SerializeField] private GameObject originalRoomMesh; - [SerializeField] private float wrapperScale = 0.9f; + [SerializeField] private float wrapperScale = 0.95f; [SerializeField] private Material cubemapMaterial; [SerializeField, Range(0, 1)] private float transparency = 0.5f; [SerializeField] private Color outlineColor = Color.black;