diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab index 26be097..276dca4 100644 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab @@ -135,6 +135,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &513466010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 513466011} + - component: {fileID: 513466013} + - component: {fileID: 513466012} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &513466011 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513466010} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0205} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7516989854894110300} + 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.0069, y: -0.1349} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &513466013 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513466010} + m_CullTransparentMesh: 1 +--- !u!114 &513466012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513466010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Start + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279426337 + m_fontColor: {r: 0.1297147, g: 0.8666667, b: 0.07058823, 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + 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: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &857526030 GameObject: m_ObjectHideFlags: 0 @@ -305,7 +440,7 @@ RectTransform: 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: -134, y: 0} + m_AnchoredPosition: {x: -145, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1671468707 @@ -336,7 +471,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300516, guid: 7f186a9ac091755489927d745be0185a, type: 3} + m_Sprite: {fileID: 21300000, guid: bedfa77ea91e4eb45ab252e90d1fca47, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -492,6 +627,7 @@ GameObject: - component: {fileID: 4890728644967733177} - component: {fileID: 4890728644967733180} - component: {fileID: 4890728644967733183} + - component: {fileID: 1392269622} m_Layer: 0 m_Name: GUI m_TagString: Untagged @@ -555,6 +691,298 @@ MonoBehaviour: m_SynchronizeRotation: 1 m_SynchronizeScale: 1 m_UseLocal: 1 +--- !u!114 &1392269622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4890728644967733176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7233e77bd50673459b9746b72155a35, type: 3} + m_Name: + m_EditorClassIdentifier: + voltageValue: {fileID: 4621530251273852237} + windDirValue: {fileID: 1160440966591220994} + temperatureValue: {fileID: 1160440967716077678} + loc: {fileID: 1160440966516636515} +--- !u!1001 &1988956797 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1160440965950818015} + m_Modifications: + - target: {fileID: 341460414844706572, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: 5ab785923652f5f46aa25760af5fac45, type: 3} + - target: {fileID: 820969500809806042, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _audioClips.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 820969500809806042, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _audioClips.Array.data[0] + value: + objectReference: {fileID: 8300000, guid: 5ab785923652f5f46aa25760af5fac45, type: 3} + - target: {fileID: 820969500809806042, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _audioClips.Array.data[1] + value: + objectReference: {fileID: 8300000, guid: d3079463ddbfc9d47ab550bc5bf59b5b, type: 3} + - target: {fileID: 820969500809806042, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _audioClips.Array.data[2] + value: + objectReference: {fileID: 8300000, guid: d3079463ddbfc9d47ab550bc5bf59b5b, type: 3} + - target: {fileID: 7516989853945399145, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenHover.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenUnselect.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenHover.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1160440965950818012} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 820969500584170151} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenHover.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnButtonClick + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: PlayAudio + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: API, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: Oculus.Interaction.AudioTrigger, Oculus.Interaction.OVR.Samples + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7516989854015812293, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _whenSelect.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalScale.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalScale.y + value: 299.99997 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalScale.z + value: 299.99997 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalPosition.x + value: 88.8 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalPosition.y + value: -132.3 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalPosition.z + value: 29.2 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalRotation.w + value: 0.71293515 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalRotation.x + value: -0.70123 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.052 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125638, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125640, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_Name + value: StartButton + objectReference: {fileID: 0} + - target: {fileID: 7516989854395125640, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7516989854707263118, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalScale.x + value: 0.89236 + objectReference: {fileID: 0} + - target: {fileID: 7516989854707263118, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalScale.y + value: 0.89236 + objectReference: {fileID: 0} + - target: {fileID: 7516989854707263118, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_LocalScale.z + value: 0.89236 + objectReference: {fileID: 0} + - target: {fileID: 7516989854707263119, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7516989854852174099, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _hoverColor.b + value: 0.003921569 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _hoverColor.g + value: 0.9843137 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _hoverColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _normalColor.b + value: 0.0027712516 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _normalColor.g + value: 0.9811321 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _normalColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _selectColor.b + value: 0.003921569 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _selectColor.g + value: 0.9843137 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _selectColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _disabledColor.b + value: 0.003921569 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _disabledColor.g + value: 0.9843137 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _disabledColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _selectedColor.b + value: 0.3773585 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _selectedColor.g + value: 0.3773585 + objectReference: {fileID: 0} + - target: {fileID: 7516989854951799702, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + propertyPath: _selectedColor.r + value: 0.3773585 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} +--- !u!114 &820969500584170151 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 820969500809806042, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + m_PrefabInstance: {fileID: 1988956797} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 925ef87c5bafc37469a2f7ec825dee4b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &7516989854894110300 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7516989854733870113, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + m_PrefabInstance: {fileID: 1988956797} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7516989855853633717 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7516989854015812296, guid: d2d6934a666a18d46b8b7a3864dc9f63, type: 3} + m_PrefabInstance: {fileID: 1988956797} + m_PrefabAsset: {fileID: 0} +--- !u!114 &427475618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7516989855853633717} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdeaf26e845dc5841bcd31de97d26003, type: 3} + m_Name: + m_EditorClassIdentifier: + _tags: + - Button --- !u!1001 &4890728645080894793 PrefabInstance: m_ObjectHideFlags: 0 @@ -713,6 +1141,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 287564679268710938, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3} m_PrefabInstance: {fileID: 4890728645080894793} m_PrefabAsset: {fileID: 0} +--- !u!114 &4621530251273852237 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 287564679024842756, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3} + m_PrefabInstance: {fileID: 4890728645080894793} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4621530253098982377 stripped GameObject: m_CorrespondingSourceObject: {fileID: 287564678239901344, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3} @@ -810,6 +1249,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 29.2 objectReference: {fileID: 0} + - target: {fileID: 4293156750282774331, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6036491610417066955, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -834,6 +1277,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6036491610696200438, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} - target: {fileID: 6036491611111016748, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: m_AnchoredPosition.x value: 7.8 @@ -958,6 +1405,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6036491611617463841, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0 + objectReference: {fileID: 0} - target: {fileID: 6036491611617463842, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: m_text value: Twin Turbine @@ -1006,6 +1457,18 @@ PrefabInstance: propertyPath: m_Name value: CanvasJsonData objectReference: {fileID: 0} + - target: {fileID: 6036491612173940088, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6036491612173940088, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6036491612173940088, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6036491612173940093, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1094,6 +1557,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6036491612173940094, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6036491612173940094, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + propertyPath: voltageValue + value: + objectReference: {fileID: 4621530251273852237} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} --- !u!1 &1160440965950817989 stripped @@ -1117,16 +1588,60 @@ MonoBehaviour: m_SynchronizeRotation: 1 m_SynchronizeScale: 1 m_UseLocal: 1 +--- !u!114 &1160440965950818012 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6036491612173940094, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + m_PrefabInstance: {fileID: 4890728645620921250} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1160440965950817989} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7233e77bd50673459b9746b72155a35, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1160440965950818015 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6036491612173940093, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} m_PrefabInstance: {fileID: 4890728645620921250} m_PrefabAsset: {fileID: 0} +--- !u!114 &1160440966516636515 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6036491611599734977, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + m_PrefabInstance: {fileID: 4890728645620921250} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1160440966591220994 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6036491611539832480, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + m_PrefabInstance: {fileID: 4890728645620921250} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1160440967424361300 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6036491610696200438, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} m_PrefabInstance: {fileID: 4890728645620921250} m_PrefabAsset: {fileID: 0} +--- !u!114 &1160440967716077678 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6036491610417066956, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} + m_PrefabInstance: {fileID: 4890728645620921250} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &8668022573833670448 stripped Transform: m_CorrespondingSourceObject: {fileID: 4293156750076656786, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3} diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/WBgTeamLogo.jpeg.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/WBgTeamLogo.jpeg.meta index 3143a7c..9e5d359 100644 --- a/Assets/SharedSpatialAnchors/Prefabs/Resources/WBgTeamLogo.jpeg.meta +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/WBgTeamLogo.jpeg.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -36,13 +36,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -51,9 +51,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -131,7 +131,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/WebSocketController.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/WebSocketController.prefab new file mode 100644 index 0000000..c27fe82 --- /dev/null +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/WebSocketController.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6512430749609997905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6512430749609997911} + - component: {fileID: 6512430749609997904} + m_Layer: 0 + m_Name: WebSocketController + m_TagString: WebController + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6512430749609997911 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6512430749609997905} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.3785317, y: 1.3, z: -3.8689885} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6512430749609997904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6512430749609997905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3c468066257183f4eb657f07381143b7, type: 3} + m_Name: + m_EditorClassIdentifier: + voltageValue: 0 diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/WebSocketController.prefab.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/WebSocketController.prefab.meta new file mode 100644 index 0000000..42d9e66 --- /dev/null +++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/WebSocketController.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4b2c20ae41a78ad49bb40fc151516b79 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity index d1c5205..f324bf6 100644 --- a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity +++ b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity @@ -165,51 +165,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8607079646963991754, guid: bac340b17ae71864ab3a424b042a3ce7, type: 3} m_PrefabInstance: {fileID: 8607079647158505904} m_PrefabAsset: {fileID: 0} ---- !u!1 &472077538 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 472077540} - - component: {fileID: 472077539} - m_Layer: 0 - m_Name: WebSocketController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &472077539 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 472077538} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3c468066257183f4eb657f07381143b7, type: 3} - m_Name: - m_EditorClassIdentifier: - voltageValue: 0 ---- !u!4 &472077540 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 472077538} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.3785317, y: 1.3, z: -3.8689885} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &504459020 stripped Transform: m_CorrespondingSourceObject: {fileID: 2982998299359123673, guid: 60fa00281e83b294583adc31df520fbe, type: 3} @@ -2506,6 +2461,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd8280e8c381fbd4bbcad4b7ee581c31, type: 3} +--- !u!1001 &6512430749679280819 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6512430749609997905, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_Name + value: WebSocketController + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalPosition.x + value: 1.3785317 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalPosition.y + value: 1.3 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalPosition.z + value: -3.8689885 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512430749609997911, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4b2c20ae41a78ad49bb40fc151516b79, type: 3} --- !u!4 &7079690333416248134 stripped Transform: m_CorrespondingSourceObject: {fileID: 5414912244175512723, guid: 60fa00281e83b294583adc31df520fbe, type: 3} diff --git a/Assets/SharedSpatialAnchors/Scripts/API.cs b/Assets/SharedSpatialAnchors/Scripts/API.cs index 8b945aa..1d0e60d 100644 --- a/Assets/SharedSpatialAnchors/Scripts/API.cs +++ b/Assets/SharedSpatialAnchors/Scripts/API.cs @@ -44,17 +44,19 @@ public class API : MonoBehaviour private float LatestT; private float latestWD; private string unit; - public GameObject webSocketController; + private GameObject webSocketController; private WebSocketController webSocketControllerScript; void Start() { + //TestFromJsonToData(); EmergencyButtonClick(); } public void OnButtonClick() { + webSocketController = GameObject.FindGameObjectWithTag("WebController"); webSocketControllerScript = webSocketController.GetComponent<WebSocketController>(); StartCoroutine(GetText()); } @@ -63,6 +65,7 @@ public class API : MonoBehaviour loc.SetText("----"); windDirValue.SetText("----"); temperatureValue.SetText("----"); + voltageValue.SetText("----"); } IEnumerator GetText() { diff --git a/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs b/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs index e8d1a4e..69a6700 100644 --- a/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs +++ b/Assets/SharedSpatialAnchors/Scripts/WebSocketController.cs @@ -15,8 +15,8 @@ public class WebSocketController : MonoBehaviour // Serial Port to which Arduino is connected - SerialPort arduinoPort = new SerialPort("COM4", 115200); - public float voltageValue = 0.0f; + SerialPort arduinoPort = new SerialPort("COM4", 9600); + public String voltageValue = "0.0f"; public void Start(){ ConnectWithESP32(); @@ -43,9 +43,10 @@ public class WebSocketController : MonoBehaviour ws.OnMessage += (sender, e) => { Debug.Log("Received message: " + e.Data); - voltageValue = float.Parse(e.Data.Split(':')[1]); + //Debug.Log(); + voltageValue = e.Data.Split(':')[1].ToString(); + Debug.Log(voltageValue); //Voltage:180.0 - Debug.Log(e.Data.Split(':')[1]); if (e.Data.Equals("Start Narration", StringComparison.OrdinalIgnoreCase)){ // narrationControllerScript.startNarration = true; } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..602fe2a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - WebController layers: - Default - TransparentFX