Get property value encoding to work

CesiumGS · Aug 8, 2023 · e50cdeb · e50cdeb
1 parent d5b8fdf
commit e50cdeb
Show file tree

Hide file tree

Showing 18 changed files with 1,681 additions and 813 deletions.
diff --git a/Config/Engine.ini b/Config/Engine.ini
@@ -72,7 +72,7 @@
     ("Boolean","Boolean_DEPRECATED"),
     ("Enum","Enum_DEPRECATED"),
     ("String","String_DEPRECATED"),
-    ("Array","Array_DEPRECATED"),
+    ("Array","Array_DEPRECATED")
     ))
 
 +StructRedirects=(OldName="CesiumMetadataGenericValue", NewName="CesiumMetadataValue")
@@ -131,19 +131,19 @@
 
 +EnumRedirects=(OldName="ECesiumPropertyComponentType", NewName="ECesiumPropertyComponentType_DEPRECATED", ValueChanges=(
     ("Uint8","Uint8_DEPRECATED"),
-    ("Float","Float_DEPRECATED"),
+    ("Float","Float_DEPRECATED")
     ))
 
 +EnumRedirects=(OldName="ECesiumPropertyType", NewName="ECesiumPropertyType_DEPRECATED", ValueChanges=(
     ("Scalar","Scalar_DEPRECATED"),
     ("Vec2","Vec2_DEPRECATED"),
     ("Vec3","Vec3_DEPRECATED"),
-    ("Vec4","Vec4_DEPRECATED"),
+    ("Vec4","Vec4_DEPRECATED")
     ))
 
 +EnumRedirects=(OldName="ECesiumFeatureTableAccessType", NewName="ECesiumFeatureTableAccessType_DEPRECATED", ValueChanges=(
     ("Unknown","Unknown_DEPRECATED"),
     ("Texture","Texture_DEPRECATED"),
     ("Attribute","Attribute_DEPRECATED"),
-    ("Mixed","Mixed_DEPRECATED"),
+    ("Mixed","Mixed_DEPRECATED")
     ))
diff --git a/Content/Materials/MaterialFunctions/CesiumGetFeatureIdsFromTexture.uasset b/Content/Materials/MaterialFunctions/CesiumGetFeatureIdsFromTexture.uasset
diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp
@@ -665,7 +665,8 @@ class UnrealResourcePreparer
     options.ignoreKhrMaterialsUnlit =
         this->_pActor->GetIgnoreKhrMaterialsUnlit();
 
-    options.pPrimitiveFeaturesDescription = &this->_pActor->_featuresDescription;
+    options.pPrimitiveFeaturesDescription =
+        &this->_pActor->_featuresDescription;
     options.pEncodedMetadataDescription =
         &this->_pActor->_modelMetadataDescription;
 
@@ -938,8 +939,9 @@ void ACesium3DTileset::LoadTileset() {
   const UCesiumFeaturesMetadataComponent* pFeaturesMetadataComponent =
       this->FindComponentByClass<UCesiumFeaturesMetadataComponent>();
   if (pFeaturesMetadataComponent) {
-    this->_featuresDescription = pFeaturesMetadataComponent->Features;
-    this->_modelMetadataDescription = pFeaturesMetadataComponent->ModelMetadata;
+    this->_featuresDescription = {pFeaturesMetadataComponent->FeatureIdSets};
+    this->_modelMetadataDescription = {
+        pFeaturesMetadataComponent->PropertyTables};
   } else {
     this->_featuresDescription = {};
     this->_modelMetadataDescription = {};