Merge pull request #1 from lim-at-infinity/mrtk

Mrtk
nasa-gibs · Jun 22, 2021 · fbfcc90 · fbfcc90
2 parents edc97e7 + 52bdb12
commit fbfcc90
Show file tree

Hide file tree

Showing 9 changed files with 996 additions and 308 deletions.
diff --git a/Assets/Prefabs/WMTS/WMTSBall - MUR SST.prefab b/Assets/Prefabs/WMTS/WMTSBall - MUR SST.prefab
@@ -18,6 +18,7 @@ GameObject:
   - component: {fileID: 2410911445152304941}
   - component: {fileID: 2370013573791862113}
   - component: {fileID: 2370013573791862046}
+  - component: {fileID: 1690433617625567694}
   m_Layer: 8
   m_Name: WMTSBall - MUR SST
   m_TagString: Untagged
@@ -183,6 +184,19 @@ Rigidbody:
   m_Constraints: 0
   m_CollisionDetection: 0
 --- !u!135 &2370013573791862046
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2370620339487688075}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!135 &1690433617625567694
 SphereCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

diff --git a/Assets/Prefabs/WMTS/WMTSBall - VIIRS CorrectedReflectance.prefab b/Assets/Prefabs/WMTS/WMTSBall - VIIRS CorrectedReflectance.prefab
@@ -16,6 +16,19 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!135 &1879644238586978410
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8034128907031867231}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &8033064692087384013
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/WMTS/WMTSPlane.prefab b/Assets/Prefabs/WMTS/WMTSPlane.prefab
@@ -5611,6 +5611,7 @@ GameObject:
   - component: {fileID: 2228875225448288658}
   - component: {fileID: 641791970361293050}
   - component: {fileID: 8461938103945633730}
+  - component: {fileID: 3967420125789132631}
   m_Layer: 0
   m_Name: WMTSPlane
   m_TagString: Untagged
@@ -5666,6 +5667,20 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!64 &3967420125789132631
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8461938103945633784}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &8520839879056564476
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scenes/icesat-2.unity b/Assets/Scenes/icesat-2.unity
@@ -209,7 +209,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &947101869
 GameObject:
@@ -344,7 +344,7 @@ PrefabInstance:
     - target: {fileID: 2666767512476531530, guid: 5615ba4645e002e43aa93ece5d5951b2,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 2666767512476531530, guid: 5615ba4645e002e43aa93ece5d5951b2,
         type: 3}