Emission Profiles now load properly!

Author: devshgraphicsprogramming

include/nbl/ext/MitsubaLoader/CMitsubaLoader.h

@@ -48,8 +48,7 @@ class CMitsubaLoader final : public asset::ISceneLoader
 		virtual ~CMitsubaLoader() = default;
 
 #if 0
-		void									cacheTexture(SContext& ctx, uint32_t hierarchyLevel, const CElementTexture* texture, const CMitsubaMaterialCompilerFrontend::E_IMAGE_VIEW_SEMANTIC semantic);
-		void cacheEmissionProfile(SContext& ctx, const CElementEmissionProfile* profile);
+		void cacheTexture(SContext& ctx, uint32_t hierarchyLevel, const CElementTexture* texture, const CMitsubaMaterialCompilerFrontend::E_IMAGE_VIEW_SEMANTIC semantic);
 
 		template <typename Iter>
 		core::smart_refctd_ptr<asset::ICPUDescriptorSet> createDS0(const SContext& _ctx, asset::ICPUPipelineLayout* _layout, const asset::material_compiler::CMaterialCompilerGLSLBackendCommon::result_t& _compResult, Iter meshBegin, Iter meshEnd);

include/nbl/ext/MitsubaLoader/CMitsubaMaterialCompilerFrontend.h

@@ -16,14 +16,10 @@
 namespace nbl::ext::MitsubaLoader
 {
 
-struct SContext;
-
 class CMitsubaMaterialCompilerFrontend
 {
     public:
 #ifdef 0
-        using IRNode = asset::material_compiler::IR::INode;
-        using EmitterNode = asset::material_compiler::IR::CEmitterNode;
         enum E_IMAGE_VIEW_SEMANTIC : uint8_t
         {
             EIVS_IDENTITIY,
@@ -33,24 +29,16 @@ class CMitsubaMaterialCompilerFrontend
             EIVS_COUNT
         };
 
-        explicit CMitsubaMaterialCompilerFrontend(const SContext* _ctx) : m_loaderContext(_ctx) {}
-
         front_and_back_t compileToIRTree(asset::material_compiler::IR* ir, const CElementBSDF* _bsdf);
-        EmitterNode* createEmitterNode(asset::material_compiler::IR* ir, const CElementEmitter* _emitter, core::matrix4SIMD transform);
 
     private:
         using tex_ass_type = std::tuple<core::smart_refctd_ptr<asset::ICPUImageView>,core::smart_refctd_ptr<asset::ICPUSampler>,float>;
-        using emission_profile_type = std::tuple<core::smart_refctd_ptr<asset::ICPUSampler>, const asset::CIESProfileMetadata*>;
 
         const SContext* m_loaderContext;
 
         std::pair<const CElementTexture*,float> unwindTextureScale(const CElementTexture* _element) const;
 
         tex_ass_type getTexture(const CElementTexture* _element, const E_IMAGE_VIEW_SEMANTIC semantic=EIVS_IDENTITIY) const;
-
-        emission_profile_type getEmissionProfile(const CElementEmissionProfile* _element);
-
-        tex_ass_type getErrorTexture(const E_IMAGE_VIEW_SEMANTIC semantic) const;
 #endif
 };
 

include/nbl/ext/MitsubaLoader/SContext.h

@@ -34,7 +34,7 @@ struct SContext final
 
 		// Mitsuba XML Materials do not support emission from a BSDF node (i.e. emitter behind a coating or glass screen), its purely additive and cannot be backface emitting
 		using material_t = asset::material_compiler3::CFrontendIR::typed_pointer_type<const asset::material_compiler3::CFrontendIR::CLayer>; // TODO: change to true IR
-		material_t getMaterial(const CElementBSDF* bsdf, const CElementEmitter* frontFaceEmitter, const hlsl::float32_t3x3& iesProfileOrientation, const core::string& debugName, system::ISystem* debugFileWriter=nullptr);
+		material_t getMaterial(const CElementBSDF* bsdf, const CElementEmitter* frontFaceEmitter, const core::string& debugName, system::ISystem* debugFileWriter=nullptr);
 
 		inline void writeFrontendForestDot3(system::ISystem* system, const system::path& filepath)
 		{
@@ -60,8 +60,8 @@ struct SContext final
 		// not `frontend_ir_t::CEmitter` because the color factor gets multiplied in
 		using frontend_emitter_t = frontend_ir_t::typed_pointer_type<const frontend_ir_t::CMul>;
 		frontend_material_t genMaterial(const CElementBSDF* bsdf, system::ISystem* debugFileWriter);
-		frontend_emitter_t getEmitter(const CElementEmitter* emitter, const hlsl::float32_t3x3& iesProfileOrientation, system::ISystem* debugFileWriter);
 		frontend_emitter_t genEmitter(const CElementEmitter* emitter, system::ISystem* debugFileWriter);
+		frontend_ir_t::SParameter getProfile(const CElementEmissionProfile* profile);
 		//
 		void writeDot3File(system::ISystem* system, const system::path& filepath, frontend_ir_t::SDotPrinter& printer);
 
@@ -70,28 +70,16 @@ struct SContext final
 		//
 		core::unordered_map<const CElementShape::ShapeGroup*,CMitsubaMetadata::SGeometryCollectionMetaPair> groupCache;
 		//
-		core::unordered_map<const CElementBSDF*,frontend_material_t> bsdfCache;
 		core::unordered_map<const CElementEmitter*,frontend_emitter_t> emitterCache;
+		core::unordered_map<const CElementBSDF*,frontend_material_t> bsdfCache;
+		core::unordered_map<const CElementEmissionProfile*,frontend_ir_t::SParameter> profileCache;
 
 #if 0 // stuff that belongs in the Material Compiler backend
 		//image, sampler
 		using tex_ass_type = std::tuple<core::smart_refctd_ptr<asset::ICPUImageView>,core::smart_refctd_ptr<asset::ICPUSampler>>;
 		//image, scale 
 		core::map<core::smart_refctd_ptr<asset::ICPUImage>,float> derivMapCache;
 
-		static asset::ISampler::SParams emissionProfileSamplerParams(const CElementEmissionProfile* profile, const asset::CIESProfileMetadata& meta)
-		{
-			return {
-				asset::ISampler::ETC_REPEAT,
-				asset::ISampler::ETC_REPEAT,
-				asset::ISampler::ETC_REPEAT,
-				asset::ISampler::ETBC_INT_OPAQUE_BLACK,
-				asset::ISampler::ETF_LINEAR,
-				asset::ISampler::ETF_LINEAR,
-				asset::ISampler::ETF_LINEAR,
-				0u, false, asset::ECO_ALWAYS
-			};
-		}
 
 		static auto computeSamplerParameters(const CElementTexture::Bitmap& bitmap)
 		{