WIP

CesiumGS · Aug 26, 2024 · 53a5394 · 53a5394
1 parent 5dc202e
commit 53a5394
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/Source/CesiumRuntime/Private/CesiumFeaturesMetadataComponent.cpp b/Source/CesiumRuntime/Private/CesiumFeaturesMetadataComponent.cpp
@@ -274,9 +274,15 @@ void AutoFillPropertyTextureDescriptions(
 void AutoFillFeatureIdSetDescriptions(
     TArray<FCesiumFeatureIdSetDescription>& Descriptions,
     const FCesiumPrimitiveFeatures& Features,
+    const FCesiumInstanceFeatures* InstanceFeatures,
     const TArray<FCesiumPropertyTable>& PropertyTables) {
-  const TArray<FCesiumFeatureIdSet> featureIDSets =
+  TArray<FCesiumFeatureIdSet> featureIDSets =
       UCesiumPrimitiveFeaturesBlueprintLibrary::GetFeatureIDSets(Features);
+  if (InstanceFeatures) {
+    featureIDSets.Append(
+        UCesiumInstanceFeaturesBlueprintLibrary::GetFeatureIDSets(
+            *InstanceFeatures));
+  }
   int32 featureIDTextureCounter = 0;
 
   for (const FCesiumFeatureIdSet& featureIDSet : featureIDSets) {
@@ -391,9 +397,16 @@ void UCesiumFeaturesMetadataComponent::AutoFill() {
       const TArray<FCesiumPropertyTable>& propertyTables =
           UCesiumModelMetadataBlueprintLibrary::GetPropertyTables(
               modelMetadata);
+      const FCesiumInstanceFeatures* pInstanceFeatures = nullptr;
+      const auto* pInstancedComponent =
+          Cast<UCesiumGltfInstancedComponent>(pChildComponent);
+      if (pInstancedComponent) {
+        pInstanceFeatures = pInstancedComponent->pInstanceFeatures.Get();
+      }
       AutoFillFeatureIdSetDescriptions(
           this->FeatureIdSets,
           primitiveFeatures,
+          pInstanceFeatures,
           propertyTables);
 
       const FCesiumPrimitiveMetadata& primitiveMetadata = primData.Metadata;

diff --git a/Source/CesiumRuntime/Private/CesiumGltfComponent.cpp b/Source/CesiumRuntime/Private/CesiumGltfComponent.cpp
@@ -3170,6 +3170,23 @@ static void SetMetadataParameterValues_DEPRECATED(
 PRAGMA_ENABLE_DEPRECATION_WARNINGS
 #pragma endregion
 
+namespace {
+void addInstanceFeatureIds(UCesiumGltfInstancedComponent* pInstancedComponent) {
+  const FCesiumInstanceFeatures& instanceFeatures =
+      UCesiumInstanceFeaturesBlueprintLibrary::GetInstanceFeatures(
+          pInstancedComponent);
+  const TArray<FCesiumFeatureIdSet>& featureIdSets =
+      UCesiumInstanceFeaturesBlueprintLibrary::GetFeatureIDSets(instanceFeatures);
+  int32 featureSetCount = featureIdSets.Num();
+  if (featureSetCount == 0) {
+    return;
+  }
+  for (const auto& idSet : featureIdSets) {
+  }
+
+}
+} // namespace
+
 static void loadPrimitiveGameThreadPart(
     CesiumGltf::Model& model,
     UCesiumGltfComponent* pGltf,