Merge pull request #26 from NASA-AMMOS/dev/g72-maintenance-2

Dev/g72 maintenance 2
NASA-AMMOS · Jun 2, 2021 · 0bb0bb4 · 0bb0bb4
2 parents 0d4f140 + 29f6194
commit 0bb0bb4
Show file tree

Hide file tree

Showing 22 changed files with 1,153 additions and 1,079 deletions.
diff --git a/Assets/Examples/Options/cache_1k_scene_options.json b/Assets/Examples/Options/cache_1k_scene_options.json
@@ -1,3 +1,3 @@
 {
-  "LRUCacheMaxSize": 1000
+  "CacheMaxSize": 1000
 }
diff --git a/Assets/Examples/Scenes/GenericWeb.unity b/Assets/Examples/Scenes/GenericWeb.unity
@@ -665,36 +665,33 @@ MonoBehaviour:
     PauseMemThreshold: -1
     GCMemThreshold: -1
     MaximumTilesToProcessPerFrame: 1
-    LRUCacheTargetSize: 600
-    LRUCacheMaxSize: 1000
-    LRUMaxFrameUnloadRatio: 0.2
+    CacheTargetSize: 600
+    CacheMaxSize: 1000
+    MaxCacheUnloadRatio: 0.2
     MaxConcurrentRequests: 6
     ShaderOverride: 
     LoadIndices: 0
     ClippingCameras: []
     DefaultCameraTranslation: {x: 0, y: 0, z: -10}
     DefaultCameraRotation: {x: 0, y: 0, z: -0.70710677, w: 0.70710677}
   Stats:
-    FrustumSetCount: 0
-    UsedSetCount: 0
-    VisibleTileCount: 0
-    ColliderTileCount: 0
+    UsedSet: 0
+    FrustumSet: 0
+    ColliderSet: 0
+    VisibleTiles: 0
     VisibleFaces: 0
     VisibleTextures: 0
     VisiblePixels: 0
     MinVisibleTileDepth: 0
     MaxVisibleTileDepth: 0
+    RequestsThisFrame: 0
+    NetworkErrorsThisFrame: 0
     NumberOfTilesTotal: 0
-    LoadedContentCount: 0
-    ProcessingTiles: 0
     RequestQueueLength: 0
-    ConcurrentRequests: 0
-    TotalTilesLoaded: 0
-    TilesLeftToLoad: 0
-    LeafContentRequired: 0
-    LeafContentLoaded: 0
-    RequestsThisFrame: 0
-    NetworkError: 0
+    ActiveDownloads: 0
+    ProcessingQueueLength: 0
+    DownloadedTiles: 0
+    ReadyTiles: 0
   TilesetOptions: []
   SceneUrl: 
 --- !u!114 &1485971529
@@ -738,7 +735,7 @@ MonoBehaviour:
   rotateButton: 0
   scaleButton: 2
   rollButton: 1
-  lockRoll: 1
+  lockRoll: 0
   lockRollSpeed: 0.01
   lockRollCrossover: 0.7
   worldUp: {x: 0, y: 0, z: -1}

diff --git a/Assets/Examples/Scenes/MainHololens.unity b/Assets/Examples/Scenes/MainHololens.unity
@@ -143,138 +143,138 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3376399834326130634, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchorMin.y
+      propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399834326130634, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchorMax.y
+      propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399834326130634, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
+      propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399834326130634, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
+      propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399834326130634, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_SizeDelta.x
+      propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399834326130634, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_SizeDelta.y
+      propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalPosition.x
+      propertyPath: m_Pivot.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
+      propertyPath: m_Pivot.y
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalPosition.z
+      propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalRotation.x
+      propertyPath: m_AnchorMax.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalRotation.z
+      propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalRotation.w
+      propertyPath: m_AnchorMin.y
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_RootOrder
+      propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
+      propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
+      propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
+      propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 20
+      propertyPath: m_LocalPosition.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -20
+      propertyPath: m_LocalRotation.w
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_SizeDelta.x
+      propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_SizeDelta.y
+      propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchorMin.x
+      propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
+      propertyPath: m_AnchoredPosition.x
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
+      propertyPath: m_AnchoredPosition.y
+      value: -20
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_Pivot.x
+      propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366642, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
-      propertyPath: m_Pivot.y
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3376399835161366643, guid: 5b36edd38769f254e8ee3f629b1741a6,
         type: 3}
@@ -798,37 +798,36 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   SceneOptions:
+    PauseMemThreshold: -1
+    GCMemThreshold: -1
     MaximumTilesToProcessPerFrame: 1
-    LRUCacheTargetSize: 600
-    LRUCacheMaxSize: 700
-    LRUMaxFrameUnloadRatio: 0.2
+    CacheTargetSize: 600
+    CacheMaxSize: 1000
+    MaxCacheUnloadRatio: 0.2
     MaxConcurrentRequests: 6
     ShaderOverride: 
     LoadIndices: 0
     ClippingCameras: []
     DefaultCameraTranslation: {x: 160, y: 32, z: 100}
     DefaultCameraRotation: {x: 0, y: 0.76604444, z: 0, w: 0.64278764}
   Stats:
-    FrustumSetCount: 0
-    UsedSetCount: 0
-    VisibleTileCount: 0
-    ColliderTileCount: 0
+    UsedSet: 0
+    FrustumSet: 0
+    ColliderSet: 0
+    VisibleTiles: 0
     VisibleFaces: 0
     VisibleTextures: 0
     VisiblePixels: 0
     MinVisibleTileDepth: 0
     MaxVisibleTileDepth: 0
+    RequestsThisFrame: 0
+    NetworkErrorsThisFrame: 0
     NumberOfTilesTotal: 0
-    LoadedContentCount: 0
-    ProcessingTiles: 0
     RequestQueueLength: 0
-    ConcurrentRequests: 0
-    TotalTilesLoaded: 0
-    TilesLeftToLoad: 0
-    LeafContentRequired: 0
-    LeafContentLoaded: 0
-    RequestsThisFrame: 0
-    NetworkError: 0
+    ActiveDownloads: 0
+    ProcessingQueueLength: 0
+    DownloadedTiles: 0
+    ReadyTiles: 0
   TilesetOptions:
     Name: 
     Url: data://SampleTileset/tileset.json
@@ -860,6 +859,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6551e1c668008d044b4d380b72192ee6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  targetFrameRate: 60
   tileset: {fileID: 2111641893}
   hud: {fileID: 596472553}
   mouseFly: {fileID: 2111641896}
@@ -888,6 +888,11 @@ MonoBehaviour:
   rotateButton: 0
   scaleButton: 2
   rollButton: 1
+  lockRoll: 0
+  lockRollSpeed: 0.1
+  lockRollCrossover: 0.2
+  worldUp: {x: 0, y: 1, z: 0}
+  worldNorth: {x: 0, y: 0, z: 1}
   rotateModifier: 4
   scaleModifier: 2
   accelModifier: 1
@@ -913,6 +918,11 @@ MonoBehaviour:
   rotateButton: 0
   scaleButton: 2
   rollButton: 1
+  lockRoll: 1
+  lockRollSpeed: 0.1
+  lockRollCrossover: 0.2
+  worldUp: {x: 0, y: 1, z: 0}
+  worldNorth: {x: 0, y: 0, z: 1}
   rotateModifier: 4
   scaleModifier: 2
   accelModifier: 1