wip: fix FFT

README.md

@@ -139,7 +139,7 @@ shader.
 
 ```
 uniform vec3      iResolution;     // viewport resolution (in pixels)
-uniform float     iGlobalTime;     // shader playback time (in seconds)
+uniform float     iTime;     // shader playback time (in seconds)
 uniform float     iChannelTime[4]; // channel playback time (in seconds)
 uniform vec3      iChannelResolution[4]; // channel width, height, 1
 uniform vec4      iMouse;          // mouse pixel coords. xy: current (if MLB down), zw: click

examples/03demo_translate.clj

@@ -5,10 +5,10 @@
 ;; translate this Clojure-like code to a GLSL shader
 (trans/defshader simple
   '((uniform vec3  iResolution)
-    (uniform float iGlobalTime)
+    (uniform float iTime)
     (defn void main []
       (setq vec2 uv (/ gl_FragCoord.xy iResolution.xy))
-      (setq float b (abs (sin iGlobalTime)))
+      (setq float b (abs (sin iTime)))
       (setq gl_FragColor (vec4 uv.x uv.y b 1.0)))))
 ;;(print simple)
 

examples/disco.glsl

@@ -18,15 +18,15 @@ void main(void)
     float v2 = 0.1 + 0.5*hz(800);
     float v3 = 0.1 + 0.5*hz(8000);
     vec3 col = vec3(0.0, 0.0, 0.0);
-    float v1x = uv.x + sin(5.0*iGlobalTime + 1.5*uv.y)*v1;
-    float v2x = uv.x + 0.5 + sin(3.0*iGlobalTime + 0.8*uv.y)*v1;
-    float v3x = uv.x - 0.5 + sin(7.0*iGlobalTime + 3.2*uv.y)*v1;
+    float v1x = uv.x + sin(5.0*iTime + 1.5*uv.y)*v1;
+    float v2x = uv.x + 0.5 + sin(3.0*iTime + 0.8*uv.y)*v1;
+    float v3x = uv.x - 0.5 + sin(7.0*iTime + 3.2*uv.y)*v1;
     col += vec3(1.0,0.0,1.0) * abs(0.066/v1x) * v1;
     col += vec3(1.0,1.0,0.0) * abs(0.066/v2x) * v2;
     col += vec3(0.0,1.0,1.0) * abs(0.066/v3x) * v3;
 
     // with a lighted disco floor pattern
-    float uvy2 = 0.25*iGlobalTime-uv.y;
+    float uvy2 = 0.25*iTime-uv.y;
     float a1 = max(0.0,0.25*hz(200)) *
         max(0.0,min(1.0,sin(10.0*uv.x)*sin(10.0*uvy2)));
     col += vec3(1.0,1.0,1.0) * a1;

examples/implicit_fn.glsl

@@ -87,7 +87,7 @@ vec3 color4(vec2 rt)
 vec3 color5(vec2 rt)
 {
     float u = fract2(abs(fn(rt)));
-    float v = fract2(iGlobalTime/50);
+    float v = fract2(iTime/50);
     return texture2D(iChannel0,vec2(u,v)).xyz;
 }
 // ======================================================================
@@ -96,12 +96,12 @@ void main(void)
 {
     // select one
     vec2 uv = 3*getScreenUV(gl_FragCoord.xy);
-    //vec2 uv = 2.5*(0.1+fract2(iGlobalTime/5))*getScreenUV(gl_FragCoord.xy); // zoom!
+    //vec2 uv = 2.5*(0.1+fract2(iTime/5))*getScreenUV(gl_FragCoord.xy); // zoom!
 
     vec2 rt = getPolar(uv);
 
     // uncomment to spin...
-    //rt.y += iGlobalTime/4.0;
+    //rt.y += iTime/4.0;
 
     // Select one colorN routine at a time
     //vec3 c = vec3(uv.x,uv.y,0);  // see x, y

examples/quasicrystal.glsl

@@ -30,7 +30,7 @@ vec2 point(vec2 src)
 
 float wave(vec2 p, float th)
 {
-    float t = fract(iGlobalTime/tscale);
+    float t = fract(iTime/tscale);
     t *= 2.0 * PI;
     float sth = sin(th);
     float cth = cos(th);

examples/raymarching1.glsl

@@ -95,9 +95,9 @@ void main(void)
     vec2 window_pos        = -1.0 + 2.0*(gl_FragCoord.xy/iResolution.xy);
     vec3 camera_up         = vec3(0,1,0);
     vec3 camera_lookat     = vec3(0,0,0);
-    vec3 camera_pos        = vec3(5.0*cos(0.1*iGlobalTime),
+    vec3 camera_pos        = vec3(5.0*cos(0.1*iTime),
                                 5.0,
-                                5.0*sin(0.1*iGlobalTime));
+                                5.0*sin(0.1*iTime));
     vec3 light_pos         = vec3(5.0,10.0,5.0);
     vec3 norm_camera_dir   = normalize(camera_lookat-camera_pos);
     vec3 u                 = normalize(cross(camera_up,norm_camera_dir));

examples/redFrik.glsl

@@ -3,16 +3,16 @@ uniform float t0;
 void main(void)
 {
     vec3  c      = vec3(0.0);
-    float act    = abs(cos(iGlobalTime));
+    float act    = abs(cos(iTime));
     vec2  uv     = gl_FragCoord.xy/iResolution.xy;
     float aspect = iResolution.x / iResolution.y;
     vec2  ar     = vec2( (aspect < 1.0) ? 1.0/aspect : 1.0,
                          (aspect < 1.0) ? 1.0 : 1.0/aspect);
     uv *= ar;
-    uv *= (3.0 + 2.0*sin(iGlobalTime/3.0));
+    uv *= (3.0 + 2.0*sin(iTime/3.0));
     for(int i = 0; i < 6; i++) {
-        vec2 xy  = vec2(sin(iGlobalTime-11.0*abs(t0)+6.28*(i/6.0)),
-                        cos(iGlobalTime+23.0*abs(t0)+6.28*(i/6.0)));
+        vec2 xy  = vec2(sin(iTime-11.0*abs(t0)+6.28*(i/6.0)),
+                        cos(iTime+23.0*abs(t0)+6.28*(i/6.0)));
         vec2 uv2 = uv - 2.0*ar + xy;
         float r  = sqrt(uv2.x*uv2.x + uv2.y*uv2.y);
         c += (vec3(0.0,0.15*(1.0-act),0.1*(act)) *

examples/simple.glsl

@@ -11,6 +11,6 @@ void main(void) {
   float r = sqrt(uv2.x*uv2.x + uv2.y*uv2.y);
   gl_FragColor = vec4(uv.x,
                       20.0*iOvertoneVolume*(1-r),
-                      0.5*sin(3.0*iGlobalTime)+0.5,
+                      0.5*sin(3.0*iTime)+0.5,
                       1.0);
 }

examples/simplecube.glsl

@@ -20,7 +20,7 @@ void main(void) {
     float roty = 0.0;
     float rotx = 0.0;
     if (iMouse.z <= 0.0) {
-        roty = iGlobalTime*0.25;
+        roty = iTime*0.25;
     } else {
         rotx = (mouse.y-0.5)*3.0;
         roty = -(mouse.x-0.5)*6.0;

examples/simpletex.glsl

@@ -6,8 +6,8 @@ uniform float iOvertoneVolume;
 
 void main(void) {
   vec2 uv = (gl_FragCoord.xy / iResolution.xy);
-  uv.x = uv.x + 0.5*sin(0.15*iGlobalTime);
-  uv.y = uv.y + 0.5*cos(0.03*iGlobalTime);
+  uv.x = uv.x + 0.5*sin(0.15*iTime);
+  uv.y = uv.y + 0.5*cos(0.03*iTime);
   vec4 c1 = texture2D(iChannel1,uv);
   vec4 c2 = texture2D(iChannel2,uv);
   vec4 c = mix(c1,c2,10.0*iOvertoneVolume);

examples/simpletexa.glsl

@@ -4,8 +4,8 @@
 
 void main(void) {
   vec2 uv = (gl_FragCoord.xy / iResolution.xy);
-  uv.x = uv.x + 0.5*sin(0.15*iGlobalTime);
-  uv.y = uv.y + 0.5*cos(0.03*iGlobalTime);
+  uv.x = uv.x + 0.5*sin(0.15*iTime);
+  uv.y = uv.y + 0.5*cos(0.03*iTime);
   vec4 c1 = texture2D(iChannel0,uv);
   vec4 c2 = texture2D(iChannel1,uv);
   vec4 c = mix(c1,c2,1.0-c1.w);  // alpha blend between two textures

examples/sine_dance.glsl

@@ -8,7 +8,7 @@ void main(void)
     // equvalent to the video's spec.y, I think
     float spec_y = 0.01 + 5.0*iOvertoneVolume;
     float col = 0.0;
-    uv.x += sin(iGlobalTime * 6.0 + uv.y*1.5)*spec_y;
+    uv.x += sin(iTime * 6.0 + uv.y*1.5)*spec_y;
     col += abs(0.066/uv.x) * spec_y;
     gl_FragColor = vec4(col,col,col,1.0);
 }

examples/spectrograph.clj

@@ -2,12 +2,23 @@
   (:require [overtone.live :as o]
             [shadertone.tone :as t]))
 
-(t/start "examples/spectrograph.glsl"
+(o/definst external [] (o/sound-in 0))
+
+(external)
+
+(t/start "examples/spectrum2.glsl"
+         :title "Shadertone Spectrograph"
+         :width 420 :height 236
+         ;; this puts the FFT data in iChannel0 and a texture of the
+         ;; previous frame in iChannel1
+         :textures [:overtone-audio #_:previous-frame])
+
+(t/start "examples/sound.glsl"
          :title "Shadertone Spectrograph"
-         :width 1024 :height 512
+         :width 420 :height 236
          ;; this puts the FFT data in iChannel0 and a texture of the
          ;; previous frame in iChannel1
-         :textures [:overtone-audio :previous-frame])
+         :textures [:overtone-audio #_:previous-frame])
 
 ;; check out live microphone input
 (o/definst external [] (o/sound-in 0))
@@ -26,8 +37,12 @@
 
 ;; testing precise frequencies
 (o/definst sn [n 1] (o/sin-osc (* n 5.4)))
-(sn 16)
+(sn 79)
+(sn 78)
+(sn 80)
+(sn 81)
 (sn 128)
 (sn 256)  ;; 2764.8
 (sn 2048) ;; (* 5.4 2048) = 11k appears mid-screen
+(sn 1024) ;; (* 5.4 2048) = 11k appears mid-screen
 (o/stop)

examples/spectrograph.glsl

@@ -50,10 +50,10 @@ void main(void)
 
     // But, we don't want the full screen to show the current FFT.  We
     // want to only update the data under the cursor.  So, we use the
-    // iGlobalTime input to find a particular X value for a column we
+    // iTime input to find a particular X value for a column we
     // want to update.  The following creates a value that ranges from
     // [0,1024) over 30 seconds.
-    int   cur_x  = int(fract(iGlobalTime/SEC_PER_SCREEN)*iResolution.x);
+    int   cur_x  = int(fract(iTime/SEC_PER_SCREEN)*iResolution.x);
 
     // For the data that is NOT under the cursor, we want the older
     // sonogram data that we rendered into the framebuffer.  get that

examples/vihart_braid.glsl

@@ -1,5 +1,5 @@
 uniform float v1, v2, v3;
-//uniform float iGlobalTime;
+//uniform float iTime;
 uniform float iOvertoneVolume;
 
 vec2 getScreenUV(vec2 fc) {
@@ -35,9 +35,9 @@ void main(void) {
     vec3 c3 = get_dot(uv.x, uv.y, v3)*vec3(0.1, 0.5, 0.6);
 
     vec2 uv2 = (uv+1.0)/2.0;
-    uv2.y += 0.07 + 0.05*sin(iGlobalTime);
-    uv2.x += 0.008*sin(19.0*sin(uv2.y)*mod(iGlobalTime,8.0));
-    //uv2.x += 0.004*noise1(iGlobalTime*3.0);
+    uv2.y += 0.07 + 0.05*sin(iTime);
+    uv2.x += 0.008*sin(19.0*sin(uv2.y)*mod(iTime,8.0));
+    //uv2.x += 0.004*noise1(iTime*3.0);
     vec3 pc = 0.91*texture2D(iChannel0,uv2).rgb;
 
     vec3 c = c1 + c2 + c3 + pc;

examples/zoomwave.glsl

@@ -16,7 +16,7 @@ void main(void)
     vec2  uv     = gl_FragCoord.xy/iResolution.xy;
     float wave   = texture2D(iChannel0,vec2(uv.x,0.75)).x;
     wave         = smoothbump(0.0,(6.0/iResolution.y), wave + uv.y - 0.5);
-    vec3  wc     = wave*hsv2rgb(fract(iGlobalTime/2.0),0.9,0.9);
+    vec3  wc     = wave*hsv2rgb(fract(iTime/2.0),0.9,0.9);
 
     // zoom into the previous frame
     float zf     = -0.05;

project.clj

@@ -4,10 +4,12 @@
   :license {:name "MIT License"
             :url "https://github.com/overtone/shadertone/blob/master/LICENSE"}
   :dependencies [;; 1.6.0 causes error with *warn-on-reflection*.  1.7.0-RC1 works
-                 [org.clojure/clojure "1.5.1"]
+                 [org.clojure/clojure "1.10.1"]
                  [hello_lwjgl/lwjgl   "2.9.1"]
-                 [overtone            "0.9.1"]
-                 [watchtower          "0.1.1"]]
+                 [overtone            "0.10.7-SNAPSHOT"]
+                 [watchtower          "0.1.1"]
+
+                 [org.apache.commons/commons-math3 "3.6.1"]]
   :main ^{:skip-aot true} shadertone.core
   ;; add per WARNING: JVM argument TieredStopAtLevel=1 is active...
   :jvm-opts ^:replace []

src/shadertone/shader.clj

@@ -136,9 +136,9 @@
   [locals filename]
   (let [{:keys [tex-types]} @locals
         ;;file-str (slurp filename)
-        file-str (str "#version 120\n"
+        file-str (str "#version 140\n"
                       "uniform vec3      iResolution;\n"
-                      "uniform float     iGlobalTime;\n"
+                      "uniform float     iTime;\n"
                       "uniform float     iChannelTime[4];\n"
                       "uniform vec3      iChannelResolution[4];\n"
                       "uniform vec4      iMouse;\n"
@@ -231,9 +231,10 @@
            :vertices-count vertices-count)))
 
 (def vs-shader
-  (str "#version 120\n"
+  (str "#version 140\n"
+       "in vec3 pos;\n"
        "void main(void) {\n"
-       "    gl_Position = gl_Vertex;\n"
+       "    gl_Position = vec4(pos, 1.0);\n"
        "}\n"))
 
 (defn- load-shader
@@ -273,9 +274,12 @@
             _                     (when (== gl-link-status GL11/GL_FALSE)
                                     (println "ERROR: Linking Shaders:")
                                     (println (GL20/glGetProgramInfoLog pgm-id 10000)))
+            _ (except-gl-errors "@ let before EnableVertexAttribArray")
+            _                     (GL20/glVertexAttribPointer 0, 4, GL11/GL_FLOAT, false, 16, 0)
+            _                     (GL20/glEnableVertexAttribArray 0)
             _ (except-gl-errors "@ let before GetUniformLocation")
             i-resolution-loc      (GL20/glGetUniformLocation pgm-id "iResolution")
-            i-global-time-loc     (GL20/glGetUniformLocation pgm-id "iGlobalTime")
+            i-global-time-loc     (GL20/glGetUniformLocation pgm-id "iTime")
             i-channel-time-loc    (GL20/glGetUniformLocation pgm-id "iChannelTime")
             i-mouse-loc           (GL20/glGetUniformLocation pgm-id "iMouse")
             i-channel0-loc        (GL20/glGetUniformLocation pgm-id "iChannel0")
@@ -505,7 +509,7 @@
             (except-gl-errors "@ try-reload-shader useProgram2"))
           (let [_ (println "Reloading shader:" shader-filename)
                 i-resolution-loc   (GL20/glGetUniformLocation new-pgm-id "iResolution")
-                i-global-time-loc  (GL20/glGetUniformLocation new-pgm-id "iGlobalTime")
+                i-global-time-loc  (GL20/glGetUniformLocation new-pgm-id "iTime")
                 i-channel-time-loc (GL20/glGetUniformLocation new-pgm-id "iChannelTime")
                 i-mouse-loc        (GL20/glGetUniformLocation new-pgm-id "iMouse")
                 i-channel0-loc     (GL20/glGetUniformLocation new-pgm-id "iChannel0")