From f3fd8c138058d78419201fa68042f0f105ffb79e Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Sat, 22 Jul 2023 19:20:16 +0100 Subject: [PATCH 1/6] Add webcam panel for PC --- Assets/Prefabs/Panels/ExtraPanel.prefab | 158 ++++- Assets/Prefabs/Panels/WebcamPanel.prefab | 646 +++++++++++++++++ Assets/Prefabs/Panels/WebcamPanel.prefab.meta | 7 + Assets/Prefabs/Webcam.prefab | 647 ++++++++++++++++++ Assets/Prefabs/Webcam.prefab.meta | 7 + Assets/Scenes/Main.unity | 9 + Assets/Scripts/GUI/BasePanel.cs | 1 + Assets/Scripts/WebcamSurface.cs | 62 ++ Assets/Scripts/WebcamSurface.cs.meta | 11 + 9 files changed, 1544 insertions(+), 4 deletions(-) create mode 100644 Assets/Prefabs/Panels/WebcamPanel.prefab create mode 100644 Assets/Prefabs/Panels/WebcamPanel.prefab.meta create mode 100644 Assets/Prefabs/Webcam.prefab create mode 100644 Assets/Prefabs/Webcam.prefab.meta create mode 100644 Assets/Scripts/WebcamSurface.cs create mode 100644 Assets/Scripts/WebcamSurface.cs.meta diff --git a/Assets/Prefabs/Panels/ExtraPanel.prefab b/Assets/Prefabs/Panels/ExtraPanel.prefab index 82b3798448..30d29cfaa7 100644 --- a/Assets/Prefabs/Panels/ExtraPanel.prefab +++ b/Assets/Prefabs/Panels/ExtraPanel.prefab @@ -30,7 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4232412870837608} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &65772034241514116 BoxCollider: @@ -340,6 +340,7 @@ Transform: - {fileID: 8211543910910235730} - {fileID: 7161901348231431177} - {fileID: 3298845783872388597} + - {fileID: 3413628451374233986} - {fileID: 4159606566656768} - {fileID: 4082672982539268} - {fileID: 4924232686100982} @@ -378,7 +379,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4232412870837608} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33786679359167878 MeshFilter: @@ -1121,7 +1122,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4232412870837608} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33572971787848210 MeshFilter: @@ -1578,6 +1579,155 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 0.01} m_Center: {x: 0, y: 0, z: -0.05} +--- !u!1 &3110157463552763897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3413628451374233986} + - component: {fileID: 7451102554742090033} + - component: {fileID: 1315690515366486446} + - component: {fileID: 5830682980645365130} + - component: {fileID: 6027553819448946632} + m_Layer: 16 + m_Name: Webcam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3413628451374233986 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3110157463552763897} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.214, y: -0.425, z: 0.049999237} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4232412870837608} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7451102554742090033 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3110157463552763897} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &1315690515366486446 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3110157463552763897} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, 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: 0 + 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!114 &5830682980645365130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3110157463552763897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Webcam + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: bc16ebd42512d3d479639955f68090a4, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 0 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Type: 5200 + m_AlwaysSpawn: 0 + references: + version: 2 + RefIds: [] +--- !u!65 &6027553819448946632 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3110157463552763897} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.01} + m_Center: {x: 0, y: 0, z: -0.05} --- !u!1 &3302177877346690095 GameObject: m_ObjectHideFlags: 0 @@ -1606,7 +1756,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3302177877346690095} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.425, z: 0.049999237} + m_LocalPosition: {x: -0.206, y: -0.425, z: 0.049999237} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Prefabs/Panels/WebcamPanel.prefab b/Assets/Prefabs/Panels/WebcamPanel.prefab new file mode 100644 index 0000000000..2febaf8057 --- /dev/null +++ b/Assets/Prefabs/Panels/WebcamPanel.prefab @@ -0,0 +1,646 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1027666980516482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4159606566656768} + - component: {fileID: 65772034241514116} + m_Layer: 16 + m_Name: MeshCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4159606566656768 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1027666980516482} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4232412870837608} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &65772034241514116 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1027666980516482} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.4, y: 1.4096358, z: 0.02} + m_Center: {x: 0, y: -0.0020278692, z: 0} +--- !u!1 &1077557619903986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4223803146443412} + - component: {fileID: 33955959752836372} + - component: {fileID: 23947092074022216} + m_Layer: 16 + m_Name: _Bounds(inactive) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4223803146443412 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077557619903986} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.4784614, y: 1.43, z: 2.4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4197185823870920} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33955959752836372 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077557619903986} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &23947092074022216 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077557619903986} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + 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!1 &1129504163572690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4232412870837608} + m_Layer: 16 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4232412870837608 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129504163572690} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2152454908181128714} + - {fileID: 4159606566656768} + - {fileID: 4082672982539268} + - {fileID: 4924232686100982} + - {fileID: 2276294325867133517} + m_Father: {fileID: 4197185823870920} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1269971072766788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4082672982539268} + - component: {fileID: 33786679359167878} + - component: {fileID: 23528343814881480} + - component: {fileID: 114155335523308684} + m_Layer: 16 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4082672982539268 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269971072766788} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4232412870837608} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33786679359167878 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269971072766788} + m_Mesh: {fileID: 4300000, guid: abfb1ed71d7809e4ca432a0cb90d676b, type: 3} +--- !u!23 &23528343814881480 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269971072766788} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + 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: 3e92ccbfed650604686991e69902e663, 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: 0 + 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!114 &114155335523308684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269971072766788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aaefde5afe80784e908d27fcb05a101, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OffsetOverride: -1 +--- !u!1 &1272310558547734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4197185823870920} + - component: {fileID: 114137448250961176} + - component: {fileID: 114695644258670246} + - component: {fileID: 114306850044095870} + m_Layer: 16 + m_Name: WebcamPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4197185823870920 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272310558547734} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 11.681803, y: -0.47926903, z: 26.083145} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4223803146443412} + - {fileID: 4322589350354290} + - {fileID: 4232412870837608} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 37.184097, y: 63.1294, z: 0} +--- !u!114 &114137448250961176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272310558547734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7d0b1933e6839443a2050b4306ef453, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PanelType: 5200 + m_Collider: {fileID: 65686315866890560} + m_Mesh: {fileID: 1129504163572690} + m_Border: {fileID: 23528343814881480} + m_MeshCollider: {fileID: 65772034241514116} + m_ParticleBounds: {x: 1.2, y: 0.8, z: 0} + m_PanelPopUpMap: + - m_PopUpPrefab: {fileID: 125142, guid: 7196a3c4e8222e349866bcfb5adff521, type: 3} + m_Command: 18 + - m_PopUpPrefab: {fileID: 197348, guid: d6d515da978a4db419b15f960d57d718, type: 3} + m_Command: 31 + m_PanelDescription: Webcam + m_LocalizedPanelDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_PanelDescriptionPrefab: {fileID: 160918, guid: 3491f4f01ba6cac47b1633f36d7c6c84, + type: 3} + m_PanelDescriptionOffset: {x: 1.15, y: 0.6, z: 0} + m_PanelDescriptionColor: {r: 1, g: 1, b: 1, a: 1} + m_PanelFlairPrefab: {fileID: 0} + m_PanelFlairOffset: {x: 0, y: 0, z: 0} + m_DescriptionSpringK: 4 + m_DescriptionSpringDampen: 0.2 + m_DescriptionClosedAngle: -90 + m_DescriptionOpenAngle: 0 + m_DescriptionAlphaDistance: 90 + m_Decor: [] + m_GazeHighlightScaleMultiplier: 1.1 + m_BorderMeshWidth: 0.02 + m_BorderMeshAdvWidth: 0.01 + m_PanelSensitivity: 0.1 + m_ClampToBounds: 1 + m_ReticleBounds: {x: 1.35, y: 1.9, z: 0} + m_BorderSphereHighlightRadius: 2.5 + m_PositioningSpheresBounds: {x: 1, y: 1} + m_PositioningSphereRadius: 0.4 + m_UseGazeRotation: 1 + m_MaxGazeRotation: 20 + m_GazeActivateSpeed: 8 + m_InitialSpawnPos: {x: 8, y: 14, z: 5.34} + m_InitialSpawnRotEulers: {x: 37.18, y: 63.12, z: 0} + m_WandAttachAngle: 240 + m_WandAttachYOffset: -0.6 + m_WandAttachHalfHeight: 0.6 + m_BeginFixed: 0 + m_CanBeFixedToWand: 1 + m_CanBeDetachedFromWand: 1 + m_PopUpGazeDuration: 0.2 + m_PromoBorders: [] + references: + version: 2 + RefIds: [] +--- !u!114 &114695644258670246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272310558547734} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6311d8a25dba6a443be8afe87803c545, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDuration: 0.25 + m_GrabDistance: 1.4 + m_CollisionRadius: 0.8 + m_AllowTwoHandGrab: 0 + m_DestroyOnHide: 0 + m_AllowHideWithToss: 0 + m_DisableDrift: 0 + m_RecordMovements: 0 + m_AllowSnapping: 0 + m_SnapDisabledDelay: 0.2 + m_AllowPinning: 0 + m_AllowDormancy: 1 + m_TossDuration: 0 + m_TintableMeshes: + - {fileID: 23528343814881480} + m_SpawnPlacementOffset: {x: 3.5, y: 0, z: 1.5} + m_IntroAnimSpinAmount: 360 + m_BoxCollider: {fileID: 65686315866890560} + m_Mesh: {fileID: 4197185823870920} + m_HighlightMeshXfs: + - {fileID: 4924232686100982} + m_ValidSnapRotationStickyAngle: 0 + m_SnapGhostMaterial: {fileID: 0} + m_Border: {fileID: 4082672982539268} + m_GrabFixedMaxFacingAngle: 70 +--- !u!114 &114306850044095870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272310558547734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 739d5b1996234d64992a2ae60c3723e9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1406911291435214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4322589350354290} + - component: {fileID: 65686315866890560} + m_Layer: 16 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4322589350354290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406911291435214} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4197185823870920} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &65686315866890560 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406911291435214} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.4157543, y: 1.425672, z: 0.5} + m_Center: {x: 0, y: 0.0048424006, z: 0} +--- !u!1 &1871313576491328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4924232686100982} + - component: {fileID: 33572971787848210} + m_Layer: 16 + m_Name: HighlightMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4924232686100982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1871313576491328} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.05} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4232412870837608} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33572971787848210 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1871313576491328} + m_Mesh: {fileID: 4300000, guid: bfb0baf1a986fe5479556d1776afff52, type: 3} +--- !u!1 &7674764324587663635 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2276294325867133517} + - component: {fileID: 8223159316324752237} + m_Layer: 16 + m_Name: Video Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2276294325867133517 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674764324587663635} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4232412870837608} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!328 &8223159316324752237 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674764324587663635} + m_Enabled: 1 + m_VideoClip: {fileID: 0} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 0} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: + m_RenderMode: 2 + m_AspectRatio: 2 + m_DataSource: 0 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 1 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] +--- !u!1001 &304273775999082949 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4232412870837608} + m_Modifications: + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.398 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7448022236017278401, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_Name + value: Webcam + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56ec8ee0db1efc446a6f76935a5392f5, type: 3} +--- !u!4 &2152454908181128714 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1866725787647526863, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + m_PrefabInstance: {fileID: 304273775999082949} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Panels/WebcamPanel.prefab.meta b/Assets/Prefabs/Panels/WebcamPanel.prefab.meta new file mode 100644 index 0000000000..4b6f5cda31 --- /dev/null +++ b/Assets/Prefabs/Panels/WebcamPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 38a4b95a5f6824c41994709bfbd012ad +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Webcam.prefab b/Assets/Prefabs/Webcam.prefab new file mode 100644 index 0000000000..a416f3bf0e --- /dev/null +++ b/Assets/Prefabs/Webcam.prefab @@ -0,0 +1,647 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1020935432328901783 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4406547569020425325} + - component: {fileID: 2239876595213064924} + - component: {fileID: 6511088891619073603} + m_Layer: 16 + m_Name: Screen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4406547569020425325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020935432328901783} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.617, z: 0} + m_LocalScale: {x: -1.2033, y: 1.2033, z: 1.2033} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6971963563930640786} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2239876595213064924 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020935432328901783} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6511088891619073603 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020935432328901783} + 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: 8abca4e4c3fe53347928928c0b64d985, 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!1 &1486367014069596956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6971963563930640786} + m_Layer: 0 + m_Name: Screen Origin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6971963563930640786 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1486367014069596956} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.151, z: 0} + m_LocalScale: {x: 1, y: 0.6666667, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4406547569020425325} + m_Father: {fileID: 1866725787647526863} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3735374499446627345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1109447615107176046} + - component: {fileID: 6175639478077962449} + - component: {fileID: 330012647604546395} + m_Layer: 16 + m_Name: Device Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1109447615107176046 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735374499446627345} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.025, y: 0.025, z: 0.025} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1866725787647526863} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -0.806} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &6175639478077962449 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735374499446627345} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + 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: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, 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!114 &330012647604546395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735374499446627345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sample text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: ec48085d8b1ed18499cf1411d42005a0, type: 2} + m_sharedMaterial: {fileID: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 3 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -14.907036, y: -1.0668178, z: -15.464783, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6175639478077962449} + m_maskType: 0 +--- !u!1 &7448022236017278401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1866725787647526863} + - component: {fileID: -2214940817581839681} + m_Layer: 16 + m_Name: Webcam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1866725787647526863 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7448022236017278401} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6971963563930640786} + - {fileID: 1109447615107176046} + - {fileID: 4480697233370351510} + - {fileID: 8720976293651703736} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-2214940817581839681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7448022236017278401} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33c74321f02a3e9498966a293f739d1f, type: 3} + m_Name: + m_EditorClassIdentifier: + deviceIndex: 0 + Screen: {fileID: 6511088891619073603} + Pivot: {fileID: 6971963563930640786} + DeviceNameLabel: {fileID: 330012647604546395} + PreviousDeviceButton: {fileID: 4223277647453853130} + NextDeviceButton: {fileID: 9058317180742825444} +--- !u!1001 &1220085234276966425 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1866725787647526863} + m_Modifications: + - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Name + value: Next Device + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.y + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.125 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.973 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ButtonTexture + value: + objectReference: {fileID: 2800000, guid: ab8b9a0b96b6cb74ca1e518f3c56b425, type: 3} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionText + value: Next Device + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: -2214940817581839681} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleChangeDevice + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: WebcamSurface, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3} +--- !u!4 &8720976293651703736 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 1220085234276966425} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9058317180742825444 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 1220085234276966425} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07f172f1096366841bb9362060bb0095, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &6325058084803493943 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1866725787647526863} + m_Modifications: + - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Name + value: Previous Device + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.y + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.13299999 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.973 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ButtonTexture + value: + objectReference: {fileID: 2800000, guid: f74f6eac3e3e3c640b1a343ec46ba2dd, type: 3} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionText + value: Previous Device + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: -2214940817581839681} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleChangeDevice + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: WebcamSurface, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3} +--- !u!114 &4223277647453853130 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 6325058084803493943} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07f172f1096366841bb9362060bb0095, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &4480697233370351510 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 6325058084803493943} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Webcam.prefab.meta b/Assets/Prefabs/Webcam.prefab.meta new file mode 100644 index 0000000000..203800ad80 --- /dev/null +++ b/Assets/Prefabs/Webcam.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 56ec8ee0db1efc446a6f76935a5392f5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 6c7fc60b66..26e1d47d40 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -30572,6 +30572,15 @@ MonoBehaviour: m_ModeGvr: 0 m_Basic: 0 m_Advanced: 0 + - m_PanelPrefab: {fileID: 1272310558547734, guid: 38a4b95a5f6824c41994709bfbd012ad, + type: 3} + m_ModeVr: 1 + m_ModeVrExperimental: 1 + m_ModeMono: 1 + m_ModeQuest: 0 + m_ModeGvr: 0 + m_Basic: 0 + m_Advanced: 1 - m_PanelPrefab: {fileID: 199434, guid: 87deb34c3f9672645984b6032a6c1f8d, type: 3} m_ModeVr: 1 m_ModeVrExperimental: 1 diff --git a/Assets/Scripts/GUI/BasePanel.cs b/Assets/Scripts/GUI/BasePanel.cs index 20853cf3f4..a2e3c8d4e1 100644 --- a/Assets/Scripts/GUI/BasePanel.cs +++ b/Assets/Scripts/GUI/BasePanel.cs @@ -105,6 +105,7 @@ public enum PanelType ReferenceMobile, CameraPath, BrushLab, + WebcamPanel = 5200, Scripts = 6000, SnapSettings = 8000, StencilSettings = 20200, diff --git a/Assets/Scripts/WebcamSurface.cs b/Assets/Scripts/WebcamSurface.cs new file mode 100644 index 0000000000..7aeb592fdb --- /dev/null +++ b/Assets/Scripts/WebcamSurface.cs @@ -0,0 +1,62 @@ +using System; +using TiltBrush; +using TMPro; +using UnityEngine; + +public class WebcamSurface : MonoBehaviour +{ + public int deviceIndex = 0; + public MeshRenderer Screen; + public Transform Pivot; + public TextMeshPro DeviceNameLabel; + public ActionButton PreviousDeviceButton; + public ActionButton NextDeviceButton; + + private WebCamDevice[] _Devices; + private WebCamTexture _webcam; + + void Start() + { + _Devices = WebCamTexture.devices; + UpdateButtonState(); + UpdateDevice(); + } + + private void UpdateDevice() + { + if (_webcam != null) + { + _webcam.Stop(); + Destroy(_webcam); + } + var device = _Devices[deviceIndex]; + DeviceNameLabel.text = device.name; + Application.RequestUserAuthorization(UserAuthorization.WebCam); + _webcam = new WebCamTexture(device.name); + Screen.material.mainTexture = _webcam; + _webcam.Play(); + // Note that it's height / width, not width / height + var aspectRatio = _webcam.height / (float)_webcam.width; + Pivot.localScale = new Vector3(1, aspectRatio, 1); + } + + public void HandleChangeDevice(int increment) + { + deviceIndex += increment; + deviceIndex = Mathf.Clamp(deviceIndex, 0, _Devices.Length - 1); + UpdateButtonState(); + UpdateDevice(); + } + + private void UpdateButtonState() + { + NextDeviceButton.SetButtonAvailable(deviceIndex < _Devices.Length - 1); + PreviousDeviceButton.SetButtonAvailable(deviceIndex > 0); + } + + private void OnDestroy() + { + _webcam.Stop(); + Destroy(_webcam); + } +} diff --git a/Assets/Scripts/WebcamSurface.cs.meta b/Assets/Scripts/WebcamSurface.cs.meta new file mode 100644 index 0000000000..745a4c2ea9 --- /dev/null +++ b/Assets/Scripts/WebcamSurface.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 33c74321f02a3e9498966a293f739d1f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 10587c469f69485b9a856882caf0bc59def12336 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Mon, 24 Jul 2023 17:41:01 +0100 Subject: [PATCH 2/6] Button viz tweaks and RunInCompositor when switching devices --- Assets/Prefabs/Panels/WebcamPanel.prefab | 20 ++++++++++++++++++++ Assets/Scripts/WebcamSurface.cs | 20 ++++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Assets/Prefabs/Panels/WebcamPanel.prefab b/Assets/Prefabs/Panels/WebcamPanel.prefab index 2febaf8057..c05bbfb812 100644 --- a/Assets/Prefabs/Panels/WebcamPanel.prefab +++ b/Assets/Prefabs/Panels/WebcamPanel.prefab @@ -631,11 +631,31 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4480697233370351510, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.525 + objectReference: {fileID: 0} + - target: {fileID: 4480697233370351510, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.968 + objectReference: {fileID: 0} - target: {fileID: 7448022236017278401, guid: 56ec8ee0db1efc446a6f76935a5392f5, type: 3} propertyPath: m_Name value: Webcam objectReference: {fileID: 0} + - target: {fileID: 8720976293651703736, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.512 + objectReference: {fileID: 0} + - target: {fileID: 8720976293651703736, guid: 56ec8ee0db1efc446a6f76935a5392f5, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.96799994 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 56ec8ee0db1efc446a6f76935a5392f5, type: 3} --- !u!4 &2152454908181128714 stripped diff --git a/Assets/Scripts/WebcamSurface.cs b/Assets/Scripts/WebcamSurface.cs index 7aeb592fdb..f1faf8b38a 100644 --- a/Assets/Scripts/WebcamSurface.cs +++ b/Assets/Scripts/WebcamSurface.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using TiltBrush; using TMPro; using UnityEngine; @@ -19,7 +20,18 @@ void Start() { _Devices = WebCamTexture.devices; UpdateButtonState(); - UpdateDevice(); + UpdateDeviceInCompositor(); + } + + private void UpdateDeviceInCompositor() + { + StartCoroutine( + OverlayManager.m_Instance.RunInCompositor( + OverlayType.LoadGeneric, + UpdateDevice, + 0.25f + ) + ); } private void UpdateDevice() @@ -45,13 +57,13 @@ public void HandleChangeDevice(int increment) deviceIndex += increment; deviceIndex = Mathf.Clamp(deviceIndex, 0, _Devices.Length - 1); UpdateButtonState(); - UpdateDevice(); + UpdateDeviceInCompositor(); } private void UpdateButtonState() { - NextDeviceButton.SetButtonAvailable(deviceIndex < _Devices.Length - 1); - PreviousDeviceButton.SetButtonAvailable(deviceIndex > 0); + NextDeviceButton.gameObject.SetActive(deviceIndex < _Devices.Length - 1); + PreviousDeviceButton.gameObject.SetActive(deviceIndex > 0); } private void OnDestroy() From 5a054605a8410e1a365bc6e57f9e001a23200a39 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Mon, 24 Jul 2023 17:44:45 +0100 Subject: [PATCH 3/6] Update PackageManagerSettings.asset --- ProjectSettings/PackageManagerSettings.asset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index a0caee7ddc..18fd947c51 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -65,6 +65,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -848 - m_OriginalInstanceId: -852 + m_UserModificationsInstanceId: -830 + m_OriginalInstanceId: -832 m_LoadAssets: 0 From 5529395ed94255c259e5a4b574ed8ba187ca66cc Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Mon, 24 Jul 2023 18:47:43 +0100 Subject: [PATCH 4/6] dotnet-format --- Assets/Scripts/WebcamSurface.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/WebcamSurface.cs b/Assets/Scripts/WebcamSurface.cs index f1faf8b38a..c3fcd93c29 100644 --- a/Assets/Scripts/WebcamSurface.cs +++ b/Assets/Scripts/WebcamSurface.cs @@ -18,7 +18,7 @@ public class WebcamSurface : MonoBehaviour void Start() { - _Devices = WebCamTexture.devices; + _Devices = WebCamTexture.devices; UpdateButtonState(); UpdateDeviceInCompositor(); } From f0681406232c65b417185060bb980b70e6bda315 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Wed, 26 Jul 2023 16:03:40 +0100 Subject: [PATCH 5/6] Add missing copyright --- Assets/Scripts/WebcamSurface.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Assets/Scripts/WebcamSurface.cs b/Assets/Scripts/WebcamSurface.cs index c3fcd93c29..e6be9d3374 100644 --- a/Assets/Scripts/WebcamSurface.cs +++ b/Assets/Scripts/WebcamSurface.cs @@ -1,3 +1,17 @@ +// Copyright 2023 The Open Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using System; using System.Collections.Generic; using TiltBrush; From ff0f13b46238997c56b0c6b3c531411dcc45a0a8 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Fri, 28 Jul 2023 11:02:29 +0100 Subject: [PATCH 6/6] Move webcam button to labs panel --- Assets/Prefabs/Panels/ExtraPanel.prefab | 621 +++--------------------- Assets/Prefabs/Panels/LabsPanel.prefab | 349 ++++++++++++- 2 files changed, 385 insertions(+), 585 deletions(-) diff --git a/Assets/Prefabs/Panels/ExtraPanel.prefab b/Assets/Prefabs/Panels/ExtraPanel.prefab index a6982d5dfc..6e52c9cd23 100644 --- a/Assets/Prefabs/Panels/ExtraPanel.prefab +++ b/Assets/Prefabs/Panels/ExtraPanel.prefab @@ -236,8 +236,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6c6859eec74651247968d56b594ac313, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: EXTRA_PANEL_ENVIRONMENT_BUTTON_DESCRIPTION @@ -246,17 +246,17 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7690667696037888 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: + m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -284,17 +284,17 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7690784670982144 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_ToggleOnDescription: + m_ToggleOnDescription: m_LocalizedToggleOnDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -342,7 +342,6 @@ Transform: - {fileID: 7656778960772056826} - {fileID: 2183017126753138076} - {fileID: 3298845783872388597} - - {fileID: 3413628451374233986} - {fileID: 4159606566656768} - {fileID: 4082672982539268} - {fileID: 4924232686100982} @@ -381,11 +380,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4232412870837608} -<<<<<<< HEAD - m_RootOrder: 10 -======= m_RootOrder: 11 ->>>>>>> main m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33786679359167878 MeshFilter: @@ -447,8 +442,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1aaefde5afe80784e908d27fcb05a101, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_OffsetOverride: -1 --- !u!1 &1272310558547734 GameObject: @@ -497,8 +492,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a7d0b1933e6839443a2050b4306ef453, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_PanelType: 27 m_Collider: {fileID: 65686315866890560} m_Mesh: {fileID: 1129504163572690} @@ -516,7 +511,7 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7689873479409664 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -567,8 +562,8 @@ MonoBehaviour: m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6311d8a25dba6a443be8afe87803c545, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_ShowDuration: 0.25 m_GrabDistance: 1.4 m_CollisionRadius: 0.8 @@ -604,8 +599,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 739d5b1996234d64992a2ae60c3723e9, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1 &1388918871144404 GameObject: m_ObjectHideFlags: 0 @@ -701,8 +696,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: EXTRA_PANEL_GUIDES_BUTTON_DESCRIPTION @@ -711,17 +706,17 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7691186472722432 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: + m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -863,8 +858,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: EXTRA_PANEL_BACKDROP_BUTTON_DESCRIPTION @@ -873,17 +868,17 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7691111650533376 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: + m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -1044,8 +1039,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: LABS_PANEL_POLY_BUTTON_DESCRIPTION @@ -1054,17 +1049,17 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7691576060649472 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: + m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -1128,11 +1123,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4232412870837608} -<<<<<<< HEAD - m_RootOrder: 11 -======= m_RootOrder: 12 ->>>>>>> main m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33572971787848210 MeshFilter: @@ -1250,8 +1241,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: EXTRA_PANEL_LIGHTS_BUTTON_DESCRIPTION @@ -1260,17 +1251,17 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7690924718792704 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: + m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -1386,8 +1377,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: EXTRA_PANEL_LOCALMEDIA_BUTTON_DESCRIPTION @@ -1396,17 +1387,17 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7867671724662784 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: + m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -1535,8 +1526,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: EXTRA_PANEL_CAMERAPATHS_BUTTON_DESCRIPTION @@ -1545,17 +1536,17 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 7691821452599296 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: + m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -1589,155 +1580,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 0.01} m_Center: {x: 0, y: 0, z: -0.05} ---- !u!1 &3110157463552763897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3413628451374233986} - - component: {fileID: 7451102554742090033} - - component: {fileID: 1315690515366486446} - - component: {fileID: 5830682980645365130} - - component: {fileID: 6027553819448946632} - m_Layer: 16 - m_Name: Webcam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3413628451374233986 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.214, y: -0.425, z: 0.049999237} - m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4232412870837608} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7451102554742090033 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &1315690515366486446 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, 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: 0 - 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!114 &5830682980645365130 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DescriptionType: 0 - m_DescriptionYOffset: 0 - m_DescriptionText: Webcam - m_LocalizedDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionTextExtra: - m_LocalizedDescriptionExtra: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionActivateSpeed: 12 - m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: bc16ebd42512d3d479639955f68090a4, type: 3} - m_AtlasTexture: 1 - m_ToggleButton: 1 - m_LongPressReleaseButton: 0 - m_ButtonHasPressedAudio: 0 - m_ZAdjustHover: -0.02 - m_ZAdjustClick: 0.05 - m_HoverScale: 1.1 - m_HoverBoxColliderGrow: 0.2 - m_AddOverlay: 0 - m_Type: 5200 - m_AlwaysSpawn: 0 - references: - version: 2 - RefIds: [] ---- !u!65 &6027553819448946632 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 0.01} - m_Center: {x: 0, y: 0, z: -0.05} --- !u!1 &3302177877346690095 GameObject: m_ObjectHideFlags: 0 @@ -1766,11 +1608,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3302177877346690095} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} -<<<<<<< HEAD - m_LocalPosition: {x: -0.206, y: -0.425, z: 0.049999237} -======= m_LocalPosition: {x: -0.422, y: -0.425, z: 0.049999237} ->>>>>>> main m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1837,8 +1675,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: EXTRA_PANEL_LAYERS_BUTTON_DESCRIPTION @@ -1847,341 +1685,6 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 68764809030598656 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionTextExtra: - m_LocalizedDescriptionExtra: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionActivateSpeed: 12 - m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 524d978d6b53123478aa58e5dae54302, type: 3} - m_AtlasTexture: 1 - m_ToggleButton: 1 - m_LongPressReleaseButton: 0 - m_ButtonHasPressedAudio: 0 - m_ZAdjustHover: -0.02 - m_ZAdjustClick: 0.05 - m_HoverScale: 1.1 - m_HoverBoxColliderGrow: 0.2 - m_AddOverlay: 0 - m_Type: 15000 - m_AlwaysSpawn: 0 - references: - version: 2 - RefIds: [] ---- !u!65 &3260516044134733857 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3302177877346690095} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 0.01} - m_Center: {x: 0, y: 0, z: -0.05} ---- !u!1001 &4136892008545286871 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4232412870837608} - m_Modifications: - - target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_DescriptionText - value: Grid and Snap Settings - objectReference: {fileID: 0} - - target: {fileID: 4969199155606796208, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_Name - value: OptionButton_SnapSettings - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.425 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.049999237 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3a98611722d498f4c93e269bfc1ba325, type: 3} ---- !u!4 &7656778960772056826 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - m_PrefabInstance: {fileID: 4136892008545286871} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &5575672093838166449 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4232412870837608} - m_Modifications: - - target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_Type - value: 12000 - objectReference: {fileID: 0} - - target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_AtlasTexture - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_ButtonTexture - value: - objectReference: {fileID: 2800000, guid: 4fb00a3c13d9a1b4e916be1c5a5357b8, type: 3} - - target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_DescriptionText - value: Transform Tools - objectReference: {fileID: 0} - - target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalizedDescription.m_TableEntryReference.m_KeyId - value: 103943359016206336 - objectReference: {fileID: 0} - - target: {fileID: 4969199155606796208, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_Name - value: OptionButton_TransformPanel - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.422 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.425 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.049999237 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3a98611722d498f4c93e269bfc1ba325, type: 3} ---- !u!4 &2183017126753138076 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325, - type: 3} - m_PrefabInstance: {fileID: 5575672093838166449} - m_PrefabAsset: {fileID: 0} - m_RootOrder: 9 - m_RootOrder: 10 - - {fileID: 7656778960772056826} - - {fileID: 2183017126753138076} - - {fileID: 3413628451374233986} - m_RootOrder: 12 ---- !u!1 &3110157463552763897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3413628451374233986} - - component: {fileID: 7451102554742090033} - - component: {fileID: 1315690515366486446} - - component: {fileID: 5830682980645365130} - - component: {fileID: 6027553819448946632} - m_Layer: 16 - m_Name: Webcam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3413628451374233986 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.214, y: -0.425, z: 0.049999237} - m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4232412870837608} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7451102554742090033 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &1315690515366486446 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, 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: 0 - 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!114 &5830682980645365130 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DescriptionType: 0 - m_DescriptionYOffset: 0 - m_DescriptionText: Webcam - m_LocalizedDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -2198,7 +1701,7 @@ MonoBehaviour: m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: bc16ebd42512d3d479639955f68090a4, type: 3} + m_ButtonTexture: {fileID: 2800000, guid: 524d978d6b53123478aa58e5dae54302, type: 3} m_AtlasTexture: 1 m_ToggleButton: 1 m_LongPressReleaseButton: 0 @@ -2208,26 +1711,24 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Type: 5200 + m_Type: 15000 m_AlwaysSpawn: 0 references: version: 2 RefIds: [] ---- !u!65 &6027553819448946632 +--- !u!65 &3260516044134733857 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3110157463552763897} + m_GameObject: {fileID: 3302177877346690095} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 0.01} m_Center: {x: 0, y: 0, z: -0.05} - m_LocalPosition: {x: -0.422, y: -0.425, z: 0.049999237} - m_RootOrder: 100 --- !u!1001 &4136892008545286871 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Panels/LabsPanel.prefab b/Assets/Prefabs/Panels/LabsPanel.prefab index cfa4301b22..2dac8b29e4 100644 --- a/Assets/Prefabs/Panels/LabsPanel.prefab +++ b/Assets/Prefabs/Panels/LabsPanel.prefab @@ -302,6 +302,7 @@ Transform: - {fileID: 4000011596321798} - {fileID: 4000012572946912} - {fileID: 4959811239207079844} + - {fileID: 1210818133549774434} - {fileID: 434412} - {fileID: 4000011486688576} - {fileID: 499404} @@ -1022,7 +1023,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010690061500} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.213, y: -0.3, z: 0.05} + m_LocalPosition: {x: -0.415, y: -0.3, z: 0.05} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2352,6 +2353,155 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!1 &1016131236980122382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4959811239207079844} + - component: {fileID: 7459773723550717888} + - component: {fileID: 8317747706054025758} + - component: {fileID: 8285705766130651766} + - component: {fileID: 2336559717057158639} + m_Layer: 16 + m_Name: PanelButton_Scripts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4959811239207079844 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016131236980122382} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.3, z: 0.05} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 402684} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7459773723550717888 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016131236980122382} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &8317747706054025758 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016131236980122382} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, 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: 0 + 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!114 &8285705766130651766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016131236980122382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: LABS_PANEL_SCRIPTS_BUTTON_DESCRIPTION + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 7870646065012736 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 77bf8765016e8ff4080d523e18a50722, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 0 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Type: 6000 + m_AlwaysSpawn: 0 + references: + version: 2 + RefIds: [] +--- !u!65 &2336559717057158639 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016131236980122382} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2720949118896594763 GameObject: m_ObjectHideFlags: 0 @@ -2501,78 +2651,227 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 0.01} m_Center: {x: 0, y: 0, z: -0.05} ---- !u!1001 &2718574506684042944 +--- !u!1 &4011871447704911063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 3536661520790244040, guid: 85c17aa035a7c9442b282e84d56462df, + type: 3} + m_PrefabInstance: {fileID: 5014542329798129147} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1210818133549774434} + - component: {fileID: 4510907067803236372} + - component: {fileID: 8214681752030472003} + - component: {fileID: 5616146602988485478} + - component: {fileID: 2060444129593214251} + m_Layer: 16 + m_Name: Webcam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1210818133549774434 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, + type: 3} + m_PrefabInstance: {fileID: 5014542329798129147} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4011871447704911063} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.415, y: -0.3, z: 0.049999237} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 402684} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4510907067803236372 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 9032640981526184960, guid: 85c17aa035a7c9442b282e84d56462df, + type: 3} + m_PrefabInstance: {fileID: 5014542329798129147} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4011871447704911063} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &8214681752030472003 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 612354154054831263, guid: 85c17aa035a7c9442b282e84d56462df, + type: 3} + m_PrefabInstance: {fileID: 5014542329798129147} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4011871447704911063} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, 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: 0 + 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!114 &5616146602988485478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 5392917690490882235, guid: 85c17aa035a7c9442b282e84d56462df, + type: 3} + m_PrefabInstance: {fileID: 5014542329798129147} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4011871447704911063} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03222d9718beeb748bf9e9be379fea39, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Webcam + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: bc16ebd42512d3d479639955f68090a4, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 0 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Type: 5200 + m_AlwaysSpawn: 0 + references: + version: 2 + RefIds: [] +--- !u!65 &2060444129593214251 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 5304093661399925497, guid: 85c17aa035a7c9442b282e84d56462df, + type: 3} + m_PrefabInstance: {fileID: 5014542329798129147} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4011871447704911063} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.01} + m_Center: {x: 0, y: 0, z: -0.05} +--- !u!1001 &5014542329798129147 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 402684} m_Modifications: - - target: {fileID: 3143605885771001294, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3536661520790244040, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_Name - value: PanelButton_Scripts + value: Webcam objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalPosition.x - value: 0.20199999 + value: 0.415 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalPosition.y value: -0.3 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalPosition.z - value: 0.05 + value: 0.049999237 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, + - target: {fileID: 3846748820477744307, guid: 85c17aa035a7c9442b282e84d56462df, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6e69b3bc22681fb44ac931399886cd69, type: 3} ---- !u!4 &4959811239207079844 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, - type: 3} - m_PrefabInstance: {fileID: 2718574506684042944} - m_PrefabAsset: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 85c17aa035a7c9442b282e84d56462df, type: 3}