[general] turn off hand meshes

CLAWS-UMICH · May 22, 2024 · fe8e97a · fe8e97a
1 parent 8d976ba
commit fe8e97a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/Assets/CLAWS/0-Backend/EventSystem/EventTypes.cs b/Assets/CLAWS/0-Backend/EventSystem/EventTypes.cs
@@ -134,6 +134,7 @@ public class GeosamplesDeletedEvent
 
     public GeosamplesDeletedEvent(List<Geosample> deletedGeosamples)
     {
+        Debug.Log("Geosample deleted event");
         DeletedGeosamples = deletedGeosamples;
     }
 }
@@ -144,6 +145,7 @@ public class GeosamplesEditedEvent
 
     public GeosamplesEditedEvent(List<Geosample> editedGeosamples)
     {
+        Debug.Log("Geosample edited event");
         EditedGeosamples = editedGeosamples;
     }
 }
@@ -154,6 +156,7 @@ public class GeosamplesAddedEvent
 
     public GeosamplesAddedEvent(List<Geosample> newAddedGeosamples)
     {
+        Debug.Log("Geosample added event");
         NewAddedGeosamples = newAddedGeosamples;
     }
 }

diff --git a/Assets/CLAWS/2-Geosampling/GeosamplingManager.cs b/Assets/CLAWS/2-Geosampling/GeosamplingManager.cs
@@ -12,6 +12,16 @@ private void Awake()
             Instance = this;
         }
     }
+    private void Start()
+    {
+        EventBus.Subscribe<GeosamplesAddedEvent>(e =>
+        {
+            foreach (Geosample g in e.NewAddedGeosamples)
+            {
+                CreateLoadedGeosample(g);
+            }
+        });
+    }
 
 
     public static bool GeosamplingMode = false;
@@ -40,6 +50,15 @@ public static void CreateGeosample()
 
         _screen.Init();
     }
+    public static void CreateLoadedGeosample(Geosample sample)
+    {
+        Vector3 _spawn = GPSUtils.GPSCoordsToAppPosition(sample.location);
+        _spawn = new Vector3(_spawn.x, Camera.main.transform.position.y - 0.2f, _spawn.z);
+        GameObject _geosample = Instantiate(Instance.SingleGeosamplePrefab, _spawn, Quaternion.identity);
+        SingleGeosampleScreen _screen = _geosample.transform.Find("Prefab_SingleGeosampleScreen").GetComponent<SingleGeosampleScreen>();
+
+        _screen.Load(sample);
+    }
 
 
     public static void SendData()

diff --git a/...s/MixedRealityToolkit.Generated/CustomProfiles/CLAWS_MixedRealityInputSystemProfile.asset b/...s/MixedRealityToolkit.Generated/CustomProfiles/CLAWS_MixedRealityInputSystemProfile.asset
@@ -109,4 +109,4 @@ MonoBehaviour:
   enableControllerMapping: 1
   controllerMappingProfile: {fileID: 11400000, guid: 39ded1fd0711a0c448413d0e1ec4f7f3, type: 2}
   controllerVisualizationProfile: {fileID: 11400000, guid: 345c06fdf3732db46b96299bd3cba653, type: 2}
-  handTrackingProfile: {fileID: 11400000, guid: 7f1e3cd673742f94ca860ac7ae733024, type: 2}
+  handTrackingProfile: {fileID: 11400000, guid: e445e6fda57508c46935bb141b7673a7, type: 2}
diff --git a/Assets/MixedRealityToolkit.Generated/ProjectPreferences.asset b/Assets/MixedRealityToolkit.Generated/ProjectPreferences.asset
@@ -17,7 +17,8 @@ MonoBehaviour:
     - MixedRealityToolkit_Editor_RunOptimalConfig
     - _MixedRealityToolkit_Editor_IgnoreSettingsPrompts
     - _MixedRealityToolkit_Editor_LockProfiles
-    values: 010101
+    - MixedRealityToolkit_Editor_NullDataProviders
+    values: 01010100
   intPreferences:
     keys:
     - MixedRealityToolkit_Editor_AudioSpatializerCount