Merge branch 'main' into update-readme

Author: Janine Liu

Assets/CesiumForUnitySamples/CesiumSamplesScene.cs

@@ -18,11 +18,15 @@
 [InitializeOnLoad]
 static class CesiumSamplesSceneManager
 {
+    static readonly string samplesKey = "OpenedCesiumSamples";
+
     static CesiumSamplesSceneManager()
     {
         DisableTextMeshProIcons();
 
         EditorSceneManager.sceneOpened += ResetSceneViewCamera;
+        EditorApplication.update += OpenFirstSampleScene;
+        EditorApplication.quitting += RemoveSamplesKeyFromPlayerPrefs;
     }
 
     // There's no public API to disable component icons in the SceneView, which
@@ -61,6 +65,26 @@ static void DisableTextMeshProIcons()
         }
     }
 
+    // Unity will not open the first sample scene on its own, so this manually opens
+    // the sample scene when the Editor is first opened. The PlayerPref prevents
+    // the first scene from being re-opened whenever the user's code compiles.
+    static void OpenFirstSampleScene()
+    {
+        EditorApplication.update -= OpenFirstSampleScene;
+        if(PlayerPrefs.GetInt(samplesKey, -1) > 0)
+        {
+            return;
+        }
+
+        PlayerPrefs.SetInt(samplesKey, 1);
+        EditorSceneManager.OpenScene("Assets/Scenes/01_CesiumWorld.unity");
+    }
+
+    static void RemoveSamplesKeyFromPlayerPrefs()
+    {
+        PlayerPrefs.DeleteKey(samplesKey);
+    }
+
     static void ResetSceneViewCamera(Scene scene, OpenSceneMode mode)
     {
         GameObject[] gameObjects = scene.GetRootGameObjects();
@@ -101,8 +125,6 @@ class CesiumSamplesScene : MonoBehaviour
         "for SceneView.LookAtDirect.")]
     private float _lookAtSize = 0;
 
-    private readonly float _sceneViewFarClip = 1000000;
-
     [SerializeField]
     [Tooltip("The List of GameObjects that the scene should disable during play mode.")]
     private List<GameObject> _objectsToDisable = new List<GameObject>();
@@ -158,8 +180,6 @@ void ResetSceneView()
     public void ResetSceneViewOnLoad()
     {
         ResetSceneView();
-        SceneView.lastActiveSceneView.cameraSettings.farClip = this._sceneViewFarClip;
-
         EditorApplication.update -= ResetSceneViewOnLoad;
     }
     #endif

Assets/Scenes/03_CesiumSanFrancisco.unity

@@ -567,7 +567,7 @@ MonoBehaviour:
   _url: 
   _ionAssetID: 1
   _ionAccessToken: 
-  _maximumScreenSpaceError: 16
+  _maximumScreenSpaceError: 32
   _preloadAncestors: 1
   _preloadSiblings: 1
   _forbidHoles: 0
@@ -1020,8 +1020,8 @@ MonoBehaviour:
   _url: 
   _ionAssetID: 1415196
   _ionAccessToken: 
-  _maximumScreenSpaceError: 2
-  _preloadAncestors: 0
+  _maximumScreenSpaceError: 8
+  _preloadAncestors: 1
   _preloadSiblings: 1
   _forbidHoles: 0
   _maximumSimultaneousTileLoads: 20