minor fixes

Former-commit-id: 47f6ce6 [formerly 9d510cd] Former-commit-id: c364a91
Insight-XR · Mar 11, 2024 · 64cc5b6 · 64cc5b6
1 parent 6858ff5
commit 64cc5b6
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 34 deletions.
diff --git a/Assets/ExternalDependencyManager.meta b/Assets/ExternalDependencyManager.meta
diff --git a/Assets/ExternalDependencyManager/Editor.meta b/Assets/ExternalDependencyManager/Editor.meta
diff --git a/Assets/ExternalDependencyManager/Editor/1.2.177.meta b/Assets/ExternalDependencyManager/Editor/1.2.177.meta
diff --git a/Assets/Firebase.meta b/Assets/Firebase.meta
diff --git a/Assets/Firebase/Editor.meta b/Assets/Firebase/Editor.meta
diff --git a/Assets/Firebase/Plugins.meta b/Assets/Firebase/Plugins.meta
diff --git a/Assets/Firebase/Plugins/iOS.meta b/Assets/Firebase/Plugins/iOS.meta
diff --git a/Assets/InsightXR/Network/DataHandleLayer.cs b/Assets/InsightXR/Network/DataHandleLayer.cs
@@ -43,6 +43,10 @@ public class DataHandleLayer : MonoBehaviour
 
         private void OnEnable()
         {
+            if (!Directory.Exists(Application.persistentDataPath + "/Saves"))
+            {
+                Directory.CreateDirectory(Application.persistentDataPath + "/Saves");
+            }
             if (Application.platform != RuntimePlatform.WebGLPlayer)
             {
                 Debug.Log("Not running on WebGL");
@@ -74,10 +78,7 @@ private void OnDisable()
                 {
                     //Create a Save File incase the Application wants to close
                     DataCollector.CollectionRequestEvent -= SortAndStoreData;
-                    if (Directory.Exists(Application.persistentDataPath + "/Saves"))
-                    {
-                        Directory.CreateDirectory(Application.persistentDataPath + "/Saves");
-                    }
+
                     Debug.Log("Record Count: "+ UserInstanceData.First().Value.Count);
                     File.WriteAllText(Application.persistentDataPath + "/Saves/Save.json",JsonConvert.SerializeObject(UserInstanceData));
                     // //We can instead call it directly with the file path and create a stream like that, but for now, this will do

diff --git a/Assets/InsightXR/Network/NetworkUploader.cs b/Assets/InsightXR/Network/NetworkUploader.cs
@@ -17,9 +17,9 @@ namespace InsightXR.Network
     public class NetworkUploader : MonoBehaviour
     {
         public IAmazonS3 s3Client;
-        private string awsAccessKeyId = "AKIAXQOF2EHXCW6YVEPP";
-        private string awsSecretAccessKey = "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";
-        private string bucketName = "shyreyanshaws";
+        public string awsAccessKeyId;
+        public string awsSecretAccessKey;
+        public string bucketName;
 
         private void Start()
         {

diff --git a/Assets/InsightXR/VR/LoadCamData.cs b/Assets/InsightXR/VR/LoadCamData.cs
@@ -38,30 +38,19 @@ private void OnEnable()
         // Start is called before the first frame update
         void Start()
         {
-            // if (UnityEngine.Device.Application.platform == RuntimePlatform.WebGLPlayer)
-            // { GetCamData(Application.persistentDataPath + "/Saves", gameObject.name, "callback", "fallback","https://shivam1807.s3.ap-south-1.amazonaws.com/Replay+Data");
-            // }
-            // else
-            // {
-            //     callback(File.ReadAllText(UnityEngine.Device.Application.persistentDataPath + "/Saves/Save.json"));
-            // }
-
-
-
-            // Debug.Log("Check");
-            // MotionPackage loadedData =
-            //     JsonConvert.DeserializeObject<MotionPackage>(
-            //         File.ReadAllText(Application.dataPath + "/Saves/Save.json"));
-            //
-            // Debug.Log(loadedData.Playerdata);
-            //
-            // MotionRecord = loadedData.GetPlayerData();
-            // loaded = true;
-            // totalframes = MotionRecord.Count;
-            // frame = 0;
-            // Debug.Log("Loaded Data");
-            //
-            // loaded = true;
+            if (UnityEngine.Device.Application.platform == RuntimePlatform.WebGLPlayer)
+            {
+                //GetCamData(Application.persistentDataPath + "/Saves", gameObject.name, "callback", "fallback", "https://shyreyanshaws.s3.ap-south-1.amazonaws.com/Replay+Data.json");
+                Debug.Log("Cam data function if available was executed");
+            }
+            else
+            {
+                callback(File.ReadAllText(UnityEngine.Device.Application.persistentDataPath + "/Saves/Save.json"));
+            }
+
+
+
+
         }
 
         // Update is called once per frame
@@ -90,9 +79,8 @@ void FixedUpdate()
         }
 
 
-        // [DllImport("__Internal")]
-        // public static extern void GetCamData(string path, string ObjectName, string callback, string fallback,
-        //     string url);
+        //[DllImport("__Internal")]
+        //public static extern void GetCamData(string path, string ObjectName, string callback, string fallback, string url);
 
         public void callback(string camdata)
         {