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

Commit 5aab31f

Browse files
Vin-dictiveVin-dictive
committed
Fixed Cube Prefab
Following bugs where also fixed :- Cube faces where not accomadating more 1 digit values Auto rotation wasnt working as required
1 parent 9881504 commit 5aab31f

File tree

6 files changed

+79
-46
lines changed

6 files changed

+79
-46
lines changed

‎Assets/Resources/Cube.prefab‎

Lines changed: 54 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ MeshRenderer:
5656
m_RenderingLayerMask: 1
5757
m_RendererPriority: 0
5858
m_Materials:
59-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
59+
- {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
6060
m_StaticBatchInfo:
6161
firstSubMesh: 0
6262
subMeshCount: 0
@@ -106,8 +106,9 @@ MonoBehaviour:
106106
m_Calls: []
107107
m_text: 1
108108
m_isRightToLeft: 0
109-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
110-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
109+
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
110+
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
111+
type: 2}
111112
m_fontSharedMaterials: []
112113
m_fontMaterial: {fileID: 0}
113114
m_fontMaterials: []
@@ -131,12 +132,12 @@ MonoBehaviour:
131132
m_faceColor:
132133
serializedVersion: 2
133134
rgba: 4294967295
134-
m_fontSize: 10
135+
m_fontSize: 8.3
135136
m_fontSizeBase: 10
136137
m_fontWeight: 400
137-
m_enableAutoSizing: 0
138-
m_fontSizeMin: 18
139-
m_fontSizeMax: 72
138+
m_enableAutoSizing: 1
139+
m_fontSizeMin: 1
140+
m_fontSizeMax: 10
140141
m_fontStyle: 0
141142
m_HorizontalAlignment: 2
142143
m_VerticalAlignment: 256
@@ -173,6 +174,7 @@ MonoBehaviour:
173174
m_hasFontAssetChanged: 0
174175
m_renderer: {fileID: 7130408755992057462}
175176
m_maskType: 0
177+
_SortingLayer: 0
176178
_SortingLayerID: 0
177179
_SortingOrder: 0
178180
--- !u!1 &2551204902414856791
@@ -231,7 +233,7 @@ MeshRenderer:
231233
m_RenderingLayerMask: 1
232234
m_RendererPriority: 0
233235
m_Materials:
234-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
236+
- {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
235237
m_StaticBatchInfo:
236238
firstSubMesh: 0
237239
subMeshCount: 0
@@ -281,8 +283,9 @@ MonoBehaviour:
281283
m_Calls: []
282284
m_text: '[1]'
283285
m_isRightToLeft: 0
284-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
285-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
286+
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
287+
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
288+
type: 2}
286289
m_fontSharedMaterials: []
287290
m_fontMaterial: {fileID: 0}
288291
m_fontMaterials: []
@@ -306,12 +309,12 @@ MonoBehaviour:
306309
m_faceColor:
307310
serializedVersion: 2
308311
rgba: 4294967295
309-
m_fontSize: 8
312+
m_fontSize: 8.3
310313
m_fontSizeBase: 8
311314
m_fontWeight: 400
312-
m_enableAutoSizing: 0
313-
m_fontSizeMin: 18
314-
m_fontSizeMax: 72
315+
m_enableAutoSizing: 1
316+
m_fontSizeMin: 0
317+
m_fontSizeMax: 10
315318
m_fontStyle: 0
316319
m_HorizontalAlignment: 1
317320
m_VerticalAlignment: 256
@@ -348,6 +351,7 @@ MonoBehaviour:
348351
m_hasFontAssetChanged: 0
349352
m_renderer: {fileID: 3196528726217517222}
350353
m_maskType: 0
354+
_SortingLayer: 0
351355
_SortingLayerID: 0
352356
_SortingOrder: 0
353357
--- !u!1 &3357462402450317513
@@ -505,7 +509,7 @@ MeshRenderer:
505509
m_RenderingLayerMask: 1
506510
m_RendererPriority: 0
507511
m_Materials:
508-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
512+
- {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
509513
m_StaticBatchInfo:
510514
firstSubMesh: 0
511515
subMeshCount: 0
@@ -555,8 +559,9 @@ MonoBehaviour:
555559
m_Calls: []
556560
m_text: 1
557561
m_isRightToLeft: 0
558-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
559-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
562+
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
563+
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
564+
type: 2}
560565
m_fontSharedMaterials: []
561566
m_fontMaterial: {fileID: 0}
562567
m_fontMaterials: []
@@ -580,12 +585,12 @@ MonoBehaviour:
580585
m_faceColor:
581586
serializedVersion: 2
582587
rgba: 4294967295
583-
m_fontSize: 10
588+
m_fontSize: 8.3
584589
m_fontSizeBase: 10
585590
m_fontWeight: 400
586-
m_enableAutoSizing: 0
587-
m_fontSizeMin: 18
588-
m_fontSizeMax: 72
591+
m_enableAutoSizing: 1
592+
m_fontSizeMin: 0
593+
m_fontSizeMax: 10
589594
m_fontStyle: 0
590595
m_HorizontalAlignment: 2
591596
m_VerticalAlignment: 256
@@ -622,6 +627,7 @@ MonoBehaviour:
622627
m_hasFontAssetChanged: 0
623628
m_renderer: {fileID: 6997106965992526475}
624629
m_maskType: 0
630+
_SortingLayer: 0
625631
_SortingLayerID: 0
626632
_SortingOrder: 0
627633
--- !u!1 &5161914759529451729
@@ -680,7 +686,7 @@ MeshRenderer:
680686
m_RenderingLayerMask: 1
681687
m_RendererPriority: 0
682688
m_Materials:
683-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
689+
- {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
684690
m_StaticBatchInfo:
685691
firstSubMesh: 0
686692
subMeshCount: 0
@@ -730,8 +736,9 @@ MonoBehaviour:
730736
m_Calls: []
731737
m_text: 1
732738
m_isRightToLeft: 0
733-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
734-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
739+
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
740+
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
741+
type: 2}
735742
m_fontSharedMaterials: []
736743
m_fontMaterial: {fileID: 0}
737744
m_fontMaterials: []
@@ -755,12 +762,12 @@ MonoBehaviour:
755762
m_faceColor:
756763
serializedVersion: 2
757764
rgba: 4294967295
758-
m_fontSize: 10
765+
m_fontSize: 8.3
759766
m_fontSizeBase: 10
760767
m_fontWeight: 400
761-
m_enableAutoSizing: 0
762-
m_fontSizeMin: 18
763-
m_fontSizeMax: 72
768+
m_enableAutoSizing: 1
769+
m_fontSizeMin: 0
770+
m_fontSizeMax: 10
764771
m_fontStyle: 0
765772
m_HorizontalAlignment: 2
766773
m_VerticalAlignment: 256
@@ -797,6 +804,7 @@ MonoBehaviour:
797804
m_hasFontAssetChanged: 0
798805
m_renderer: {fileID: 9163104182923573848}
799806
m_maskType: 0
807+
_SortingLayer: 0
800808
_SortingLayerID: 0
801809
_SortingOrder: 0
802810
--- !u!1 &6913065444530297940
@@ -855,7 +863,7 @@ MeshRenderer:
855863
m_RenderingLayerMask: 1
856864
m_RendererPriority: 0
857865
m_Materials:
858-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
866+
- {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
859867
m_StaticBatchInfo:
860868
firstSubMesh: 0
861869
subMeshCount: 0
@@ -905,8 +913,9 @@ MonoBehaviour:
905913
m_Calls: []
906914
m_text: 1
907915
m_isRightToLeft: 0
908-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
909-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
916+
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
917+
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
918+
type: 2}
910919
m_fontSharedMaterials: []
911920
m_fontMaterial: {fileID: 0}
912921
m_fontMaterials: []
@@ -930,12 +939,12 @@ MonoBehaviour:
930939
m_faceColor:
931940
serializedVersion: 2
932941
rgba: 4294967295
933-
m_fontSize: 10
942+
m_fontSize: 8.3
934943
m_fontSizeBase: 10
935944
m_fontWeight: 400
936-
m_enableAutoSizing: 0
937-
m_fontSizeMin: 18
938-
m_fontSizeMax: 72
945+
m_enableAutoSizing: 1
946+
m_fontSizeMin: 0
947+
m_fontSizeMax: 10
939948
m_fontStyle: 0
940949
m_HorizontalAlignment: 2
941950
m_VerticalAlignment: 256
@@ -972,6 +981,7 @@ MonoBehaviour:
972981
m_hasFontAssetChanged: 0
973982
m_renderer: {fileID: 1365050203703094491}
974983
m_maskType: 0
984+
_SortingLayer: 0
975985
_SortingLayerID: 0
976986
_SortingOrder: 0
977987
--- !u!1 &8165305649284234394
@@ -1030,7 +1040,7 @@ MeshRenderer:
10301040
m_RenderingLayerMask: 1
10311041
m_RendererPriority: 0
10321042
m_Materials:
1033-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1043+
- {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
10341044
m_StaticBatchInfo:
10351045
firstSubMesh: 0
10361046
subMeshCount: 0
@@ -1080,8 +1090,9 @@ MonoBehaviour:
10801090
m_Calls: []
10811091
m_text: 1
10821092
m_isRightToLeft: 0
1083-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1084-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1093+
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
1094+
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
1095+
type: 2}
10851096
m_fontSharedMaterials: []
10861097
m_fontMaterial: {fileID: 0}
10871098
m_fontMaterials: []
@@ -1105,12 +1116,12 @@ MonoBehaviour:
11051116
m_faceColor:
11061117
serializedVersion: 2
11071118
rgba: 4294967295
1108-
m_fontSize: 10
1119+
m_fontSize: 8.3
11091120
m_fontSizeBase: 10
11101121
m_fontWeight: 400
1111-
m_enableAutoSizing: 0
1112-
m_fontSizeMin: 18
1113-
m_fontSizeMax: 72
1122+
m_enableAutoSizing: 1
1123+
m_fontSizeMin: 0
1124+
m_fontSizeMax: 10
11141125
m_fontStyle: 0
11151126
m_HorizontalAlignment: 2
11161127
m_VerticalAlignment: 256
@@ -1147,5 +1158,6 @@ MonoBehaviour:
11471158
m_hasFontAssetChanged: 0
11481159
m_renderer: {fileID: 6416505811883954909}
11491160
m_maskType: 0
1161+
_SortingLayer: 0
11501162
_SortingLayerID: 0
11511163
_SortingOrder: 0

