ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compositing=coverage was not used and blend was replaced by shader

Browse Source
This commit is contained in:
jean 2021-02-07 19:20:19 +01:00
parent 60d3e6cc1c
commit 91980a2fdd
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/gui/icons/materials.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<materials>
<material name="speedback.png" compositing="test" clampU="Y" clampV="Y" light="N" ignore="Y"/>
<material name="speedfore.png" compositing="test" clampU="Y" clampV="Y" light="N" ignore="Y"/>
<material name="notes.png" compositing="test" light="N" ignore="Y"/>
<material name="soccer_player_red.png" shader="alphablend" ignore="Y"/>
<material name="soccer_player_blue.png" shader="alphablend" ignore="Y"/>
<material name="speedback.png" shader="alphatest" clampU="Y" clampV="Y" ignore="Y"/>
<material name="speedfore.png" shader="alphatest" clampU="Y" clampV="Y" ignore="Y"/>
<material name="notes.png" shader="alphatest" ignore="Y"/>
<material name="soccer_player_red.png" shader="alphablend" ignore="Y"/>
<material name="soccer_player_blue.png" shader="alphablend" ignore="Y"/>
</materials>

10
src/graphics/material.cpp
View File

@ -218,11 +218,7 @@ Material::Material(const XMLNode *node, bool deprecated)
}
if (node->get("compositing", &s))
{
if (s == "blend")
{
m_shader_name = "alphablend";
}
else if (s == "test")
if (s == "test")
{
m_shader_name = "alphatest";
}
@ -230,10 +226,6 @@ Material::Material(const XMLNode *node, bool deprecated)
{
m_shader_name = "additive";
}
else if (s == "coverage")
{
m_shader_name = "alphatest";
}
else if (s != "none")
Log::warn("material", "Unknown compositing mode '%s'", s.c_str());
}