From 3b385c44aec593afb3d30257c2ee74e1c5f46227 Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 14 May 2020 12:25:06 +0200 Subject: [PATCH] no f on glsl floats --- src/gl/gl2_shaders/default.vert | 2 +- src/gl/gl2_shaders/default_vs_gl2.inc | 2 +- src/gl/gl2_shaders/matfx_env.vert | 2 +- src/gl/gl2_shaders/matfx_gl2.inc | 2 +- src/gl/gl2_shaders/skin.vert | 2 +- src/gl/gl2_shaders/skin_gl2.inc | 2 +- src/gl/shaders/default.vert | 2 +- src/gl/shaders/default_vs_gl3.inc | 2 +- src/gl/shaders/matfx_env.vert | 2 +- src/gl/shaders/matfx_gl3.inc | 2 +- src/gl/shaders/skin.vert | 2 +- src/gl/shaders/skin_gl3.inc | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gl/gl2_shaders/default.vert b/src/gl/gl2_shaders/default.vert index 1abdc82..6b2c9d7 100644 --- a/src/gl/gl2_shaders/default.vert +++ b/src/gl/gl2_shaders/default.vert @@ -19,7 +19,7 @@ main(void) v_color = in_color; v_color.rgb += u_ambLight.rgb*surfAmbient; v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse; - v_color = clamp(v_color, 0.0f, 1.0); + v_color = clamp(v_color, 0.0, 1.0); v_color *= u_matColor; v_fog = DoFog(gl_Position.w); diff --git a/src/gl/gl2_shaders/default_vs_gl2.inc b/src/gl/gl2_shaders/default_vs_gl2.inc index d208f8d..7d2b77a 100644 --- a/src/gl/gl2_shaders/default_vs_gl2.inc +++ b/src/gl/gl2_shaders/default_vs_gl2.inc @@ -20,7 +20,7 @@ const char *default_vert_src = " v_color = in_color;\n" " v_color.rgb += u_ambLight.rgb*surfAmbient;\n" " v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse;\n" -" v_color = clamp(v_color, 0.0f, 1.0);\n" +" v_color = clamp(v_color, 0.0, 1.0);\n" " v_color *= u_matColor;\n" " v_fog = DoFog(gl_Position.w);\n" diff --git a/src/gl/gl2_shaders/matfx_env.vert b/src/gl/gl2_shaders/matfx_env.vert index 5cd14f3..7e8e45f 100644 --- a/src/gl/gl2_shaders/matfx_env.vert +++ b/src/gl/gl2_shaders/matfx_env.vert @@ -23,7 +23,7 @@ main(void) v_color = in_color; v_color.rgb += u_ambLight.rgb*surfAmbient; v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse; - v_color = clamp(v_color, 0.0f, 1.0); + v_color = clamp(v_color, 0.0, 1.0); v_color *= u_matColor; v_fog = DoFog(gl_Position.w); diff --git a/src/gl/gl2_shaders/matfx_gl2.inc b/src/gl/gl2_shaders/matfx_gl2.inc index 5e18644..9d037bd 100644 --- a/src/gl/gl2_shaders/matfx_gl2.inc +++ b/src/gl/gl2_shaders/matfx_gl2.inc @@ -24,7 +24,7 @@ const char *matfx_env_vert_src = " v_color = in_color;\n" " v_color.rgb += u_ambLight.rgb*surfAmbient;\n" " v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse;\n" -" v_color = clamp(v_color, 0.0f, 1.0);\n" +" v_color = clamp(v_color, 0.0, 1.0);\n" " v_color *= u_matColor;\n" " v_fog = DoFog(gl_Position.w);\n" diff --git a/src/gl/gl2_shaders/skin.vert b/src/gl/gl2_shaders/skin.vert index fddd6a9..e79db10 100644 --- a/src/gl/gl2_shaders/skin.vert +++ b/src/gl/gl2_shaders/skin.vert @@ -30,7 +30,7 @@ main(void) v_color = in_color; v_color.rgb += u_ambLight.rgb*surfAmbient; v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse; - v_color = clamp(v_color, 0.0f, 1.0); + v_color = clamp(v_color, 0.0, 1.0); v_color *= u_matColor; v_fog = DoFog(gl_Position.z); diff --git a/src/gl/gl2_shaders/skin_gl2.inc b/src/gl/gl2_shaders/skin_gl2.inc index 61036d6..7e52c4e 100644 --- a/src/gl/gl2_shaders/skin_gl2.inc +++ b/src/gl/gl2_shaders/skin_gl2.inc @@ -31,7 +31,7 @@ const char *skin_vert_src = " v_color = in_color;\n" " v_color.rgb += u_ambLight.rgb*surfAmbient;\n" " v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse;\n" -" v_color = clamp(v_color, 0.0f, 1.0);\n" +" v_color = clamp(v_color, 0.0, 1.0);\n" " v_color *= u_matColor;\n" " v_fog = DoFog(gl_Position.z);\n" diff --git a/src/gl/shaders/default.vert b/src/gl/shaders/default.vert index 66499a3..0fde135 100644 --- a/src/gl/shaders/default.vert +++ b/src/gl/shaders/default.vert @@ -19,7 +19,7 @@ main(void) v_color = in_color; v_color.rgb += u_ambLight.rgb*surfAmbient; v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse; - v_color = clamp(v_color, 0.0f, 1.0); + v_color = clamp(v_color, 0.0, 1.0); v_color *= u_matColor; v_fog = DoFog(gl_Position.w); diff --git a/src/gl/shaders/default_vs_gl3.inc b/src/gl/shaders/default_vs_gl3.inc index 6422cab..e95c5e8 100644 --- a/src/gl/shaders/default_vs_gl3.inc +++ b/src/gl/shaders/default_vs_gl3.inc @@ -20,7 +20,7 @@ const char *default_vert_src = " v_color = in_color;\n" " v_color.rgb += u_ambLight.rgb*surfAmbient;\n" " v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse;\n" -" v_color = clamp(v_color, 0.0f, 1.0);\n" +" v_color = clamp(v_color, 0.0, 1.0);\n" " v_color *= u_matColor;\n" " v_fog = DoFog(gl_Position.w);\n" diff --git a/src/gl/shaders/matfx_env.vert b/src/gl/shaders/matfx_env.vert index 73d4b44..c6de99a 100644 --- a/src/gl/shaders/matfx_env.vert +++ b/src/gl/shaders/matfx_env.vert @@ -23,7 +23,7 @@ main(void) v_color = in_color; v_color.rgb += u_ambLight.rgb*surfAmbient; v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse; - v_color = clamp(v_color, 0.0f, 1.0); + v_color = clamp(v_color, 0.0, 1.0); v_color *= u_matColor; v_fog = DoFog(gl_Position.w); diff --git a/src/gl/shaders/matfx_gl3.inc b/src/gl/shaders/matfx_gl3.inc index 7562b33..fd138c9 100644 --- a/src/gl/shaders/matfx_gl3.inc +++ b/src/gl/shaders/matfx_gl3.inc @@ -24,7 +24,7 @@ const char *matfx_env_vert_src = " v_color = in_color;\n" " v_color.rgb += u_ambLight.rgb*surfAmbient;\n" " v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse;\n" -" v_color = clamp(v_color, 0.0f, 1.0);\n" +" v_color = clamp(v_color, 0.0, 1.0);\n" " v_color *= u_matColor;\n" " v_fog = DoFog(gl_Position.w);\n" diff --git a/src/gl/shaders/skin.vert b/src/gl/shaders/skin.vert index 1933497..c4be0e3 100644 --- a/src/gl/shaders/skin.vert +++ b/src/gl/shaders/skin.vert @@ -30,7 +30,7 @@ main(void) v_color = in_color; v_color.rgb += u_ambLight.rgb*surfAmbient; v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse; - v_color = clamp(v_color, 0.0f, 1.0); + v_color = clamp(v_color, 0.0, 1.0); v_color *= u_matColor; v_fog = DoFog(gl_Position.z); diff --git a/src/gl/shaders/skin_gl3.inc b/src/gl/shaders/skin_gl3.inc index 980099b..fdcad55 100644 --- a/src/gl/shaders/skin_gl3.inc +++ b/src/gl/shaders/skin_gl3.inc @@ -31,7 +31,7 @@ const char *skin_vert_src = " v_color = in_color;\n" " v_color.rgb += u_ambLight.rgb*surfAmbient;\n" " v_color.rgb += DoDynamicLight(V.xyz, N)*surfDiffuse;\n" -" v_color = clamp(v_color, 0.0f, 1.0);\n" +" v_color = clamp(v_color, 0.0, 1.0);\n" " v_color *= u_matColor;\n" " v_fog = DoFog(gl_Position.z);\n"