From f3c9e8812d9ddd5766860fd2fde3d53205bbf2bf Mon Sep 17 00:00:00 2001 From: marcgauch <34353267+marcgauch@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:22:55 +0100 Subject: [PATCH] REEEEEEEEEEEEEEEEEEE --- Assets/Oculus/SampleFramework.meta | 8 + Assets/Oculus/SampleFramework/Usage.meta | 8 + .../SampleFramework/Usage/SceneManager.meta | 8 + .../Usage/SceneManager/Scripts.meta | 8 + .../Scripts/VolumeAndPlaneSwitcher.cs | 126 +++++++++++++ .../Scripts/VolumeAndPlaneSwitcher.cs.meta | 11 ++ Assets/SamplePrefabs/PassthroughPlane.prefab | 147 +++++++++++++++ .../PassthroughPlane.prefab.meta | 7 + Assets/SamplePrefabs/PassthroughVolume.prefab | 172 ++++++++++++++++++ .../PassthroughVolume.prefab.meta | 7 + Assets/Scenes/SampleScene.unity | 74 ++++---- Assets/VFX/Special/SampleOccluder.mat | 89 +++++++++ Assets/VFX/Special/SampleOccluder.mat.meta | 8 + Assets/VFX/White.tga | Bin 0 -> 12332 bytes Assets/VFX/White.tga.meta | 96 ++++++++++ ProjectSettings/ProjectSettings.asset | 2 - ProjectSettings/TagManager.asset | 2 +- 17 files changed, 733 insertions(+), 40 deletions(-) create mode 100644 Assets/Oculus/SampleFramework.meta create mode 100644 Assets/Oculus/SampleFramework/Usage.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/SceneManager.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts.meta create mode 100755 Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts/VolumeAndPlaneSwitcher.cs create mode 100755 Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts/VolumeAndPlaneSwitcher.cs.meta create mode 100644 Assets/SamplePrefabs/PassthroughPlane.prefab create mode 100755 Assets/SamplePrefabs/PassthroughPlane.prefab.meta create mode 100644 Assets/SamplePrefabs/PassthroughVolume.prefab create mode 100755 Assets/SamplePrefabs/PassthroughVolume.prefab.meta create mode 100644 Assets/VFX/Special/SampleOccluder.mat create mode 100644 Assets/VFX/Special/SampleOccluder.mat.meta create mode 100644 Assets/VFX/White.tga create mode 100644 Assets/VFX/White.tga.meta diff --git a/Assets/Oculus/SampleFramework.meta b/Assets/Oculus/SampleFramework.meta new file mode 100644 index 0000000..458d65d --- /dev/null +++ b/Assets/Oculus/SampleFramework.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f6fe9557fb1a9c639cca14557a17089 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage.meta b/Assets/Oculus/SampleFramework/Usage.meta new file mode 100644 index 0000000..193cf83 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e64c8a34e7a5768da99d840b3ff9f4a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/SceneManager.meta b/Assets/Oculus/SampleFramework/Usage/SceneManager.meta new file mode 100644 index 0000000..dce4521 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/SceneManager.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0e1a1cfbeccb77d891655fbe615e34d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts.meta b/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts.meta new file mode 100644 index 0000000..be4bf03 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a7e8f8f4c07de1f08690a5eb3e1333c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts/VolumeAndPlaneSwitcher.cs b/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts/VolumeAndPlaneSwitcher.cs new file mode 100755 index 0000000..cfaf98a --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts/VolumeAndPlaneSwitcher.cs @@ -0,0 +1,126 @@ +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(OVRSceneAnchor))] +public class VolumeAndPlaneSwitcher : MonoBehaviour +{ + public OVRSceneAnchor planePrefab; + public OVRSceneAnchor volumePrefab; + public enum GeometryType + { + Plane, + Volume, + } + [System.Serializable] + public struct LabelGeometryPair + { + public string label; + public GeometryType desiredGeometryType; + } + public List desiredSwitches; + + private void ReplaceAnchor(OVRSceneAnchor prefab, Vector3 position, Quaternion rotation, Vector3 localScale) + { + var anchor = Instantiate(prefab, transform.parent); + anchor.enabled = false; // disable so it won't update transform + anchor.InitializeFrom(GetComponent()); + + anchor.transform.SetPositionAndRotation(position, rotation); + foreach (Transform child in anchor.transform) + { + child.localScale = localScale; + } + + Destroy(gameObject); + } + + void Start() + { + var classification = GetComponent(); + if (!classification) return; + + foreach (LabelGeometryPair pair in desiredSwitches) + { + if (classification.Contains(pair.label)) + { + Vector3 position = Vector3.zero; + Quaternion rotation = Quaternion.identity; + Vector3 localScale = Vector3.zero; + switch (pair.desiredGeometryType) + { + case GeometryType.Plane: + { + var volume = GetComponent(); + if (!volume) + { + Debug.LogWarning($"Ignoring desired volume to plane switch for {pair.label} because it is not a volume."); + continue; + } + + Debug.Log($"IN Volume Position {transform.position}, Dimensions: {volume.Dimensions}"); + // This object is a volume, but we want a plane instead. + GetTopPlaneFromVolume( + transform, + volume.Dimensions, + out position, + out rotation, + out localScale); + Debug.Log($"OUT Plane Position {position}, Dimensions: {localScale}"); + ReplaceAnchor(planePrefab, position, rotation, localScale); + break; + } + case GeometryType.Volume: + { + var plane = GetComponent(); + if (!plane) + { + Debug.LogWarning($"Ignoring desired plane to volume switch for {pair.label} because it is not a plane."); + continue; + } + + Debug.Log($"IN Plane Position {transform.position}, Dimensions: {plane.Dimensions}"); + // This object is a plane, but we want a volume instead. + GetVolumeFromTopPlane( + transform, + plane.Dimensions, + transform.position.y, + out position, + out rotation, + out localScale); + Debug.Log($"OUT Volume Position {position}, Dimensions: {localScale}"); + ReplaceAnchor(volumePrefab, position, rotation, localScale); + break; + } + } + } + } + // IF we arrived here, no conversion was needed. Let's remove this component + Destroy(this); + } + + private void GetVolumeFromTopPlane( + Transform plane, + Vector2 dimensions, + float height, + out Vector3 position, + out Quaternion rotation, + out Vector3 localScale) + { + position = plane.position; + rotation = plane.rotation; + localScale = new Vector3(dimensions.x, dimensions.y, height); + } + + private void GetTopPlaneFromVolume( + Transform volume, + Vector3 dimensions, + out Vector3 position, + out Quaternion rotation, + out Vector3 localScale) + { + float halfHeight = dimensions.y / 2.0f; + position = volume.position + Vector3.up * halfHeight; + rotation = Quaternion.LookRotation(Vector3.up, -volume.forward); + localScale = new Vector3(dimensions.x, dimensions.z, dimensions.y); + } +} diff --git a/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts/VolumeAndPlaneSwitcher.cs.meta b/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts/VolumeAndPlaneSwitcher.cs.meta new file mode 100755 index 0000000..d64dc20 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/SceneManager/Scripts/VolumeAndPlaneSwitcher.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 337d67c8752f4d542bc432fdeba8f797 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SamplePrefabs/PassthroughPlane.prefab b/Assets/SamplePrefabs/PassthroughPlane.prefab new file mode 100644 index 0000000..0b9ad27 --- /dev/null +++ b/Assets/SamplePrefabs/PassthroughPlane.prefab @@ -0,0 +1,147 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4350422998566360405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 670190173264333139} + - component: {fileID: 102490448831091297} + - component: {fileID: -5283477811931044483} + m_Layer: 9 + m_Name: PassthroughPlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &670190173264333139 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4350422998566360405} + 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_Children: + - {fileID: 4300361411138007567} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &102490448831091297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4350422998566360405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ab3ec25e32ce0c4380714d75e39cb05, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-5283477811931044483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4350422998566360405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 337d67c8752f4d542bc432fdeba8f797, type: 3} + m_Name: + m_EditorClassIdentifier: + planePrefab: {fileID: 102490448831091297} + volumePrefab: {fileID: 8013016026686888416, guid: 1766fdf6f83d249cdb25297bf25a2bcc, type: 3} + desiredSwitches: + - label: DESK + desiredGeometryType: 1 + - label: COUCH + desiredGeometryType: 1 +--- !u!1 &6733509573060874094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4300361411138007567} + - component: {fileID: 56595018460018838} + - component: {fileID: 5168781885901884559} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4300361411138007567 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6733509573060874094} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 670190173264333139} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!33 &56595018460018838 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6733509573060874094} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5168781885901884559 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6733509573060874094} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: a2c41fdeefdfc4e20a026501ba4c8e78, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/SamplePrefabs/PassthroughPlane.prefab.meta b/Assets/SamplePrefabs/PassthroughPlane.prefab.meta new file mode 100755 index 0000000..9460af2 --- /dev/null +++ b/Assets/SamplePrefabs/PassthroughPlane.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0d75460355b0149c59b1e4cf473413f5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SamplePrefabs/PassthroughVolume.prefab b/Assets/SamplePrefabs/PassthroughVolume.prefab new file mode 100644 index 0000000..10ef403 --- /dev/null +++ b/Assets/SamplePrefabs/PassthroughVolume.prefab @@ -0,0 +1,172 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8017086724548712388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7131841940641118542} + - component: {fileID: 492056420189160028} + - component: {fileID: 3395806750721357724} + - component: {fileID: 6447170532250327969} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7131841940641118542 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8017086724548712388} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6132931345405909768} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &492056420189160028 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8017086724548712388} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3395806750721357724 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8017086724548712388} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: a2c41fdeefdfc4e20a026501ba4c8e78, 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6447170532250327969 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8017086724548712388} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8117833199190285257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6132931345405909768} + m_Layer: 9 + m_Name: Parent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6132931345405909768 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8117833199190285257} + 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_Children: + - {fileID: 7131841940641118542} + m_Father: {fileID: 1132682185376712905} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8999845180316542267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1132682185376712905} + - component: {fileID: 8013016026686888416} + m_Layer: 9 + m_Name: PassthroughVolume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1132682185376712905 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8999845180316542267} + 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_Children: + - {fileID: 6132931345405909768} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8013016026686888416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8999845180316542267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ab3ec25e32ce0c4380714d75e39cb05, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/SamplePrefabs/PassthroughVolume.prefab.meta b/Assets/SamplePrefabs/PassthroughVolume.prefab.meta new file mode 100755 index 0000000..991bd38 --- /dev/null +++ b/Assets/SamplePrefabs/PassthroughVolume.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1766fdf6f83d249cdb25297bf25a2bcc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ae4d0e4..5829335 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -3649,7 +3649,7 @@ Transform: m_GameObject: {fileID: 782628375} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3995762, y: 0.22418404, z: 4.471058} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5802,7 +5802,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 618858154} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 555725d48e9051a4bb6b8d45178c2fdd, type: 3} m_Name: @@ -6400,90 +6400,90 @@ PrefabInstance: - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PlanePrefab value: - objectReference: {fileID: 102490448831091297, guid: 3ecf103c2a191704eb3046d6765665ed, type: 3} + objectReference: {fileID: 102490448831091297, guid: 0d75460355b0149c59b1e4cf473413f5, type: 3} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: VolumePrefab value: - objectReference: {fileID: 8013016026686888416, guid: 891349029806e4144812ff2d304d9cf9, type: 3} + objectReference: {fileID: 8013016026686888416, guid: 1766fdf6f83d249cdb25297bf25a2bcc, type: 3} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: ActiveRoomsOnly value: 1 objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.size - value: 6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[0].Prefab value: - objectReference: {fileID: 7567567580182691726, guid: 4b34373f64d7c0915873c14fb0f5b0d7, type: 3} + objectReference: {fileID: 102490448831091297, guid: 1c364474c162a4787ac58cb716b754d3, type: 3} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[1].Prefab value: - objectReference: {fileID: 2090311380571388787, guid: 1bcccd34ff6e4ed369f018cbf30415d9, type: 3} + objectReference: {fileID: 7567567580182691726, guid: 4b34373f64d7c0915873c14fb0f5b0d7, type: 3} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[2].Prefab value: - objectReference: {fileID: 1209628186732020232, guid: 82a26ccfe871f9e70acbd3091df7d085, type: 3} + objectReference: {fileID: 2090311380571388787, guid: 1bcccd34ff6e4ed369f018cbf30415d9, type: 3} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[3].Prefab value: - objectReference: {fileID: 29834324114389151, guid: 62bb7a4743eee21f189576238d01292c, type: 3} + objectReference: {fileID: 1209628186732020232, guid: 82a26ccfe871f9e70acbd3091df7d085, type: 3} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[4].Prefab value: - objectReference: {fileID: 3685766024578757413, guid: 00f12700905120bd8a9ac57cf4832751, type: 3} + objectReference: {fileID: 29834324114389151, guid: 62bb7a4743eee21f189576238d01292c, type: 3} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[5].Prefab value: - objectReference: {fileID: 102490448831091297, guid: 1c364474c162a4787ac58cb716b754d3, type: 3} + objectReference: {fileID: 3685766024578757413, guid: 00f12700905120bd8a9ac57cf4832751, type: 3} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[0].ClassificationLabel - value: FLOOR - objectReference: {fileID: 0} - - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} - propertyPath: PrefabOverrides.Array.data[1].ClassificationLabel - value: CEILING - objectReference: {fileID: 0} - - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} - propertyPath: PrefabOverrides.Array.data[2].ClassificationLabel - value: STORAGE - objectReference: {fileID: 0} - - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} - propertyPath: PrefabOverrides.Array.data[3].ClassificationLabel - value: WALL_ART - objectReference: {fileID: 0} - - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} - propertyPath: PrefabOverrides.Array.data[4].ClassificationLabel - value: WALL_FACE - objectReference: {fileID: 0} - - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} - propertyPath: PrefabOverrides.Array.data[5].ClassificationLabel value: DOOR_FRAME objectReference: {fileID: 0} + - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} + propertyPath: PrefabOverrides.Array.data[1].ClassificationLabel + value: FLOOR + objectReference: {fileID: 0} + - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} + propertyPath: PrefabOverrides.Array.data[2].ClassificationLabel + value: CEILING + objectReference: {fileID: 0} + - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} + propertyPath: PrefabOverrides.Array.data[3].ClassificationLabel + value: STORAGE + objectReference: {fileID: 0} + - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} + propertyPath: PrefabOverrides.Array.data[4].ClassificationLabel + value: WALL_ART + objectReference: {fileID: 0} + - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} + propertyPath: PrefabOverrides.Array.data[5].ClassificationLabel + value: WALL_FACE + objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[0]._editorClassificationIndex - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[1]._editorClassificationIndex - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[2]._editorClassificationIndex - value: 8 + value: 1 objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[3]._editorClassificationIndex - value: 14 + value: 8 objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[4]._editorClassificationIndex - value: 2 + value: 14 objectReference: {fileID: 0} - target: {fileID: 747806495401477012, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: PrefabOverrides.Array.data[5]._editorClassificationIndex - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 747806495401477014, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} propertyPath: m_Name diff --git a/Assets/VFX/Special/SampleOccluder.mat b/Assets/VFX/Special/SampleOccluder.mat new file mode 100644 index 0000000..b99732b --- /dev/null +++ b/Assets/VFX/Special/SampleOccluder.mat @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SampleOccluder + m_Shader: {fileID: 4800000, guid: 40ac756e736b6f34d97c3734c9d39364, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2999 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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: 2800000, guid: e933da9fc5bddfa49ae7baa28eba78a5, type: 3} + 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} + m_Floats: + - _BlendOpAlpha: 2 + - _BlendOpColor: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EffectStrength: 0 + - _EffectTimer: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Inflation: 0 + - _InvertedAlpha: 0 + - _InvertedMask: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _PatternTiling: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EffectPosition: {r: 0.5, g: 0.5, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/VFX/Special/SampleOccluder.mat.meta b/Assets/VFX/Special/SampleOccluder.mat.meta new file mode 100644 index 0000000..b45e2f6 --- /dev/null +++ b/Assets/VFX/Special/SampleOccluder.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2c41fdeefdfc4e20a026501ba4c8e78 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VFX/White.tga b/Assets/VFX/White.tga new file mode 100644 index 0000000000000000000000000000000000000000..2b338018f00f5c7f75564e537b08e4db5e7e3505 GIT binary patch literal 12332 zcmeI(y9t0m00qH^RoH~qaLEY=qTmnvZ$u+|Fqkc2@=dyYm6Y^(M1TMR0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF{9fR@0gmmgSKHgV K4ENOLI_3rHGT27| literal 0 HcmV?d00001 diff --git a/Assets/VFX/White.tga.meta b/Assets/VFX/White.tga.meta new file mode 100644 index 0000000..a2a7364 --- /dev/null +++ b/Assets/VFX/White.tga.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: e933da9fc5bddfa49ae7baa28eba78a5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index eefee64..75fdc46 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -139,8 +139,6 @@ PlayerSettings: bundleVersion: 0.1 preloadedAssets: - {fileID: 11400000, guid: 29d72bf9f28086693968cedbdc8f08cd, type: 2} - - {fileID: 11400000, guid: 541751c4fa90967d68ef779a22ee43f3, type: 2} - - {fileID: -3127938587913570544, guid: 8eb28e39ec717d0799039f01965f0533, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 854f12d..fd21c2a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - - Outside World - - - + - Furniture - - -