Merge branch 'main' into supporting-i3dm-poc

Author: tomlee-dev

.github/workflows/build.yml

@@ -51,9 +51,10 @@ jobs:
           key: vcpkg-windows-${{ hashFiles('native~/vcpkg/ports/**/vcpkg.json', 'native~/vcpkg/triplets/**/*', 'native~/extern/*toolchain.cmake') }}-${{ hashFiles('native~/extern/cesium-native/CMakeLists.txt', 'native~/CMakeLists.txt') }}
           restore-keys: |
             vcpkg-windows-${{ hashFiles('native~/vcpkg/ports/**/vcpkg.json', 'native~/vcpkg/triplets/**/*', 'native~/extern/*toolchain.cmake') }}-
-      - name: Install Ninja
-        run: |
-          choco install -y ninja
+      - name: Install latest ninja and cmake
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: "3.31.6"
       - name: Install nasm
         uses: ilammy/setup-nasm@v1.5.1
       - name: Install wget
@@ -114,6 +115,10 @@ jobs:
         run: |
           cd d:\cesium\CesiumForUnityBuildProject\Packages\com.cesium.unity
           dotnet publish Reinterop~ -o .
+      - name: Print disk space 1
+        if: success() || failure()    # run this step even if previous step failed
+        run: |
+          get-psdrive
       - name: Build Package
         run: |
           cd d:\cesium\CesiumForUnityBuildProject\Packages\com.cesium.unity
@@ -128,6 +133,10 @@ jobs:
           $ENV:EZVCPKG_BASEDIR="D:/.ezvcpkg"
           # Run the build
           dotnet run --project Build~
+      - name: Print disk space 2
+        if: success() || failure()    # run this step even if previous step failed
+        run: |
+          get-psdrive
       - name: Publish Logs
         if: success() || failure()    # run this step even if previous step failed
         uses: actions/upload-artifact@v4

.github/workflows/prod.yml

@@ -0,0 +1,41 @@
+name: prod
+on:
+  push:
+    branches:
+      - 'cesium.com'
+      - 'cesium.com-staging'
+jobs:
+  deploy-docs:
+    runs-on: ubuntu-22.04
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.NATIVE_ACCESS_KEY }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.NATIVE_SECRET_KEY }}
+      AWS_REGION: us-east-1
+    steps:
+      - name: Install Doxygen
+        run: |
+          cd ~
+          wget https://github.com/doxygen/doxygen/releases/download/Release_1_12_0/doxygen-1.12.0.linux.bin.tar.gz
+          tar xzf doxygen-1.12.0.linux.bin.tar.gz
+          export PATH=$PWD/doxygen-1.12.0/bin:$PATH
+          echo "PATH=$PATH" >> "$GITHUB_ENV"
+          doxygen --version
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Mark documentation official
+        if: ${{ github.ref_name == 'cesium.com' }}
+        run: |
+          sed -i 's/PRE-RELEASE/ /g' Documentation~/Doxyfile
+      - name: Generate Documentation
+        run: |
+          npm run doxygen
+      - name: Deploy to cesium.com
+        if: ${{ github.ref_name == 'cesium.com' }}
+        run: |
+          aws s3 sync Documentation~/Reference/html/ s3://cesium-website/cesium-unity/ref-doc/ --cache-control "public, max-age=1800" --delete
+      - name: Deploy to cesium.com staging
+        if: ${{ github.ref_name == 'cesium.com-staging' }}
+        run: |
+          aws s3 sync Documentation~/Reference/html/ s3://cesium-website/cesium-unity/ref-doc-staging/ --cache-control "public, max-age=1800" --delete

.gitignore

@@ -11,6 +11,8 @@ Plugins.meta
 CesiumForUnityNativeBindings/native/
 .vs/
 *.user
+.DS_STORE
+.idea
 Reinterop.dll
 Reinterop.deps.json
 Reinterop.deps.json.meta
@@ -22,4 +24,4 @@ libCesiumForUnityNative-*.so
 libCesiumForUnityNative-*.so.meta
 libCesiumForUnityNative-*.dylib
 libCesiumForUnityNative-*.dylib.meta
-Documentation~/Reference/
+Documentation~/Reference/

Build~/Build~.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Build</RootNamespace>
     <Nullable>enable</Nullable>
   </PropertyGroup>

CHANGES.md

@@ -1,5 +1,84 @@
 # Change Log
 
