diff --git a/Shaders/Private/CesiumPointAttenuationVertexFactory.ush b/Shaders/Private/CesiumPointAttenuationVertexFactory.ush index 6574e9c04..7ec41bed4 100644 --- a/Shaders/Private/CesiumPointAttenuationVertexFactory.ush +++ b/Shaders/Private/CesiumPointAttenuationVertexFactory.ush @@ -40,7 +40,7 @@ struct FVertexFactoryInput #endif }; -/** +/** * Per-vertex inputs. Used by passes with a trimmed down position-only shader. */ struct FPositionOnlyVertexFactoryInput @@ -54,7 +54,7 @@ struct FPositionOnlyVertexFactoryInput #endif }; -/** +/** * Per-vertex inputs. Used by passes with a trimmed down position-and-normal-only shader. */ struct FPositionAndNormalOnlyVertexFactoryInput @@ -83,7 +83,7 @@ struct FVertexFactoryIntermediates half TangentToWorldSign; half4 Color; - + /** Cached primitive and instance data */ FSceneDataIntermediates SceneData; }; @@ -119,7 +119,7 @@ half3x3 CalculateTangentToLocal(uint PointIndex, out float TangentSign) { half3 TangentInputX = PackedTangentsBuffer[2 * PointIndex + 0].xyz; half4 TangentInputZ = PackedTangentsBuffer[2 * PointIndex + 1].xyzw; - + half3 TangentX = TangentBias(TangentInputX); half4 TangentZ = TangentBias(TangentInputZ); @@ -127,7 +127,7 @@ half3x3 CalculateTangentToLocal(uint PointIndex, out float TangentSign) // Derive the binormal by getting the cross product of the normal and tangent half3 TangentY = cross(TangentZ.xyz, TangentX) * TangentZ.w; - + // Recalculate TangentX off of the other two vectors // This corrects quantization errors since TangentX was passed in as a quantized vertex input half3x3 Result; @@ -158,7 +158,7 @@ FVertexFactoryIntermediates GetVertexFactoryIntermediates(FVertexFactoryInput In { FVertexFactoryIntermediates Intermediates = (FVertexFactoryIntermediates)0; Intermediates.SceneData = VF_GPUSCENE_GET_INTERMEDIATES(Input); - + uint PointIndex = Input.VertexId / 4; uint CornerIndex = Input.VertexId - (PointIndex * 4); @@ -213,19 +213,19 @@ FVertexFactoryInterpolantsVSToPS VertexFactoryGetInterpolantsVSToPS( Interpolants.TangentToWorld0 = float4(Intermediates.TangentToWorld[0], 0); Interpolants.TangentToWorld2 = float4(Intermediates.TangentToWorld[2], Intermediates.TangentToWorldSign); Interpolants.Color = Intermediates.Color; - + #if NUM_TEX_COORD_INTERPOLATORS float2 CustomizedUVs[NUM_TEX_COORD_INTERPOLATORS]; GetMaterialCustomizedUVs(VertexParameters, CustomizedUVs); GetCustomInterpolators(VertexParameters, CustomizedUVs); - + UNROLL for (int CoordinateIndex = 0; CoordinateIndex < NUM_TEX_COORD_INTERPOLATORS; CoordinateIndex++) { SetUV(Interpolants, CoordinateIndex, CustomizedUVs[CoordinateIndex]); } #endif - + #if INSTANCED_STEREO Interpolants.EyeIndex = 0; #endif @@ -336,7 +336,7 @@ FMaterialVertexParameters GetMaterialVertexParameters( half3x3 TangentToLocal) { FMaterialVertexParameters Result = (FMaterialVertexParameters)0; - + Result.SceneData = Intermediates.SceneData; Result.WorldPosition = WorldPosition; Result.TangentToWorld = Intermediates.TangentToWorld; @@ -357,6 +357,16 @@ FMaterialVertexParameters GetMaterialVertexParameters( return Result; } +FMaterialVertexParameters GetMaterialVertexParameters( + FVertexFactoryInput Input, + FVertexFactoryIntermediates Intermediates, + float3 WorldPosition, + half3x3 TangentToLocal, + bool noIdeaWhatThisIs) +{ + return GetMaterialVertexParameters(Input, Intermediates, WorldPosition, TangentToLocal); +} + FMaterialPixelParameters GetMaterialPixelParameters(FVertexFactoryInterpolantsVSToPS Interpolants, float4 SvPosition) { FMaterialPixelParameters Result = MakeInitializedMaterialPixelParameters(); @@ -439,7 +449,7 @@ FVertexFactoryRayTracingInterpolants VertexFactoryInterpolate( float bInterp) { FVertexFactoryRayTracingInterpolants O; - + INTERPOLATE_MEMBER(InterpolantsVSToPS.TangentToWorld0.xyz); INTERPOLATE_MEMBER(InterpolantsVSToPS.TangentToWorld2); diff --git a/Source/CesiumRuntime/Private/CesiumEncodedFeaturesMetadata.cpp b/Source/CesiumRuntime/Private/CesiumEncodedFeaturesMetadata.cpp index 9528d8734..6c18d36d8 100644 --- a/Source/CesiumRuntime/Private/CesiumEncodedFeaturesMetadata.cpp +++ b/Source/CesiumRuntime/Private/CesiumEncodedFeaturesMetadata.cpp @@ -524,13 +524,13 @@ EncodedPropertyTable encodePropertyTableAnyThreadPart( CesiumEncodedMetadataParseColorFromString::encode( *pDescription, property, - gsl::span(pImage->pixelData), + std::span(pImage->pixelData), encodedFormat.bytesPerChannel * encodedFormat.channels); } else /* info.Conversion == ECesiumEncodedMetadataConversion::Coerce */ { CesiumEncodedMetadataCoerce::encode( *pDescription, property, - gsl::span(pImage->pixelData), + std::span(pImage->pixelData), encodedFormat.bytesPerChannel * encodedFormat.channels); } diff --git a/Source/CesiumRuntime/Private/CesiumEncodedMetadataConversions.cpp b/Source/CesiumRuntime/Private/CesiumEncodedMetadataConversions.cpp index 3384878a2..7ac5a7b4b 100644 --- a/Source/CesiumRuntime/Private/CesiumEncodedMetadataConversions.cpp +++ b/Source/CesiumRuntime/Private/CesiumEncodedMetadataConversions.cpp @@ -135,7 +135,7 @@ template void coerceAndEncodeArrays( const FCesiumPropertyTablePropertyDescription& propertyDescription, const FCesiumPropertyTableProperty& property, - const gsl::span& textureData, + const std::span& textureData, size_t pixelSize) { int64 propertySize = UCesiumPropertyTablePropertyBlueprintLibrary::GetPropertySize(property); @@ -180,7 +180,7 @@ void coerceAndEncodeArrays( template void coerceAndEncodeScalars( const FCesiumPropertyTableProperty& property, - const gsl::span& textureData) { + const std::span& textureData) { int64 propertySize = UCesiumPropertyTablePropertyBlueprintLibrary::GetPropertySize(property); if (textureData.size() < propertySize * sizeof(T)) { @@ -208,7 +208,7 @@ void coerceAndEncodeScalars( template void coerceAndEncodeVec2s( const FCesiumPropertyTableProperty& property, - const gsl::span& textureData, + const std::span& textureData, size_t pixelSize) { int64 propertySize = UCesiumPropertyTablePropertyBlueprintLibrary::GetPropertySize(property); @@ -254,7 +254,7 @@ void coerceAndEncodeVec2s( template void coerceAndEncodeVec3s( const FCesiumPropertyTableProperty& property, - const gsl::span& textureData, + const std::span& textureData, size_t pixelSize) { int64 propertySize = UCesiumPropertyTablePropertyBlueprintLibrary::GetPropertySize(property); @@ -298,7 +298,7 @@ void coerceAndEncodeVec3s( template void coerceAndEncodeVec4s( const FCesiumPropertyTableProperty& property, - const gsl::span& textureData, + const std::span& textureData, size_t pixelSize) { int64 propertySize = UCesiumPropertyTablePropertyBlueprintLibrary::GetPropertySize(property); @@ -383,7 +383,7 @@ bool CesiumEncodedMetadataCoerce::canEncode( void CesiumEncodedMetadataCoerce::encode( const FCesiumPropertyTablePropertyDescription& propertyDescription, const FCesiumPropertyTableProperty& property, - const gsl::span& textureData, + const std::span& textureData, size_t pixelSize) { if (propertyDescription.PropertyDetails.bIsArray) { if (propertyDescription.EncodingDetails.ComponentType == @@ -497,7 +497,7 @@ glm::u8vec3 getRgbColorFromString(const FString& rgbString) { template void parseAndEncodeColors( const FCesiumPropertyTableProperty& property, - const gsl::span& textureData, + const std::span& textureData, size_t pixelSize) { int64 propertySize = UCesiumPropertyTablePropertyBlueprintLibrary::GetPropertySize(property); @@ -555,7 +555,7 @@ bool CesiumEncodedMetadataParseColorFromString::canEncode( void CesiumEncodedMetadataParseColorFromString::encode( const FCesiumPropertyTablePropertyDescription& propertyDescription, const FCesiumPropertyTableProperty& property, - const gsl::span& textureData, + const std::span& textureData, size_t pixelSize) { if (propertyDescription.EncodingDetails.ComponentType == ECesiumEncodedMetadataComponentType::Uint8) { diff --git a/Source/CesiumRuntime/Private/CesiumEncodedMetadataConversions.h b/Source/CesiumRuntime/Private/CesiumEncodedMetadataConversions.h index 09ad5fb60..d3ed133e6 100644 --- a/Source/CesiumRuntime/Private/CesiumEncodedMetadataConversions.h +++ b/Source/CesiumRuntime/Private/CesiumEncodedMetadataConversions.h @@ -3,7 +3,7 @@ #pragma once #include "HAL/Platform.h" -#include +#include enum class ECesiumMetadataType : uint8; enum class ECesiumEncodedMetadataType : uint8; @@ -80,7 +80,7 @@ struct CesiumEncodedMetadataCoerce { static void encode( const FCesiumPropertyTablePropertyDescription& propertyDescription, const FCesiumPropertyTableProperty& property, - const gsl::span& pTextureData, + const std::span& pTextureData, size_t pixelSize); }; @@ -113,6 +113,6 @@ struct CesiumEncodedMetadataParseColorFromString { static void encode( const FCesiumPropertyTablePropertyDescription& propertyDescription, const FCesiumPropertyTableProperty& property, - const gsl::span& textureData, + const std::span& textureData, size_t pixelSize); }; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumCameraManager.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumCameraManager.spec.cpp index f1372ef20..a852d540c 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumCameraManager.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumCameraManager.spec.cpp @@ -8,7 +8,9 @@ BEGIN_DEFINE_SPEC( FCesiumCameraManagerSpec, "Cesium.Unit.CameraManager", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) END_DEFINE_SPEC(FCesiumCameraManagerSpec) diff --git a/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdAttribute.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdAttribute.spec.cpp index 4cb47a251..0abfb1ca8 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdAttribute.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdAttribute.spec.cpp @@ -8,7 +8,9 @@ BEGIN_DEFINE_SPEC( FCesiumFeatureIdAttributeSpec, "Cesium.Unit.FeatureIdAttribute", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) CesiumGltf::Model model; CesiumGltf::MeshPrimitive* pPrimitive; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdSet.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdSet.spec.cpp index 881fe1d0c..7da2be043 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdSet.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdSet.spec.cpp @@ -10,7 +10,9 @@ BEGIN_DEFINE_SPEC( FCesiumFeatureIdSetSpec, "Cesium.Unit.FeatureIdSet", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) CesiumGltf::Model model; CesiumGltf::MeshPrimitive* pPrimitive; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdTexture.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdTexture.spec.cpp index 370dd3688..982d475a6 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdTexture.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumFeatureIdTexture.spec.cpp @@ -11,7 +11,9 @@ BEGIN_DEFINE_SPEC( FCesiumFeatureIdTextureSpec, "Cesium.Unit.FeatureIdTexture", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) CesiumGltf::Model model; CesiumGltf::MeshPrimitive* pPrimitive; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumGeoreference.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumGeoreference.spec.cpp index 779b24cb0..754b26e42 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumGeoreference.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumGeoreference.spec.cpp @@ -13,7 +13,9 @@ using namespace CesiumUtility; BEGIN_DEFINE_SPEC( FCesiumGeoreferenceSpec, "Cesium.Unit.Georeference", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) TObjectPtr pGeoreferenceNullIsland; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumGlobeAnchor.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumGlobeAnchor.spec.cpp index 6d51c2ddd..897ab41fb 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumGlobeAnchor.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumGlobeAnchor.spec.cpp @@ -9,7 +9,9 @@ BEGIN_DEFINE_SPEC( FCesiumGlobeAnchorSpec, "Cesium.Unit.GlobeAnchor", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) TObjectPtr pActor; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumMetadataPickingBlueprintLibrary.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumMetadataPickingBlueprintLibrary.spec.cpp index ff8c52312..099c59381 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumMetadataPickingBlueprintLibrary.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumMetadataPickingBlueprintLibrary.spec.cpp @@ -13,7 +13,9 @@ BEGIN_DEFINE_SPEC( FCesiumMetadataPickingSpec, "Cesium.Unit.MetadataPicking", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) CesiumGltf::Model model; CesiumGltf::MeshPrimitive* pPrimitive; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumMetadataValue.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumMetadataValue.spec.cpp index 49858c73e..be829c7e3 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumMetadataValue.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumMetadataValue.spec.cpp @@ -9,7 +9,9 @@ BEGIN_DEFINE_SPEC( FCesiumMetadataValueSpec, "Cesium.Unit.MetadataValue", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) END_DEFINE_SPEC(FCesiumMetadataValueSpec) diff --git a/Source/CesiumRuntime/Private/Tests/CesiumOriginShiftComponent.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumOriginShiftComponent.spec.cpp index e9a2d1efd..1b6e4be11 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumOriginShiftComponent.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumOriginShiftComponent.spec.cpp @@ -18,7 +18,9 @@ BEGIN_DEFINE_SPEC( FCesiumOriginShiftComponentSpec, "Cesium.Unit.OriginShiftComponent", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) TObjectPtr pWorld; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPrimitiveFeatures.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPrimitiveFeatures.spec.cpp index 63fac56c6..7dd21d9f1 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumPrimitiveFeatures.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumPrimitiveFeatures.spec.cpp @@ -8,7 +8,9 @@ BEGIN_DEFINE_SPEC( FCesiumPrimitiveFeaturesSpec, "Cesium.Unit.PrimitiveFeatures", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) CesiumGltf::Model model; CesiumGltf::MeshPrimitive* pPrimitive; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyArray.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyArray.spec.cpp index 6eae0eb5d..1c5e51b02 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumPropertyArray.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumPropertyArray.spec.cpp @@ -7,7 +7,9 @@ BEGIN_DEFINE_SPEC( FCesiumPropertyArraySpec, "Cesium.Unit.PropertyArray", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) END_DEFINE_SPEC(FCesiumPropertyArraySpec) diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp index 6f3a89394..c1cf7cc34 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp @@ -10,7 +10,9 @@ BEGIN_DEFINE_SPEC( FCesiumPropertyTableSpec, "Cesium.Unit.PropertyTable", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) CesiumGltf::Model model; CesiumGltf::ExtensionModelExtStructuralMetadata* pExtension; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTableProperty.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTableProperty.spec.cpp index 1ed3f52b4..66a1d1435 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTableProperty.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTableProperty.spec.cpp @@ -11,7 +11,9 @@ using namespace CesiumGltf; BEGIN_DEFINE_SPEC( FCesiumPropertyTablePropertySpec, "Cesium.Unit.PropertyTableProperty", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) END_DEFINE_SPEC(FCesiumPropertyTablePropertySpec) @@ -96,7 +98,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( @@ -177,7 +179,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( @@ -239,9 +241,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, size, - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(), + std::span(data.data(), data.size()), + std::span(), + std::span(), PropertyComponentType::None, PropertyComponentType::None); @@ -305,11 +307,11 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, size, - gsl::span(data.data(), data.size()), - gsl::span( + std::span(data.data(), data.size()), + std::span( offsetsData.data(), offsetsData.size()), - gsl::span(), + std::span(), PropertyComponentType::Uint16, PropertyComponentType::None); @@ -382,7 +384,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( @@ -497,7 +499,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( @@ -693,7 +695,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(8), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -729,7 +731,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(8), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -786,9 +788,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(offsetsData.data(), offsetsData.size()), + std::span(data.data(), data.size()), + std::span(), + std::span(offsetsData.data(), offsetsData.size()), PropertyComponentType::None, PropertyComponentType::Uint32); @@ -844,7 +846,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -880,7 +882,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -917,7 +919,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -961,7 +963,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1023,7 +1025,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1063,7 +1065,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1106,7 +1108,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1150,7 +1152,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1216,7 +1218,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1256,7 +1258,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1297,7 +1299,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1341,7 +1343,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1405,7 +1407,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1441,7 +1443,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1482,7 +1484,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1531,7 +1533,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1585,7 +1587,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1625,7 +1627,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1663,7 +1665,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1720,9 +1722,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(offsetsData.data(), offsetsData.size()), + std::span(data.data(), data.size()), + std::span(), + std::span(offsetsData.data(), offsetsData.size()), PropertyComponentType::None, PropertyComponentType::Uint8); FCesiumPropertyTableProperty property(propertyView); @@ -1771,7 +1773,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1829,7 +1831,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1874,7 +1876,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1915,7 +1917,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -1965,7 +1967,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2030,7 +2032,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2075,7 +2077,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2117,7 +2119,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2175,9 +2177,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(offsetsData.data(), offsetsData.size()), + std::span(data.data(), data.size()), + std::span(), + std::span(offsetsData.data(), offsetsData.size()), PropertyComponentType::None, PropertyComponentType::Uint8); FCesiumPropertyTableProperty property(propertyView); @@ -2229,7 +2231,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2291,7 +2293,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2336,7 +2338,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2378,7 +2380,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2433,7 +2435,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2498,7 +2500,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2543,7 +2545,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2585,7 +2587,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2640,7 +2642,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2702,7 +2704,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2747,7 +2749,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2789,7 +2791,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2851,9 +2853,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(offsetsData.data(), offsetsData.size()), + std::span(data.data(), data.size()), + std::span(), + std::span(offsetsData.data(), offsetsData.size()), PropertyComponentType::None, PropertyComponentType::Uint8); FCesiumPropertyTableProperty property(propertyView); @@ -2905,7 +2907,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -2967,7 +2969,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3012,7 +3014,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3058,7 +3060,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3125,9 +3127,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(offsetsData.data(), offsetsData.size()), + std::span(data.data(), data.size()), + std::span(), + std::span(offsetsData.data(), offsetsData.size()), PropertyComponentType::None, PropertyComponentType::Uint8); FCesiumPropertyTableProperty property(propertyView); @@ -3179,7 +3181,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3252,7 +3254,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3308,7 +3310,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3371,7 +3373,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3424,7 +3426,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3474,7 +3476,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3537,7 +3539,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -3588,7 +3590,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "PropertyTablePropertyStatus", @@ -3652,9 +3654,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, size, - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(), + std::span(data.data(), data.size()), + std::span(), + std::span(), PropertyComponentType::None, PropertyComponentType::None); FCesiumPropertyTableProperty property(propertyView); @@ -3710,9 +3712,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, size, - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(), + std::span(data.data(), data.size()), + std::span(), + std::span(), PropertyComponentType::None, PropertyComponentType::None); FCesiumPropertyTableProperty property(propertyView); @@ -3778,11 +3780,11 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, size, - gsl::span(data.data(), data.size()), - gsl::span( + std::span(data.data(), data.size()), + std::span( offsetsData.data(), offsetsData.size()), - gsl::span(), + std::span(), PropertyComponentType::Uint16, PropertyComponentType::None); FCesiumPropertyTableProperty property(propertyView); @@ -3854,9 +3856,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, size, - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(), + std::span(data.data(), data.size()), + std::span(), + std::span(), PropertyComponentType::None, PropertyComponentType::None); FCesiumPropertyTableProperty property(propertyView); @@ -3942,9 +3944,9 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, size, - gsl::span(data.data(), data.size()), - gsl::span(), - gsl::span(), + std::span(data.data(), data.size()), + std::span(), + std::span(), PropertyComponentType::None, PropertyComponentType::None); FCesiumPropertyTableProperty property(propertyView); @@ -4045,7 +4047,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -4087,7 +4089,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -4137,7 +4139,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -4184,7 +4186,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", @@ -4242,7 +4244,7 @@ void FCesiumPropertyTablePropertySpec::Define() { propertyTableProperty, classProperty, static_cast(values.size()), - gsl::span(data.data(), data.size())); + std::span(data.data(), data.size())); FCesiumPropertyTableProperty property(propertyView); TestEqual( "status", diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp index 512597a5a..c88059739 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp @@ -12,7 +12,9 @@ BEGIN_DEFINE_SPEC( FCesiumPropertyTextureSpec, "Cesium.Unit.PropertyTexture", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) Model model; MeshPrimitive* pPrimitive; diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTextureProperty.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTextureProperty.spec.cpp index 8229b5ef8..073446de0 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTextureProperty.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTextureProperty.spec.cpp @@ -9,7 +9,9 @@ BEGIN_DEFINE_SPEC( FCesiumPropertyTexturePropertySpec, "Cesium.Unit.PropertyTextureProperty", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) const std::vector texCoords{ FVector2D(0, 0), diff --git a/Source/CesiumRuntime/Private/Tests/CesiumTextureUtility.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumTextureUtility.spec.cpp index 764efa69d..fea05be2a 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumTextureUtility.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/CesiumTextureUtility.spec.cpp @@ -15,7 +15,7 @@ using namespace CesiumUtility; BEGIN_DEFINE_SPEC( CesiumTextureUtilitySpec, "Cesium.Unit.CesiumTextureUtility", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | EAutomationTestFlags::ProductFilter | EAutomationTestFlags::NonNullRHI) std::vector originalPixels; std::vector originalMipPixels; diff --git a/Source/CesiumRuntime/Private/Tests/GeoTransforms.spec.cpp b/Source/CesiumRuntime/Private/Tests/GeoTransforms.spec.cpp index 2ab9e6f9d..117f0b018 100644 --- a/Source/CesiumRuntime/Private/Tests/GeoTransforms.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/GeoTransforms.spec.cpp @@ -11,7 +11,9 @@ using namespace CesiumUtility; BEGIN_DEFINE_SPEC( FGeoTransformsSpec, "Cesium.Unit.GeoTransforms", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) END_DEFINE_SPEC(FGeoTransformsSpec) diff --git a/Source/CesiumRuntime/Private/Tests/GlobeAwareDefaultPawn.spec.cpp b/Source/CesiumRuntime/Private/Tests/GlobeAwareDefaultPawn.spec.cpp index fbe751339..84098476d 100644 --- a/Source/CesiumRuntime/Private/Tests/GlobeAwareDefaultPawn.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/GlobeAwareDefaultPawn.spec.cpp @@ -17,7 +17,9 @@ BEGIN_DEFINE_SPEC( FGlobeAwareDefaultPawnSpec, "Cesium.Unit.GlobeAwareDefaultPawn", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) FDelegateHandle subscriptionPostPIEStarted; diff --git a/Source/CesiumRuntime/Private/Tests/SampleHeightMostDetailed.spec.cpp b/Source/CesiumRuntime/Private/Tests/SampleHeightMostDetailed.spec.cpp index 6f766faff..479e63beb 100644 --- a/Source/CesiumRuntime/Private/Tests/SampleHeightMostDetailed.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/SampleHeightMostDetailed.spec.cpp @@ -10,7 +10,9 @@ BEGIN_DEFINE_SPEC( FSampleHeightMostDetailedSpec, "Cesium.Unit.SampleHeightMostDetailed", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) TObjectPtr pTileset; diff --git a/Source/CesiumRuntime/Private/Tests/SubLevels.spec.cpp b/Source/CesiumRuntime/Private/Tests/SubLevels.spec.cpp index 3cd88dca3..383c17b19 100644 --- a/Source/CesiumRuntime/Private/Tests/SubLevels.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/SubLevels.spec.cpp @@ -18,7 +18,9 @@ BEGIN_DEFINE_SPEC( FSubLevelsSpec, "Cesium.Unit.SubLevels", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) TObjectPtr pWorld; diff --git a/Source/CesiumRuntime/Private/Tests/UnrealAssetAccessor.spec.cpp b/Source/CesiumRuntime/Private/Tests/UnrealAssetAccessor.spec.cpp index 23ad0b24d..48f9e46fa 100644 --- a/Source/CesiumRuntime/Private/Tests/UnrealAssetAccessor.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/UnrealAssetAccessor.spec.cpp @@ -12,7 +12,9 @@ BEGIN_DEFINE_SPEC( FUnrealAssetAccessorSpec, "Cesium.Unit.UnrealAssetAccessor", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) FString Filename; @@ -31,7 +33,7 @@ void TestAccessorRequest(const FString& Uri, const std::string& expectedData) { if (!Response) return; - gsl::span data = Response->data(); + std::span data = Response->data(); TestEqual("data length", data.size(), expectedData.size()); std::string s( reinterpret_cast(data.data()), diff --git a/Source/CesiumRuntime/Private/Tests/UnrealMetadataConversions.spec.cpp b/Source/CesiumRuntime/Private/Tests/UnrealMetadataConversions.spec.cpp index f4c9e9af0..f4e81ea48 100644 --- a/Source/CesiumRuntime/Private/Tests/UnrealMetadataConversions.spec.cpp +++ b/Source/CesiumRuntime/Private/Tests/UnrealMetadataConversions.spec.cpp @@ -9,7 +9,9 @@ BEGIN_DEFINE_SPEC( FUnrealMetadataConversionsSpec, "Cesium.Unit.MetadataConversions", - EAutomationTestFlags::ApplicationContextMask | + EAutomationTestFlags::EditorContext | EAutomationTestFlags::ClientContext | + EAutomationTestFlags::ServerContext | + EAutomationTestFlags::CommandletContext | EAutomationTestFlags::ProductFilter) END_DEFINE_SPEC(FUnrealMetadataConversionsSpec) diff --git a/Source/CesiumRuntime/Private/UnrealAssetAccessor.cpp b/Source/CesiumRuntime/Private/UnrealAssetAccessor.cpp index d26da1e2b..6ede3bb33 100644 --- a/Source/CesiumRuntime/Private/UnrealAssetAccessor.cpp +++ b/Source/CesiumRuntime/Private/UnrealAssetAccessor.cpp @@ -59,9 +59,9 @@ class UnrealAssetResponse : public CesiumAsync::IAssetResponse { return this->_headers; } - virtual gsl::span data() const override { + virtual std::span data() const override { const TArray& content = this->_pResponse->GetContent(); - return gsl::span( + return std::span( reinterpret_cast(content.GetData()), content.Num()); } @@ -235,7 +235,7 @@ UnrealAssetAccessor::request( const std::string& verb, const std::string& url, const std::vector& headers, - const gsl::span& contentPayload) { + const std::span& contentPayload) { const FString& userAgent = this->_userAgent; const TMap& cesiumRequestHeaders = @@ -319,8 +319,8 @@ class UnrealFileAssetRequestResponse : public CesiumAsync::IAssetRequest, virtual std::string contentType() const override { return std::string(); } - virtual gsl::span data() const override { - return gsl::span( + virtual std::span data() const override { + return std::span( reinterpret_cast(this->_data.GetData()), size_t(this->_data.Num())); } diff --git a/Source/CesiumRuntime/Public/UnrealAssetAccessor.h b/Source/CesiumRuntime/Public/UnrealAssetAccessor.h index 0a76c3fe6..01095bcf9 100644 --- a/Source/CesiumRuntime/Public/UnrealAssetAccessor.h +++ b/Source/CesiumRuntime/Public/UnrealAssetAccessor.h @@ -26,7 +26,7 @@ class CESIUMRUNTIME_API UnrealAssetAccessor const std::string& verb, const std::string& url, const std::vector& headers, - const gsl::span& contentPayload) override; + const std::span& contentPayload) override; virtual void tick() noexcept override; diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 5fce667b1..1491053b9 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -12,7 +12,7 @@ endif() if (NOT UNREAL_ENGINE_ROOT) # On Windows, try to use the default UE 5.2 location - set(WINDOWS_DEFAULT_UNREAL_INSTALLATION "C:/Program Files/Epic Games/UE_5.2") + set(WINDOWS_DEFAULT_UNREAL_INSTALLATION "C:/Program Files/Epic Games/UE_5.5") if (WIN32 AND EXISTS "${WINDOWS_DEFAULT_UNREAL_INSTALLATION}") set(UNREAL_ENGINE_ROOT "${WINDOWS_DEFAULT_UNREAL_INSTALLATION}") else() diff --git a/extern/cesium-native b/extern/cesium-native index b164fc915..9c616411b 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit b164fc915ffd9080e0d3f7c3f72076b1e65090ed +Subproject commit 9c616411bad8dadbc07b718e54f0ec4f0fe21f2a diff --git a/extern/vcpkg-overlays/ms-gsl/portfile.cmake b/extern/vcpkg-overlays/ms-gsl/portfile.cmake new file mode 100644 index 000000000..36c674662 --- /dev/null +++ b/extern/vcpkg-overlays/ms-gsl/portfile.cmake @@ -0,0 +1,73 @@ +if (NOT DEFINED ENV{UNREAL_ENGINE_ROOT}) + message(FATAL_ERROR "The environment variable `UNREAL_ENGINE_ROOT` must be defined.") +endif() + +message(STATUS "Using Unreal Engine installation at $ENV{UNREAL_ENGINE_ROOT}") + +# UE 5.5 is the first version of UE to include GSL, and it only has a single version of it. This logic may need to +# change if a future UE version includes multiple copies of GSL. +set(GSL_VERSIONS_DIR "$ENV{UNREAL_ENGINE_ROOT}/Engine/Source/ThirdParty/GuidelinesSupportLibrary") +file(GLOB GSL_POSSIBLE_ROOT_DIRS LIST_DIRECTORIES true "${GSL_VERSIONS_DIR}/*") + +# Find the subdirectories, each of which should represent a GSL version. +set(GSL_VERSION_DIRS "") +foreach(GSL_POSSIBLE_ROOT_DIR IN LISTS GSL_POSSIBLE_ROOT_DIRS) + if(IS_DIRECTORY "${GSL_POSSIBLE_ROOT_DIR}") + list(APPEND GSL_VERSION_DIRS "${GSL_POSSIBLE_ROOT_DIR}") + endif() +endforeach() + +# There should be either zero versions (UE 5.2-5.4) or one version (UE 5.5). +# Otherwise we don't know what to do. +list(LENGTH GSL_VERSION_DIRS GSL_VERSION_DIRS_LENGTH) +if(GSL_VERSION_DIRS_LENGTH EQUAL 0) + # Use the standard GSL from vcpkg + + #header-only library with an install target + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/GSL + REF a3534567187d2edc428efd3f13466ff75fe5805c + SHA512 5bd6aad37fee3b56a2ee2fed10d6ef02fdcf37a1f40b3fb1bbec8146a573e235169b315405d010ab75175674ed82658c8202f40b128a849c5250b4a1b8b0a1b3 + HEAD_REF main + ) + + vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DGSL_TEST=OFF + ) + + vcpkg_cmake_install() + + vcpkg_cmake_config_fixup( + PACKAGE_NAME Microsoft.GSL + CONFIG_PATH share/cmake/Microsoft.GSL + ) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + + # Handle copyright + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +elseif(NOT GSL_VERSION_DIRS_LENGTH EQUAL 1) + message(FATAL_ERROR "Could not deduce the GSL root directory because there is not exactly one directory matching `${GSL_VERSIONS_DIR}/*`.") +else() + # Use Unreal Engine's copy of GSL + list(GET GSL_VERSION_DIRS 0 GSL_ROOT_DIR) + + set(SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}/ue55") + message("***** ${SOURCE_PATH}") + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DUNREAL_GSL=${GSL_ROOT_DIR}" + ) + + vcpkg_cmake_install() + + vcpkg_cmake_config_fixup( + PACKAGE_NAME Microsoft.GSL + CONFIG_PATH share/cmake/Microsoft.GSL + ) +endif() diff --git a/extern/vcpkg-overlays/ms-gsl/ue55/CMakeLists.txt b/extern/vcpkg-overlays/ms-gsl/ue55/CMakeLists.txt new file mode 100644 index 000000000..0e8476e83 --- /dev/null +++ b/extern/vcpkg-overlays/ms-gsl/ue55/CMakeLists.txt @@ -0,0 +1,36 @@ +cmake_minimum_required(VERSION 3.14...3.16) + +project(GSL VERSION 4.1.0 LANGUAGES CXX) + +add_library(GSL INTERFACE) +add_library(Microsoft.GSL::GSL ALIAS GSL) + +# https://cmake.org/cmake/help/latest/variable/PROJECT_IS_TOP_LEVEL.html +string(COMPARE EQUAL ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} PROJECT_IS_TOP_LEVEL) + +option(GSL_INSTALL "Generate and install GSL target" ${PROJECT_IS_TOP_LEVEL}) + +# The implementation generally assumes a platform that implements C++14 support +target_compile_features(GSL INTERFACE "cxx_std_14") + +# Setup include directory +target_include_directories(GSL INTERFACE "${UNREAL_GSL}/include") + +if (GSL_INSTALL) + include(GNUInstallDirs) + include(CMakePackageConfigHelpers) + + set(export_name "Microsoft.GSLConfig") + set(namespace "Microsoft.GSL::") + set(cmake_files_install_dir ${CMAKE_INSTALL_DATADIR}/cmake/Microsoft.GSL) + + install(TARGETS GSL EXPORT ${export_name} INCLUDES DESTINATION "${UNREAL_GSL}/include") + install(EXPORT ${export_name} NAMESPACE ${namespace} DESTINATION ${cmake_files_install_dir}) + export(TARGETS GSL NAMESPACE ${namespace} FILE ${export_name}.cmake) + + set(gls_config_version "${CMAKE_CURRENT_BINARY_DIR}/Microsoft.GSLConfigVersion.cmake") + + write_basic_package_version_file(${gls_config_version} COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT) + + install(FILES ${gls_config_version} DESTINATION ${cmake_files_install_dir}) +endif() diff --git a/extern/vcpkg-overlays/ms-gsl/vcpkg.json b/extern/vcpkg-overlays/ms-gsl/vcpkg.json new file mode 100644 index 000000000..8d70ddbcd --- /dev/null +++ b/extern/vcpkg-overlays/ms-gsl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ms-gsl", + "version": "4.0.0", + "port-version": 1, + "description": "Microsoft implementation of the Guidelines Support Library", + "homepage": "https://github.com/Microsoft/GSL", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +}