Skip to content

Commit

Permalink
#5565: Implement the RGBA vertex colour export. Some refactoring in t…
Browse files Browse the repository at this point in the history 
…he unit test department.
  • Loading branch information
@codereader
codereader committed Mar 26, 2021
1 parent 9c2f612 commit 58a32a9
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 24 deletions.
71 changes: 71 additions & 0 deletions radiantcore/shaders/MaterialSourceGenerator.cpp
View file
Expand Up @@ -178,6 +178,77 @@ std::ostream& operator<<(std::ostream& stream, Doom3ShaderLayer& layer)
stream << "\t\tmaskDepth\n";
}

// Vertex colours
if (layer.getVertexColourMode() == IShaderLayer::VERTEX_COLOUR_MULTIPLY)
{
stream << "\t\tvertexColor\n";
}
else if (layer.getVertexColourMode() == IShaderLayer::VERTEX_COLOUR_INVERSE_MULTIPLY)
{
stream << "\t\tinverseVertexColor\n";
}

auto redExpr = layer.getColourExpression(IShaderLayer::COMP_RED);
auto greenExpr = layer.getColourExpression(IShaderLayer::COMP_GREEN);
auto blueExpr = layer.getColourExpression(IShaderLayer::COMP_BLUE);
auto alphaExpr = layer.getColourExpression(IShaderLayer::COMP_ALPHA);

if (layer.getColourExpression(IShaderLayer::COMP_RGBA))
{
// All RGBA components are equivalent
stream << "\t\trgba " << layer.getColourExpression(IShaderLayer::COMP_RGBA)->getExpressionString() << "\n";
}
else if (redExpr && greenExpr && blueExpr && alphaExpr)
{
// All 4 expressions in use, check for the colored special case
if (redExpr->getExpressionString() == "parm0" &&
greenExpr->getExpressionString() == "parm1" &&
blueExpr->getExpressionString() == "parm2" &&
alphaExpr->getExpressionString() == "parm3")
{
stream << "\t\tcolored\n";
}
// No colored, but RGB+Alpha is still possible
else if (layer.getColourExpression(IShaderLayer::COMP_RGB))
{
stream << "\t\trgb " << layer.getColourExpression(IShaderLayer::COMP_RGB)->getExpressionString() << "\n";
stream << "\t\talpha " << alphaExpr->getExpressionString() << "\n";
}
else // make use of the color shortcut to define all 4 in one line
{
stream << "\t\tcolor " << redExpr->getExpressionString() << ", "
<< greenExpr->getExpressionString() << ", "
<< blueExpr->getExpressionString() << ", "
<< alphaExpr->getExpressionString() << "\n";
}
}
else if (layer.getColourExpression(IShaderLayer::COMP_RGB))
{
stream << "\t\trgb " << layer.getColourExpression(IShaderLayer::COMP_RGB)->getExpressionString() << "\n";
}
else // No shortcuts possible, just write out any non-empty expressions
{
if (redExpr)
{
stream << "\t\tred " << redExpr->getExpressionString() << "\n";
}

if (greenExpr)
{
stream << "\t\tgreen " << greenExpr->getExpressionString() << "\n";
}

if (blueExpr)
{
stream << "\t\tblue " << blueExpr->getExpressionString() << "\n";
}

if (alphaExpr)
{
stream << "\t\talpha " << alphaExpr->getExpressionString() << "\n";
}
}

stream << "\t}\n";

return stream;
Expand Down
54 changes: 30 additions & 24 deletions test/MaterialExport.cpp
View file
Expand Up @@ -121,9 +121,7 @@ TEST_F(MaterialExportTest, ClampType)
expectDefinitionContains(material, "alphazeroclamp");

material->setClampType(CLAMP_REPEAT); // this is the default => no keyword necessary
expectDefinitionDoesNotContain(material, "clamp");
expectDefinitionDoesNotContain(material, "zeroclamp");
expectDefinitionDoesNotContain(material, "alphazeroclamp");
expectDefinitionDoesNotContainAnyOf(material, { "clamp", "zeroclamp", "alphazeroclamp" });
}

TEST_F(MaterialExportTest, CullType)
Expand All @@ -139,8 +137,7 @@ TEST_F(MaterialExportTest, CullType)
expectDefinitionContains(material, "twosided");

material->setCullType(Material::CULL_BACK); // This is the default
expectDefinitionDoesNotContain(material, "twosided");
expectDefinitionDoesNotContain(material, "backsided");
expectDefinitionDoesNotContainAnyOf(material, { "twosided", "backsided" });
}

TEST_F(MaterialExportTest, GuiSurf)
Expand Down Expand Up @@ -543,16 +540,14 @@ TEST_F(MaterialExportTest, TextureFilter)
expectDefinitionDoesNotContain(material, "linear");

layer->clearStageFlag(IShaderLayer::FLAG_FILTER_NEAREST);
expectDefinitionDoesNotContain(material, "nearest");
expectDefinitionDoesNotContain(material, "linear");
expectDefinitionDoesNotContainAnyOf(material, { "nearest", "linear" });

layer->setStageFlag(IShaderLayer::FLAG_FILTER_LINEAR);
expectDefinitionContains(material, "linear");
expectDefinitionDoesNotContain(material, "nearest");

layer->clearStageFlag(IShaderLayer::FLAG_FILTER_LINEAR);
expectDefinitionDoesNotContain(material, "nearest");
expectDefinitionDoesNotContain(material, "linear");
expectDefinitionDoesNotContainAnyOf(material, { "nearest", "linear" });
}

TEST_F(MaterialExportTest, TextureQuality)
Expand Down Expand Up @@ -687,19 +682,15 @@ TEST_F(MaterialExportTest, StageFlags)
layer->setStageFlag(IShaderLayer::FLAG_MASK_GREEN);
layer->setStageFlag(IShaderLayer::FLAG_MASK_BLUE);
expectDefinitionContains(material, "maskColor");
expectDefinitionDoesNotContain(material, "maskRed");
expectDefinitionDoesNotContain(material, "maskGreen");
expectDefinitionDoesNotContain(material, "maskBlue");
expectDefinitionDoesNotContainAnyOf(material, { "maskRed", "maskGreen", "maskBlue" });

layer->setStageFlag(IShaderLayer::FLAG_MASK_RED);
layer->setStageFlag(IShaderLayer::FLAG_MASK_GREEN);
layer->setStageFlag(IShaderLayer::FLAG_MASK_BLUE);
layer->setStageFlag(IShaderLayer::FLAG_MASK_ALPHA);
layer->setStageFlag(IShaderLayer::FLAG_MASK_DEPTH);
expectDefinitionContains(material, "maskColor");
expectDefinitionDoesNotContain(material, "maskRed");
expectDefinitionDoesNotContain(material, "maskGreen");
expectDefinitionDoesNotContain(material, "maskBlue");
expectDefinitionDoesNotContainAnyOf(material, { "maskRed", "maskGreen", "maskBlue" });
expectDefinitionContains(material, "maskAlpha");
expectDefinitionContains(material, "maskDepth");
}
Expand All @@ -713,28 +704,28 @@ TEST_F(MaterialExportTest, StageVertexColours)
auto layer = material->getEditableLayer(material->addLayer(IShaderLayer::BLEND));
layer->setColourExpressionFromString(IShaderLayer::COMP_RED, "time * 0.1");
expectDefinitionContains(material, "red time * 0.1");
expectDefinitionDoesNotContainAnyOf(material, { "blue", "green", "alpha", "colored", "color", "rgb", "rgba" });
expectDefinitionDoesNotContainAnyOf(material, { "blue", "green", "alpha", "colored", "color", "rgb ", "rgba" });

material->revertModifications();

layer = material->getEditableLayer(material->addLayer(IShaderLayer::BLEND));
layer->setColourExpressionFromString(IShaderLayer::COMP_BLUE, "time * 0.1");
expectDefinitionContains(material, "blue time * 0.1");
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "alpha", "colored", "color", "rgb", "rgba" });
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "alpha", "colored", "color", "rgb ", "rgba" });

material->revertModifications();

