starting making the factor (SpectralVariable from CTrueIR by CFrontendIR) but realize its all just duplicate code

Author: devshgraphicsprogramming

include/nbl/asset/material_compiler3/CFrontendIR.h

@@ -361,6 +361,9 @@ class CFrontendIR final : public CNodePool
 			private:
 				SCreationParams<1>* pWonky() {return reinterpret_cast<SCreationParams<1>*>(this+1);}
 				const SCreationParams<1>* pWonky() const {return reinterpret_cast<const SCreationParams<1>*>(this+1);}
+
+				friend class CFrontendIR;
+				NBL_API2 CTrueIR::typed_pointer_type<CTrueIR::ISpectralVariable> createIRNode(const CFrontendIR* ast, CTrueIR* ir) const;
 		};
 		//
 		class IUnaryOp : public obj_pool_type::INonTrivial, public IExprNode

include/nbl/asset/material_compiler3/CTrueIR.h

@@ -434,6 +434,11 @@ class CTrueIR : public CNodePool // TODO: turn into an asset!
 		class ISpectralVariable : public IFactorLeaf
 		{
 			public:
+				virtual uint8_t getSpectralBins() const = 0;
+
+				virtual SParameter* getParameter(const uint8_t i) = 0;
+				inline const SParameter* getParameter(const uint8_t i) const {return const_cast<const SParameter*>(const_cast<ISpectralVariable*>(this)->getParameter(i));}
+
 				enum class ESemantics : uint8_t
 				{
 					NoneUndefined = 0,
@@ -447,6 +452,13 @@ class CTrueIR : public CNodePool // TODO: turn into an asset!
 					// PairsLinear = 5, // linear interpolation
 					// PairsLogLinear = 5, // linear interpolation in wavelenght log space
 				};
+				inline ESemantics getSemantics() const
+				{
+					if (getSpectralBins()>1)
+						return static_cast<ESemantics>(getParameter(1)->padding[0]);
+					else
+						return ESemantics::NoneUndefined;
+				}
 		};
 		template<uint8_t SpectralBins>
 		class CSpectralVariable final : public obj_pool_type::INonTrivial, public ISpectralVariable
@@ -456,7 +468,7 @@ class CTrueIR : public CNodePool // TODO: turn into an asset!
 					hasher << paramSet;
 					if constexpr (SpectralBins>1)
 					{
-						const ESemantics semantics = getSemantics<SpectralBins>();
+						const ESemantics semantics = getSemantics();
 						if (semantics!=ESemantics::NoneUndefined)
 							return false;
 						hasher << semantics;
@@ -465,6 +477,7 @@ class CTrueIR : public CNodePool // TODO: turn into an asset!
 				}
 
 			public:
+				// TODO: maybe undo this?
 				inline EFinalType getFinalType() const override
 				{
 					static_assert(1<=SpectralBins && SpectralBins<=4);
@@ -475,11 +488,12 @@ class CTrueIR : public CNodePool // TODO: turn into an asset!
 				inline const std::string_view getTypeName() const override {return TYPE_NAME_STR(CSpectralVariable<SpectralBins>);}
 
 				//
-				inline uint8_t getSpectralBins() const {return SpectralBins;}
+				inline uint8_t getSpectralBins() const override {return SpectralBins;}
+
+				//
+				inline SParameter* getParameter(const uint8_t i) {return paramSet.params+i;}
 
 				//
-				template<uint8_t N> requires (N>1 && N==SpectralBins)
-				inline ESemantics getSemantics() const {return static_cast<ESemantics>(paramSet.params[1].padding[0]);}
 				template<uint8_t N> requires (N>1 && N==SpectralBins)
 				inline void setSemantics(const ESemantics value) {paramSet.params[1].padding[0] = static_cast<uint8_t>(value);}
 

src/nbl/asset/material_compiler3/CFrontendIR.cpp

@@ -753,6 +753,7 @@ auto CFrontendIR::SAdd2IRSession::makeContributors(const CFrontendIR::typed_poin
 	assert(contributorStack.empty());
 	exprStack.push_back({.nodeH=bxdfRootH});
 	CTrueIR::typed_pointer_type<CTrueIR::CContributorSum> tailH = {};
+	// the mul node gets visited after children are made
 	while (!exprStack.empty())
 	{
 		auto& entry = exprStack.back();
@@ -814,6 +815,11 @@ auto CFrontendIR::SAdd2IRSession::makeContributors(const CFrontendIR::typed_poin
 			// do stuff now
 			switch (astExprType)
 			{
+				case ast_expr_type_e::Mul:
+				{
+					// silently skip
+					break;
+				}
 				case ast_expr_type_e::Add:
 				{
 					// we visited the leftmost subtrees first so this is the right order
@@ -837,6 +843,26 @@ auto CFrontendIR::SAdd2IRSession::makeContributors(const CFrontendIR::typed_poin
 					mulChain.resize(entry.mulChainLen);
 					break;
 				}
+				case ast_expr_type_e::SpectralVariable:
+				{
+					const auto varH = static_cast<const CSpectralVariable*>(node)->createIRNode(srcAST,tmpIR.get());
+					auto* const var = irPool.deref(varH);
+					if (!var)
+					{
+						args.logger.log("Failed to create the Spectral Variable.",ELL_ERROR);
+						return (headH=errorRetval);
+					}
+					auto& factor = mulChain.emplace_back();
+					factor.handle = varH;
+					const auto channels = var->getSpectralBins();
+					factor.monochrome = channels>1;
+					for (uint8_t c=0; c<channels; c++)
+					{
+						if (!(var->getParameter(c)->scale>std::numeric_limits<float>::min()))
+							factor.liveSpectralChannels &= ~(0b1<<c);
+					}
+					break;
+				}
 				default:
 				{
 					args.logger.log("Unsupported AST Expression type \"%s\"",ELL_ERROR,system::to_string(astExprType).c_str());
@@ -867,6 +893,35 @@ auto CFrontendIR::SAdd2IRSession::makeContributors(const CFrontendIR::typed_poin
 	return headH;
 }
 
+auto CFrontendIR::CSpectralVariable::createIRNode(const CFrontendIR* ast, CTrueIR* ir) const -> CTrueIR::typed_pointer_type<CTrueIR::ISpectralVariable>
+{
+	return {};
+	auto& irPool = ir->getObjectPool();
+	uint8_t realCount = 1;
+	for (uint8_t c=0; c<getKnotCount(); c++)
+	if (*getParam(c)!=*getParam(0))
+		realCount = 3;
+	CTrueIR::typed_pointer_type<CTrueIR::ISpectralVariable> retval = {};
+	// TODO: maybe make it wholly polymorphic like the AST ? Or even have both classes use the same struct ?
+	switch (realCount)
+	{
+		case 1:
+		{
+			retval = irPool.emplace<CTrueIR::CSpectralVariable<1>>();
+			break;
+		}
+		case 3:
+		{
+			retval = irPool.emplace<CTrueIR::CSpectralVariable<3>>();
+			break;
+		}
+		default:
+			break;
+	}
+//	==
+	return retval;
+}
+
 //
 auto CFrontendIR::SAdd2IRSession::popContributor() -> CTrueIR::typed_pointer_type<const CTrueIR::CWeightedContributor>
 {