Half implement normal map handling for @Crisspl

Author: devshgraphicsprogramming

include/nbl/ext/MitsubaLoader/CElementBSDF.h

@@ -242,6 +242,7 @@ class CElementBSDF : public IElement
 		struct BumpMap : MetaBSDF
 		{
 			CElementTexture* texture;
+			bool wasNormal;
 		};
 		struct MixtureBSDF : MetaBSDF
 		{

include/nbl/ext/MitsubaLoader/CMitsubaMaterialCompilerFrontend.h

@@ -23,7 +23,7 @@ class CMitsubaMaterialCompilerFrontend
 
     const SContext* m_loaderContext;
 
-    tex_ass_type getDerivMap(const CElementTexture* _element) const;
+    tex_ass_type getDerivMap(const CElementBSDF::BumpMap& _bump) const;
     tex_ass_type getBlendWeightTex(const CElementTexture* _element) const;
 
     std::pair<const CElementTexture*, float> getTexture_common(const CElementTexture* _element) const;

include/nbl/ext/MitsubaLoader/SContext.h

@@ -61,7 +61,7 @@ namespace MitsubaLoader
 			return imageCacheKey + "?view";
 		}
 
-		static std::string derivMapCacheKey(const CElementTexture* bitmap)
+		static std::string derivMapCacheKey(const CElementBSDF::BumpMap& _bump)
 		{
 			using namespace std::string_literals;
 			static const char* wrap[5]
@@ -73,16 +73,18 @@ namespace MitsubaLoader
 				"?one"
 			};
 
+			const auto* bitmap = _bump.texture;
 			std::string key = bitmap->bitmap.filename.svalue + "?deriv"s;
+			key += _bump.wasNormal ? "n"s:"h"s;
 			key += wrap[bitmap->bitmap.wrapModeU];
 			key += wrap[bitmap->bitmap.wrapModeV];
 
 			return key;
 		}
 
-		static std::string derivMapViewCacheKey(const CElementTexture* bitmap)
+		static std::string derivMapViewCacheKey(const CElementBSDF::BumpMap& _bump)
 		{
-			return imageViewCacheKey(derivMapCacheKey(bitmap));
+			return imageViewCacheKey(derivMapCacheKey(_bump));
 		}
 
 		static std::string blendWeightViewCacheKey(const CElementTexture* bitmap)

src/nbl/ext/MitsubaLoader/CElementBSDF.cpp

@@ -40,6 +40,7 @@ CElementFactory::return_type CElementFactory::createElement<CElementBSDF>(const
 		{"coating",			CElementBSDF::Type::COATING},
 		{"roughcoating",	CElementBSDF::Type::ROUGHCOATING},
 		{"bumpmap",			CElementBSDF::Type::BUMPMAP},
+		{"normalmap",		CElementBSDF::Type::BUMPMAP},
 		{"phong",			CElementBSDF::Type::PHONG},
 		{"ward",			CElementBSDF::Type::WARD},
 		{"mixturebsdf",		CElementBSDF::Type::MIXTURE_BSDF},
@@ -96,6 +97,7 @@ CElementFactory::return_type CElementFactory::createElement<CElementBSDF>(const
 			break;
 		case CElementBSDF::Type::BUMPMAP:
 			obj->bumpmap = CElementBSDF::BumpMap();
+			obj->bumpmap.wasNormal = strcmp(type,"bumpmap")!=0;
 			break;
 		case CElementBSDF::Type::PHONG:
 			obj->phong = CElementBSDF::Phong();

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -270,10 +270,12 @@ static core::smart_refctd_ptr<asset::ICPUImageView> createImageView(core::smart_
 
 	return asset::ICPUImageView::create(std::move(params));
 }
-static core::smart_refctd_ptr<asset::ICPUImage> createDerivMap(asset::ICPUImage* _heightMap, asset::ICPUSampler* _smplr)
+static core::smart_refctd_ptr<asset::ICPUImage> createDerivMap(asset::ICPUImage* _heightMap, asset::ICPUSampler* _smplr, bool fromNormalMap)
 {
 	const auto& sp = _smplr->getParams();
 
+	if (fromNormalMap) // TODO: use the normalmap to derivative map filter and utils from the glTF PR
+		os::Printer::log("Normalmaps not implemented yet! Treating with Bumpmap creation pipeline, expect results to be off!",ELL_ERROR);
 	return asset::CDerivativeMapCreator::createDerivativeMapFromHeightMap(
 			_heightMap,
 			static_cast<asset::ICPUSampler::E_TEXTURE_CLAMP>(sp.TextureWrapU),
@@ -1269,11 +1271,12 @@ auto CMitsubaLoader::genBSDFtreeTraversal(SContext& ctx, const CElementBSDF* _bs
 				// TODO check and restore if dummy (image and sampler)
 				auto bumpmap = std::get<0>(bm)->getCreationParameters().image;
 				auto sampler = std::get<1>(bm);
-				const std::string key = ctx.derivMapCacheKey(bumpmap_element);
+				const std::string key = ctx.derivMapCacheKey(bsdf->bumpmap);
 
 				if (!getBuiltinAsset<asset::ICPUImage, asset::IAsset::ET_IMAGE>(key.c_str(), m_assetMgr))
 				{
-					auto derivmap = createDerivMap(bumpmap.get(), sampler.get());
+					// TODO: @Crisspl retrieve the normalization factor from the deriv map filter, then adjust the scale accordingly!
+					auto derivmap = createDerivMap(bumpmap.get(),sampler.get(),bsdf->bumpmap.wasNormal);
 					asset::SAssetBundle imgBundle(nullptr,{ derivmap });
 					ctx.override_->insertAssetIntoCache(std::move(imgBundle), key, ctx.inner, 0u);
 					auto derivmap_view = createImageView(std::move(derivmap));

src/nbl/ext/MitsubaLoader/CMitsubaMaterialCompilerFrontend.cpp

@@ -13,15 +13,16 @@ namespace ext
 namespace MitsubaLoader
 {
 
-    auto CMitsubaMaterialCompilerFrontend::getDerivMap(const CElementTexture* _element) const -> tex_ass_type
+    auto CMitsubaMaterialCompilerFrontend::getDerivMap(const CElementBSDF::BumpMap& _bump) const -> tex_ass_type
     {
+        const CElementTexture* texture = nullptr;
         float scale = 1.f;
-        std::tie(_element, scale) = getTexture_common(_element);
-        std::string key = m_loaderContext->derivMapCacheKey(_element);
-        if (_element->type != CElementTexture::BITMAP)
+        std::tie(texture, scale) = getTexture_common(_bump.texture);
+        std::string key = m_loaderContext->derivMapCacheKey(_bump);
+        if (texture->type != CElementTexture::BITMAP)
             return { nullptr, nullptr, 0.f };
 
-        return getTexture(key, _element, scale);
+        return getTexture(key, texture, scale);
     }
 
     auto CMitsubaMaterialCompilerFrontend::getBlendWeightTex(const CElementTexture* _element) const -> tex_ass_type
@@ -250,7 +251,7 @@ namespace MitsubaLoader
             //no other source supported for now (uncomment in the future) [far future TODO]
             //node->source = IR::CGeomModifierNode::ESRC_TEXTURE;
 
-            std::tie(node->texture.image, node->texture.sampler, node->texture.scale) = getDerivMap(_bsdf->bumpmap.texture);
+            std::tie(node->texture.image, node->texture.sampler, node->texture.scale) = getDerivMap(_bsdf->bumpmap);
         }
         break;
         case CElementBSDF::COATING: