Skip to content

RTSS: support emissive colour on unlit passes #3785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chex4ever wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −2
Open

RTSS: support emissive colour on unlit passes #3785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions Components/RTShaderSystem/src/OgreShaderFFPColour.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ const String SRS_VERTEX_COLOUR = "FFP_Colour";
FFPColour::FFPColour()
{
mResolveStageFlags = 0;
mUseEmissiveColour = false;
mSurfaceEmissiveColour = UniformParameterPtr();
mSurfaceEmissiveColourPS = UniformParameterPtr();
}

//-----------------------------------------------------------------------
Expand Down Expand Up @@ -83,6 +86,14 @@ bool FFPColour::resolveParameters(ProgramSet* programSet)
// Resolve PS output diffuse color.
mPSOutputDiffuse = psMain->resolveOutputParameter(Parameter::SPC_COLOR_DIFFUSE);

if (mUseEmissiveColour)
{
if (mVSOutputDiffuse)
mSurfaceEmissiveColour = vsProgram->resolveParameter(GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR);
if (!mPSInputDiffuse)
mSurfaceEmissiveColourPS = psProgram->resolveParameter(GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR);
}

return true;
}

Expand Down Expand Up @@ -117,7 +128,10 @@ bool FFPColour::addFunctionInvocations(ProgramSet* programSet)
else
{
vsDiffuse = vsMain->resolveLocalParameter(Parameter::SPC_COLOR_DIFFUSE);
vsStage.assign(Vector4(1.0), vsDiffuse);
if (mSurfaceEmissiveColour)
vsStage.assign(mSurfaceEmissiveColour, vsDiffuse);
else
vsStage.assign(Vector4(1.0), vsDiffuse);
}

if (mVSOutputDiffuse)
Expand Down Expand Up @@ -148,7 +162,10 @@ bool FFPColour::addFunctionInvocations(ProgramSet* programSet)
else
{
psDiffuse = psMain->resolveLocalParameter(Parameter::SPC_COLOR_DIFFUSE);
psStage.assign(Vector4(1.0), psDiffuse);
if (mSurfaceEmissiveColourPS)
psStage.assign(mSurfaceEmissiveColourPS, psDiffuse);
else
psStage.assign(Vector4(1.0), psDiffuse);
}

// Handle specular colour.
Expand Down Expand Up @@ -190,6 +207,8 @@ bool FFPColour::preAddToRenderState(const RenderState* renderState, Pass* srcPas
if (trackColour != 0)
addResolveStageMask(FFPColour::SF_VS_INPUT_DIFFUSE);

mUseEmissiveColour = !srcPass->getLightingEnabled() && srcPass->getEmissive() != ColourValue::Black;

return true;
}

Expand Down
6 changes: 6 additions & 0 deletions Components/RTShaderSystem/src/OgreShaderFFPColour.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@ class FFPColour : public SubRenderState
ParameterPtr mPSOutputDiffuse;
// Stage flags that defines resolve parameters definitions.
unsigned int mResolveStageFlags;
// Use emissive colour for unlit passes.
bool mUseEmissiveColour;
// Surface emissive colour uniform parameter (VS).
UniformParameterPtr mSurfaceEmissiveColour;
// Surface emissive colour uniform parameter (PS).
UniformParameterPtr mSurfaceEmissiveColourPS;
};


Expand Down
19 changes: 19 additions & 0 deletions Tests/Components/RTShaderSystemTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,22 @@ TEST_F(RTShaderSystem, FunctionInvocationOrder)
EXPECT_TRUE(c == a);
EXPECT_FALSE(c < a);
}

TEST_F(RTShaderSystem, UnlitEmissive)
{
auto& shaderGen = RTShader::ShaderGenerator::getSingleton();
auto mat = MaterialManager::getSingleton().create("UnlitEmissiveMat", RGN_DEFAULT);
auto pass = mat->getTechniques()[0]->getPasses()[0];
pass->setLightingEnabled(false);
pass->setEmissive(ColourValue(0.9f, 0.7f, 0.4f));

EXPECT_TRUE(shaderGen.createShaderBasedTechnique(mat->getTechniques()[0], "MyScheme"));
shaderGen.getRenderState("MyScheme")->setLightCountAutoUpdate(false);
shaderGen.validateMaterial("MyScheme", *mat);

auto newPass = mat->getTechniques()[1]->getPasses()[0];
auto fsSource = newPass->getFragmentProgram()->getSource();
EXPECT_NE(fsSource.find("surface_emissive_colour"), String::npos);

EXPECT_TRUE(shaderGen.removeShaderBasedTechnique(mat->getTechniques()[0], "MyScheme"));
}
Loading