a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 04:50:00 +00:00
Code Issues Projects Releases Wiki Activity

removed some f suffixes from shaders

Browse source
This commit is contained in:
aap 2021-02-15 15:08:11 +01:00
parent 826be7472f
commit 08f0f275af
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/extras/shaders/colourfilterLCS.frag
View file

@ -13,7 +13,7 @@ main(void)
vec4 color; vec4 color;
color.rgb = dst.rgb; color.rgb = dst.rgb;
color.a = 1.0f; color.a = 1.0;
FRAGCOLOR(color); FRAGCOLOR(color);
} }

2
src/extras/shaders/contrast.frag
View file

@ -12,7 +12,7 @@ main(void)
vec4 dst = texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y)); vec4 dst = texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));
vec4 color; vec4 color;
color.rgb = dst.rgb*u_contrastMult + u_contrastAdd; color.rgb = dst.rgb*u_contrastMult + u_contrastAdd;
color.a = 1.0f; color.a = 1.0;
FRAGCOLOR(color); FRAGCOLOR(color);
} }

2
src/extras/shaders/neoVehicle.vert
View file

@ -42,7 +42,7 @@ main(void)
v_tex1 = uv2.xy*0.5 + 0.5; v_tex1 = uv2.xy*0.5 + 0.5;
float b = 1.0 - clamp(dot(viewVec, Normal), 0.0, 1.0); float b = 1.0 - clamp(dot(viewVec, Normal), 0.0, 1.0);
v_reflcolor = vec4(0.0, 0.0, 0.0, 1.0); v_reflcolor = vec4(0.0, 0.0, 0.0, 1.0);
v_reflcolor.a = mix(b*b*b*b*b, 1.0f, fresnel)*shininess; v_reflcolor.a = mix(b*b*b*b*b, 1.0, fresnel)*shininess;
for(int i = 0; i < 5; i++) for(int i = 0; i < 5; i++)
v_reflcolor.rgb += DoDirLightSpec(u_specDir[i].xyz, u_specColor[i].rgb, Normal, viewVec, u_specDir[i].w)*specularity*lightStrength; v_reflcolor.rgb += DoDirLightSpec(u_specDir[i].xyz, u_specColor[i].rgb, Normal, viewVec, u_specDir[i].w)*specularity*lightStrength;

2
src/extras/shaders/neoVehicle_VS.hlsl
View file

@ -52,7 +52,7 @@ VS_out main(in VS_in input)
output.TexCoord1 = uv2.xy*0.5 + 0.5; output.TexCoord1 = uv2.xy*0.5 + 0.5;
float b = 1.0 - saturate(dot(viewVec, Normal)); float b = 1.0 - saturate(dot(viewVec, Normal));
output.ReflColor = float4(0.0, 0.0, 0.0, 1.0); output.ReflColor = float4(0.0, 0.0, 0.0, 1.0);
output.ReflColor.a = lerp(b*b*b*b*b, 1.0f, fresnel)*shininess; output.ReflColor.a = lerp(b*b*b*b*b, 1.0, fresnel)*shininess;
//Light mainLight = lights[0]; //Light mainLight = lights[0];
for(i = 0; i < 5; i++) for(i = 0; i < 5; i++)

2
src/extras/shaders/obj/colourfilterLCS_frag.inc
View file

@ -14,7 +14,7 @@ const char *colourfilterLCS_frag_src =
" vec4 color;\n" " vec4 color;\n"
" color.rgb = dst.rgb;\n" " color.rgb = dst.rgb;\n"
" color.a = 1.0f;\n" " color.a = 1.0;\n"
" FRAGCOLOR(color);\n" " FRAGCOLOR(color);\n"
"}\n" "}\n"

2
src/extras/shaders/obj/contrast_frag.inc
View file

@ -13,7 +13,7 @@ const char *contrast_frag_src =
" vec4 dst = texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));\n" " vec4 dst = texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));\n"
" vec4 color;\n" " vec4 color;\n"
" color.rgb = dst.rgb*u_contrastMult + u_contrastAdd;\n" " color.rgb = dst.rgb*u_contrastMult + u_contrastAdd;\n"
" color.a = 1.0f;\n" " color.a = 1.0;\n"
" FRAGCOLOR(color);\n" " FRAGCOLOR(color);\n"
"}\n" "}\n"

2
src/extras/shaders/obj/neoVehicle_vert.inc
View file

@ -43,7 +43,7 @@ const char *neoVehicle_vert_src =
" v_tex1 = uv2.xy*0.5 + 0.5;\n" " v_tex1 = uv2.xy*0.5 + 0.5;\n"
" float b = 1.0 - clamp(dot(viewVec, Normal), 0.0, 1.0);\n" " float b = 1.0 - clamp(dot(viewVec, Normal), 0.0, 1.0);\n"
" v_reflcolor = vec4(0.0, 0.0, 0.0, 1.0);\n" " v_reflcolor = vec4(0.0, 0.0, 0.0, 1.0);\n"
" v_reflcolor.a = mix(b*b*b*b*b, 1.0f, fresnel)*shininess;\n" " v_reflcolor.a = mix(b*b*b*b*b, 1.0, fresnel)*shininess;\n"
" for(int i = 0; i < 5; i++)\n" " for(int i = 0; i < 5; i++)\n"
" v_reflcolor.rgb += DoDirLightSpec(u_specDir[i].xyz, u_specColor[i].rgb, Normal, viewVec, u_specDir[i].w)*specularity*lightStrength;\n" " v_reflcolor.rgb += DoDirLightSpec(u_specDir[i].xyz, u_specColor[i].rgb, Normal, viewVec, u_specDir[i].w)*specularity*lightStrength;\n"