+## ? - ?
+
+##### Additions :tada:
+
+- Added option to ignore the `KHR_material_unlit` extension to force default lighting on tilesets. 
+
+## v1.17.0 - 2025-08-01
+
+##### Additions :tada:
+
+- Added support for Cesium3DTileset tile selection using orthographic views.
+
+In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.49.0 to v0.50.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.16.2 - 2025-07-01
+
+##### Fixes :wrench:
+
+- Fixed broken support for `TRIANGLE_FAN` primitives in tile meshes.
+- Fixed editor crash when any scale component on `Cesium3DTileset` was set to zero. 
+- Fixed a bug where CameraFlyToController, after the user interrupted a flight, would jump to the middle of the flight path immediately upon starting the next flight.
+
+In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.48.0 to v0.49.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.16.1 - 2025-06-02
+
+This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.47.0 to v0.48.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.16.0 - 2025-05-01
+
+##### Additions :tada:
+
+- Added `CesiumUrlTemplateRasterOverlay` component, allowing a raster overlay to be added using tiles requested based on a specified URL template.
+
+##### Fixes :wrench:
+
+- Fixed a bug where credits would not display in the Game tab after entering Play Mode.
+- Improved stability during AppDomain reloads by catching exceptions thrown while freeing tiles.
+
+In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.46.0 to v0.47.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.15.5 - 2025-04-01
+
+##### Fixes :wrench:
+
+- Fixed a bug that could cause a crash when reloading a scene or tileset repeatedly.
+
+In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.45.0 to v0.46.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.15.4 - 2025-03-03
+
+##### Fixes :wrench:
+
+- "External Tilesets" are now unloaded when they are no longer used. This will significantly reduce the growth of memory usage over time when using Google Photorealistic 3D Tiles and similar tilesets.
+
+This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.44.3 to v0.45.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.15.3 - 2025-02-12
+
+This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.44.2 to v0.44.3. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.15.2 - 2025-02-10
+
+This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.44.1 to v0.44.2. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.15.1 - 2025-02-03
+
+This release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.44.0 to v0.44.1. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
+## v1.15.0 - 2025-02-03
+
+Cesium for Unity now requires Unity 2022 LTS (2022.3), Unity 6, or later.
+
+##### Fixes :wrench:
+
+- Exceptions in either C# or C++ code are now handled much more reliably.
+
+In addition to the above, this release updates [cesium-native](https://github.com/CesiumGS/cesium-native) from v0.43.0 to v0.44.0. See the [changelog](https://github.com/CesiumGS/cesium-native/blob/main/CHANGES.md) for a complete list of changes in cesium-native.
+
 ## v1.14.1 - 2025-01-02
 
 This is the last release of Cesium for Unity that will support Unity 2021 LTS (2021.3). Future versions will require Unity 2022 LTS (2022.3) or Unity 6.

CHANGES.md.meta

@@ -54,7 +54,7 @@ PROJECT_NUMBER         = $(npm_package_version)
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = 
+PROJECT_BRIEF          = PRE-RELEASE
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55

Documentation~/Doxyfile

@@ -53,7 +53,8 @@ This should be repeated if you modify Reinterop, or if you pull new changes that
 
 For more details, see the [Reinterop README](../Reinterop~/README.md).
 
-A common mistake is to open Unity before doing this step, which will cause Unity to delete `Reinterop.dll.meta` file because the `Reinterop.dll` file does not yet exist. Then, even after you publish `Reinterop.dll`, the `Reinterop.dll.meta` that Unity creates will be missing important information, and you'll get errors when Unity attemps to compile Cesium for Unity. If this happens to you, executing `git restore Reinterop.dll.meta` should fix it.
+> [!IMPORTANT] 
+> A common mistake is to open Unity before doing this step, which will cause Unity to delete `Reinterop.dll.meta` file because the `Reinterop.dll` file does not yet exist. Then, even after you publish `Reinterop.dll`, the `Reinterop.dll.meta` that Unity creates will be missing important information, and you'll get errors when Unity attemps to compile Cesium for Unity. If this happens to you, executing `git restore Reinterop.dll.meta` should fix it.
 
 ## Build for the Editor
 
@@ -66,7 +67,7 @@ DllNotFoundException: CesiumForUnityNative assembly:<unknown assembly> type:<unk
 NotImplementedException: The native implementation is missing so OnValidate cannot be invoked.
 ```
 
-This is because the C++ code has not yet been compiled. To compile the C++ code for use in the Editor, run:
+This is because the C++ code has not yet been compiled. To compile the C++ code for use by the Editor, run:
 
 ```
 cd cesium-unity-samples/Packages/com.cesium.unity/native~
@@ -86,6 +87,22 @@ cmake --build build -j14 --target install --config RelWithDebInfo
 
 Once this build/install completes, Cesium for Unity should work the next time Unity loads Cesium for Unity. You can get it to do so by either restarting the Editor, or by making a small change to any Cesium for Unity script (.cs) file in `Packages/com.cesium.unity/Runtime`.
 
+> [!NOTE]
+> If you receive compilation errors such as, 
+> ```
+> IonTokenTroubleshootingWindowImpl.h:3:10: fatal error: 'DotNet/System/String.h' file not found
+> ```
+> Verify that Reinterop has generated the required `.cpp` and `.h` source files. These should be located in `com.cesium.unity/native~/Runtime/generated-Editor/` and `com.cesium.unity/native~/Editor/generated-Editor/`. 
+> If those directories are not present, you may force Reinterop to run by adding a comment or other minor change to `./Runtime/ConfigureReinterop.cs`
+and `./Editor/ConfigureReinterop.cs` . 
+> ```
+> cd cesium-unity-samples/Packages/com.cesium.unity
+> echo "" >> ./Runtime/ConfigureReinterop.cs
+> echo "" >> ./Editor/ConfigureReinterop.cs
+> ```
+> (Alternatively, one may open both `ConfigureReinterop.cs` files from within Unity or any text editor, make a whitespace or other minor change, and save the files.)
+> Once those changes have been saved, go back to the Unity editor. It should detect the file changes and cause Reinterop to generate the required C++ source files. 
+
 ## Building and Running Games
 
 When you build and run a standalone game (i.e. with File -> Build Settings... or File -> Build and Run in the Unity Editor), Unity will automatically compile Cesium for Unity for the target platform. Then, by hooking into Unity build events, Cesium for Unity will build the corresponding native code for that platform by running CMake on the command-line. This can take a few minutes, and during that time Unity's progress bar will display a message stating the location of the build log file.

Documentation~/developer-setup.md

@@ -31,6 +31,7 @@ public class Cesium3DTilesetEditor : Editor
         private SerializedProperty _culledScreenSpaceError;
 
         private SerializedProperty _opaqueMaterial;
+        private SerializedProperty _ignoreKhrMaterialsUnlit;
         //private SerializedProperty _useLodTransitions;
         //private SerializedProperty _lodTransitionLength;
         private SerializedProperty _generateSmoothNormals;
@@ -83,6 +84,7 @@ private void OnEnable()
             //    this.serializedObject.FindProperty("_lodTransitionLength");
             this._generateSmoothNormals =
                 this.serializedObject.FindProperty("_generateSmoothNormals");
+            this._ignoreKhrMaterialsUnlit = this.serializedObject.FindProperty("_ignoreKhrMaterialsUnlit");
 
             this._pointCloudShading = this.serializedObject.FindProperty("_pointCloudShading");
 
@@ -425,6 +427,19 @@ private void DrawRenderProperties()
                 "normals requires duplicating vertices. This option allows the glTFs to be " +
                 "rendered with smooth normals instead when the original glTF is missing normals.");
             EditorGUILayout.PropertyField(this._generateSmoothNormals, generateSmoothNormalsContent);
