From 928dd92276345b95e54fc057092347987563355f Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 14 Jan 2012 20:51:43 +0900 Subject: [PATCH] Use 0.0 instead of 0.5 for t for palette lookups. I realized it's pretty silly using colormap + palette when I can just combine the two into one and have a 2D palette. This is in preparation for that. --- libs/video/renderer/glsl/quake2d.frag | 2 +- libs/video/renderer/glsl/quakebsp.frag | 2 +- libs/video/renderer/glsl/quakemdl.frag | 2 +- libs/video/renderer/glsl/quakepnt.frag | 2 +- libs/video/renderer/glsl/quakeski.frag | 2 +- libs/video/renderer/glsl/quakespr.frag | 4 ++-- libs/video/renderer/glsl/quaketrb.frag | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/video/renderer/glsl/quake2d.frag b/libs/video/renderer/glsl/quake2d.frag index 4720e1989..730b48e22 100644 --- a/libs/video/renderer/glsl/quake2d.frag +++ b/libs/video/renderer/glsl/quake2d.frag @@ -12,5 +12,5 @@ main (void) pix = texture2D (texture, st).r; if (pix == 1.0) discard; - gl_FragColor = texture2D (palette, vec2 (pix, 0.5)) * color; + gl_FragColor = texture2D (palette, vec2 (pix, 0.0)) * color; } diff --git a/libs/video/renderer/glsl/quakebsp.frag b/libs/video/renderer/glsl/quakebsp.frag index 896b050bd..f48761cdc 100644 --- a/libs/video/renderer/glsl/quakebsp.frag +++ b/libs/video/renderer/glsl/quakebsp.frag @@ -14,5 +14,5 @@ main (void) float col; col = texture2D (colormap, vec2 (pix, light * 4.0)).r; - gl_FragColor = texture2D (palette, vec2 (col, 0.5)); + gl_FragColor = texture2D (palette, vec2 (col, 0.0)); } diff --git a/libs/video/renderer/glsl/quakemdl.frag b/libs/video/renderer/glsl/quakemdl.frag index fb4f01fae..cf7014e9b 100644 --- a/libs/video/renderer/glsl/quakemdl.frag +++ b/libs/video/renderer/glsl/quakemdl.frag @@ -21,5 +21,5 @@ main (void) light = 255.0 - light; light += d * shadelight; col = texture2D (colormap, vec2 (pix, light / 255.0)).r; - gl_FragColor = texture2D (palette, vec2 (col, 0.5)); + gl_FragColor = texture2D (palette, vec2 (col, 0.0)); } diff --git a/libs/video/renderer/glsl/quakepnt.frag b/libs/video/renderer/glsl/quakepnt.frag index 3d17156dd..145e70fd1 100644 --- a/libs/video/renderer/glsl/quakepnt.frag +++ b/libs/video/renderer/glsl/quakepnt.frag @@ -6,5 +6,5 @@ main (void) { if (color == 1.0) discard; - gl_FragColor = texture2D (palette, vec2 (pix, 0.5)); + gl_FragColor = texture2D (palette, vec2 (pix, 0.0)); } diff --git a/libs/video/renderer/glsl/quakeski.frag b/libs/video/renderer/glsl/quakeski.frag index a2ce4be11..7c83f6d75 100644 --- a/libs/video/renderer/glsl/quakeski.frag +++ b/libs/video/renderer/glsl/quakeski.frag @@ -26,5 +26,5 @@ main (void) st = direction.xy * len + flow * realtime / 16.0; pix = texture2D (solid, st).r; } - gl_FragColor = texture2D (palette, vec2 (pix, 0.5)); + gl_FragColor = texture2D (palette, vec2 (pix, 0.0)); } diff --git a/libs/video/renderer/glsl/quakespr.frag b/libs/video/renderer/glsl/quakespr.frag index 09e51cbcd..0b4fa9ab7 100644 --- a/libs/video/renderer/glsl/quakespr.frag +++ b/libs/video/renderer/glsl/quakespr.frag @@ -16,8 +16,8 @@ main (void) pixb = texture2D (spriteb, stb).r; if (pixa == 1.0 && pixb == 1.0) discard; - cola = texture2D (palette, vec2 (pixa, 0.5)) * colora; - colb = texture2D (palette, vec2 (pixb, 0.5)) * colorb; + cola = texture2D (palette, vec2 (pixa, 0.0)) * colora; + colb = texture2D (palette, vec2 (pixb, 0.0)) * colorb; col = mix (cola, colb, blend); if (col.a == 0.0) discard; diff --git a/libs/video/renderer/glsl/quaketrb.frag b/libs/video/renderer/glsl/quaketrb.frag index 724713725..7828cab87 100644 --- a/libs/video/renderer/glsl/quaketrb.frag +++ b/libs/video/renderer/glsl/quaketrb.frag @@ -27,5 +27,5 @@ main (void) st = turb_st (tst, realtime); pix = texture2D (texture, st).r; - gl_FragColor = texture2D (palette, vec2 (pix, 0.5)); + gl_FragColor = texture2D (palette, vec2 (pix, 0.0)); }