Merge branch 'main' into more-texture-formats

Author: kring

.github/workflows/build.yml

@@ -6,24 +6,36 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Check out repository code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Install clang-format
  run: pip install clang-format
  - name: Check source formatting
  run: |
  find native~/Runtime native~/Editor native~/Shared \( -iname '*.cpp' -o -iname '*.h' \) -print0 | xargs -0 clang-format --dry-run -Werror
  Windows:
  needs: [QuickChecks]
- runs-on: ["self-hosted","windows","x64","unity-2021-3"]
+ runs-on: windows-latest
  # Only allow a single Windows build at a time, for Unity licensing reasons
  concurrency: windows
  steps:
  - name: Check out repository code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: recursive
  - name: Install nasm
- uses: ilammy/setup-nasm@v1.4.0
+ uses: ilammy/setup-nasm@v1.5.1
+ - name: Install wget
+ run: |
+ choco install -y wget
+ - name: Install Unity Hub
+ run: |
+ wget https://public-cdn.cloud.unity3d.com/hub/prod/UnityHubSetup.exe
+ Start-Process "./UnityHubSetup.exe" -Args "/S" -Wait
+ del ./UnityHubSetup.exe
+ - name: Install Unity
+ run: |
+ Start-Process -FilePath "C:/Program Files/Unity Hub/Unity Hub.exe" -Args "-- --headless install --version 2021.3.13f1 --changeset 9e7d58001ecf" -Wait
+ Start-Process -FilePath "C:/Program Files/Unity Hub/Unity Hub.exe" -Args "-- --headless install-modules --version 2021.3.13f1 --changeset 9e7d58001ecf --module android android-sdk-ndk-tools android-open-jdk-8u172-b11 universal-windows-platform uwp-il2cpp" -Wait
  - name: Create SSH tunnel to Unity License Server
  env:
  UNITY_LICENSE_SERVER_SSH_KEY: ${{ secrets.UNITY_LICENSE_SERVER_SSH_KEY }}
@@ -77,7 +89,7 @@ jobs:
  dir d:\cesium\CesiumForUnityBuildProject
  - name: Publish package artifact
  if: ${{ success() }}
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: Windows Package
  path: d:\cesium\CesiumForUnityBuildProject\*.tgz
@@ -86,24 +98,28 @@ jobs:
  start -FilePath "C:\Program Files\Unity\Hub\Editor\2021.3.13f1\Editor\Unity.exe" -ArgumentList "-runTests -batchmode -projectPath d:\cesium\CesiumForUnityBuildProject -testResults d:\cesium\temp\TestResults.xml -testPlatform PlayMode -logFile d:\cesium\temp\test-log.txt" -Wait
  cat d:\cesium\temp\test-log.txt
  - name: Test Report
- uses: kring/test-reporter@v1.6.1-kring
+ uses: kring/test-reporter@v1.6.2-kring
  if: success() || failure() # run this step even if previous step failed
  with:
  name: Tests - Windows
  path: d:/cesium/temp/TestResults.xml
  reporter: dotnet-nunit
  MacOS:
  needs: [QuickChecks]
- runs-on: macos-11
+ runs-on: macos-12
  # Only allow a single macOS build at a time, for Unity licensing reasons
  concurrency: mac
  steps:
+ - name: Set XCode version
+ uses: maxim-lobanov/setup-xcode@v1
+ with:
+ xcode-version: "14.1"
  - name: Check out repository code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: recursive
  - name: Install nasm
- uses: ilammy/setup-nasm@v1.4.0
+ uses: ilammy/setup-nasm@v1.5.1
  - name: Install jq
  run: brew install jq
  - name: Install Unity Hub
@@ -118,10 +134,10 @@ jobs:
  # This command sometimes returns exit code 130, despite actually succeeding.
  continue-on-error: true
  run: |
- /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless install --version 2021.3.13f1 --changeset 9e7d58001ecf
+ /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless install --version 2021.3.13f1 --changeset 9e7d58001ecf --architecture x86_64
  - name: Install Unity iOS Support 
  run: |
- /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless install-modules --version 2021.3.13f1 --changeset 9e7d58001ecf --module ios
+ /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless install-modules --version 2021.3.13f1 --changeset 9e7d58001ecf --module ios --architecture x86_64
  - name: Configure Unity to Use the License Server
  run: |
  sudo mkdir -p "/Library/Application Support/Unity/config"
