fix bugs and revert a normal change

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/raytraceCommon.glsl

@@ -187,7 +187,7 @@ nbl_glsl_xoroshiro64star_state_t load_aux_vertex_attrs(
 	const nbl_glsl_xoroshiro64star_state_t scramble_start_state = imageLoad(scramblebuf,ivec3(outPixelLocation,1u/*vertex_depth_mod_2*/)).rg;
 
 	// while waiting for the scramble state
-	const bool needsSmoothNormals = false;
+	const bool needsSmoothNormals = true;
 	if (needsSmoothNormals)
 	{
 		const mat3 normals = mat3(

include/nbl/ext/MitsubaLoader/CElementBSDF.h

@@ -58,6 +58,7 @@ class CElementBSDF : public IElement
 		struct AllDiffuse
 		{
 			AllDiffuse() : reflectance(0.5f), alpha(0.2f), useFastApprox(false) {}
+			~AllDiffuse() {}
 
 			inline AllDiffuse& operator=(const AllDiffuse& other)
 			{
@@ -67,7 +68,11 @@ class CElementBSDF : public IElement
 				return *this;
 			}
 
-			CElementTexture::SpectrumOrTexture	reflectance;
+			union // to support the unholy undocumented feature of Mitsuba
+			{
+				CElementTexture::SpectrumOrTexture	reflectance;
+				CElementTexture::SpectrumOrTexture	diffuseReflectance;
+			};
 			CElementTexture::FloatOrTexture		alpha; // not the parameter from Oren-Nayar
 			bool								useFastApprox;
 		};

src/nbl/ext/MitsubaLoader/CElementBSDF.cpp

@@ -432,7 +432,7 @@ bool CElementBSDF::addProperty(SNamedPropertyElement&& _property)
 		});
 	};
 	auto processSpecularReflectance = SET_SPECTRUM(specularReflectance, SPECULAR_TYPES,Phong,Ward);
-	auto processDiffuseReflectance = SET_SPECTRUM(diffuseReflectance, AllPlastic,Phong,Ward);
+	auto processDiffuseReflectance = SET_SPECTRUM(diffuseReflectance, AllDiffuse,AllPlastic,Phong,Ward);
 	auto processSpecularTransmittance = SET_SPECTRUM(specularTransmittance, TRANSMISSIVE_TYPES);
 #undef SPECULAR_TYPES
 #undef TRANSMISSIVE_TYPES
@@ -693,7 +693,7 @@ bool CElementBSDF::processChildData(IElement* _child, const std::string& name)
 				auto processAlphaU = SET_TEXTURE(alphaU, SPECULAR_TYPES);
 				auto processAlphaV = SET_TEXTURE(alphaV, SPECULAR_TYPES);
 				auto processSpecularReflectance = SET_TEXTURE(specularReflectance, SPECULAR_TYPES,Phong,Ward);
-				auto processDiffuseReflectance = SET_TEXTURE(diffuseReflectance, AllPlastic,Phong,Ward);
+				auto processDiffuseReflectance = SET_TEXTURE(diffuseReflectance, AllDiffuse,AllPlastic,Phong,Ward);
 				auto processSpecularTransmittance = SET_TEXTURE(specularTransmittance, TRANSMISSIVE_TYPES);
 				auto processSigmaA = SET_TEXTURE(sigmaA, AllCoating);
 				auto processExponent = SET_TEXTURE(exponent, Phong);