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

Commit 3e9b6f2

Browse files
Vin-dictiveVin-dictive
committed
Removed Scene and Debug.Log
1 parent 04c8dcc commit 3e9b6f2

File tree

10 files changed

+80
-853
lines changed

10 files changed

+80
-853
lines changed

‎Assets/Scenes/ARStageTest.unity‎

Lines changed: 0 additions & 714 deletions
This file was deleted.

‎Assets/Scenes/ARStageTest.unity.meta‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Assets/Scripts/ArgorithmCloudMenu.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ private void Update()
2929
{
3030
RectTransform panelRT = PanelListHolderGameObject.transform.GetComponent<RectTransform>();
3131
//panelRT.sizeDelta = new Vector2(0, this.panelListHeight);
32-
Debug.Log(this.panelListHeight);
3332
panelRT.offsetMin = new Vector2(0, -this.panelListHeight);
3433
flag = true;
3534
}

‎Assets/Scripts/PageSwipper.cs‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎Assets/Scripts/PageSwipper.cs.meta‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Assets/Scripts/ParametersMenu.cs‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public class ParametersMenu : MonoBehaviour
2626
void OnEnable()
2727
{
2828
customParameters = new Dictionary<string, JToken>();
29-
/*
30-
foreach (Transform child in VariablesGameObject.transform)
29+
30+
foreach (Transform child in ParameterGameObject.transform)
3131
{
3232
GameObject.Destroy(child.gameObject);
3333
}
34-
34+
/*
3535
* On Getting Values from ARgorithmCloudMenu for parametersInfo jObject
3636
* It takes some time to do so. So a timer is set withn the Coroutine for
3737
* the jobject to load all the values
@@ -45,7 +45,6 @@ private void FixedUpdate()
4545
{
4646
RectTransform panelRT = ParameterGameObject.transform.GetComponent<RectTransform>();
4747
//panelRT.sizeDelta = new Vector2(0, this.panelListHeight);
48-
Debug.Log(this.panelListHeight);
4948
panelRT.offsetMin = new Vector2(0, -this.panelListHeight);
5049
panelFlag = true;
5150
}
@@ -107,16 +106,6 @@ private void SettingUpParametersInfo()
107106
break;
108107
}
109108
}
110-
111-
112-
for (int i = 0; i < 40; i++)
113-
{
114-
GameObject matrixParameter = Instantiate(Resources.Load("MatrixParameterPrefab") as GameObject);
115-
matrixParameter.transform.parent = ParameterGameObject.transform;
116-
matrixParameter.transform.localScale = new Vector3(1, 1, 1);
117-
RectTransform rt = matrixParameter.transform.GetComponent<RectTransform>();
118-
this.panelListHeight += rt.rect.height + 50;
119-
}
120109
}
121110
private void SetupVariableParameters<T>(string variable,string description)
122111
{
@@ -456,10 +445,7 @@ private void SetupMatrixParameters<T>(string variable,string description)
456445
this.panelListHeight += rt.rect.height + 50;
457446

458447
}
459-
void OnDisable()
460-
{
461-
Debug.Log("Parameters Menu diasbled");
462-
}
448+
463449

464450
private T Parse<T>(string elem)
465451
{
@@ -485,7 +471,6 @@ public void RunParameters()
485471
string argorithmID = PlayerPrefs.GetString("argorithmID");
486472
string parametersInStringFormat = JsonConvert.SerializeObject(customParameters, Formatting.Indented);
487473
JObject parameters = JObject.Parse(parametersInStringFormat);
488-
Debug.Log(parameters);
489474

490475
StartCoroutine(
491476
APIClient.Instance.run(
@@ -524,7 +509,6 @@ void callback(ExecutionResponse response, string argorithmID)
524509
525510
This function should send the states to the ARgorithm Parser which in turn send to ARStage
526511
*/
527-
Debug.Log(response.status);
528512
string data = JsonConvert.SerializeObject(response);
529513
PlayerPrefs.SetString("StateSet", data);
530514
//PlayerPrefs.SetString("argorithmID", argorithmID);

‎Packages/manifest.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"com.unity.collab-proxy": "1.2.16",
44
"com.unity.ide.rider": "1.1.4",
55
"com.unity.ide.vscode": "1.2.3",
6-
"com.unity.test-framework": "1.1.22",
7-
"com.unity.textmeshpro": "2.1.1",
6+
"com.unity.test-framework": "1.1.24",
7+
"com.unity.textmeshpro": "2.1.4",
88
"com.unity.timeline": "1.2.17",
99
"com.unity.ugui": "1.0.0",
1010
"com.unity.vectorgraphics": "2.0.0-preview.13",
11-
"com.unity.xr.arcore": "2.1.14",
12-
"com.unity.xr.arfoundation": "2.1.14",
11+
"com.unity.xr.arcore": "4.1.5",
12+
"com.unity.xr.arfoundation": "4.1.5",
1313
"com.unity.modules.ai": "1.0.0",
1414
"com.unity.modules.androidjni": "1.0.0",
1515
"com.unity.modules.animation": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,16 @@
3737
"url": "https://packages.unity.com"
3838
},
3939
"com.unity.subsystemregistration": {
40-
"version": "1.0.6",
40+
"version": "1.1.0",
4141
"depth": 2,
4242
"source": "registry",
43-
"dependencies": {},
43+
"dependencies": {
44+
"com.unity.modules.subsystems": "1.0.0"
45+
},
4446
"url": "https://packages.unity.com"
4547
},
4648
"com.unity.test-framework": {
47-
"version": "1.1.22",
49+
"version": "1.1.24",
4850
"depth": 0,
4951
"source": "registry",
5052
"dependencies": {
@@ -55,7 +57,7 @@
5557
"url": "https://packages.unity.com"
5658
},
5759
"com.unity.textmeshpro": {
58-
"version": "2.1.1",
60+
"version": "2.1.4",
5961
"depth": 0,
6062
"source": "registry",
6163
"dependencies": {
@@ -90,37 +92,38 @@
9092
"url": "https://packages.unity.com"
9193
},
9294
"com.unity.xr.arcore": {
93-
"version": "2.1.14",
95+
"version": "4.1.5",
9496
"depth": 0,
9597
"source": "registry",
9698
"dependencies": {
97-
"com.unity.xr.arsubsystems": "2.1.14",
98-
"com.unity.xr.management": "3.2.17"
99+
"com.unity.xr.arsubsystems": "4.1.5",
100+
"com.unity.xr.management": "4.0.1",
101+
"com.unity.modules.androidjni": "1.0.0"
99102
},
100103
"url": "https://packages.unity.com"
101104
},
102105
"com.unity.xr.arfoundation": {
103-
"version": "2.1.14",
106+
"version": "4.1.5",
104107
"depth": 0,
105108
"source": "registry",
106109
"dependencies": {
107-
"com.unity.xr.legacyinputhelpers": "2.1.7",
108-
"com.unity.xr.arsubsystems": "2.1.14"
110+
"com.unity.xr.arsubsystems": "4.1.5",
111+
"com.unity.xr.management": "4.0.1"
109112
},
110113
"url": "https://packages.unity.com"
111114
},
112115
"com.unity.xr.arsubsystems": {
113-
"version": "2.1.14",
116+
"version": "4.1.5",
114117
"depth": 1,
115118
"source": "registry",
116119
"dependencies": {
117-
"com.unity.subsystemregistration": "1.0.6"
120+
"com.unity.subsystemregistration": "1.1.0"
118121
},
119122
"url": "https://packages.unity.com"
120123
},
121124
"com.unity.xr.legacyinputhelpers": {
122125
"version": "2.1.7",
123-
"depth": 1,
126+
"depth": 2,
124127
"source": "registry",
125128
"dependencies": {
126129
"com.unity.modules.vr": "1.0.0",
@@ -129,11 +132,14 @@
129132
"url": "https://packages.unity.com"
130133
},
131134
"com.unity.xr.management": {
132-
"version": "3.2.17",
135+
"version": "4.0.1",
133136
"depth": 1,
134137
"source": "registry",
135138
"dependencies": {
136-
"com.unity.xr.legacyinputhelpers": "2.1.2",
139+
"com.unity.modules.subsystems": "1.0.0",
140+
"com.unity.modules.vr": "1.0.0",
141+
"com.unity.modules.xr": "1.0.0",
142+
"com.unity.xr.legacyinputhelpers": "2.1.7",
137143
"com.unity.subsystemregistration": "1.0.6"
138144
},
139145
"url": "https://packages.unity.com"

‎ProjectSettings/EditorBuildSettings.asset‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ EditorBuildSettings:
1212
path: Assets/Scenes/ARStage.unity
1313
guid: 9b8dcc6c86513a04da8b702e13f5b745
1414
m_configObjects:
15+
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 7cec985fee73d2a408194e0aead634a3,
16+
type: 2}
1517
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 4d77a2d5be99e174c8945645f1e51fec,
1618
type: 2}

0 commit comments

Comments
 (0)