layer = material->getEditableLayer(material->addLayer(IShaderLayer::BLEND));
layer->setColourExpressionFromString(IShaderLayer::COMP_GREEN, "time * 0.1");
expectDefinitionContains(material, "green time * 0.1");
expectDefinitionDoesNotContainAnyOf(material, { "red", "blue", "alpha", "colored", "color", "rgb", "rgba" });
expectDefinitionDoesNotContainAnyOf(material, { "red", "blue", "alpha", "colored", "color", "rgb ", "rgba" });

material->revertModifications();

layer = material->getEditableLayer(material->addLayer(IShaderLayer::BLEND));
layer->setColourExpressionFromString(IShaderLayer::COMP_ALPHA, "time * 0.1");
expectDefinitionContains(material, "alpha time * 0.1");
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "blue", "colored", "color", "rgb", "rgba" });
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "blue", "colored", "color", "rgb ", "rgba" });

material->revertModifications();

Expand All @@ -743,7 +734,7 @@ TEST_F(MaterialExportTest, StageVertexColours)
layer->setColourExpressionFromString(IShaderLayer::COMP_GREEN, "time * 7");
expectDefinitionContains(material, "red time * 0.1");
expectDefinitionContains(material, "green time * 7.0");
expectDefinitionDoesNotContainAnyOf(material, { "blue", "alpha", "colored", "color", "rgb", "rgba" });
expectDefinitionDoesNotContainAnyOf(material, { "blue", "alpha", "colored", "color", "rgb ", "rgba" });

material->revertModifications();

Expand All @@ -764,7 +755,8 @@ TEST_F(MaterialExportTest, StageVertexColours)
layer->setColourExpressionFromString(IShaderLayer::COMP_BLUE, "time * 0.1");
layer->setColourExpressionFromString(IShaderLayer::COMP_ALPHA, "time * 0.1");
expectDefinitionContains(material, "rgba time * 0.1");
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "blue", "alpha", "colored", "color", "rgb" });
// Note: we use a space after "rgb " because a valid RGBA keyword also contains "RGB"
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "blue", "alpha", "colored", "color", "rgb " });

material->revertModifications();

Expand All @@ -775,7 +767,8 @@ TEST_F(MaterialExportTest, StageVertexColours)
layer->setColourExpressionFromString(IShaderLayer::COMP_BLUE, "parm2");
layer->setColourExpressionFromString(IShaderLayer::COMP_ALPHA, "parm3");
expectDefinitionContains(material, "colored");
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "blue", "alpha", "color", "rgb", "rgba" });
// Note: we use a space after "red " because the colored keyword also contains "red", some for "color "
expectDefinitionDoesNotContainAnyOf(material, { "red ", "green", "blue", "alpha", "color ", "rgb ", "rgba" });

material->revertModifications();

Expand All @@ -785,8 +778,21 @@ TEST_F(MaterialExportTest, StageVertexColours)
layer->setColourExpressionFromString(IShaderLayer::COMP_GREEN, "2");
layer->setColourExpressionFromString(IShaderLayer::COMP_BLUE, "parm2");
layer->setColourExpressionFromString(IShaderLayer::COMP_ALPHA, "parm3");
expectDefinitionContains(material, "color time * 0.1, 2, parm2, parm3");
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "blue", "alpha", "colored", "rgb", "rgba" });
expectDefinitionContains(material, "color time * 0.1, 2.0, parm2, parm3");
expectDefinitionDoesNotContainAnyOf(material, { "red", "green", "blue", "alpha", "colored", "rgb ", "rgba" });

material->revertModifications();

// Make use of color shortcut
layer = material->getEditableLayer(material->addLayer(IShaderLayer::BLEND));
layer->setVertexColourMode(IShaderLayer::VERTEX_COLOUR_MULTIPLY);
expectDefinitionContains(material, { "vertexColor" });

layer->setVertexColourMode(IShaderLayer::VERTEX_COLOUR_INVERSE_MULTIPLY);
expectDefinitionContains(material, { "inverseVertexColor" });

layer->setVertexColourMode(IShaderLayer::VERTEX_COLOUR_NONE);
expectDefinitionDoesNotContainAnyOf(material, { "vertexColor", "inverseVertexColor" });
}

}

0 comments on commit 58a32a9

Please sign in to comment.