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

Commit 65e1e88

Browse files
committed
Fixed comment and undo behavior #12
Fixe for #12
1 parent ac847d1 commit 65e1e88

File tree

4 files changed

+531
-62
lines changed

4 files changed

+531
-62
lines changed

Assets/Fonts/GlacialIndifference-Bold SDF.asset

Lines changed: 515 additions & 47 deletions
Large diffs are not rendered by default.

Assets/Scenes/ARStage.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ GameObject:
10651065
- component: {fileID: 753343938}
10661066
- component: {fileID: 753343937}
10671067
m_Layer: 5
1068-
m_Name: Prev Button
1068+
m_Name: Undo Button
10691069
m_TagString: Untagged
10701070
m_Icon: {fileID: 0}
10711071
m_NavMeshLayer: 0
@@ -1514,7 +1514,7 @@ RectTransform:
15141514
m_AnchorMin: {x: 0, y: 0}
15151515
m_AnchorMax: {x: 0, y: 0}
15161516
m_AnchoredPosition: {x: 0, y: 0}
1517-
m_SizeDelta: {x: 104.16243, y: 62}
1517+
m_SizeDelta: {x: 180, y: 90}
15181518
m_Pivot: {x: 0.5, y: 0.5}
15191519
--- !u!114 &981664038
15201520
MonoBehaviour:

Assets/Scenes/UI.unity

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ RectTransform:
860860
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
861861
m_AnchorMin: {x: 0, y: 1}
862862
m_AnchorMax: {x: 0, y: 1}
863-
m_AnchoredPosition: {x: 600, y: -73.5}
863+
m_AnchoredPosition: {x: 600, y: -73.47378}
864864
m_SizeDelta: {x: 318.98636, y: 67.72216}
865865
m_Pivot: {x: 0.5, y: 0.5}
866866
--- !u!114 &126347978
@@ -1465,7 +1465,8 @@ MonoBehaviour:
14651465
m_OnCullStateChanged:
14661466
m_PersistentCalls:
14671467
m_Calls: []
1468-
m_text: "Select a <color=#FEBC2C>ARgorithm</color> from \nthe available ones "
1468+
m_text: "Select a <b><color=#FEBC2C>AR</b>gorithm</color> from \nthe available
1469+
ones "
14691470
m_isRightToLeft: 0
14701471
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
14711472
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
@@ -2260,8 +2261,8 @@ RectTransform:
22602261
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
22612262
m_AnchorMin: {x: 0, y: 1}
22622263
m_AnchorMax: {x: 0, y: 1}
2263-
m_AnchoredPosition: {x: 114, y: -90}
2264-
m_SizeDelta: {x: 140, y: 70}
2264+
m_AnchoredPosition: {x: 132, y: -91}
2265+
m_SizeDelta: {x: 173.47699, y: 76.95407}
22652266
m_Pivot: {x: 0.5, y: 0.5}
22662267
--- !u!114 &443007843
22672268
MonoBehaviour:
@@ -3321,7 +3322,7 @@ MonoBehaviour:
33213322
m_enableAutoSizing: 0
33223323
m_fontSizeMin: 18
33233324
m_fontSizeMax: 35
3324-
m_fontStyle: 1
3325+
m_fontStyle: 0
33253326
m_HorizontalAlignment: 2
33263327
m_VerticalAlignment: 1024
33273328
m_textAlignment: 65535
@@ -4895,7 +4896,7 @@ MonoBehaviour:
48954896
m_fontMaterials: []
48964897
m_fontColor32:
48974898
serializedVersion: 2
4898-
rgba: 4294967295
4899+
rgba: 4282073056
48994900
m_fontColor: {r: 0.87843144, g: 0.24705884, b: 0.23137257, a: 1}
49004901
m_enableVertexGradient: 0
49014902
m_colorMode: 3
@@ -6066,8 +6067,8 @@ RectTransform:
60666067
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
60676068
m_AnchorMin: {x: 0, y: 1}
60686069
m_AnchorMax: {x: 0, y: 1}
6069-
m_AnchoredPosition: {x: 116, y: -66}
6070-
m_SizeDelta: {x: 140, y: 70}
6070+
m_AnchoredPosition: {x: 132, y: -66}
6071+
m_SizeDelta: {x: 163.4826, y: 77.82756}
60716072
m_Pivot: {x: 0.5, y: 0.5}
60726073
--- !u!114 &1698532736
60736074
MonoBehaviour:
@@ -6674,7 +6675,7 @@ RectTransform:
66746675
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
66756676
m_AnchorMin: {x: 0, y: 1}
66766677
m_AnchorMax: {x: 0, y: 1}
6677-
m_AnchoredPosition: {x: 200, y: -73.5}
6678+
m_AnchoredPosition: {x: 200, y: -73.47378}
66786679
m_SizeDelta: {x: 318.98636, y: 67.72216}
66796680
m_Pivot: {x: 0.5, y: 0.5}
66806681
--- !u!114 &1871835922
@@ -7351,7 +7352,7 @@ MonoBehaviour:
73517352
m_enableAutoSizing: 0
73527353
m_fontSizeMin: 18
73537354
m_fontSizeMax: 35
7354-
m_fontStyle: 1
7355+
m_fontStyle: 0
73557356
m_HorizontalAlignment: 2
73567357
m_VerticalAlignment: 1024
73577358
m_textAlignment: 65535

Assets/Scripts/ARStage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ void FixedUpdate()
6363
UpdatePlacementPose();
6464
UpdatePlacementIndicator();
6565
}
66-
if(index+1 > 0 && index+1<=stageData.size)
66+
if(index > -1 && index<=stageData.size)
6767
{
68-
ChangeStateCounter(index+1, stageData.size);
68+
ChangeStateCounter(index, stageData.size);
6969
}
7070
}
7171

@@ -178,7 +178,7 @@ public void Undo()
178178
if (index <= -1)
179179
return;
180180
State args = stageData.states[index];
181-
if (args.state_type == "comments")
181+
if (args.state_type == "comment")
182182
{
183183
index--;
184184
return;

0 commit comments

Comments
 (0)