From b64b84b843c81903e54e26cfec0602761fa0adf4 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Wed, 10 Apr 2019 11:48:22 -0500 Subject: [PATCH] defaults for diffusecolor, specularcolor (reminder todo: shift that to composite) and normal for createForwardSurface --- .../shaderGen/HLSL/shaderFeatureHLSL.cpp | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp index 4dbce82c9..348923a82 100644 --- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp +++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp @@ -3169,15 +3169,33 @@ void ReflectionProbeFeatHLSL::processPix(Vector &componentList Var *diffuseColor = (Var*)LangElement::find("diffuseColor"); if (!diffuseColor) - return; + { + diffuseColor = new Var; + diffuseColor->setType("float4"); + diffuseColor->setName("diffuseColor"); + LangElement* colorDecl = new DecOp(diffuseColor); + meta->addStatement(new GenOp(" @ = float4(1.0,1.0,1.0,1.0);\r\n", colorDecl)); //default to flat white + } Var *specularColor = (Var*)LangElement::find("specularColor"); if (!specularColor) - return; + { + specularColor = new Var; + specularColor->setType("float4"); + specularColor->setName("specularColor"); + LangElement* colorDecl = new DecOp(specularColor); + meta->addStatement(new GenOp(" @ = float4(0.0,0.0,1.0,0.0);\r\n", colorDecl)); //default to no flag, no rough or metal, no ao darkening + } Var *bumpNormal = (Var*)LangElement::find("bumpNormal"); if (!bumpNormal) - return; + { + bumpNormal = new Var; + bumpNormal->setType("float4"); + bumpNormal->setName("bumpNormal"); + LangElement* colorDecl = new DecOp(bumpNormal); + meta->addStatement(new GenOp(" @ = float4(1.0,0.0,0.0,0.0);\r\n", colorDecl)); //default to identiry normal + } Var *wsEyePos = (Var*)LangElement::find("eyePosWorld");