Skip to content
This repository was archived by the owner on Sep 17, 2022. It is now read-only.

Commit f7355e5

Browse files
committed
Queues and Stacks implemented
Implemented - Queues Stacks UI changes and improvements
1 parent b79d63c commit f7355e5

File tree

8 files changed

+137
-107
lines changed

8 files changed

+137
-107
lines changed

Assets/Animations.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Materials.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Prefabs/ARgorithmItem.prefab

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ MonoBehaviour:
9999
m_fontSizeMin: 18
100100
m_fontSizeMax: 72
101101
m_fontStyle: 0
102-
m_HorizontalAlignment: 1
103-
m_VerticalAlignment: 256
102+
m_HorizontalAlignment: 2
103+
m_VerticalAlignment: 4096
104104
m_textAlignment: 65535
105105
m_characterSpacing: 0
106106
m_wordSpacing: 0
@@ -505,8 +505,8 @@ RectTransform:
505505
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
506506
m_AnchorMin: {x: 0.5, y: 0.5}
507507
m_AnchorMax: {x: 0.5, y: 0.5}
508-
m_AnchoredPosition: {x: -18.697, y: 44.061}
509-
m_SizeDelta: {x: 362.60315, y: 57.877876}
508+
m_AnchoredPosition: {x: -46.501, y: 44.061}
509+
m_SizeDelta: {x: 418.2115, y: 57.877876}
510510
m_Pivot: {x: 0.5, y: 0.5}
511511
--- !u!222 &8151022269553422357
512512
CanvasRenderer:
@@ -535,7 +535,7 @@ MonoBehaviour:
535535
m_OnCullStateChanged:
536536
m_PersistentCalls:
537537
m_Calls: []
538-
m_text: ALGORITHM NAME
538+
m_text: ARgorithm Name
539539
m_isRightToLeft: 0
540540
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
541541
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
@@ -563,15 +563,15 @@ MonoBehaviour:
563563
m_faceColor:
564564
serializedVersion: 2
565565
rgba: 4294967295
566-
m_fontSize: 35
566+
m_fontSize: 48.2
567567
m_fontSizeBase: 35
568568
m_fontWeight: 400
569-
m_enableAutoSizing: 0
570-
m_fontSizeMin: 18
571-
m_fontSizeMax: 72
569+
m_enableAutoSizing: 1
570+
m_fontSizeMin: 25
571+
m_fontSizeMax: 60
572572
m_fontStyle: 0
573-
m_HorizontalAlignment: 1
574-
m_VerticalAlignment: 256
573+
m_HorizontalAlignment: 2
574+
m_VerticalAlignment: 512
575575
m_textAlignment: 65535
576576
m_characterSpacing: 0
577577
m_wordSpacing: 0
@@ -581,7 +581,7 @@ MonoBehaviour:
581581
m_charWidthMaxAdj: 0
582582
m_enableWordWrapping: 0
583583
m_wordWrappingRatios: 0.4
584-
m_overflowMode: 0
584+
m_overflowMode: 3
585585
m_linkedTextComponent: {fileID: 0}
586586
parentLinkedComponent: {fileID: 0}
587587
m_enableKerning: 1
@@ -599,7 +599,7 @@ MonoBehaviour:
599599
m_VertexBufferAutoSizeReduction: 1
600600
m_useMaxVisibleDescender: 1
601601
m_pageToDisplay: 1
602-
m_margin: {x: 0, y: 0, z: 0, w: 0}
602+
m_margin: {x: 20.613388, y: 0, z: 0, w: 0}
603603
m_isUsingLegacyAnimationComponent: 0
604604
m_isVolumetricText: 0
605605
m_hasFontAssetChanged: 0

Assets/Scenes/ARStage.unity

