Merge pull request #1347 from CesiumGS/use-accessor-utility

Use `AccessorUtility` in cesium-native instead of `GltfAccessors`

Source/CesiumRuntime/Private/CesiumFeatureIdAttribute.cpp

@@ -1,8 +1,8 @@
 // Copyright 2020-2023 CesiumGS, Inc. and Contributors
 
 #include "CesiumFeatureIdAttribute.h"
-#include "CesiumGltf/Accessor.h"
-#include "CesiumGltf/Model.h"
+#include <CesiumGltf/Accessor.h>
+#include <CesiumGltf/Model.h>
 
 using namespace CesiumGltf;
 
@@ -12,7 +12,7 @@ FCesiumFeatureIdAttribute::FCesiumFeatureIdAttribute(
     const int64 FeatureIDAttribute,
     const FString& PropertyTableName)
     : _status(ECesiumFeatureIdAttributeStatus::ErrorInvalidAttribute),
-      _featureIDAccessor(),
+      _featureIdAccessor(),
       _attributeIndex(FeatureIDAttribute),
       _propertyTableName(PropertyTableName) {
   const std::string attributeName =
@@ -26,32 +26,24 @@ FCesiumFeatureIdAttribute::FCesiumFeatureIdAttribute(
   const Accessor* accessor =
       Model.getSafe<Accessor>(&Model.accessors, featureID->second);
   if (!accessor || accessor->type != Accessor::Type::SCALAR) {
-    _status = ECesiumFeatureIdAttributeStatus::ErrorInvalidAccessor;
+    this->_status = ECesiumFeatureIdAttributeStatus::ErrorInvalidAccessor;
     return;
   }
 
-  switch (accessor->componentType) {
-  case Accessor::ComponentType::BYTE:
-    this->_featureIDAccessor = AccessorView<int8_t>(Model, *accessor);
-    break;
-  case Accessor::ComponentType::UNSIGNED_BYTE:
-    this->_featureIDAccessor = AccessorView<uint8_t>(Model, *accessor);
-    break;
-  case Accessor::ComponentType::SHORT:
-    this->_featureIDAccessor = AccessorView<int16_t>(Model, *accessor);
-    break;
-  case Accessor::ComponentType::UNSIGNED_SHORT:
-    this->_featureIDAccessor = AccessorView<uint16_t>(Model, *accessor);
-    break;
-  case Accessor::ComponentType::FLOAT:
-    this->_featureIDAccessor = AccessorView<float>(Model, *accessor);
-    break;
-  default:
-    _status = ECesiumFeatureIdAttributeStatus::ErrorInvalidAccessor;
-    return;
-  }
+  this->_featureIdAccessor = CesiumGltf::getFeatureIdAccessorView(
+      Model,
+      Primitive,
+      this->_attributeIndex);
 
-  _status = ECesiumFeatureIdAttributeStatus::Valid;
+  this->_status = std::visit(
+      [](auto view) {
+        if (view.status() != AccessorViewStatus::Valid) {
+          return ECesiumFeatureIdAttributeStatus::ErrorInvalidAccessor;
+        }
+
+        return ECesiumFeatureIdAttributeStatus::Valid;
+      },
+      this->_featureIdAccessor);
 }
 
 const FString& UCesiumFeatureIdAttributeBlueprintLibrary::GetFeatureTableName(
@@ -67,15 +59,13 @@ UCesiumFeatureIdAttributeBlueprintLibrary::GetFeatureIDAttributeStatus(
 
 int64 UCesiumFeatureIdAttributeBlueprintLibrary::GetVertexCount(
     UPARAM(ref) const FCesiumFeatureIdAttribute& FeatureIDAttribute) {
-  return std::visit(
-      CesiumCountFromAccessor{},
-      FeatureIDAttribute._featureIDAccessor);
+  return std::visit(CountFromAccessor{}, FeatureIDAttribute._featureIdAccessor);
 }
 
 int64 UCesiumFeatureIdAttributeBlueprintLibrary::GetFeatureIDForVertex(
     UPARAM(ref) const FCesiumFeatureIdAttribute& FeatureIDAttribute,
     int64 VertexIndex) {
   return std::visit(
-      CesiumFeatureIDFromAccessor{VertexIndex},
-      FeatureIDAttribute._featureIDAccessor);
+      FeatureIdFromAccessor{VertexIndex},
+      FeatureIDAttribute._featureIdAccessor);
 }

Source/CesiumRuntime/Private/CesiumFeatureIdSet.cpp

@@ -151,17 +151,18 @@ int64 UCesiumFeatureIdSetBlueprintLibrary::GetFeatureIDFromHit(
   // Find the first vertex of the face.
   const UCesiumGltfPrimitiveComponent* pGltfComponent =
       Cast<UCesiumGltfPrimitiveComponent>(Hit.Component);
-  if (!IsValid(pGltfComponent)) {
+  if (!IsValid(pGltfComponent) || !pGltfComponent->pMeshPrimitive) {
     return -1;
   }
 
-  auto faceIndices = std::visit(
-      CesiumFaceVertexIndicesFromAccessor{
+  auto VertexIndices = std::visit(
+      CesiumGltf::IndicesForFaceFromAccessor{
           Hit.FaceIndex,
-          pGltfComponent->PositionAccessor.size()},
+          pGltfComponent->PositionAccessor.size(),
+          pGltfComponent->pMeshPrimitive->mode},
       pGltfComponent->IndexAccessor);
 
-  int64 VertexIndex = faceIndices[0];
+  int64 VertexIndex = VertexIndices[0];
 
   if (FeatureIDSet._featureIDSetType == ECesiumFeatureIdSetType::Attribute) {
     FCesiumFeatureIdAttribute attribute =

Source/CesiumRuntime/Private/CesiumFeatureIdTexture.cpp

@@ -40,7 +40,7 @@ FCesiumFeatureIdTexture::FCesiumFeatureIdTexture(
   // To maintain this functionality in EXT_mesh_features, the texture view will
   // still be valid if the intended texcoords don't exist. However, feature IDs
   // won't be retrievable by vertex index.
-  this->_texCoordAccessor = GetTexCoordAccessorView(
+  this->_texCoordAccessor = CesiumGltf::getTexCoordAccessorView(
       Model,
       Primitive,
       this->_textureCoordinateSetIndex);
@@ -102,7 +102,7 @@ int64 UCesiumFeatureIdTextureBlueprintLibrary::GetFeatureIDForVertex(
     UPARAM(ref) const FCesiumFeatureIdTexture& FeatureIDTexture,
     int64 VertexIndex) {
   const std::optional<glm::dvec2> texCoords = std::visit(
-      CesiumTexCoordFromAccessor{VertexIndex},
+      CesiumGltf::TexCoordFromAccessor{VertexIndex},
       FeatureIDTexture._texCoordAccessor);
   if (!texCoords) {
     return -1;

Source/CesiumRuntime/Private/CesiumGltfComponent.cpp

@@ -6,30 +6,13 @@
 #include "CesiumEncodedFeaturesMetadata.h"
 #include "CesiumEncodedMetadataUtility.h"
 #include "CesiumFeatureIdSet.h"
-#include "CesiumGeometry/Axis.h"
-#include "CesiumGeometry/Rectangle.h"
-#include "CesiumGeometry/Transforms.h"
-#include "CesiumGltf/AccessorView.h"
-#include "CesiumGltf/ExtensionExtMeshFeatures.h"
-#include "CesiumGltf/ExtensionKhrMaterialsUnlit.h"
-#include "CesiumGltf/ExtensionKhrTextureTransform.h"
-#include "CesiumGltf/ExtensionMeshPrimitiveExtStructuralMetadata.h"
-#include "CesiumGltf/ExtensionModelExtFeatureMetadata.h"
-#include "CesiumGltf/ExtensionModelExtStructuralMetadata.h"
-#include "CesiumGltf/PropertyType.h"
-#include "CesiumGltf/TextureInfo.h"
-#include "CesiumGltfContent/GltfUtilities.h"
 #include "CesiumGltfPointsComponent.h"
 #include "CesiumGltfPrimitiveComponent.h"
 #include "CesiumMaterialUserData.h"
 #include "CesiumRasterOverlays.h"
-#include "CesiumRasterOverlays/RasterOverlay.h"
-#include "CesiumRasterOverlays/RasterOverlayTile.h"
 #include "CesiumRuntime.h"
 #include "CesiumTextureUtility.h"
 #include "CesiumTransforms.h"
-#include "CesiumUtility/Tracing.h"
-#include "CesiumUtility/joinToString.h"
 #include "Chaos/AABBTree.h"
 #include "Chaos/CollisionConvexMesh.h"
 #include "Chaos/TriangleMeshImplicitObject.h"
@@ -51,6 +34,25 @@
 #include "UObject/ConstructorHelpers.h"
 #include "VecMath.h"
 #include "mikktspace.h"
+
+#include <CesiumGeometry/Axis.h>
+#include <CesiumGeometry/Rectangle.h>
+#include <CesiumGeometry/Transforms.h>
+#include <CesiumGltf/AccessorUtility.h>
+#include <CesiumGltf/AccessorView.h>
+#include <CesiumGltf/ExtensionExtMeshFeatures.h>
+#include <CesiumGltf/ExtensionKhrMaterialsUnlit.h>
+#include <CesiumGltf/ExtensionKhrTextureTransform.h>
+#include <CesiumGltf/ExtensionMeshPrimitiveExtStructuralMetadata.h>
+#include <CesiumGltf/ExtensionModelExtFeatureMetadata.h>
+#include <CesiumGltf/ExtensionModelExtStructuralMetadata.h>
+#include <CesiumGltf/PropertyType.h>
+#include <CesiumGltf/TextureInfo.h>
+#include <CesiumGltfContent/GltfUtilities.h>
+#include <CesiumRasterOverlays/RasterOverlay.h>
+#include <CesiumRasterOverlays/RasterOverlayTile.h>
+#include <CesiumUtility/Tracing.h>
+#include <CesiumUtility/joinToString.h>
 #include <cstddef>
 #include <glm/ext/matrix_transform.hpp>
 #include <glm/gtc/matrix_inverse.hpp>
@@ -518,7 +520,7 @@ static void createTexCoordAccessorsForFeaturesMetadata(
     const FCesiumPrimitiveFeatures& primitiveFeatures,
     const FCesiumPrimitiveMetadata& primitiveMetadata,
     const FCesiumModelMetadata& modelMetadata,
-    std::unordered_map<int32_t, CesiumTexCoordAccessorType>&
+    std::unordered_map<int32_t, CesiumGltf::TexCoordAccessorType>&
         texCoordAccessorsMap) {
   auto featureIdTextures =
       UCesiumPrimitiveFeaturesBlueprintLibrary::GetFeatureIDSetsOfType(
@@ -540,7 +542,10 @@ static void createTexCoordAccessorsForFeaturesMetadata(
     }
     texCoordAccessorsMap.emplace(
         gltfTexCoordSetIndex,
-        GetTexCoordAccessorView(model, primitive, gltfTexCoordSetIndex));
+        CesiumGltf::getTexCoordAccessorView(
+            model,
+            primitive,
+            gltfTexCoordSetIndex));
   }
 
   auto propertyTextureIndices =
@@ -567,7 +572,10 @@ static void createTexCoordAccessorsForFeaturesMetadata(
       }
       texCoordAccessorsMap.emplace(
           gltfTexCoordSetIndex,
-          GetTexCoordAccessorView(model, primitive, gltfTexCoordSetIndex));
+          CesiumGltf::getTexCoordAccessorView(
+              model,
+              primitive,
+              gltfTexCoordSetIndex));
     }
   }
 }

Source/CesiumRuntime/Private/CesiumGltfPrimitiveComponent.cpp

@@ -2,15 +2,16 @@
 
 #include "CesiumGltfPrimitiveComponent.h"
 #include "CalcBounds.h"
-#include "CesiumGltf/MeshPrimitive.h"
-#include "CesiumGltf/Model.h"
 #include "CesiumLifetime.h"
 #include "CesiumMaterialUserData.h"
 #include "Engine/StaticMesh.h"
 #include "Engine/Texture.h"
 #include "Materials/MaterialInstanceDynamic.h"
 #include "PhysicsEngine/BodySetup.h"
 #include "VecMath.h"
+
+#include <CesiumGltf/MeshPrimitive.h>
+#include <CesiumGltf/Model.h>
 #include <variant>
 
 // Prevent deprecation warnings while initializing deprecated metadata structs.

Source/CesiumRuntime/Private/CesiumGltfPrimitiveComponent.h

@@ -11,7 +11,7 @@
 #include "CesiumRasterOverlays.h"
 #include "Components/StaticMeshComponent.h"
 #include "CoreMinimal.h"
-#include "GltfAccessors.h"
+#include <CesiumGltf/AccessorUtility.h>
 #include <cstdint>
 #include <glm/mat4x4.hpp>
 #include <unordered_map>
@@ -87,7 +87,8 @@ class UCesiumGltfPrimitiveComponent : public UStaticMeshComponent {
    * accessor views on texture coordinate sets that will be used by feature ID
    * textures or property textures for picking.
    */
-  std::unordered_map<int32_t, CesiumTexCoordAccessorType> TexCoordAccessorMap;
+  std::unordered_map<int32_t, CesiumGltf::TexCoordAccessorType>
+      TexCoordAccessorMap;
 
   /**
    * The position accessor of the glTF primitive. This is used for computing
@@ -100,7 +101,7 @@ class UCesiumGltfPrimitiveComponent : public UStaticMeshComponent {
    * The index accessor of the glTF primitive, if one is specified. This is used
    * for computing the UV at a hit location on a primitive.
    */
-  CesiumIndexAccessorType IndexAccessor;
+  CesiumGltf::IndexAccessorType IndexAccessor;
 
   std::optional<Cesium3DTilesSelection::BoundingVolume> boundingVolume;
 

Source/CesiumRuntime/Private/CesiumMetadataPickingBlueprintLibrary.cpp

@@ -85,7 +85,7 @@ bool UCesiumMetadataPickingBlueprintLibrary::FindUVFromHit(
     FVector2D& UV) {
   const UCesiumGltfPrimitiveComponent* pGltfComponent =
       Cast<UCesiumGltfPrimitiveComponent>(Hit.Component);
-  if (!IsValid(pGltfComponent)) {
+  if (!IsValid(pGltfComponent) || !pGltfComponent->pMeshPrimitive) {
     return false;
   }
 
@@ -100,20 +100,22 @@ bool UCesiumMetadataPickingBlueprintLibrary::FindUVFromHit(
     return false;
   }
 
-  std::array<int64, 3> VertexIndices = std::visit(
-      CesiumFaceVertexIndicesFromAccessor{
+  auto VertexIndices = std::visit(
+      CesiumGltf::IndicesForFaceFromAccessor{
           Hit.FaceIndex,
-          pGltfComponent->PositionAccessor.size()},
+          pGltfComponent->PositionAccessor.size(),
+          pGltfComponent->pMeshPrimitive->mode},
       pGltfComponent->IndexAccessor);
 
   // Adapted from UBodySetup::CalcUVAtLocation. Compute the barycentric
   // coordinates of the point relative to the face, then use those to
   // interpolate the UVs.
   std::array<FVector2D, 3> UVs;
-  const CesiumTexCoordAccessorType& accessor = accessorIt->second;
+  const CesiumGltf::TexCoordAccessorType& accessor = accessorIt->second;
   for (size_t i = 0; i < UVs.size(); i++) {
-    auto maybeTexCoord =
-        std::visit(CesiumTexCoordFromAccessor{VertexIndices[i]}, accessor);
+    auto maybeTexCoord = std::visit(
+        CesiumGltf::TexCoordFromAccessor{VertexIndices[i]},
+        accessor);
     if (!maybeTexCoord) {
       return false;
     }