Merge pull request #1720 from CesiumGS/const-get-root-tile

Use `const-get-root-tile` branch of cesium-native

Author: j9liu

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -1657,8 +1657,7 @@ bool ACesium3DTileset::ShouldTickIfViewportsOnly() const {
 namespace {
 template <typename Func>
 void forEachRenderableTile(const auto& tiles, Func&& f) {
-  for (const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
-           pTile : tiles) {
+  for (const auto& pTile : tiles) {
     if (!pTile ||
         pTile->getState() != Cesium3DTilesSelection::TileLoadState::Done) {
       continue;
@@ -1686,17 +1685,14 @@ void forEachRenderableTile(const auto& tiles, Func&& f) {
 }
 
 void removeVisibleTilesFromList(
-    std::vector<CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>&
-        list,
-    const std::vector<
-        CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>&
+    std::vector<Cesium3DTilesSelection::Tile::ConstPointer>& list,
+    const std::vector<Cesium3DTilesSelection::Tile::ConstPointer>&
         visibleTiles) {
   if (list.empty()) {
     return;
   }
 
-  for (const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
-           pTile : visibleTiles) {
+  for (const Cesium3DTilesSelection::Tile::ConstPointer& pTile : visibleTiles) {
     auto it = std::find(list.begin(), list.end(), pTile);
     if (it != list.end()) {
       list.erase(it);
@@ -1714,13 +1710,11 @@ void removeVisibleTilesFromList(
  * @param tiles The tiles to hide
  */
 void hideTiles(
-    const std::vector<
-        CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>& tiles) {
+    const std::vector<Cesium3DTilesSelection::Tile::ConstPointer>& tiles) {
   TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::HideTiles)
   forEachRenderableTile(
       tiles,
-      [](const CesiumUtility::IntrusivePointer<
-             Cesium3DTilesSelection::Tile>& /*pTile*/,
+      [](const Cesium3DTilesSelection::Tile::ConstPointer& /*pTile*/,
          UCesiumGltfComponent* pGltf) {
         if (pGltf->IsVisible()) {
           TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::SetVisibilityFalse)
@@ -1740,13 +1734,12 @@ void hideTiles(
  * list. This includes tiles that are fading out.
  */
 void removeCollisionForTiles(
-    const std::unordered_set<
-        CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>& tiles) {
+    const std::unordered_set<Cesium3DTilesSelection::Tile::ConstPointer>&
+        tiles) {
   TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::RemoveCollisionForTiles)
   forEachRenderableTile(
       tiles,
-      [](const CesiumUtility::IntrusivePointer<
-             Cesium3DTilesSelection::Tile>& /*pTile*/,
+      [](const Cesium3DTilesSelection::Tile::ConstPointer& /*pTile*/,
          UCesiumGltfComponent* pGltf) {
         TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::SetCollisionDisabled)
         pGltf->SetCollisionEnabled(ECollisionEnabled::NoCollision);
@@ -1829,8 +1822,8 @@ void ACesium3DTileset::updateLastViewUpdateResultState(
         ResolveGeoreference();
     check(Georeference);
 
-    for (const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
-             pTile : result.tilesToRenderThisFrame) {
+    for (const Cesium3DTilesSelection::Tile::ConstPointer& pTile :
+         result.tilesToRenderThisFrame) {
       CesiumGeometry::OrientedBoundingBox obb =
           Cesium3DTilesSelection::getOrientedBoundingBoxFromBoundingVolume(
               pTile->getBoundingVolume(),
@@ -1930,15 +1923,13 @@ void ACesium3DTileset::updateLastViewUpdateResultState(
 }
 
 void ACesium3DTileset::showTilesToRender(
-    const std::vector<
-        CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>& tiles) {
+    const std::vector<Cesium3DTilesSelection::Tile::ConstPointer>& tiles) {
   TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::ShowTilesToRender)
   forEachRenderableTile(
       tiles,
       [&RootComponent = this->RootComponent,
        &BodyInstance = this->BodyInstance](
-          const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
-              pTile,
+          const Cesium3DTilesSelection::Tile::ConstPointer& pTile,
           UCesiumGltfComponent* pGltf) {
         applyActorCollisionSettings(BodyInstance, pGltf);
 
@@ -1977,8 +1968,7 @@ static void updateTileFades(const auto& tiles, bool fadingIn) {
   forEachRenderableTile(
       tiles,
       [fadingIn](
-          const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
-              pTile,
+          const Cesium3DTilesSelection::Tile::ConstPointer& pTile,
           UCesiumGltfComponent* pGltf) {
         float percentage = pTile->getContent()
                                .getRenderContent()
@@ -2091,9 +2081,9 @@ void ACesium3DTileset::Tick(float DeltaTime) {
   hideTiles(this->_tilesToHideNextFrame);
 
   _tilesToHideNextFrame.clear();
-  for (const CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>&
-           pTile : pResult->tilesFadingOut) {
-    Cesium3DTilesSelection::TileRenderContent* pRenderContent =
+  for (const Cesium3DTilesSelection::Tile::ConstPointer& pTile :
+       pResult->tilesFadingOut) {
+    const Cesium3DTilesSelection::TileRenderContent* pRenderContent =
         pTile->getContent().getRenderContent();
     if (!this->UseLodTransitions ||
         (pRenderContent &&

Source/CesiumRuntime/Private/Tests/SampleTilesetsLoad.perf.cpp

@@ -192,22 +192,24 @@ bool FLoadTilesetMontrealPointCloud::RunTest(const FString& Parameters) {
         playContext.tilesets[0]->GetTileset();
     if (TestNotNull("Tileset", pTileset)) {
       int visibleTiles = 0;
-      pTileset->forEachLoadedTile([&](Cesium3DTilesSelection::Tile& tile) {
-        if (tile.getState() != Cesium3DTilesSelection::TileLoadState::Done)
-          return;
-        const Cesium3DTilesSelection::TileContent& content = tile.getContent();
-        const Cesium3DTilesSelection::TileRenderContent* pRenderContent =
-            content.getRenderContent();
-        if (!pRenderContent) {
-          return;
-        }
-
-        UCesiumGltfComponent* Gltf = static_cast<UCesiumGltfComponent*>(
-            pRenderContent->getRenderResources());
-        if (Gltf && Gltf->IsVisible()) {
-          ++visibleTiles;
-        }
-      });
+      pTileset->forEachLoadedTile(
+          [&](const Cesium3DTilesSelection::Tile& tile) {
+            if (tile.getState() != Cesium3DTilesSelection::TileLoadState::Done)
+              return;
+            const Cesium3DTilesSelection::TileContent& content =
+                tile.getContent();
+            const Cesium3DTilesSelection::TileRenderContent* pRenderContent =
+                content.getRenderContent();
+            if (!pRenderContent) {
+              return;
+            }
+
+            UCesiumGltfComponent* Gltf = static_cast<UCesiumGltfComponent*>(
+                pRenderContent->getRenderResources());
+            if (Gltf && Gltf->IsVisible()) {
+              ++visibleTiles;
+            }
+          });
 
       TestEqual("visibleTiles", visibleTiles, 1);
     }

Source/CesiumRuntime/Private/Tests/TileLoadingSoakTest.cpp

@@ -58,7 +58,7 @@ FString& getLogFilePath() {
 }
 
 void countTree(
-    Cesium3DTilesSelection::Tile* tile,
+    const Cesium3DTilesSelection::Tile* tile,
     int depth,
     int& outCount,
     int& outUnloaded,
@@ -67,8 +67,8 @@ void countTree(
     int& outContentLoaded,
     int& outDone) {
   outCount++;
-  std::span<Cesium3DTilesSelection::Tile> tiles = tile->getChildren();
-  for (Cesium3DTilesSelection::Tile& child : tiles) {
+  std::span<const Cesium3DTilesSelection::Tile> tiles = tile->getChildren();
+  for (const Cesium3DTilesSelection::Tile& child : tiles) {
     switch (child.getState()) {
     case Cesium3DTilesSelection::TileLoadState::Unloaded:
       outUnloaded++;

Source/CesiumRuntime/Public/Cesium3DTileset.h

@@ -1289,8 +1289,8 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
    *
    * @param tiles The tiles
    */
-  void showTilesToRender(const std::vector<CesiumUtility::IntrusivePointer<
-                             Cesium3DTilesSelection::Tile>>& tiles);
+  void showTilesToRender(
+      const std::vector<Cesium3DTilesSelection::Tile::ConstPointer>& tiles);
 
   /**
    * Will be called after the tileset is loaded or spawned, to register
@@ -1366,8 +1366,7 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
   // If we find a way to clear the wrong occlusion information in the
   // Unreal Engine, then this field may be removed, and the
   // tilesToHideThisFrame may be hidden immediately.
-  std::vector<CesiumUtility::IntrusivePointer<Cesium3DTilesSelection::Tile>>
-      _tilesToHideNextFrame;
+  std::vector<Cesium3DTilesSelection::Tile::ConstPointer> _tilesToHideNextFrame;
 
   int32 _tilesetsBeingDestroyed;