Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-04-10 19:15:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update step 1.5 luminous logic with Harry's findings. Fixes various shading issues.

Browse source
This commit is contained in:
Ian Curtis 2017-11-05 13:25:33 +00:00
parent 8e13c3bbb9
commit df44ad458b
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,13 +124,19 @@ vec4 GetTextureValue()
return tex1Data; return tex1Data;
} }
void Step15Lighting(inout vec4 colour) void Step15Luminous(inout vec4 colour)
{ {
// on step 1.5 these polys seem to be effected by vpAmbient // luminous polys seem to behave very differently on step 1.5 hardware
// logic is not completely understood // when fixed shading is enabled the colour is modulated by the vp ambient + fixed shade value
// when disabled it appears to be multiplied by 1.5, presumably to allow a higher range
if(hardwareStep==0x15) { if(hardwareStep==0x15) {
if(!lightEnabled && fixedShading) { if(!lightEnabled && textureEnabled) {
colour.rgb *= (fsFixedShade+lighting[1].x) + lighting[1].y; if(fixedShading) {
colour.rgb *= 1.0 + fsFixedShade + lighting[1].y;
}
else {
colour.rgb *= vec3(1.5);
}
} }
} }
} }
@ -154,7 +160,7 @@ void main()
} }
colData = fsColor; colData = fsColor;
Step15Lighting(colData); // no-op for step 2.0 Step15Luminous(colData); // no-op for step 2.0+
finalData = tex1Data * colData; finalData = tex1Data * colData;
if (finalData.a < (1.0/16.0)) { // basically chuck out any totally transparent pixels value = 1/16 the smallest transparency level h/w supports if (finalData.a < (1.0/16.0)) { // basically chuck out any totally transparent pixels value = 1/16 the smallest transparency level h/w supports