updated Unity and added compass

alexbourgeois · Aug 29, 2023 · e022872 · e022872
1 parent fdaad5c
commit e022872
Show file tree

Hide file tree

Showing 40 changed files with 1,553 additions and 9 deletions.
diff --git a/Assets/Resources.meta b/Assets/Resources.meta
diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json
@@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}
diff --git a/Assets/Resources/BillingMode.json.meta b/Assets/Resources/BillingMode.json.meta
diff --git a/Assets/Scripts/SensorManager.cs b/Assets/Scripts/SensorManager.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Net;
 using UnityEngine;
-using UnityEngine.Networking.NetworkSystem;
 using UnityEngine.UI;
 using UnityOSC;
 
@@ -40,20 +39,26 @@ public int TargetPort
 
     public bool sendAccelerometer;
     public bool sendGyroscope;
+    public bool sendCompass;
     public bool sendTouch;
 
     public string accelerometerValue;
     public string gyroscopeValue;
+    public string compassValue;
     public int touchCount;
 
     public string accelerometerOSCAddress = "/device/accelerometer";
     public string gyroscopeOSCAddress = "/device/gyroscope";
+    public string compassOSCAddress = "/device/compass";
     public string touchOSCAddress = "/device/touch/";
 
     private string OSCClientName = "CaptainSensor";
 
     void Start ()
     {
+        Input.compass.enabled = true;
+        Input.gyro.enabled = true;
+
         Connect();
     }
 
@@ -97,7 +102,6 @@ void Update ()
 
         if (sendGyroscope)
         {
-            Input.gyro.enabled = true;
             var message = new OSCMessage(gyroscopeOSCAddress);
             message.Append(Input.gyro.attitude.x);
             message.Append(Input.gyro.attitude.y);
@@ -108,6 +112,16 @@ void Update ()
             gyroscopeValue = Input.gyro.attitude.ToString();
         }
 
+        if (sendCompass)
+        {
+            var message = new OSCMessage(compassOSCAddress);
+            message.Append(Input.compass.trueHeading);
+            message.Append(Input.compass.magneticHeading);
+            OSCMaster.SendMessageUsingClient(OSCClientName, message);
+
+            compassValue = Input.compass.trueHeading + " " + Input.compass.magneticHeading;
+        }
+
         if (sendTouch)
         {
             if (!touchOSCAddress.EndsWith("/"))

diff --git a/Assets/Scripts/SensorManagerControllable.cs b/Assets/Scripts/SensorManagerControllable.cs
@@ -27,6 +27,14 @@ public class SensorManagerControllable : Controllable
     [OSCProperty]
     public string gyroscopeOSCAddress;
 
+    [Header("Compass")]
+    [OSCProperty]
+    public bool sendCompass;
+    [OSCProperty(isInteractible = false)]
+    public string compassValue;
+    [OSCProperty]
+    public string compassOSCAddress;
+
     [Header("Touch")]
     [OSCProperty]
     public bool sendTouch;

diff --git a/Assets/main.unity b/Assets/main.unity
diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log
diff --git a/Logs/AssetImportWorker1.log b/Logs/AssetImportWorker1.log
diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log
@@ -0,0 +1,25 @@
+
+=== Tue Aug 29 15:42:52 2023
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were added:
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+  [email protected]
+The following packages were updated:
+  com.unity.ads from version 2.3.1 to 4.4.2
+  com.unity.analytics from version 3.2.2 to 3.6.12
+  com.unity.collab-proxy from version 1.2.15 to 2.0.5
+  com.unity.purchasing from version 2.0.3 to 4.9.3
+  com.unity.textmeshpro from version 1.3.0 to 3.0.6
+The following packages were removed:
+  [email protected]
diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-AssetImportWorker0.log
@@ -0,0 +1,3 @@
+Base path: 'C:/Program Files/Unity/Hub/Editor/2021.3.29f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2021.3.29f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe1.log b/Logs/shadercompiler-UnityShaderCompiler.exe1.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe10.log b/Logs/shadercompiler-UnityShaderCompiler.exe10.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe11.log b/Logs/shadercompiler-UnityShaderCompiler.exe11.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe12.log b/Logs/shadercompiler-UnityShaderCompiler.exe12.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe13.log b/Logs/shadercompiler-UnityShaderCompiler.exe13.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe14.log b/Logs/shadercompiler-UnityShaderCompiler.exe14.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe15.log b/Logs/shadercompiler-UnityShaderCompiler.exe15.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe2.log b/Logs/shadercompiler-UnityShaderCompiler.exe2.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe3.log b/Logs/shadercompiler-UnityShaderCompiler.exe3.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe4.log b/Logs/shadercompiler-UnityShaderCompiler.exe4.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe5.log b/Logs/shadercompiler-UnityShaderCompiler.exe5.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe6.log b/Logs/shadercompiler-UnityShaderCompiler.exe6.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe7.log b/Logs/shadercompiler-UnityShaderCompiler.exe7.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe8.log b/Logs/shadercompiler-UnityShaderCompiler.exe8.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe9.log b/Logs/shadercompiler-UnityShaderCompiler.exe9.log
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,12 +1,21 @@
 {
   "dependencies": {
-    "com.unity.ads": "2.3.1",
-    "com.unity.analytics": "3.2.2",
-    "com.unity.collab-proxy": "1.2.15",
-    "com.unity.package-manager-ui": "2.0.3",
-    "com.unity.purchasing": "2.0.3",
-    "com.unity.textmeshpro": "1.3.0",
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "4.4.2",
+    "com.unity.analytics": "3.6.12",
+    "com.unity.collab-proxy": "2.0.5",
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.18",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.purchasing": "4.9.3",
+    "com.unity.test-framework": "1.1.33",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.6.5",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.1.10",
     "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
     "com.unity.modules.audio": "1.0.0",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Base path: 'C:/Program Files/Unity/Hub/Editor/2021.3.29f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2021.3.29f1/Editor/Data/PlaybackEngines'
		Cmd: initializeCompiler