+
+            var ignoreKhrMaterialsUnlit = new GUIContent(
+                "Ignore KHR_materials_unlit",
+                "Whether to ignore the KHR_materials_unlit extension on the glTF tiles in "+
+                "this tileset, if it exists, and instead render with standard lighting and "+
+                "shadows. This property will have no effect if the tileset does not have any "+
+                "tiles that use this extension. "+
+                "\n\n"+
+               "The KHR_materials_unlit extension is often applied to photogrammetry "+
+                "tilesets because lighting and shadows are already baked into their "+
+                "textures. "
+            );
+            EditorGUILayout.PropertyField(this._ignoreKhrMaterialsUnlit, ignoreKhrMaterialsUnlit);
         }
 
         private void DrawPointCloudShadingProperties()

Editor/Cesium3DTilesetEditor.cs

@@ -0,0 +1,64 @@
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace CesiumForUnity
+{
+    [InitializeOnLoad]
+    public static class CesiumCreditSystemManager
+    {
+        static CesiumCreditSystemManager()
+        {
+            EditorApplication.playModeStateChanged += HandleEnteringPlayMode;
+            EditorSceneManager.sceneClosing += HandleClosingScene;
+        }
+
+        /// <summary>
+        /// This handles the destruction of the default credit system between scene switches in the 
+        /// Unity Editor.
+        /// Without this, the credit system will live between instances and fail to capture the current 
+        /// scene's credits.
+        /// </summary>
+        /// <param name="scene">The scene.</param>
+        /// <param name="removingScene">Whether the scene is being removed.</param>
+        private static void HandleClosingScene(Scene scene, bool removingScene)
+        {
+            Destroy(CesiumCreditSystem.GetDefaultCreditSystem());
+        }
+
+        /// <summary>   
+        /// This handles the destruction of the default credit system while entering Play Mode.
+        /// Without this, the persisting credit system's UI will not register with the Play Mode view, leading
+        /// to missing credits.
+        /// </summary>
+        /// <param name="state">The state change between the Edit and Play modes.</param>
+        private static void HandleEnteringPlayMode(PlayModeStateChange state)
+        {
+            if (state == PlayModeStateChange.EnteredPlayMode)
+            {
+                Destroy(CesiumCreditSystem.GetDefaultCreditSystem());
+            }
+        }
+
+        /// <summary>
+        /// Destroys the input credit system depending on the current Editor context. This is the same as
+        /// the internal UnityLifetime class (which is currently inaccessible from Editor classes).
+        /// </summary>
+        /// <param name="creditSystem">The credit system.</param>
+        private static void Destroy(CesiumCreditSystem creditSystem)
+        {
+            if (creditSystem == null) { return; }
+
+            // In the Editor, we must use DestroyImmediate because Destroy won't
+            // actually destroy the object.
+            if (!EditorApplication.isPlaying)
+            {
+                Object.DestroyImmediate(creditSystem.gameObject);
+                return;
+            }
+
+            Object.Destroy(creditSystem.gameObject);
+        }
+    }
+}