From 626d8eb86da4f3f1d3e9a2e801365aac92500762 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Sun, 27 Oct 2024 16:18:41 +0100 Subject: [PATCH] Fix more bugs --- Assets/Scenes/WebView.unity | 556 +---------------------------- Assets/Scripts/ConfigureNavBar.cs | 30 +- Assets/Scripts/ConfigureOrbital.cs | 6 +- Assets/Scripts/WebViewBrowser.cs | 15 +- 4 files changed, 60 insertions(+), 547 deletions(-) diff --git a/Assets/Scenes/WebView.unity b/Assets/Scenes/WebView.unity index 307a41d..dcc64af 100644 --- a/Assets/Scenes/WebView.unity +++ b/Assets/Scenes/WebView.unity @@ -474,18 +474,18 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 76995324} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -5} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 556921602} m_Father: {fileID: 721930542} - m_RootOrder: 1 + m_RootOrder: 0 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: -45, y: 178} - m_SizeDelta: {x: 480, y: 30} + m_AnchoredPosition: {x: 0, y: 178} + m_SizeDelta: {x: 570, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &102826381 GameObject: @@ -656,12 +656,12 @@ RectTransform: m_Children: - {fileID: 53469507} m_Father: {fileID: 2137857638} - m_RootOrder: 1 + m_RootOrder: 0 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: -45, y: 178} - m_SizeDelta: {x: 480, y: 30} + m_AnchoredPosition: {x: 0, y: 178} + m_SizeDelta: {x: 570, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &298665358 GameObject: @@ -847,7 +847,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 54817b0d59467934792a72cfcacb1ba6, type: 3} m_Name: m_EditorClassIdentifier: - GoButton: {fileID: 1499038037} URLField: {fileID: 76995325} --- !u!4 &323128551 stripped Transform: @@ -1266,7 +1265,7 @@ MonoBehaviour: smoothing: 1 lifetime: 0 orientationType: 0 - localOffset: {x: 0.3, y: 0.1, z: 0.75} + localOffset: {x: 0.4, y: 0.1, z: 0.75} worldOffset: {x: 0, y: 0, z: 0} useAngleStepping: 0 tetherAngleSteps: 6 @@ -1385,8 +1384,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 600, y: 400, z: 30} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 600, y: 370, z: 1} + m_Center: {x: 0, y: -16, z: 0} --- !u!114 &721930538 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1473,7 +1472,6 @@ RectTransform: m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1499038040} - {fileID: 76995328} - {fileID: 323128551} m_Father: {fileID: 425776887} @@ -1481,7 +1479,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.3, y: 0.1} + m_AnchoredPosition: {x: -0.4, y: 0.1} m_SizeDelta: {x: 600, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &781542337 @@ -1591,7 +1589,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 54817b0d59467934792a72cfcacb1ba6, type: 3} m_Name: m_EditorClassIdentifier: - GoButton: {fileID: 1398365137} URLField: {fileID: 102826382} --- !u!114 &781542341 stripped MonoBehaviour: @@ -1739,141 +1736,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &957579659 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 957579660} - - component: {fileID: 957579662} - - component: {fileID: 957579661} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &957579660 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 957579659} - 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: 1499038040} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &957579661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 957579659} - 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: Go - 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: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - 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!222 &957579662 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 957579659} - m_CullTransparentMesh: 1 --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -2082,10 +1944,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2692de2cb7707be478671c78efb37020, type: 3} m_Name: m_EditorClassIdentifier: + canvas1: {fileID: 721930529} + canvas2: {fileID: 2137857637} addressField1: {fileID: 76995324} - goButton1: {fileID: 1499038036} addressField2: {fileID: 102826381} - goButton2: {fileID: 1398365136} --- !u!1 &1041187335 GameObject: m_ObjectHideFlags: 0 @@ -2374,250 +2236,6 @@ MonoBehaviour: showHandleForX: 0 showHandleForY: 0 showHandleForZ: 0 ---- !u!1 &1398365136 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1398365140} - - component: {fileID: 1398365139} - - component: {fileID: 1398365138} - - component: {fileID: 1398365137} - m_Layer: 5 - m_Name: Go Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1398365137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1398365136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1398365138} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1398365138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1398365136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1398365139 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1398365136} - m_CullTransparentMesh: 1 ---- !u!224 &1398365140 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1398365136} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1750079327} - m_Father: {fileID: 2137857638} - m_RootOrder: 0 - 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: 242, y: 178} - m_SizeDelta: {x: 75, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1499038036 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1499038040} - - component: {fileID: 1499038039} - - component: {fileID: 1499038038} - - component: {fileID: 1499038037} - m_Layer: 5 - m_Name: Go Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1499038037 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499038036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1499038038} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1499038038 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499038036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1499038039 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499038036} - m_CullTransparentMesh: 1 ---- !u!224 &1499038040 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499038036} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 957579660} - m_Father: {fileID: 721930542} - m_RootOrder: 0 - 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: 242, y: 178} - m_SizeDelta: {x: 75, y: 30} - m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1551505455 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2640,141 +2258,6 @@ MonoBehaviour: handleSlatePrefab: {fileID: 1134031327877807717, guid: c45e552a6d92491468c421c35c5dd63d, type: 3} showScaleHandles: 1 scaleBehavior: 0 ---- !u!1 &1750079326 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1750079327} - - component: {fileID: 1750079329} - - component: {fileID: 1750079328} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1750079327 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750079326} - 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: 1398365140} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1750079328 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750079326} - 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: Go - 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: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - 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!222 &1750079329 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750079326} - m_CullTransparentMesh: 1 --- !u!1 &1882837452 GameObject: m_ObjectHideFlags: 0 @@ -2837,7 +2320,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3231283774461358941, guid: 4410a2a17e71713438d8cf4ebc93d9a4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3231283774461358941, guid: 4410a2a17e71713438d8cf4ebc93d9a4, type: 3} propertyPath: m_LocalScale.x @@ -2857,7 +2340,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3231283774461358941, guid: 4410a2a17e71713438d8cf4ebc93d9a4, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3231283774461358941, guid: 4410a2a17e71713438d8cf4ebc93d9a4, type: 3} propertyPath: m_LocalRotation.w @@ -3183,7 +2666,6 @@ RectTransform: m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1398365140} - {fileID: 102826385} - {fileID: 781542338} m_Father: {fileID: 425776887} @@ -3191,7 +2673,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.3, y: 0.1} + m_AnchoredPosition: {x: 0.4, y: 0.1} m_SizeDelta: {x: 600, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2137857639 @@ -3276,8 +2758,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 600, y: 400, z: 30} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 600, y: 370, z: 1} + m_Center: {x: 0, y: -16, z: 0} --- !u!114 &2137857643 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3386,7 +2868,7 @@ MonoBehaviour: smoothing: 1 lifetime: 0 orientationType: 0 - localOffset: {x: 0.3, y: 0.1, z: 0.75} + localOffset: {x: 0.4, y: 0.1, z: 0.75} worldOffset: {x: 0, y: 0, z: 0} useAngleStepping: 0 tetherAngleSteps: 6 diff --git a/Assets/Scripts/ConfigureNavBar.cs b/Assets/Scripts/ConfigureNavBar.cs index 52f633c..0018447 100644 --- a/Assets/Scripts/ConfigureNavBar.cs +++ b/Assets/Scripts/ConfigureNavBar.cs @@ -2,24 +2,44 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using TMPro; public class ConfigureNavBar : MonoBehaviour { - public GameObject addressField1; - public GameObject goButton1; + public GameObject canvas1; + public GameObject canvas2; + public GameObject addressField1; public GameObject addressField2; - public GameObject goButton2; + + private BoxCollider boxCollider1; + private BoxCollider boxCollider2; private bool isVisible = false; + private void Start() + { + boxCollider1 = canvas1.GetComponent(); + boxCollider2 = canvas2.GetComponent(); + } + public void ToggleVisibilityMethod() { isVisible = !isVisible; addressField1.SetActive(isVisible); - goButton1.SetActive(isVisible); addressField2.SetActive(isVisible); - goButton2.SetActive(isVisible); + + if (boxCollider1 != null) + { + boxCollider1.size = new Vector3(boxCollider1.size.x, isVisible ? 400 : 300, boxCollider1.size.z); + boxCollider1.center = new Vector3(isVisible ? 0: -16, 0, 0); + } + + if (boxCollider2 != null) + { + boxCollider2.size = new Vector3(boxCollider1.size.x, isVisible ? 400 : 300, boxCollider2.size.z); + boxCollider2.center = new Vector3(isVisible ? 0: -16, 0, 0); + } } } diff --git a/Assets/Scripts/ConfigureOrbital.cs b/Assets/Scripts/ConfigureOrbital.cs index 59f0a3c..282bc39 100644 --- a/Assets/Scripts/ConfigureOrbital.cs +++ b/Assets/Scripts/ConfigureOrbital.cs @@ -12,6 +12,7 @@ public class ConfigureOrbital : MonoBehaviour private Orbital orbital1; private Orbital orbital2; + private SolverHandler solverHandler1; private SolverHandler solverHandler2; @@ -50,9 +51,8 @@ public class ConfigureOrbital : MonoBehaviour if (orbital.enabled) { Vector3 headPosition = Camera.main.transform.position; - // Quaternion headRotation = Camera.main.transform.rotation; - // Vector3 relativePosition = Quaternion.Inverse(headRotation) * (orbital.transform.position - headPosition); - Vector3 relativePosition = (orbital.transform.position - headPosition); + Quaternion headRotation = Camera.main.transform.rotation; + Vector3 relativePosition = Quaternion.Inverse(headRotation) * (orbital.transform.position - headPosition); orbital.LocalOffset = relativePosition; diff --git a/Assets/Scripts/WebViewBrowser.cs b/Assets/Scripts/WebViewBrowser.cs index 1271732..ab0dcc4 100644 --- a/Assets/Scripts/WebViewBrowser.cs +++ b/Assets/Scripts/WebViewBrowser.cs @@ -6,7 +6,6 @@ using System; public class WebViewBrowser : MonoBehaviour { - public Button GoButton; public TMP_InputField URLField; private void Start() @@ -14,7 +13,7 @@ public class WebViewBrowser : MonoBehaviour var webViewComponent = gameObject.GetComponent(); webViewComponent.GetWebViewWhenReady((IWebView webView) => { - GoButton.onClick.AddListener(() => webView.Load(new Uri(URLField.text))); + URLField.onSubmit.AddListener((text) => LoadUrl(webView)); webView.Navigated += OnNavigated; @@ -29,4 +28,16 @@ public class WebViewBrowser : MonoBehaviour { URLField.text = path; } + + private void LoadUrl(IWebView webView) + { + if (Uri.TryCreate(URLField.text, UriKind.Absolute, out Uri uriResult)) + { + webView.Load(uriResult); + } + else + { + Debug.LogWarning("Invalid URL entered."); + } + } } \ No newline at end of file