Skip to content

Commit 57e3509

Browse files
committed
Added Back Press Navigation
1 parent 8782748 commit 57e3509

File tree

5 files changed

+72
-84
lines changed

5 files changed

+72
-84
lines changed

Assets/Scripts/Managers/DDOL_Navigation.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public class DDOL_Navigation : MonoBehaviour
1515
public StreamManager streamManager;
1616
public GameObject controlsParent;
1717
public RawImage capturedImage;
18-
1918
event System.Action<string> Granted;
2019
event System.Action<string> Denied;
2120
event System.Action<string> DontAskDenied;
@@ -63,11 +62,15 @@ void DontAskDeniedCallback(string callback)
6362
}
6463

6564
void Update()
65+
{
66+
CheckForBackPress();
67+
}
68+
69+
void CheckForBackPress()
6670
{
6771
if (Input.GetKeyDown(KeyCode.Escape))
6872
if (SceneManager.GetActiveScene().buildIndex == 0)
6973
Application.Quit();
70-
else SceneManager.LoadScene(0);
7174
}
7275

7376
public void Quit()

Assets/Scripts/Managers/ImageCropManager.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ IEnumerator Cropping()
9393

9494
Mat warpedMat = new Mat(mainMat.size(), CvType.CV_8UC3);
9595

96-
yield return new WaitForEndOfFrame();
97-
9896
Imgproc.warpPerspective(mainMat, warpedMat, M, new Size(CropSizeManager.CurrentDimmension.width, CropSizeManager.CurrentDimmension.height));
9997

10098
Texture2D finalTexture = new Texture2D(CropSizeManager.CurrentDimmension.width, CropSizeManager.CurrentDimmension.height, TextureFormat.RGB24, false);

Assets/Scripts/Navigation.cs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
public class Navigation : MonoBehaviour
6+
{
7+
public GameObject[] navigationPoints;
8+
9+
void Update()
10+
{
11+
OnBackPress();
12+
}
13+
14+
void OnBackPress()
15+
{
16+
if (Input.GetKeyDown(KeyCode.Escape))
17+
if (navigationPoints[3].activeInHierarchy)
18+
{
19+
navigationPoints[3].SetActive(false);
20+
navigationPoints[2].SetActive(true);
21+
}
22+
else if (navigationPoints[2].activeInHierarchy)
23+
{
24+
navigationPoints[2].SetActive(false);
25+
navigationPoints[1].SetActive(true);
26+
}
27+
else if (navigationPoints[1].activeInHierarchy)
28+
{
29+
navigationPoints[1].SetActive(false);
30+
navigationPoints[0].SetActive(true);
31+
}
32+
else UnityEngine.SceneManagement.SceneManager.LoadScene(0);
33+
}
34+
}

Assets/Scripts/Navigation.cs.meta

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

Assets/_Scenes/Transformations.unity

