From a9f8856b0d7c4cb757fa6c9e5e5871618e973621 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Thu, 13 Nov 2008 09:49:18 -0800
Subject: [PATCH] make shader code in spheres a little more readable

---
 basis/io/encodings/utf16/.utf16.factor.swo | Bin 16384 -> 0 bytes
 extra/spheres/spheres.factor               |  22 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 delete mode 100644 basis/io/encodings/utf16/.utf16.factor.swo

diff --git a/basis/io/encodings/utf16/.utf16.factor.swo b/basis/io/encodings/utf16/.utf16.factor.swo
deleted file mode 100644
index 01be8fdab2946825bf902b05af5135496b67501b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
U6w0WN#fU9xV|69mAqVFF1)sD~<p2Nx

diff --git a/extra/spheres/spheres.factor b/extra/spheres/spheres.factor
index f119956db6..d203d49eab 100755
--- a/extra/spheres/spheres.factor
+++ b/extra/spheres/spheres.factor
@@ -14,16 +14,26 @@ main()
 ;
 
 STRING: plane-fragment-shader
+uniform float checker_size_inv;
+uniform vec4 checker_color_1, checker_color_2;
 varying vec3 object_position;
+
+bool
+checker_color(vec3 p)
+{
+    vec3 pprime = checker_size_inv * object_position;
+    return fract((floor(pprime.x) + floor(pprime.z)) * 0.5) == 0.0;
+}
+
 void
 main()
 {
     float distance_factor = (gl_FragCoord.z * 0.5 + 0.5);
     distance_factor = pow(distance_factor, 500.0)*0.5;
     
-    gl_FragColor = fract((floor(0.125*object_position.x)+floor(0.125*object_position.z)) * 0.5) == 0.0
-        ? vec4(1.0, 1.0 - distance_factor, 1.0 - distance_factor, 1.0)
-        : vec4(1.0, distance_factor, distance_factor, 1.0);
+    gl_FragColor = checker_color(object_position)
+        ? mix(checker_color_1, checker_color_2, distance_factor)
+        : mix(checker_color_2, checker_color_1, distance_factor);
 }
 ;
 
@@ -212,7 +222,11 @@ M: spheres-gadget pref-dim* ( gadget -- dim )
         ] with-gl-program
     ] [
         plane-program>> [
-            drop
+            {
+                [ "checker_size_inv" glGetUniformLocation 0.125 glUniform1f ]
+                [ "checker_color_1"  glGetUniformLocation 1.0 0.5 0.0 1.0 glUniform4f ]
+                [ "checker_color_2"  glGetUniformLocation 0.0 0.0 0.0 1.0 glUniform4f ]
+            } cleave
             GL_QUADS [
                 -1000.0 -30.0  1000.0 glVertex3f
                 -1000.0 -30.0 -1000.0 glVertex3f