Adapt for ImageCesium only design.

CesiumGS · Oct 4, 2024 · ddff9db · ddff9db
1 parent d3fbccc
commit ddff9db
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 89 deletions.
diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp
@@ -2045,7 +2045,7 @@ void ACesium3DTileset::updateLastViewUpdateResultState(
     }
 
     if (this->LogAssetStats && this->_pTileset) {
-      const CesiumGltf::SingleAssetDepot<CesiumGltf::ImageCesium>* imageDepot =
+      const CesiumGltf::SharedAssetDepot<CesiumGltf::ImageCesium>* imageDepot =
           this->_pTileset->getSharedAssetDepot().getImageDepot();
       float averageAge;
       size_t deletionCount;

diff --git a/Source/CesiumRuntime/Private/CesiumEncodedFeaturesMetadata.cpp b/Source/CesiumRuntime/Private/CesiumEncodedFeaturesMetadata.cpp
@@ -143,11 +143,11 @@ std::optional<EncodedFeatureIdSet> encodeFeatureIdTexture(
     }
 
     // Copy the image, so that we can keep a copy of it in the glTF.
-    CesiumGltf::SharedAsset<CesiumGltf::ImageCesium> imageCopy =
-        CesiumGltf::SharedAsset(CesiumGltf::ImageCesium(*pFeatureIdImage));
+    CesiumUtility::IntrusivePointer<CesiumGltf::ImageCesium> pImageCopy =
+        new CesiumGltf::ImageCesium(*pFeatureIdImage);
     encodedFeatureIdTexture.pTexture =
         MakeShared<LoadedTextureResult>(std::move(*loadTextureAnyThreadPart(
-            *imageCopy,
+            *pImageCopy,
             addressX,
             addressY,
             TextureFilter::TF_Nearest,
@@ -510,11 +510,12 @@ EncodedPropertyTable encodePropertyTableAnyThreadPart(
               ? floorSqrtFeatureCount
               : (floorSqrtFeatureCount + 1);
 
-      CesiumGltf::SharedAsset<CesiumGltf::ImageCesium> image;
-      image->width = image->height = textureDimension;
-      image->bytesPerChannel = encodedFormat.bytesPerChannel;
-      image->channels = encodedFormat.channels;
-      image->pixelData.resize(
+      CesiumUtility::IntrusivePointer<CesiumGltf::ImageCesium> pImage =
+          new CesiumGltf::ImageCesium();
+      pImage->width = pImage->height = textureDimension;
+      pImage->bytesPerChannel = encodedFormat.bytesPerChannel;
+      pImage->channels = encodedFormat.channels;
+      pImage->pixelData.resize(
           textureDimension * textureDimension * encodedFormat.bytesPerChannel *
           encodedFormat.channels);
 
@@ -523,18 +524,18 @@ EncodedPropertyTable encodePropertyTableAnyThreadPart(
         CesiumEncodedMetadataParseColorFromString::encode(
             *pDescription,
             property,
-            gsl::span(image->pixelData),
+            gsl::span(pImage->pixelData),
             encodedFormat.bytesPerChannel * encodedFormat.channels);
       } else /* info.Conversion == ECesiumEncodedMetadataConversion::Coerce */ {
         CesiumEncodedMetadataCoerce::encode(
             *pDescription,
             property,
-            gsl::span(image->pixelData),
+            gsl::span(pImage->pixelData),
             encodedFormat.bytesPerChannel * encodedFormat.channels);
       }
 
       encodedProperty.pTexture = loadTextureAnyThreadPart(
-          *image,
+          *pImage,
           TextureAddress::TA_Clamp,
           TextureAddress::TA_Clamp,
           TextureFilter::TF_Nearest,
@@ -657,11 +658,11 @@ EncodedPropertyTexture encodePropertyTextureAnyThreadPart(
         }
 
         // Copy the image, so that we can keep a copy of it in the glTF.
-        CesiumGltf::SharedAsset<CesiumGltf::ImageCesium> imageCopy =
-            CesiumGltf::SharedAsset(CesiumGltf::ImageCesium(*pImage));
+        CesiumUtility::IntrusivePointer<CesiumGltf::ImageCesium> pImageCopy =
+            new CesiumGltf::ImageCesium(*pImage);
         encodedProperty.pTexture =
             MakeShared<LoadedTextureResult>(std::move(*loadTextureAnyThreadPart(
-                *imageCopy,
+                *pImageCopy,
                 addressX,
                 addressY,
                 // TODO: account for texture filter

diff --git a/Source/CesiumRuntime/Private/CesiumEncodedMetadataUtility.cpp b/Source/CesiumRuntime/Private/CesiumEncodedMetadataUtility.cpp
@@ -205,19 +205,20 @@ EncodedMetadataFeatureTable encodeMetadataFeatureTableAnyThreadPart(
             ? floorSqrtFeatureCount
             : (floorSqrtFeatureCount + 1);
 
-    CesiumGltf::SharedAsset<CesiumGltf::ImageCesium> image;
-    image->bytesPerChannel = encodedFormat.bytesPerChannel;
-    image->channels = encodedFormat.channels;
-    image->compressedPixelFormat = CesiumGltf::GpuCompressedPixelFormat::NONE;
-    image->height = image->width = ceilSqrtFeatureCount;
-    image->pixelData.resize(size_t(
-        image->width * image->height * image->channels *
-        image->bytesPerChannel));
+    CesiumUtility::IntrusivePointer<CesiumGltf::ImageCesium> pImage =
+        new CesiumGltf::ImageCesium();
+    pImage->bytesPerChannel = encodedFormat.bytesPerChannel;
+    pImage->channels = encodedFormat.channels;
+    pImage->compressedPixelFormat = CesiumGltf::GpuCompressedPixelFormat::NONE;
+    pImage->height = pImage->width = ceilSqrtFeatureCount;
+    pImage->pixelData.resize(size_t(
+        pImage->width * pImage->height * pImage->channels *
+        pImage->bytesPerChannel));
 
     if (isArray) {
       switch (gpuType) {
       case ECesiumMetadataPackedGpuType_DEPRECATED::Uint8_DEPRECATED: {
-        uint8* pWritePos = reinterpret_cast<uint8*>(image->pixelData.data());
+        uint8* pWritePos = reinterpret_cast<uint8*>(pImage->pixelData.data());
         int64_t pixelSize =
             encodedFormat.channels * encodedFormat.bytesPerChannel;
         for (int64 i = 0; i < featureCount; ++i) {
@@ -233,7 +234,7 @@ EncodedMetadataFeatureTable encodeMetadataFeatureTableAnyThreadPart(
         }
       } break;
       case ECesiumMetadataPackedGpuType_DEPRECATED::Float_DEPRECATED: {
-        uint8* pWritePos = reinterpret_cast<uint8*>(image->pixelData.data());
+        uint8* pWritePos = reinterpret_cast<uint8*>(pImage->pixelData.data());
         int64_t pixelSize =
             encodedFormat.channels * encodedFormat.bytesPerChannel;
         for (int64 i = 0; i < featureCount; ++i) {
@@ -257,7 +258,7 @@ EncodedMetadataFeatureTable encodeMetadataFeatureTableAnyThreadPart(
     } else {
       switch (gpuType) {
       case ECesiumMetadataPackedGpuType_DEPRECATED::Uint8_DEPRECATED: {
-        uint8* pWritePos = reinterpret_cast<uint8*>(image->pixelData.data());
+        uint8* pWritePos = reinterpret_cast<uint8*>(pImage->pixelData.data());
         for (int64 i = 0; i < featureCount; ++i) {
           *pWritePos = UCesiumPropertyTablePropertyBlueprintLibrary::GetByte(
               property,
@@ -266,7 +267,7 @@ EncodedMetadataFeatureTable encodeMetadataFeatureTableAnyThreadPart(
         }
       } break;
       case ECesiumMetadataPackedGpuType_DEPRECATED::Float_DEPRECATED: {
-        float* pWritePosF = reinterpret_cast<float*>(image->pixelData.data());
+        float* pWritePosF = reinterpret_cast<float*>(pImage->pixelData.data());
         for (int64 i = 0; i < featureCount; ++i) {
           *pWritePosF = UCesiumPropertyTablePropertyBlueprintLibrary::GetFloat(
               property,
@@ -278,7 +279,7 @@ EncodedMetadataFeatureTable encodeMetadataFeatureTableAnyThreadPart(
     }
 
     encodedProperty.pTexture = loadTextureAnyThreadPart(
-        *image,
+        *pImage,
         TextureAddress::TA_Clamp,
         TextureAddress::TA_Clamp,
         TextureFilter::TF_Nearest,
@@ -410,11 +411,11 @@ EncodedFeatureTexture encodeFeatureTextureAnyThreadPart(
     if (pMappedUnrealImageIt) {
       encodedFeatureTextureProperty.pTexture = pMappedUnrealImageIt->Pin();
     } else {
-      CesiumGltf::SharedAsset<CesiumGltf::ImageCesium> imageCopy =
-          CesiumGltf::SharedAsset(CesiumGltf::ImageCesium(*pImage));
+      CesiumUtility::IntrusivePointer<CesiumGltf::ImageCesium> pImageCopy =
+          new CesiumGltf::ImageCesium(*pImage);
       encodedFeatureTextureProperty.pTexture =
           MakeShared<LoadedTextureResult>(std::move(*loadTextureAnyThreadPart(
-              *imageCopy,
+              *pImageCopy,
               TextureAddress::TA_Clamp,
               TextureAddress::TA_Clamp,
               TextureFilter::TF_Nearest,
@@ -516,12 +517,11 @@ EncodedMetadataPrimitive encodeMetadataPrimitiveAnyThreadPart(
         if (pMappedUnrealImageIt) {
           encodedFeatureIdTexture.pTexture = pMappedUnrealImageIt->Pin();
         } else {
-          CesiumGltf::SharedAsset<CesiumGltf::ImageCesium> imageCopy =
-              CesiumGltf::SharedAsset(
-                  CesiumGltf::ImageCesium(*pFeatureIdImage));
+          CesiumUtility::IntrusivePointer<CesiumGltf::ImageCesium> pImageCopy =
+              new CesiumGltf::ImageCesium(*pFeatureIdImage);
           encodedFeatureIdTexture.pTexture = MakeShared<LoadedTextureResult>(
               std::move(*loadTextureAnyThreadPart(
-                  *imageCopy,
+                  *pImageCopy,
                   TextureAddress::TA_Clamp,
                   TextureAddress::TA_Clamp,
                   TextureFilter::TF_Nearest,

diff --git a/Source/CesiumRuntime/Private/CesiumGltfTextures.cpp b/Source/CesiumRuntime/Private/CesiumGltfTextures.cpp
@@ -237,7 +237,7 @@ SharedFuture<void> createTextureInLoadThread(
   const ExtensionImageCesiumUnreal& extension =
       ExtensionImageCesiumUnreal::getOrCreate(
           asyncSystem,
-          *pImage->cesium,
+          *pImage->pCesium,
           sRGB,
           needsMips,
           std::nullopt);

diff --git a/Source/CesiumRuntime/Private/CesiumTextureUtility.cpp b/Source/CesiumRuntime/Private/CesiumTextureUtility.cpp
@@ -304,7 +304,10 @@ TUniquePtr<LoadedTextureResult> loadTextureFromModelAnyThreadPart(
       model.getSafe(model.samplers, texture.sampler);
 
   TUniquePtr<LoadedTextureResult> result =
-      loadTextureFromImageAndSamplerAnyThreadPart(*image.cesium, sampler, sRGB);
+      loadTextureFromImageAndSamplerAnyThreadPart(
+          *image.pCesium,
+          sampler,
+          sRGB);
 
   if (result) {
     extension.pTexture = result->pTexture;

diff --git a/Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp b/Source/CesiumRuntime/Private/Tests/Cesium3DTileset.spec.cpp
@@ -71,7 +71,7 @@ static void setupForSharedImages(SceneGenerationContext& context) {
 void tilesetPass(
     SceneGenerationContext& context,
     TestPass::TestingParameter parameter) {
-  CesiumGltf::SharedAssetDepot& assetDepot =
+  CesiumGltf::SharedAssetDepots& assetDepot =
       context.tilesets[0]->GetTileset()->getSharedAssetDepot();
   assert(assetDepot.getImagesCount() == 2);
 }

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdTexture.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdTexture.spec.cpp
@@ -136,9 +136,9 @@ void FCesiumFeatureIdTextureSpec::Define() {
     It("constructs valid instance for texture with nonexistent texcoord attribute",
        [this]() {
          Image& image = model.images.emplace_back();
-         image.cesium->width = image.cesium->height = 1;
-         image.cesium->channels = 1;
-         image.cesium->pixelData.push_back(std::byte(42));
+         image.pCesium->width = image.pCesium->height = 1;
+         image.pCesium->channels = 1;
+         image.pCesium->pixelData.push_back(std::byte(42));
 
          Sampler& sampler = model.samplers.emplace_back();
          sampler.wrapS = Sampler::WrapS::CLAMP_TO_EDGE;
@@ -175,9 +175,9 @@ void FCesiumFeatureIdTextureSpec::Define() {
     It("constructs valid instance for texture with invalid texcoord accessor",
        [this]() {
          Image& image = model.images.emplace_back();
-         image.cesium->width = image.cesium->height = 1;
-         image.cesium->channels = 1;
-         image.cesium->pixelData.push_back(std::byte(42));
+         image.pCesium->width = image.pCesium->height = 1;
+         image.pCesium->channels = 1;
+         image.pCesium->pixelData.push_back(std::byte(42));
 
          Sampler& sampler = model.samplers.emplace_back();
          sampler.wrapS = Sampler::WrapS::CLAMP_TO_EDGE;

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumGltfSpecUtility.cpp b/Source/CesiumRuntime/Private/Tests/CesiumGltfSpecUtility.cpp
@@ -70,12 +70,13 @@ CesiumGltf::FeatureId& AddFeatureIDsAsTextureToModel(
     const int32_t samplerWrapS,
     const int32_t samplerWrapT) {
   CesiumGltf::Image& image = model.images.emplace_back();
-  image.cesium->bytesPerChannel = 1;
-  image.cesium->channels = 1;
-  image.cesium->width = imageWidth;
-  image.cesium->height = imageHeight;
+  image.pCesium.emplace();
+  image.pCesium->bytesPerChannel = 1;
+  image.pCesium->channels = 1;
+  image.pCesium->width = imageWidth;
+  image.pCesium->height = imageHeight;
 
-  std::vector<std::byte>& data = image.cesium->pixelData;
+  std::vector<std::byte>& data = image.pCesium->pixelData;
   data.resize(imageWidth * imageHeight);
   std::memcpy(data.data(), featureIDs.data(), data.size());
 

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumGltfSpecUtility.h b/Source/CesiumRuntime/Private/Tests/CesiumGltfSpecUtility.h
@@ -200,15 +200,16 @@ CesiumGltf::PropertyTextureProperty& AddPropertyTexturePropertyToModel(
   classProperty.componentType = componentType;
 
   CesiumGltf::Image& image = model.images.emplace_back();
-  image.cesium->width = 2;
-  image.cesium->height = 2;
-  image.cesium->channels = sizeof(T);
-  image.cesium->bytesPerChannel = 1;
-  image.cesium->pixelData.resize(values.size() * sizeof(T));
+  image.pCesium.emplace();
+  image.pCesium->width = 2;
+  image.pCesium->height = 2;
+  image.pCesium->channels = sizeof(T);
+  image.pCesium->bytesPerChannel = 1;
+  image.pCesium->pixelData.resize(values.size() * sizeof(T));
   std::memcpy(
-      image.cesium->pixelData.data(),
+      image.pCesium->pixelData.data(),
       values.data(),
-      image.cesium->pixelData.size());
+      image.pCesium->pixelData.size());
 
   CesiumGltf::Sampler& sampler = model.samplers.emplace_back();
   sampler.wrapS = CesiumGltf::Sampler::WrapS::CLAMP_TO_EDGE;