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

Commit f229cc1

Browse files
committed
Added States Counter
States Counter will show at which state the ARgorithm is running at.
1 parent 5aab31f commit f229cc1

File tree

2 files changed

+152
-2
lines changed

2 files changed

+152
-2
lines changed

Assets/Scenes/ARStage.unity

Lines changed: 138 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ GameObject:
312312
- component: {fileID: 218829093}
313313
- component: {fileID: 218829092}
314314
m_Layer: 5
315-
m_Name: CommentsBox
315+
m_Name: InfoBox
316316
m_TagString: Untagged
317317
m_Icon: {fileID: 0}
318318
m_NavMeshLayer: 0
@@ -329,6 +329,7 @@ RectTransform:
329329
m_LocalPosition: {x: 0, y: 0, z: 0}
330330
m_LocalScale: {x: 1, y: 1, z: 1}
331331
m_Children:
332+
- {fileID: 926064522}
332333
- {fileID: 703624899}
333334
m_Father: {fileID: 1149782917}
334335
m_RootOrder: 2
@@ -1044,7 +1045,7 @@ RectTransform:
10441045
m_LocalScale: {x: 1, y: 1, z: 1}
10451046
m_Children: []
10461047
m_Father: {fileID: 218829091}
1047-
m_RootOrder: 0
1048+
m_RootOrder: 1
10481049
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10491050
m_AnchorMin: {x: 0, y: 0}
10501051
m_AnchorMax: {x: 1, y: 1}
@@ -1343,6 +1344,140 @@ Camera:
13431344
m_OcclusionCulling: 1
13441345
m_StereoConvergence: 10
13451346
m_StereoSeparation: 0.022
1347+
--- !u!1 &926064519
1348+
GameObject:
1349+
m_ObjectHideFlags: 0
1350+
m_CorrespondingSourceObject: {fileID: 0}
1351+
m_PrefabInstance: {fileID: 0}
1352+
m_PrefabAsset: {fileID: 0}
1353+
serializedVersion: 6
1354+
m_Component:
1355+
- component: {fileID: 926064522}
1356+
- component: {fileID: 926064521}
1357+
- component: {fileID: 926064520}
1358+
m_Layer: 5
1359+
m_Name: StatesCounter
1360+
m_TagString: CommentBox
1361+
m_Icon: {fileID: 0}
1362+
m_NavMeshLayer: 0
1363+
m_StaticEditorFlags: 0
1364+
m_IsActive: 1
1365+
--- !u!114 &926064520
1366+
MonoBehaviour:
1367+
m_ObjectHideFlags: 0
1368+
m_CorrespondingSourceObject: {fileID: 0}
1369+
m_PrefabInstance: {fileID: 0}
1370+
m_PrefabAsset: {fileID: 0}
1371+
m_GameObject: {fileID: 926064519}
1372+
m_Enabled: 1
1373+
m_EditorHideFlags: 0
1374+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
1375+
m_Name:
1376+
m_EditorClassIdentifier:
1377+
m_Material: {fileID: 0}
1378+
m_Color: {r: 1, g: 1, b: 1, a: 1}
1379+
m_RaycastTarget: 1
1380+
m_Maskable: 1
1381+
m_OnCullStateChanged:
1382+
m_PersistentCalls:
1383+
m_Calls: []
1384+
m_text:
1385+
m_isRightToLeft: 0
1386+
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
1387+
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
1388+
type: 2}
1389+
m_fontSharedMaterials: []
1390+
m_fontMaterial: {fileID: 0}
1391+
m_fontMaterials: []
1392+
m_fontColor32:
1393+
serializedVersion: 2
1394+
rgba: 4294967295
1395+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
1396+
m_enableVertexGradient: 0
1397+
m_colorMode: 3
1398+
m_fontColorGradient:
1399+
topLeft: {r: 1, g: 1, b: 1, a: 1}
1400+
topRight: {r: 1, g: 1, b: 1, a: 1}
1401+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
1402+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
1403+
m_fontColorGradientPreset: {fileID: 0}
1404+
m_spriteAsset: {fileID: 0}
1405+
m_tintAllSprites: 0
1406+
m_StyleSheet: {fileID: 0}
1407+
m_TextStyleHashCode: -1183493901
1408+
m_overrideHtmlColors: 0
1409+
m_faceColor:
1410+
serializedVersion: 2
1411+
rgba: 4294967295
1412+
m_fontSize: 50
1413+
m_fontSizeBase: 50
1414+
m_fontWeight: 400
1415+
m_enableAutoSizing: 0
1416+
m_fontSizeMin: 18
1417+
m_fontSizeMax: 65
1418+
m_fontStyle: 0
1419+
m_HorizontalAlignment: 2
1420+
m_VerticalAlignment: 512
1421+
m_textAlignment: 65535
1422+
m_characterSpacing: 0
1423+
m_wordSpacing: 0
1424+
m_lineSpacing: 0
1425+
m_lineSpacingMax: 0
1426+
m_paragraphSpacing: 0
1427+
m_charWidthMaxAdj: 0
1428+
m_enableWordWrapping: 1
1429+
m_wordWrappingRatios: 0.4
1430+
m_overflowMode: 0
1431+
m_linkedTextComponent: {fileID: 0}
1432+
parentLinkedComponent: {fileID: 0}
1433+
m_enableKerning: 1
1434+
m_enableExtraPadding: 0
1435+
checkPaddingRequired: 0
1436+
m_isRichText: 1
1437+
m_parseCtrlCharacters: 1
1438+
m_isOrthographic: 1
1439+
m_isCullingEnabled: 0
1440+
m_horizontalMapping: 0
1441+
m_verticalMapping: 0
1442+
m_uvLineOffset: 0
1443+
m_geometrySortingOrder: 0
1444+
m_IsTextObjectScaleStatic: 0
1445+
m_VertexBufferAutoSizeReduction: 1
1446+
m_useMaxVisibleDescender: 1
1447+
m_pageToDisplay: 1
1448+
m_margin: {x: 0, y: 0, z: 0, w: 0}
1449+
m_isUsingLegacyAnimationComponent: 0
1450+
m_isVolumetricText: 0
1451+
m_hasFontAssetChanged: 0
1452+
m_baseMaterial: {fileID: 0}
1453+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
1454+
--- !u!222 &926064521
1455+
CanvasRenderer:
1456+
m_ObjectHideFlags: 0
1457+
m_CorrespondingSourceObject: {fileID: 0}
1458+
m_PrefabInstance: {fileID: 0}
1459+
m_PrefabAsset: {fileID: 0}
1460+
m_GameObject: {fileID: 926064519}
1461+
m_CullTransparentMesh: 0
1462+
--- !u!224 &926064522
1463+
RectTransform:
1464+
m_ObjectHideFlags: 0
1465+
m_CorrespondingSourceObject: {fileID: 0}
1466+
m_PrefabInstance: {fileID: 0}
1467+
m_PrefabAsset: {fileID: 0}
1468+
m_GameObject: {fileID: 926064519}
1469+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1470+
m_LocalPosition: {x: 0, y: 0, z: 0}
1471+
m_LocalScale: {x: 1, y: 1, z: 1}
1472+
m_Children: []
1473+
m_Father: {fileID: 218829091}
1474+
m_RootOrder: 0
1475+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1476+
m_AnchorMin: {x: 0, y: 0}
1477+
m_AnchorMax: {x: 1, y: 1}
1478+
m_AnchoredPosition: {x: 0, y: 0}
1479+
m_SizeDelta: {x: 0, y: -108.953354}
1480+
m_Pivot: {x: 0.5, y: 1}
13461481
--- !u!1 &981664036
13471482
GameObject:
13481483
m_ObjectHideFlags: 0
@@ -2537,4 +2672,5 @@ MonoBehaviour:
25372672
placementIndicator: {fileID: 543700799}
25382673
cube: {fileID: 39518484157928013, guid: 40a3700af4216614b8336f12ca407fad, type: 3}
25392674
CommentBox: {fileID: 703624896}
2675+
StatesCounterGameObject: {fileID: 926064519}
25402676
ARgorithmHeading: {fileID: 1545845627}

