tuner becomes modifier, use std::optional for version

Author: GhisBntly

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -5,6 +5,7 @@
 #include "Camera/CameraTypes.h"
 #include "Camera/PlayerCameraManager.h"
 #include "Cesium3DTilesSelection/EllipsoidTilesetLoader.h"
+#include "Cesium3DTilesSelection/GltfModifier.h"
 #include "Cesium3DTilesSelection/Tile.h"
 #include "Cesium3DTilesSelection/TilesetLoadFailureDetails.h"
 #include "Cesium3DTilesSelection/TilesetOptions.h"
@@ -994,7 +995,7 @@ void ACesium3DTileset::LoadTileset() {
           ? this->BoundingVolumePoolComponent->getPool()
           : nullptr,
       {},
-      _gltfTuner
+      _gltfModifier
   };
 
   this->_startTime = std::chrono::high_resolution_clock::now();
@@ -2329,7 +2330,7 @@ void ACesium3DTileset::RuntimeSettingsChanged(
 }
 #endif
 
-void ACesium3DTileset::SetGltfTuner(
-    const std::shared_ptr<Cesium3DTilesSelection::GltfTuner>& tuner) {
-  _gltfTuner = tuner;
+void ACesium3DTileset::SetGltfModifier(
+    const std::shared_ptr<Cesium3DTilesSelection::GltfModifier>& InModifier) {
+  _gltfModifier = InModifier;
 }

Source/CesiumRuntime/Private/CesiumGltfComponent.cpp

@@ -3536,11 +3536,11 @@ UCesiumGltfComponent::UCesiumGltfComponent() : USceneComponent() {
   PrimaryComponentTick.bCanEverTick = false;
 }
 
-int32 UCesiumGltfComponent::GetTuningVersion() const {
-  if (pTile && pTile->getContent().getRenderContent()) {
-    return pTile->getContent().getRenderContent()->getModel()._tuningVersion;
-  }
-  return -1;
+const CesiumGltf::Model* UCesiumGltfComponent::GetGltfModel() const {
+  if (pTile)
+    if (auto RenderContent = pTile->getContent().getRenderContent())
+      return &RenderContent->getModel();
+  return nullptr;
 }
 
 void UCesiumGltfComponent::UpdateTransformFromCesium(

Source/CesiumRuntime/Private/CesiumGltfComponent.h

@@ -136,7 +136,7 @@ class UCesiumGltfComponent : public USceneComponent, public ICesiumLoadedTile {
   virtual void BeginDestroy() override;
 
   // from ICesiumLoadedTile
-  int32 GetTuningVersion() const override;
+  const CesiumGltf::Model* GetGltfModel() const override;
 
   void UpdateFade(float fadePercentage, bool fadingIn);
 

Source/CesiumRuntime/Public/Cesium3DTileset.h

@@ -39,6 +39,7 @@ class CesiumViewExtension;
 struct FCesiumCamera;
 
 namespace Cesium3DTilesSelection {
+class GltfModifier;
 class Tileset;
 class TilesetView;
 class TileOcclusionRendererProxyPool;
@@ -1258,13 +1259,13 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
   void UpdateTransformFromCesium();
 
   /**
-   * Sets the glTF model tuner, an optional extension class that can edit
+   * Sets the glTF modifier, an optional extension class that can edit
    * each tile's glTF model after it has been loaded, before it can be
    * displayed. Can only be called in the same engine tick after the tileset
    * actor was spawned, or {@link RefreshTileset} was called.
    */
-  void
-  SetGltfTuner(const std::shared_ptr<Cesium3DTilesSelection::GltfTuner>& tuner);
+  void SetGltfModifier(
+      const std::shared_ptr<Cesium3DTilesSelection::GltfModifier>& InModifier);
 
 private:
   /**
@@ -1380,7 +1381,7 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
 
   int32 _tilesetsBeingDestroyed;
 
-  std::shared_ptr<Cesium3DTilesSelection::GltfTuner> _gltfTuner;
+  std::shared_ptr<Cesium3DTilesSelection::GltfModifier> _gltfModifier;
 
   friend class UnrealPrepareRendererResources;
   friend class UCesiumGltfPointsComponent;

Source/CesiumRuntime/Public/CesiumLoadedTile.h

@@ -6,12 +6,16 @@
 
 #include "CesiumLoadedTile.generated.h"
 
+namespace CesiumGltf {
+struct Model;
+}
+
 UINTERFACE()
 class UCesiumLoadedTile : public UInterface {
   GENERATED_BODY()
 };
 class ICesiumLoadedTile {
   GENERATED_BODY()
 public:
-  virtual int32 GetTuningVersion() const = 0;
+  virtual const CesiumGltf::Model* GetGltfModel() const = 0;
 };