Merge branch 'ue5-main' into property-textures

CesiumGS · Oct 5, 2023 · 829da21 · 829da21
2 parents 4ba86b3 + 69f3dbf
commit 829da21
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 22 deletions.
diff --git a/Source/CesiumRuntime/Private/CesiumPropertyTableProperty.cpp b/Source/CesiumRuntime/Private/CesiumPropertyTableProperty.cpp
@@ -54,7 +54,7 @@ propertyTablePropertyCallback(const std::any& property, Callback&& callback) {
 template <bool Normalized, typename TResult, typename Callback>
 TResult scalarPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   switch (valueType.ComponentType) {
   case ECesiumMetadataComponentType::Int8:
@@ -133,7 +133,7 @@ TResult scalarPropertyTablePropertyCallback(
 template <bool Normalized, typename TResult, typename Callback>
 TResult scalarArrayPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   switch (valueType.ComponentType) {
   case ECesiumMetadataComponentType::Int8:
@@ -218,7 +218,7 @@ TResult scalarArrayPropertyTablePropertyCallback(
 template <glm::length_t N, bool Normalized, typename TResult, typename Callback>
 TResult vecNPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   switch (valueType.ComponentType) {
   case ECesiumMetadataComponentType::Int8:
@@ -302,7 +302,7 @@ TResult vecNPropertyTablePropertyCallback(
 template <bool Normalized, typename TResult, typename Callback>
 TResult vecNPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   if (valueType.Type == ECesiumMetadataType::Vec2) {
     return vecNPropertyTablePropertyCallback<2, Normalized, TResult, Callback>(
@@ -346,7 +346,7 @@ TResult vecNPropertyTablePropertyCallback(
 template <glm::length_t N, bool Normalized, typename TResult, typename Callback>
 TResult vecNArrayPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   switch (valueType.ComponentType) {
   case ECesiumMetadataComponentType::Int8:
@@ -431,7 +431,7 @@ TResult vecNArrayPropertyTablePropertyCallback(
 template <bool Normalized, typename TResult, typename Callback>
 TResult vecNArrayPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   if (valueType.Type == ECesiumMetadataType::Vec2) {
     return vecNArrayPropertyTablePropertyCallback<
@@ -477,7 +477,7 @@ TResult vecNArrayPropertyTablePropertyCallback(
 template <glm::length_t N, bool Normalized, typename TResult, typename Callback>
 TResult matNPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   switch (valueType.ComponentType) {
   case ECesiumMetadataComponentType::Int8:
@@ -561,7 +561,7 @@ TResult matNPropertyTablePropertyCallback(
 template <bool Normalized, typename TResult, typename Callback>
 TResult matNPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   if (valueType.Type == ECesiumMetadataType::Mat2) {
     return matNPropertyTablePropertyCallback<2, Normalized, TResult, Callback>(
@@ -605,7 +605,7 @@ TResult matNPropertyTablePropertyCallback(
 template <glm::length_t N, bool Normalized, typename TResult, typename Callback>
 TResult matNArrayPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   switch (valueType.ComponentType) {
   case ECesiumMetadataComponentType::Int8:
@@ -690,7 +690,7 @@ TResult matNArrayPropertyTablePropertyCallback(
 template <bool Normalized, typename TResult, typename Callback>
 TResult matNArrayPropertyTablePropertyCallback(
     const std::any& property,
-    FCesiumMetadataValueType valueType,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   if (valueType.Type == ECesiumMetadataType::Mat2) {
     return matNArrayPropertyTablePropertyCallback<
@@ -721,8 +721,8 @@ TResult matNArrayPropertyTablePropertyCallback(
 
 template <bool Normalized, typename TResult, typename Callback>
 TResult arrayPropertyTablePropertyCallback(
-    std::any property,
-    FCesiumMetadataValueType valueType,
+    const std::any& property,
+    const FCesiumMetadataValueType& valueType,
     Callback&& callback) {
   switch (valueType.Type) {
   case ECesiumMetadataType::Scalar:
@@ -763,8 +763,8 @@ TResult arrayPropertyTablePropertyCallback(
 
 template <typename TResult, typename Callback>
 TResult propertyTablePropertyCallback(
-    std::any property,
-    FCesiumMetadataValueType valueType,
+    const std::any& property,
+    const FCesiumMetadataValueType& valueType,
     bool normalized,
     Callback&& callback) {
   if (valueType.bIsArray) {

diff --git a/Source/CesiumRuntime/Private/CesiumTileExcluderAdapter.cpp b/Source/CesiumRuntime/Private/CesiumTileExcluderAdapter.cpp
@@ -1,4 +1,6 @@
 #include "CesiumTileExcluderAdapter.h"
+#include "Cesium3DTilesSelection/Tile.h"
+#include "CesiumGeoreference.h"
 #include "VecMath.h"
 
 bool CesiumTileExcluderAdapter::shouldExclude(

diff --git a/Source/CesiumRuntime/Private/CesiumTileExcluderAdapter.h b/Source/CesiumRuntime/Private/CesiumTileExcluderAdapter.h
@@ -3,6 +3,12 @@
 #include "CesiumTileExcluder.h"
 #include <Cesium3DTilesSelection/ITileExcluder.h>
 
+class ACesiumGeoreference;
+
+namespace Cesium3DTilesSelection {
+class Tile;
+}
+
 class CesiumTileExcluderAdapter : public Cesium3DTilesSelection::ITileExcluder {
   virtual bool shouldExclude(
       const Cesium3DTilesSelection::Tile& tile) const noexcept override;

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumGltfSpecUtility.cpp b/Source/CesiumRuntime/Private/Tests/CesiumGltfSpecUtility.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include "CesiumGltfSpecUtility.h"
 
 using namespace CesiumGltf;

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTableProperty.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTableProperty.spec.cpp
@@ -540,7 +540,7 @@ void FCesiumPropertyTablePropertySpec::Define() {
           UCesiumMetadataValueBlueprintLibrary::GetArray(value);
 
       TestEqual(
-          "Size",
+          TEXT("Size"),
           UCesiumPropertyArrayBlueprintLibrary::GetSize(array),
           static_cast<int64_t>(*classProperty.count));
       TestEqual(
@@ -560,7 +560,7 @@ void FCesiumPropertyTablePropertySpec::Define() {
       array = UCesiumMetadataValueBlueprintLibrary::GetArray(value);
 
       TestEqual(
-          "Size",
+          TEXT("Size"),
           UCesiumPropertyArrayBlueprintLibrary::GetSize(array),
           static_cast<int64_t>(*classProperty.count));
       TestEqual(
@@ -581,7 +581,7 @@ void FCesiumPropertyTablePropertySpec::Define() {
       array = UCesiumMetadataValueBlueprintLibrary::GetArray(value);
 
       TestEqual(
-          "Size",
+          TEXT("Size"),
           UCesiumPropertyArrayBlueprintLibrary::GetSize(array),
           static_cast<int64_t>(*classProperty.count));
       TestEqual(
@@ -602,7 +602,7 @@ void FCesiumPropertyTablePropertySpec::Define() {
       array = UCesiumMetadataValueBlueprintLibrary::GetArray(value);
 
       TestEqual(
-          "Size",
+          TEXT("Size"),
           UCesiumPropertyArrayBlueprintLibrary::GetSize(array),
           static_cast<int64_t>(*classProperty.count));
       TestEqual(
@@ -623,7 +623,7 @@ void FCesiumPropertyTablePropertySpec::Define() {
       array = UCesiumMetadataValueBlueprintLibrary::GetArray(value);
 
       TestEqual(
-          "Size",
+          TEXT("Size"),
           UCesiumPropertyArrayBlueprintLibrary::GetSize(array),
           static_cast<int64_t>(*classProperty.count));
       TestEqual(
@@ -644,7 +644,7 @@ void FCesiumPropertyTablePropertySpec::Define() {
       array = UCesiumMetadataValueBlueprintLibrary::GetArray(value);
 
       TestEqual(
-          "Size",
+          TEXT("Size"),
           UCesiumPropertyArrayBlueprintLibrary::GetSize(array),
           static_cast<int64_t>(*classProperty.count));
       TestEqual(