Assets/Scripts/ARStage.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class ARStage : MonoBehaviour
2424
public GameObject placementIndicator;
2525
public GameObject cube;
2626
public GameObject CommentBox;
27+
public GameObject StatesCounterGameObject;
2728
public GameObject ARgorithmHeading;
2829

2930
private StageData stageData;
@@ -62,19 +63,32 @@ void FixedUpdate()
6263
UpdatePlacementPose();
6364
UpdatePlacementIndicator();
6465
}
66+
if(index+1 > 0 && index+1<=stageData.size)
67+
{
68+
ChangeStateCounter(index+1, stageData.size);
69+
}
6570
}
6671

6772
private void OnApplicationQuit()
6873
{
6974
PlayerPrefs.DeleteKey("CloudMenuEnabled");
7075
}
7176

77+
//function to change UI comments. Display states comments
7278
private void ChangeComments(string text)
7379
{
7480
// called in updates based on EventList contents with "comments" key
7581
CommentBox.GetComponent<TextMeshProUGUI>().SetText(text);
7682
}
7783

84+
//function to change UI states counter. Display states at which the stage is running
85+
private void ChangeStateCounter(int step,int totalSteps)
86+
{
87+
string stepString = step.ToString();
88+
string totalStepsString = totalSteps.ToString();
89+
StatesCounterGameObject.GetComponent<TextMeshProUGUI>().SetText(stepString+"/"+totalStepsString);
90+
}
91+
7892
//Dont Change the code below this comment
7993
private void UpdatePlacementIndicator()
8094
{

0 commit comments

Comments
 (0)