Fix type of clearcoat.clearcoatNormalTexture

spnda · Oct 16, 2024 · 6a9dc9a · 6a9dc9a
1 parent 84bb3ff
commit 6a9dc9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/fastgltf/types.hpp b/include/fastgltf/types.hpp
@@ -1929,7 +1929,7 @@ namespace fastgltf {
         Optional<TextureInfo> clearcoatTexture;
         num clearcoatRoughnessFactor = 0.0f;
         Optional<TextureInfo> clearcoatRoughnessTexture;
-        Optional<TextureInfo> clearcoatNormalTexture;
+        Optional<NormalTextureInfo> clearcoatNormalTexture;
     };
 
     FASTGLTF_EXPORT struct MaterialSheen {

diff --git a/src/fastgltf.cpp b/src/fastgltf.cpp
@@ -2637,9 +2637,9 @@ fg::Error fg::Parser::parseMaterialExtensions(simdjson::dom::object &object, fas
 					return error;
 				}
 
-				TextureInfo clearcoatNormalTexture;
+				NormalTextureInfo clearcoatNormalTexture;
 				if (auto error = parseTextureInfo(clearcoatObject, "clearcoatNormalTexture",
-												  &clearcoatNormalTexture, config.extensions); error ==
+												  &clearcoatNormalTexture, config.extensions, TextureInfoType::NormalTexture); error ==
 																							   Error::None) {
 					clearcoat->clearcoatNormalTexture = std::move(clearcoatNormalTexture);
 				} else if (error != Error::MissingField) {
@@ -4738,7 +4738,7 @@ void fg::Exporter::writeMaterials(const Asset& asset, std::string& json) {
 			if (it->clearcoat->clearcoatNormalTexture.has_value()) {
 				if (json.back() != '{') json += ',';
 				json += "\"clearcoatNormalTexture\":";
-				writeTextureInfo(json, &it->clearcoat->clearcoatNormalTexture.value());
+				writeTextureInfo(json, &it->clearcoat->clearcoatNormalTexture.value(), TextureInfoType::NormalTexture);
 			}
 			json += '}';
 		}