@@ -172,7 +188,7 @@ jobs:
  ls -l ~/cesium/CesiumForUnityBuildProject
  - name: Publish package artifact
  if: ${{ success() }}
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: macOS Package
  path: ~/cesium/CesiumForUnityBuildProject/*.tgz
@@ -182,7 +198,7 @@ jobs:
  cat ~/cesium/CesiumForUnityBuildProject/test-log.txt
  ls /Users/runner/cesium/CesiumForUnityBuildProject/TestResults.xml
  - name: Test Report
- uses: kring/test-reporter@v1.6.1-kring
+ uses: kring/test-reporter@v1.6.2-kring
  if: success() || failure() # run this step even if previous step failed
  with:
  name: Tests - macOS
@@ -193,11 +209,11 @@ jobs:
  needs: [Windows, MacOS]
  steps:
  - name: Check out repository code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Install jq
  run: sudo apt install jq
  - name: Download macOS build
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  name: macOS Package
  path: combine/macos
@@ -207,7 +223,7 @@ jobs:
  tar xzf *.tgz
  rm *.tgz
  - name: Download Windows build
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  name: Windows Package
  path: combine/windows
@@ -268,7 +284,7 @@ jobs:
  tar czf $NAME-$VERSION.tgz package
  - name: Publish combined package
  if: ${{ success() }}
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: Combined Package
  path: combine/merged/*.tgz

CHANGES.md

@@ -26,6 +26,7 @@
 - Fixed a bug where adding a `CesiumSubScene` as the child of an existing `CesiumGeoreference` in editor would cause the parent `CesiumGeoreference` to have its coordinates reset to the default.
 - Fixed the "DynamicCamera is not nested inside a game object with a CesiumGeoreference" warning when adding a new DynamicCamera in the editor.
 - Fixed support for loading textures with less than four channels.
+- Fixed "Destroying assets is not permitted to avoid data loss" error when using a custom opaque material with texture assets on a `Cesium3DTileset`.
 
 ##### Deprecated :hourglass_flowing_sand:
 

Tests/TestCesiumOriginShift.cs

@@ -164,31 +164,36 @@ public IEnumerator ShiftsOriginWithCharacterController()
 
  yield return new WaitForEndOfFrame();
 
- IEqualityComparer<double> epsilon6 = Comparers.Double(1e-6, 1e-6);
+ IEqualityComparer<double> epsilon6 = Comparers.Double(1e-6, 1e-4);
 
  Assert.That(baseEcef.x, Is.EqualTo(globeAnchor.positionGlobeFixed.x).Using(epsilon6));
 
- // speed per second
- double speed = 1000.0;
- double duration = 10.0;
- float startTime = Time.time;
- Vector3 startPos = globeAnchor.transform.position;
+ yield return null;
+
+ // Move, but not far enough to trigger an origin shift
+ double3 previousPositionEcef = globeAnchor.positionGlobeFixed.x;
+ double3 movement = georeference.TransformEarthCenteredEarthFixedDirectionToUnity(new double3(2500.0, 0, 0));
+ controller.Move((float3)movement);
 
- while ((Time.time - startTime) < duration)
- {
- double3 previousPositionEcef = globeAnchor.positionGlobeFixed.x;
+ // Explicitly sync the globe anchor, so that the origin shift's LateUpdate sees the new position this frame.
+ // Otherwise, it will base the shift on the position in the previous frame because CesiumGlobeAnchor
+ // coroutine that updates from the Transform already ran for this frame before the Move above was called.
+ globeAnchor.Sync();
 
-  yield return new WaitForFixedUpdate();
+ yield return null;
 
- double unitsEcef = speed * Time.deltaTime;
- double3 movement = georeference.TransformEarthCenteredEarthFixedDirectionToUnity(new double3(unitsEcef, 0, 0));
- controller.Move((float3)movement);
+ Assert.That(previousPositionEcef.x + 2500.0, Is.EqualTo(globeAnchor.positionGlobeFixed.x).Using(epsilon6));
+ Assert.Less(georeference.ecefX - globeAnchor.positionGlobeFixed.x, 5000.0);
 
- yield return new WaitForEndOfFrame();
+ // Move again, this time triggering an origin shift
+ previousPositionEcef = globeAnchor.positionGlobeFixed.x;
+ movement = georeference.TransformEarthCenteredEarthFixedDirectionToUnity(new double3(3000.0, 0, 0));
+ controller.Move((float3)movement);
+ globeAnchor.Sync();
+
+ yield return null;
 
- globeAnchor.Sync();
- Assert.That(previousPositionEcef.x + unitsEcef, Is.EqualTo(globeAnchor.positionGlobeFixed.x).Using(epsilon6));
- Assert.Less(georeference.ecefX - globeAnchor.positionGlobeFixed.x, 5000.0);
- }
+ Assert.That(previousPositionEcef.x + 3000.0, Is.EqualTo(globeAnchor.positionGlobeFixed.x).Using(epsilon6));
+ Assert.Less(System.Math.Abs(georeference.ecefX - globeAnchor.positionGlobeFixed.x), 5000.0);
  }
 }

native~/CMakeLists.txt

@@ -65,14 +65,17 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
  set (ALL_TARGETS
  CesiumForUnityNative-Runtime
  Async++
+ Cesium3DTilesContent
  Cesium3DTilesReader
  Cesium3DTilesSelection
  CesiumAsync
- CesiumGeospatial
  CesiumGeometry
+ CesiumGeospatial
  CesiumGltf
+ CesiumGltfContent
  CesiumGltfReader
  CesiumJsonReader
+ CesiumRasterOverlays
  CesiumUtility
  draco_attributes
  draco_compression_attributes_dec

native~/Runtime/src/UnityPrepareRendererResources.cpp

@@ -1046,6 +1046,7 @@ void setGltfMaterialParameterValues(
  UnityEngine::Texture texture =
  TextureLoader::loadTexture(model, baseColorTexture->index);
  if (texture != nullptr) {
+ texture.hideFlags(DotNet::UnityEngine::HideFlags::HideAndDontSave);
  unityMaterial.SetTexture(
  materialProperties.getBaseColorTextureID(),
  texture);
@@ -1065,6 +1066,7 @@ void setGltfMaterialParameterValues(
  UnityEngine::Texture texture =
  TextureLoader::loadTexture(model, metallicRoughness->index);
  if (texture != nullptr) {
+ texture.hideFlags(DotNet::UnityEngine::HideFlags::HideAndDontSave);
  unityMaterial.SetTexture(
  materialProperties.getMetallicRoughnessTextureID(),
  texture);
@@ -1087,6 +1089,7 @@ void setGltfMaterialParameterValues(
  model,
  gltfMaterial.emissiveTexture->index);
  if (texture != nullptr) {
+ texture.hideFlags(DotNet::UnityEngine::HideFlags::HideAndDontSave);
  unityMaterial.SetTexture(
  materialProperties.getEmissiveTextureID(),
  texture);
@@ -1104,6 +1107,7 @@ void setGltfMaterialParameterValues(
  UnityEngine::Texture texture =
  TextureLoader::loadTexture(model, gltfMaterial.normalTexture->index);
  if (texture != nullptr) {
+ texture.hideFlags(DotNet::UnityEngine::HideFlags::HideAndDontSave);
  unityMaterial.SetTexture(
  materialProperties.getNormalMapTextureID(),
  texture);
@@ -1125,6 +1129,7 @@ void setGltfMaterialParameterValues(
  model,
  gltfMaterial.occlusionTexture->index);
  if (texture != nullptr) {
+ texture.hideFlags(DotNet::UnityEngine::HideFlags::HideAndDontSave);
  unityMaterial.SetTexture(
  materialProperties.getOcclusionTextureID(),
  texture);
@@ -1587,8 +1592,11 @@ void freePrimitiveGameObject(
  for (int32_t i = 0, len = textureIDs.Count(); i < len; ++i) {
  int32_t textureID = textureIDs[i];
  UnityEngine::Texture texture = material.GetTexture(textureID);
- if (texture != nullptr)
+ if (texture != nullptr &&
+ (texture.hideFlags() & UnityEngine::HideFlags::HideAndDontSave) ==
+ UnityEngine::HideFlags::HideAndDontSave) {
  UnityLifetime::Destroy(texture);
+ }
  }
 
  UnityLifetime::Destroy(material);