Lines changed: 23 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ MonoBehaviour:
955955
m_OnCullStateChanged:
956956
m_PersistentCalls:
957957
m_Calls: []
958-
m_text: Welcome To <b><color=#F9413C>AR</color></b>gorithm
958+
m_text: 'Welcome To <b><color=#F9413C>AR</color></b>gorithm '
959959
m_isRightToLeft: 0
960960
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
961961
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
@@ -983,15 +983,15 @@ MonoBehaviour:
983983
m_faceColor:
984984
serializedVersion: 2
985985
rgba: 4294967295
986-
m_fontSize: 50
986+
m_fontSize: 66.7
987987
m_fontSizeBase: 50
988988
m_fontWeight: 400
989-
m_enableAutoSizing: 0
990-
m_fontSizeMin: 18
991-
m_fontSizeMax: 65
989+
m_enableAutoSizing: 1
990+
m_fontSizeMin: 1
991+
m_fontSizeMax: 100
992992
m_fontStyle: 0
993993
m_HorizontalAlignment: 2
994-
m_VerticalAlignment: 512
994+
m_VerticalAlignment: 4096
995995
m_textAlignment: 65535
996996
m_characterSpacing: 0
997997
m_wordSpacing: 0
@@ -1019,7 +1019,7 @@ MonoBehaviour:
10191019
m_VertexBufferAutoSizeReduction: 1
10201020
m_useMaxVisibleDescender: 1
10211021
m_pageToDisplay: 1
1022-
m_margin: {x: 0, y: 0, z: 0, w: 0}
1022+
m_margin: {x: 17.804047, y: 0, z: 17.804138, w: 0}
10231023
m_isUsingLegacyAnimationComponent: 0
10241024
m_isVolumetricText: 0
10251025
m_hasFontAssetChanged: 0
@@ -1511,10 +1511,10 @@ RectTransform:
15111511
m_Father: {fileID: 1328576795}
15121512
m_RootOrder: 0
15131513
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1514-
m_AnchorMin: {x: 0, y: 0}
1515-
m_AnchorMax: {x: 0, y: 0}
1516-
m_AnchoredPosition: {x: 0, y: 0}
1517-
m_SizeDelta: {x: 180, y: 90}
1514+
m_AnchorMin: {x: 0, y: 1}
1515+
m_AnchorMax: {x: 0, y: 1}
1516+
m_AnchoredPosition: {x: 51.600098, y: -78.9}
1517+
m_SizeDelta: {x: 130.95898, y: 87.11513}
15181518
m_Pivot: {x: 0.5, y: 0.5}
15191519
--- !u!114 &981664038
15201520
MonoBehaviour:
@@ -2221,7 +2221,6 @@ GameObject:
22212221
- component: {fileID: 1328576795}
22222222
- component: {fileID: 1328576797}
22232223
- component: {fileID: 1328576796}
2224-
- component: {fileID: 1328576798}
22252224
m_Layer: 5
22262225
m_Name: Upper Panel
22272226
m_TagString: Untagged
@@ -2287,31 +2286,6 @@ CanvasRenderer:
22872286
m_PrefabAsset: {fileID: 0}
22882287
m_GameObject: {fileID: 1328576794}
22892288
m_CullTransparentMesh: 0
2290-
--- !u!114 &1328576798
2291-
MonoBehaviour:
2292-
m_ObjectHideFlags: 0
2293-
m_CorrespondingSourceObject: {fileID: 0}
2294-
m_PrefabInstance: {fileID: 0}
2295-
m_PrefabAsset: {fileID: 0}
2296-
m_GameObject: {fileID: 1328576794}
2297-
m_Enabled: 1
2298-
m_EditorHideFlags: 0
2299-
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
2300-
m_Name:
2301-
m_EditorClassIdentifier:
2302-
m_Padding:
2303-
m_Left: 25
2304-
m_Right: 25
2305-
m_Top: 25
2306-
m_Bottom: 25
2307-
m_ChildAlignment: 3
2308-
m_Spacing: 25
2309-
m_ChildForceExpandWidth: 1
2310-
m_ChildForceExpandHeight: 0
2311-
m_ChildControlWidth: 0
2312-
m_ChildControlHeight: 0
2313-
m_ChildScaleWidth: 0
2314-
m_ChildScaleHeight: 0
23152289
--- !u!1 &1396019538
23162290
GameObject:
23172291
m_ObjectHideFlags: 0
@@ -2524,11 +2498,11 @@ RectTransform:
25242498
m_Father: {fileID: 1328576795}
25252499
m_RootOrder: 1
25262500
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2527-
m_AnchorMin: {x: 0, y: 0}
2528-
m_AnchorMax: {x: 0, y: 0}
2529-
m_AnchoredPosition: {x: 0, y: 0}
2530-
m_SizeDelta: {x: 460.229, y: 64.50248}
2531-
m_Pivot: {x: 0.5, y: 0.5}
2501+
m_AnchorMin: {x: 0, y: 1}
2502+
m_AnchorMax: {x: 0, y: 1}
2503+
m_AnchoredPosition: {x: 400.01, y: -78.729}
2504+
m_SizeDelta: {x: 601.05927, y: 87.457375}
2505+
m_Pivot: {x: 0.49999994, y: 0.5}
25322506
--- !u!114 &1545845629
25332507
MonoBehaviour:
25342508
m_ObjectHideFlags: 0
@@ -2548,7 +2522,7 @@ MonoBehaviour:
25482522
m_OnCullStateChanged:
25492523
m_PersistentCalls:
25502524
m_Calls: []
2551-
m_text: Blank Example
2525+
m_text: ARgorithm Name
25522526
m_isRightToLeft: 0
25532527
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
25542528
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
@@ -2579,11 +2553,11 @@ MonoBehaviour:
25792553
m_fontSize: 60
25802554
m_fontSizeBase: 60
25812555
m_fontWeight: 400
2582-
m_enableAutoSizing: 0
2583-
m_fontSizeMin: 18
2584-
m_fontSizeMax: 65
2556+
m_enableAutoSizing: 1
2557+
m_fontSizeMin: 30
2558+
m_fontSizeMax: 60
25852559
m_fontStyle: 0
2586-
m_HorizontalAlignment: 1
2560+
m_HorizontalAlignment: 2
25872561
m_VerticalAlignment: 512
25882562
m_textAlignment: 65535
25892563
m_characterSpacing: 0
@@ -2594,7 +2568,7 @@ MonoBehaviour:
25942568
m_charWidthMaxAdj: 0
25952569
m_enableWordWrapping: 1
25962570
m_wordWrappingRatios: 0.4
2597-
m_overflowMode: 0
2571+
m_overflowMode: 3
25982572
m_linkedTextComponent: {fileID: 0}
25992573
parentLinkedComponent: {fileID: 0}
26002574
m_enableKerning: 1
@@ -2612,7 +2586,7 @@ MonoBehaviour:
26122586
m_VertexBufferAutoSizeReduction: 1
26132587
m_useMaxVisibleDescender: 1
26142588
m_pageToDisplay: 1
2615-
m_margin: {x: 0, y: 0, z: 0.00004484636, w: -2.893333}
2589+
m_margin: {x: 0.000030919196, y: 0, z: 19.472336, w: 3.5972714}
26162590
m_isUsingLegacyAnimationComponent: 0
26172591
m_isVolumetricText: 0
26182592
m_hasFontAssetChanged: 0

Assets/Scenes/StackTesting.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Transform:
225225
m_PrefabAsset: {fileID: 0}
226226
m_GameObject: {fileID: 306859167}
227227
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
228-
m_LocalPosition: {x: 0, y: 0, z: 0}
228+
m_LocalPosition: {x: 12, y: 3, z: 1}
229229
m_LocalScale: {x: 1, y: 1, z: 1}
230230
m_Children: []
231231
m_Father: {fileID: 0}

0 commit comments

Comments
 (0)