thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make OpenGL lightmap overexposure simpler

Browse source
This commit is contained in:
MysterD 2023-06-10 15:33:59 -07:00
parent 6207f3ea01
commit 91b6514d8a
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/pc/gfx/gfx_opengl.c
View file

@ -378,31 +378,28 @@ static struct ShaderProgram *gfx_opengl_create_and_load_new_shader(struct ColorC
if (ccf.used_textures[1]) { if (ccf.used_textures[1]) {
if (cc->cm.light_map) { if (cc->cm.light_map) {
append_line(fs_buf, &fs_len, "vec4 texVal1 = sampleTex(uTex1, vLightMap, uTex1Size, uTex1Filter);"); append_line(fs_buf, &fs_len, "vec4 texVal1 = sampleTex(uTex1, vLightMap, uTex1Size, uTex1Filter);");
append_line(fs_buf, &fs_len, "texVal1.rgb = texVal1.rgb * texVal1.rgb + texVal1.rgb;");
} else { } else {
append_line(fs_buf, &fs_len, "vec4 texVal1 = sampleTex(uTex1, vTexCoord, uTex1Size, uTex1Filter);"); append_line(fs_buf, &fs_len, "vec4 texVal1 = sampleTex(uTex1, vTexCoord, uTex1Size, uTex1Filter);");
} }
} }
if (opt_light_map) { append_str(fs_buf, &fs_len, (opt_alpha) ? "vec4 texel = " : "vec3 texel = ");
append_str(fs_buf, &fs_len, "vec3 texel = texVal0.rgb * (texVal1.rgb * texVal1.rgb + texVal1.rgb);\n"); for (int i = 0; i < (opt_2cycle + 1); i++) {
} else { u8* cmd = &cc->shader_commands[i * 8];
append_str(fs_buf, &fs_len, (opt_alpha) ? "vec4 texel = " : "vec3 texel = "); if (!ccf.color_alpha_same[i] && opt_alpha) {
for (int i = 0; i < (opt_2cycle + 1); i++) { append_str(fs_buf, &fs_len, "vec4(");
u8* cmd = &cc->shader_commands[i * 8]; append_formula(fs_buf, &fs_len, cmd, ccf.do_single[i*2+0], ccf.do_multiply[i*2+0], ccf.do_mix[i*2+0], false, false, true);
if (!ccf.color_alpha_same[i] && opt_alpha) { append_str(fs_buf, &fs_len, ", ");
append_str(fs_buf, &fs_len, "vec4("); append_formula(fs_buf, &fs_len, cmd, ccf.do_single[i*2+1], ccf.do_multiply[i*2+1], ccf.do_mix[i*2+1], true, true, true);
append_formula(fs_buf, &fs_len, cmd, ccf.do_single[i*2+0], ccf.do_multiply[i*2+0], ccf.do_mix[i*2+0], false, false, true); append_str(fs_buf, &fs_len, ")");
append_str(fs_buf, &fs_len, ", "); } else {
append_formula(fs_buf, &fs_len, cmd, ccf.do_single[i*2+1], ccf.do_multiply[i*2+1], ccf.do_mix[i*2+1], true, true, true); append_formula(fs_buf, &fs_len, cmd, ccf.do_single[i*2+0], ccf.do_multiply[i*2+0], ccf.do_mix[i*2+0], opt_alpha, false, opt_alpha);
append_str(fs_buf, &fs_len, ")"); }
} else { append_line(fs_buf, &fs_len, ";");
append_formula(fs_buf, &fs_len, cmd, ccf.do_single[i*2+0], ccf.do_multiply[i*2+0], ccf.do_mix[i*2+0], opt_alpha, false, opt_alpha);
}
append_line(fs_buf, &fs_len, ";");
if (i == 0 && opt_2cycle) { if (i == 0 && opt_2cycle) {
append_str(fs_buf, &fs_len, "texel = "); append_str(fs_buf, &fs_len, "texel = ");
}
} }
} }