From d3fbccce2fed84bcb1624dd7b6a9d3f12d3ddb49 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Fri, 4 Oct 2024 08:13:02 +1000 Subject: [PATCH] AttributeSemantics -> VertexAttributeSemantics --- Source/CesiumRuntime/Private/CesiumGltfTextures.cpp | 4 ++-- Source/CesiumRuntime/Private/CesiumGltfTextures.h | 3 ++- extern/cesium-native | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/CesiumRuntime/Private/CesiumGltfTextures.cpp b/Source/CesiumRuntime/Private/CesiumGltfTextures.cpp index a6d93f014..0a8310db4 100644 --- a/Source/CesiumRuntime/Private/CesiumGltfTextures.cpp +++ b/Source/CesiumRuntime/Private/CesiumGltfTextures.cpp @@ -6,8 +6,8 @@ #include "CesiumTextureUtility.h" #include "ExtensionImageCesiumUnreal.h" #include -#include #include +#include #include using namespace CesiumAsync; @@ -177,7 +177,7 @@ bool isValidPrimitive( } auto positionAccessorIt = - primitive.attributes.find(AttributeSemantics::POSITION); + primitive.attributes.find(VertexAttributeSemantics::POSITION); if (positionAccessorIt == primitive.attributes.end()) { // This primitive doesn't have a POSITION semantic, so it's not valid. return false; diff --git a/Source/CesiumRuntime/Private/CesiumGltfTextures.h b/Source/CesiumRuntime/Private/CesiumGltfTextures.h index d3a7544d1..64540f7e9 100644 --- a/Source/CesiumRuntime/Private/CesiumGltfTextures.h +++ b/Source/CesiumRuntime/Private/CesiumGltfTextures.h @@ -16,7 +16,8 @@ class CesiumGltfTextures { public: /** * Creates all of the texture resources that are required by the given glTF, - * and adds `ExtensionImageCesiumUnreal` to each. + * and adds `ExtensionImageCesiumUnreal` to each. This is intended to be + * called from a worker thread. */ static CesiumAsync::Future createInWorkerThread( const CesiumAsync::AsyncSystem& asyncSystem, diff --git a/extern/cesium-native b/extern/cesium-native index 82fb7e8fb..e781a9c4b 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 82fb7e8fb38a98163a96df806f5ed21d4f7117e8 +Subproject commit e781a9c4bc4cf67a1108755df847e6bd1636a792