MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix noise-based dithering.

Browse Source
This commit is contained in:
Sergey Lipskiy 2013-04-27 21:57:48 +07:00
parent 3dc3aca3f2
commit a6114994ad
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
GLSLCombiner.cpp
View File

@ -333,7 +333,7 @@ GLSLCombiner::GLSLCombiner(Combiner *_color, Combiner *_alpha) {
strcpy(fragment_shader, fragment_shader_header);
#if 1
strcat(fragment_shader, " if (dither_enabled > 0) \n");
strcat(fragment_shader, " if (snoise(noiseCoord2D) < 0.5) discard; \n");
strcat(fragment_shader, " if (snoise(noiseCoord2D) < 0.0) discard; \n");
strcat(fragment_shader, fragment_shader_readtex0color);
strcat(fragment_shader, fragment_shader_readtex1color);
strcat(fragment_shader, " float intensity = calc_light(); \n");
@ -386,8 +386,6 @@ GLSLCombiner::GLSLCombiner(Combiner *_color, Combiner *_alpha) {
glLinkProgramARB(m_programObject);
}
unsigned char btNoiseTime = 0;
void GLSLCombiner::Set() {
combiner.usesT0 = FALSE;
combiner.usesT1 = FALSE;
@ -448,16 +446,15 @@ void GLSLCombiner::UpdateColors() {
int prim_lod_location = glGetUniformLocationARB(m_programObject, "prim_lod");
glUniform1fARB(prim_lod_location, gDP.primColor.l);
if ((m_nInputs & (1<<NOISE)) > 0) {
int time_location = glGetUniformLocationARB(m_programObject, "time");
glUniform1fARB(time_location, ++btNoiseTime);
}
int nDither = 0;
// int nDither = (gDP.otherMode.colorDither) == 3 ? 1 : 0;
int nDither = gDP.otherMode.colorDither == 2 || gDP.otherMode.alphaDither == 2 || gDP.otherMode.alphaCompare == 3 ? 1 : 0;
int dither_location = glGetUniformLocationARB(m_programObject, "dither_enabled");
glUniform1iARB(dither_location, nDither);
if ((m_nInputs & (1<<NOISE)) + nDither > 0) {
int time_location = glGetUniformLocationARB(m_programObject, "time");
glUniform1fARB(time_location, (float)(rand()&255));
}
int fog_location = glGetUniformLocationARB(m_programObject, "fog_enabled");
glUniform1iARB(fog_location, (gSP.geometryMode & G_FOG) > 0 ? 1 : 0);
}