diff options
| author | aap <aap@papnet.eu> | 2021-02-15 14:55:31 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-02-15 15:06:45 +0100 |
| commit | edc77d7f00f021e78b041cbd7c4ca3a8827e1ab4 (patch) | |
| tree | d30023d4cce3c27d79b22d463f1f9defc28319cd /src/extras/shaders/obj | |
| parent | Revert "always console for windows Debug builds" (diff) | |
| download | re3-edc77d7f00f021e78b041cbd7c4ca3a8827e1ab4.tar re3-edc77d7f00f021e78b041cbd7c4ca3a8827e1ab4.tar.gz re3-edc77d7f00f021e78b041cbd7c4ca3a8827e1ab4.tar.bz2 re3-edc77d7f00f021e78b041cbd7c4ca3a8827e1ab4.tar.lz re3-edc77d7f00f021e78b041cbd7c4ca3a8827e1ab4.tar.xz re3-edc77d7f00f021e78b041cbd7c4ca3a8827e1ab4.tar.zst re3-edc77d7f00f021e78b041cbd7c4ca3a8827e1ab4.zip | |
Diffstat (limited to 'src/extras/shaders/obj')
| -rw-r--r-- | src/extras/shaders/obj/colourfilterIII_frag.inc | 2 | ||||
| -rw-r--r-- | src/extras/shaders/obj/contrast_frag.inc | 2 | ||||
| -rw-r--r-- | src/extras/shaders/obj/neoVehicle_vert.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/extras/shaders/obj/colourfilterIII_frag.inc b/src/extras/shaders/obj/colourfilterIII_frag.inc index 6fd1935b..05f92785 100644 --- a/src/extras/shaders/obj/colourfilterIII_frag.inc +++ b/src/extras/shaders/obj/colourfilterIII_frag.inc @@ -18,7 +18,7 @@ const char *colourfilterIII_frag_src = " }\n" " vec4 color;\n" " color.rgb = prev.rgb;\n" -" color.a = 1.0f;\n" +" color.a = 1.0;\n" " FRAGCOLOR(color);\n" "}\n" diff --git a/src/extras/shaders/obj/contrast_frag.inc b/src/extras/shaders/obj/contrast_frag.inc index 97f78194..a1ad479f 100644 --- a/src/extras/shaders/obj/contrast_frag.inc +++ b/src/extras/shaders/obj/contrast_frag.inc @@ -13,7 +13,7 @@ const char *contrast_frag_src = " vec4 dst = texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y));\n" " vec4 color;\n" " color.rgb = dst.rgb*u_contrastMult + u_contrastAdd;\n" -" color.a = 1.0f;\n" +" color.a = 1.0;\n" " FRAGCOLOR(color);\n" "}\n" diff --git a/src/extras/shaders/obj/neoVehicle_vert.inc b/src/extras/shaders/obj/neoVehicle_vert.inc index b7b42622..ebd0ea12 100644 --- a/src/extras/shaders/obj/neoVehicle_vert.inc +++ b/src/extras/shaders/obj/neoVehicle_vert.inc @@ -43,7 +43,7 @@ const char *neoVehicle_vert_src = " v_tex1 = uv2.xy*0.5 + 0.5;\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.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" " v_reflcolor.rgb += DoDirLightSpec(u_specDir[i].xyz, u_specColor[i].rgb, Normal, viewVec, u_specDir[i].w)*specularity*lightStrength;\n" |