AssetLoader: move GLTF sampler conversions to utilities

Extract GLTF filter and wrap-mode conversion helpers from ModelBuilder into
GLTFUtilities and update GLTFLoader to use the standalone functions.

Author: TheMostDiligent

AssetLoader/CMakeLists.txt

@@ -9,6 +9,7 @@ set(INCLUDE
 set(INTERFACE
     interface/GLTFLoader.hpp
     interface/GLTFBuilder.hpp
+    interface/GLTFUtilities.hpp
     interface/GLTFVertexDataConverter.hpp
     interface/DXSDKMeshLoader.hpp
     interface/GLTFResourceManager.hpp
@@ -17,6 +18,7 @@ set(INTERFACE
 set(SOURCE 
     src/GLTFLoader.cpp
     src/GLTFBuilder.cpp
+    src/GLTFUtilities.cpp
     src/GLTFVertexDataConverter.cpp
     src/DXSDKMeshLoader.cpp
     src/GLTFResourceManager.cpp

AssetLoader/interface/GLTFBuilder.hpp

@@ -102,10 +102,6 @@ class ModelBuilder
     void InitIndexBuffer(IRenderDevice* pDevice);
     void InitVertexBuffers(IRenderDevice* pDevice);
 
-    static std::pair<FILTER_TYPE, FILTER_TYPE> GetFilterType(int32_t GltfFilterMode);
-
-    static TEXTURE_ADDRESS_MODE GetAddressMode(int32_t GltfWrapMode);
-
 private:
     struct PrimitiveKey
     {

AssetLoader/interface/GLTFUtilities.hpp

@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2019-2026 Diligent Graphics LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  In no event and under no legal theory, whether in tort (including negligence),
+ *  contract, or otherwise, unless required by applicable law (such as deliberate
+ *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
+ *  liable for any damages, including any direct, indirect, special, incidental,
+ *  or consequential damages of any character arising as a result of this License or
+ *  out of the use or inability to use the software (including but not limited to damages
+ *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and
+ *  all other commercial damages or losses), even if such Contributor has been advised
+ *  of the possibility of such damages.
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <utility>
+
+#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypes.h"
+
+namespace Diligent
+{
+
+namespace GLTF
+{
+
+std::pair<FILTER_TYPE, FILTER_TYPE> GltfFilterModeToFilterType(int32_t GltfFilterMode);
+
+TEXTURE_ADDRESS_MODE GltfWrapModeToAddressMode(int32_t GltfWrapMode);
+
+} // namespace GLTF
+
+} // namespace Diligent

AssetLoader/src/GLTFBuilder.cpp

@@ -339,44 +339,6 @@ void ModelBuilder::InitVertexBuffers(IRenderDevice* pDevice)
     }
 }
 
-std::pair<FILTER_TYPE, FILTER_TYPE> ModelBuilder::GetFilterType(int32_t GltfFilterMode)
-{
-    switch (GltfFilterMode)
-    {
-        case 9728: // NEAREST
-            return {FILTER_TYPE_POINT, FILTER_TYPE_POINT};
-        case 9729: // LINEAR
-            return {FILTER_TYPE_LINEAR, FILTER_TYPE_LINEAR};
-        case 9984: // NEAREST_MIPMAP_NEAREST
-            return {FILTER_TYPE_POINT, FILTER_TYPE_POINT};
-        case 9985: // LINEAR_MIPMAP_NEAREST
-            return {FILTER_TYPE_LINEAR, FILTER_TYPE_POINT};
-        case 9986: // NEAREST_MIPMAP_LINEAR
-            return {FILTER_TYPE_POINT, FILTER_TYPE_LINEAR};
-        case 9987: // LINEAR_MIPMAP_LINEAR
-            return {FILTER_TYPE_LINEAR, FILTER_TYPE_LINEAR};
-        default:
-            LOG_WARNING_MESSAGE("Unknown gltf filter mode: ", GltfFilterMode, ". Defaulting to linear.");
-            return {FILTER_TYPE_LINEAR, FILTER_TYPE_LINEAR};
-    }
-}
-
-TEXTURE_ADDRESS_MODE ModelBuilder::GetAddressMode(int32_t GltfWrapMode)
-{
-    switch (GltfWrapMode)
-    {
-        case 10497:
-            return TEXTURE_ADDRESS_WRAP;
-        case 33071:
-            return TEXTURE_ADDRESS_CLAMP;
-        case 33648:
-            return TEXTURE_ADDRESS_MIRROR;
-        default:
-            LOG_WARNING_MESSAGE("Unknown gltf address wrap mode: ", GltfWrapMode, ". Defaulting to WRAP.");
-            return TEXTURE_ADDRESS_WRAP;
-    }
-}
-
 } // namespace GLTF
 
 } // namespace Diligent

AssetLoader/src/GLTFLoader.cpp

@@ -44,6 +44,7 @@
 #include "GraphicsUtilities.h"
 #include "Align.hpp"
 #include "GLTFBuilder.hpp"
+#include "GLTFUtilities.hpp"
 #include "FixedLinearAllocator.hpp"
 #include "DefaultRawMemoryAllocator.hpp"
 
@@ -1539,12 +1540,12 @@ void Model::LoadTextureSamplers(IRenderDevice* pDevice, const tinygltf::Model& g
     for (const tinygltf::Sampler& smpl : gltf_model.samplers)
     {
         SamplerDesc SamDesc;
-        SamDesc.MagFilter = ModelBuilder::GetFilterType(smpl.magFilter).first;
-        auto MinMipFilter = ModelBuilder::GetFilterType(smpl.minFilter);
+        SamDesc.MagFilter = GltfFilterModeToFilterType(smpl.magFilter).first;
+        auto MinMipFilter = GltfFilterModeToFilterType(smpl.minFilter);
         SamDesc.MinFilter = MinMipFilter.first;
         SamDesc.MipFilter = MinMipFilter.second;
-        SamDesc.AddressU  = ModelBuilder::GetAddressMode(smpl.wrapS);
-        SamDesc.AddressV  = ModelBuilder::GetAddressMode(smpl.wrapT);
+        SamDesc.AddressU  = GltfWrapModeToAddressMode(smpl.wrapS);
+        SamDesc.AddressV  = GltfWrapModeToAddressMode(smpl.wrapT);
         SamDesc.AddressW  = SamDesc.AddressV;
         RefCntAutoPtr<ISampler> pSampler;
         pDevice->CreateSampler(SamDesc, &pSampler);
@@ -1562,8 +1563,8 @@ static void SetMaterialTextureSamplerProps(const tinygltf::Model& gltf_model, in
         return;
 
     const tinygltf::Sampler& gltf_sampler = gltf_model.samplers[gltf_tex.sampler];
-    Attribs.SetWrapUMode(ModelBuilder::GetAddressMode(gltf_sampler.wrapS));
-    Attribs.SetWrapVMode(ModelBuilder::GetAddressMode(gltf_sampler.wrapT));
+    Attribs.SetWrapUMode(GltfWrapModeToAddressMode(gltf_sampler.wrapS));
+    Attribs.SetWrapVMode(GltfWrapModeToAddressMode(gltf_sampler.wrapT));
 }
 
 struct MaterialLoadContext

AssetLoader/src/GLTFUtilities.cpp

@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2019-2026 Diligent Graphics LLC
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  In no event and under no legal theory, whether in tort (including negligence),
+ *  contract, or otherwise, unless required by applicable law (such as deliberate
+ *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
+ *  liable for any damages, including any direct, indirect, special, incidental,
+ *  or consequential damages of any character arising as a result of this License or
+ *  out of the use or inability to use the software (including but not limited to damages
+ *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and
+ *  all other commercial damages or losses), even if such Contributor has been advised
+ *  of the possibility of such damages.
+ */
+
+#include "GLTFUtilities.hpp"
+
+#include "DebugUtilities.hpp"
+
+namespace Diligent
+{
+
+namespace GLTF
+{
+
+std::pair<FILTER_TYPE, FILTER_TYPE> GltfFilterModeToFilterType(int32_t GltfFilterMode)
+{
+    switch (GltfFilterMode)
+    {
+        case 9728: // NEAREST
+            return {FILTER_TYPE_POINT, FILTER_TYPE_POINT};
+        case 9729: // LINEAR
+            return {FILTER_TYPE_LINEAR, FILTER_TYPE_LINEAR};
+        case 9984: // NEAREST_MIPMAP_NEAREST
+            return {FILTER_TYPE_POINT, FILTER_TYPE_POINT};
+        case 9985: // LINEAR_MIPMAP_NEAREST
+            return {FILTER_TYPE_LINEAR, FILTER_TYPE_POINT};
+        case 9986: // NEAREST_MIPMAP_LINEAR
+            return {FILTER_TYPE_POINT, FILTER_TYPE_LINEAR};
+        case 9987: // LINEAR_MIPMAP_LINEAR
+            return {FILTER_TYPE_LINEAR, FILTER_TYPE_LINEAR};
+        default:
+            LOG_WARNING_MESSAGE("Unknown gltf filter mode: ", GltfFilterMode, ". Defaulting to linear.");
+            return {FILTER_TYPE_LINEAR, FILTER_TYPE_LINEAR};
+    }
+}
+
+TEXTURE_ADDRESS_MODE GltfWrapModeToAddressMode(int32_t GltfWrapMode)
+{
+    switch (GltfWrapMode)
+    {
+        case 10497:
+            return TEXTURE_ADDRESS_WRAP;
+        case 33071:
+            return TEXTURE_ADDRESS_CLAMP;
+        case 33648:
+            return TEXTURE_ADDRESS_MIRROR;
+        default:
+            LOG_WARNING_MESSAGE("Unknown gltf address wrap mode: ", GltfWrapMode, ". Defaulting to WRAP.");
+            return TEXTURE_ADDRESS_WRAP;
+    }
+}
+
+} // namespace GLTF
+
+} // namespace Diligent