Lines changed: 22 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,6 @@ GameObject:
699699
- component: {fileID: 191616802}
700700
- component: {fileID: 191616804}
701701
- component: {fileID: 191616803}
702-
- component: {fileID: 191616805}
703702
m_Layer: 5
704703
m_Name: Warped_RawImage
705704
m_TagString: Untagged
@@ -761,70 +760,6 @@ CanvasRenderer:
761760
m_PrefabAsset: {fileID: 0}
762761
m_GameObject: {fileID: 191616801}
763762
m_CullTransparentMesh: 0
764-
--- !u!114 &191616805
765-
MonoBehaviour:
766-
m_ObjectHideFlags: 0
767-
m_CorrespondingSourceObject: {fileID: 0}
768-
m_PrefabInstance: {fileID: 0}
769-
m_PrefabAsset: {fileID: 0}
770-
m_GameObject: {fileID: 191616801}
771-
m_Enabled: 1
772-
m_EditorHideFlags: 0
773-
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
774-
m_Name:
775-
m_EditorClassIdentifier:
776-
m_Navigation:
777-
m_Mode: 0
778-
m_SelectOnUp: {fileID: 0}
779-
m_SelectOnDown: {fileID: 0}
780-
m_SelectOnLeft: {fileID: 0}
781-
m_SelectOnRight: {fileID: 0}
782-
m_Transition: 1
783-
m_Colors:
784-
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
785-
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
786-
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
787-
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
788-
m_ColorMultiplier: 1
789-
m_FadeDuration: 0.1
790-
m_SpriteState:
791-
m_HighlightedSprite: {fileID: 0}
792-
m_PressedSprite: {fileID: 0}
793-
m_DisabledSprite: {fileID: 0}
794-
m_AnimationTriggers:
795-
m_NormalTrigger: Normal
796-
m_HighlightedTrigger: Highlighted
797-
m_PressedTrigger: Pressed
798-
m_DisabledTrigger: Disabled
799-
m_Interactable: 1
800-
m_TargetGraphic: {fileID: 191616803}
801-
m_OnClick:
802-
m_PersistentCalls:
803-
m_Calls:
804-
- m_Target: {fileID: 691183892}
805-
m_MethodName: SetActive
806-
m_Mode: 6
807-
m_Arguments:
808-
m_ObjectArgument: {fileID: 0}
809-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
810-
m_IntArgument: 0
811-
m_FloatArgument: 0
812-
m_StringArgument:
813-
m_BoolArgument: 0
814-
m_CallState: 2
815-
- m_Target: {fileID: 936706865}
816-
m_MethodName: SetActive
817-
m_Mode: 6
818-
m_Arguments:
819-
m_ObjectArgument: {fileID: 0}
820-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
821-
m_IntArgument: 0
822-
m_FloatArgument: 0
823-
m_StringArgument:
824-
m_BoolArgument: 1
825-
m_CallState: 2
826-
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
827-
Culture=neutral, PublicKeyToken=null
828763
--- !u!1 &249876753
829764
GameObject:
830765
m_ObjectHideFlags: 0
@@ -1849,7 +1784,7 @@ GameObject:
18491784
- component: {fileID: 555093234}
18501785
- component: {fileID: 555093233}
18511786
m_Layer: 5
1852-
m_Name: Preview_Panel
1787+
m_Name: Preview_Controls
18531788
m_TagString: Untagged
18541789
m_Icon: {fileID: 0}
18551790
m_NavMeshLayer: 0
@@ -2612,17 +2547,6 @@ MonoBehaviour:
26122547
m_StringArgument:
26132548
m_BoolArgument: 1
26142549
m_CallState: 2
2615-
- m_Target: {fileID: 936706865}
2616-
m_MethodName: SetActive
2617-
m_Mode: 6
2618-
m_Arguments:
2619-
m_ObjectArgument: {fileID: 0}
2620-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
2621-
m_IntArgument: 0
2622-
m_FloatArgument: 0
2623-
m_StringArgument:
2624-
m_BoolArgument: 0
2625-
m_CallState: 2
26262550
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
26272551
Culture=neutral, PublicKeyToken=null
26282552
--- !u!114 &936706868
@@ -3195,6 +3119,7 @@ GameObject:
31953119
- component: {fileID: 1040794909}
31963120
- component: {fileID: 1040794910}
31973121
- component: {fileID: 1040794911}
3122+
- component: {fileID: 1040794912}
31983123
m_Layer: 0
31993124
m_Name: Scripts
32003125
m_TagString: Untagged
@@ -3257,6 +3182,23 @@ MonoBehaviour:
32573182
itemPrefab: {fileID: 9164391187329597879, guid: e36545ae09f1c2e4fac175f01cdf02fa,
32583183
type: 3}
32593184
itemSpawnParent: {fileID: 1452978827}
3185+
--- !u!114 &1040794912
3186+
MonoBehaviour:
3187+
m_ObjectHideFlags: 0
3188+
m_CorrespondingSourceObject: {fileID: 0}
3189+
m_PrefabInstance: {fileID: 0}
3190+
m_PrefabAsset: {fileID: 0}
3191+
m_GameObject: {fileID: 1040794908}
3192+
m_Enabled: 1
3193+
m_EditorHideFlags: 0
3194+
m_Script: {fileID: 11500000, guid: b028e581a68fc7d418c29d663186d945, type: 3}
3195+
m_Name:
3196+
m_EditorClassIdentifier:
3197+
navigationPoints:
3198+
- {fileID: 1543549583}
3199+
- {fileID: 1353425839}
3200+
- {fileID: 691183892}
3201+
- {fileID: 1992876104}
32603202
--- !u!1 &1048052632
32613203
GameObject:
32623204
m_ObjectHideFlags: 0
@@ -4320,7 +4262,7 @@ GameObject:
43204262
- component: {fileID: 1321723093}
43214263
- component: {fileID: 1321723094}
43224264
m_Layer: 5
4323-
m_Name: Filter_Panel
4265+
m_Name: Filter_Controls
43244266
m_TagString: Untagged
43254267
m_Icon: {fileID: 0}
43264268
m_NavMeshLayer: 0
@@ -4429,7 +4371,7 @@ MonoBehaviour:
44294371
m_Name:
44304372
m_EditorClassIdentifier:
44314373
m_Material: {fileID: 0}
4432-
m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
4374+
m_Color: {r: 0, g: 0, b: 0, a: 0.78431374}
44334375
m_RaycastTarget: 1
44344376
m_OnCullStateChanged:
44354377
m_PersistentCalls:
@@ -6696,7 +6638,7 @@ GameObject:
66966638
- component: {fileID: 1992876106}
66976639
- component: {fileID: 1992876108}
66986640
m_Layer: 5
6699-
m_Name: Preview_Control
6641+
m_Name: Preview_Panel
67006642
m_TagString: Untagged
67016643
m_Icon: {fileID: 0}
67026644
m_NavMeshLayer: 0

0 commit comments

Comments
 (0)