‎Assets/Scripts/ARStage.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ public class ARStage : MonoBehaviour
3333

3434
void Start()
3535
{
36-
//To allow screen rotation on any orientation
36+
//Forced screen rotation to prevent landscape modes
3737
Screen.autorotateToPortrait = true;
3838
Screen.autorotateToPortraitUpsideDown = true;
3939
Screen.autorotateToLandscapeLeft = true;
4040
Screen.autorotateToLandscapeRight = true;
41+
Screen.orientation = ScreenOrientation.AutoRotation;
4142

4243
string argorithmID = PlayerPrefs.GetString("argorithmID");
4344
ARgorithmHeading.GetComponent<TextMeshProUGUI>().SetText(argorithmID);

‎Assets/Scripts/ArgorithmCloudMenu.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ public class ArgorithmCloudMenu : MonoBehaviour
2020
// this function is called only when it is enabled or set to active
2121
void OnEnable()
2222
{
23+
//Forced screen rotation to prevent landscape modes
24+
Screen.autorotateToPortrait = true;
25+
Screen.autorotateToPortraitUpsideDown = true;
26+
Screen.autorotateToLandscapeLeft = false;
27+
Screen.autorotateToLandscapeRight = false;
28+
Screen.orientation = ScreenOrientation.Portrait;
29+
2330
list();
2431
}
2532

‎Assets/Scripts/Login.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@ void callback(LoginResponse c)
131131
// Start is called before the first frame update
132132
void Start()
133133
{
134+
//Forced screen rotation to prevent landscape modes
135+
Screen.autorotateToPortrait = true;
136+
Screen.autorotateToPortraitUpsideDown = true;
137+
Screen.autorotateToLandscapeLeft = false;
138+
Screen.autorotateToLandscapeRight = false;
139+
Screen.orientation = ScreenOrientation.Portrait;
140+
134141
CreateAccountButton.interactable = false;
135142
LoginButton.interactable = false;
136143

‎Assets/Scripts/MainMenu.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@ void callback(ConnectionResponse c)
101101
void Start()
102102
{
103103
//To maintain screen rotation on portrait mode only
104+
//Forced screen rotation to prevent landscape modes
104105
Screen.autorotateToPortrait = true;
105106
Screen.autorotateToPortraitUpsideDown = true;
106107
Screen.autorotateToLandscapeLeft = false;
107108
Screen.autorotateToLandscapeRight = false;
109+
Screen.orientation = ScreenOrientation.Portrait;
108110

109111
if (PlayerPrefs.HasKey("CloudMenuEnabled"))
110112
{

‎Assets/Scripts/ParametersMenu.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ public class ParametersMenu : MonoBehaviour
2525
private Dictionary<string, JToken> customParameters;
2626
void OnEnable()
2727
{
28+
//Forced screen rotation to prevent landscape modes
29+
Screen.autorotateToPortrait = true;
30+
Screen.autorotateToPortraitUpsideDown = true;
31+
Screen.autorotateToLandscapeLeft = false;
32+
Screen.autorotateToLandscapeRight = false;
33+
Screen.orientation = ScreenOrientation.Portrait;
34+
2835
customParameters = new Dictionary<string, JToken>();
2936

3037
foreach (Transform child in ParameterGameObject.transform)
@@ -67,9 +74,6 @@ private void FixedUpdate()
6774
SubmitParametersButton.interactable = true;
6875
}
6976
}
70-
71-
72-
7377
}
7478
private void SettingUpParametersInfo()
7579
{

0 commit comments

Comments
 (0)