Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-12-01 18:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed shading doesn't effect the alpha channel

Browse source
This commit is contained in:
Ian Curtis 2017-08-14 16:10:26 +00:00
parent c12e4c3215
commit 81188bee07
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Src/Graphics/New3D/R3DShader.cpp
View file

@ -22,7 +22,7 @@ attribute vec3 inVertex;
attribute vec3 inNormal; attribute vec3 inNormal;
attribute vec2 inTexCoord; attribute vec2 inTexCoord;
attribute vec4 inColour; attribute vec4 inColour;
attribute vec4 inFixedShade; attribute vec3 inFixedShade;
// outputs to fragment shader // outputs to fragment shader
varying float fsFogFactor; varying float fsFogFactor;
@ -38,14 +38,14 @@ vec4 GetVertexColour()
if(fixedShading) { if(fixedShading) {
if(hardwareStep==0x15) { if(hardwareStep==0x15) {
if(!lightEnabled) { if(!lightEnabled) {
polyColour += inFixedShade; // + vp ambient?? polyColour.rgb += inFixedShade; // + vp ambient??
} }
else { else {
polyColour *= (inFixedShade + lighting[1].y); // fixed shade value + viewport ambient polyColour.rgb *= (inFixedShade + lighting[1].y); // fixed shade value + viewport ambient
} }
} }
else { else {
polyColour *= inFixedShade; //todo work out what ambient does. Probably a min clamp or 1-min clamp for signed values polyColour.rgb *= inFixedShade; //todo work out what ambient does. Probably a min clamp or 1-min clamp for signed values
} }
} }