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

Handle vertex color in render info for COGLES2FixedPipelineRenderer

Browse Source
This commit is contained in:
Benau 2022-10-19 09:29:06 +08:00
parent 58a00f7627
commit 0e142e645c
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/shaders/irrlicht/COGLES2FixedPipeline.fsh
View File

@ -20,6 +20,7 @@ precision mediump float;
uniform int uMaterialType; uniform int uMaterialType;
uniform float uHueChange; uniform float uHueChange;
uniform vec4 uVertexColor;
uniform bool uTextureUsage0; uniform bool uTextureUsage0;
//uniform bool uTextureUsage1; //uniform bool uTextureUsage1;
@ -69,12 +70,13 @@ vec4 renderSolid()
max(old_hsv.y, saturation)), vec2(mask_step, mask_step)); max(old_hsv.y, saturation)), vec2(mask_step, mask_step));
Color.rgb = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z)); Color.rgb = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
} }
Color.rgb *= varVertexColor.rgb; vec3 mixed_color = varVertexColor.rgb * uVertexColor.rgb;
Color.rgb *= mixed_color;
Color.a = 1.0; Color.a = 1.0;
} }
else else
{ {
Color = varVertexColor; Color = varVertexColor * uVertexColor;
Color.a = 1.0; Color.a = 1.0;
} }
return Color; return Color;
@ -161,7 +163,8 @@ vec4 renderTransparentVertexColor()
vec3 new_color = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z)); vec3 new_color = hsvToRgb(vec3(new_xy.x, new_xy.y, old_hsv.z));
Color.rgb = vec3(new_color.r, new_color.g, new_color.b); Color.rgb = vec3(new_color.r, new_color.g, new_color.b);
} }
Color *= varVertexColor; vec4 mixed_color = varVertexColor * uVertexColor;
Color *= mixed_color;
} }
return Color; return Color;
@ -206,7 +209,7 @@ void main ()
vec4 Color = renderTransparent(); vec4 Color = renderTransparent();
Color.a = varVertexColor.a; Color.a = varVertexColor.a;
gl_FragColor = Color; gl_FragColor = Color * uVertexColor;
} }
else if(uMaterialType == TransparentReflection2Layer) else if(uMaterialType == TransparentReflection2Layer)
{ {

5
lib/irrlicht/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp
View File

@ -141,10 +141,15 @@ bool COGLES2FixedPipelineRenderer::OnRender(IMaterialRendererServices* service,
break; break;
} }
video::SColorf vertex_color(SColor(-1));
float hue_change = 0.0f; float hue_change = 0.0f;
if (Driver->getCurrentMaterial().getRenderInfo()) if (Driver->getCurrentMaterial().getRenderInfo())
{
hue_change = Driver->getCurrentMaterial().getRenderInfo()->getHue(); hue_change = Driver->getCurrentMaterial().getRenderInfo()->getHue();
vertex_color = video::SColorf(Driver->getCurrentMaterial().getRenderInfo()->getVertexColor());
}
IMaterialRendererServices::setPixelShaderConstant("uHueChange", &hue_change, 1); IMaterialRendererServices::setPixelShaderConstant("uHueChange", &hue_change, 1);
IMaterialRendererServices::setPixelShaderConstant("uVertexColor", &vertex_color.r, 4);
IMaterialRendererServices::setPixelShaderConstant("uMaterialType", &materialType, 1); IMaterialRendererServices::setPixelShaderConstant("uMaterialType", &materialType, 1);