lib/glsl-view: use tag for texture, uniform names

3 files changed, 17 insertions, 17 deletions

diff --git a/examples/glsl-view/simple.alv b/examples/glsl-view/simple.alv
index 64e3335..02c8796 100644
--- a/examples/glsl-view/simple.alv
+++ b/examples/glsl-view/simple.alv
@@ -1,12 +1,12 @@
 ([1]import* glsl-view time math)
 ([2]import osc)
 
-([3]def *oscout* ([4]osc/connect 'localhost' 9000))
+([4]def *oscout* ([3]osc/connect 'localhost' 9000))
 
-([5]draw $[6]shader"
+([7]draw $[6]shader"
 in vec2 uv;
 out vec4 color;
 
 void main() {
-  color = vec4(uv, sin(uv.x + $([7]ramp 1 tau)), 1);
+  color = vec4(uv, sin(uv.x + $([5]ramp 1 tau)), 1);
 }")
diff --git a/examples/glsl-view/stream-controls.alv b/examples/glsl-view/stream-controls.alv
index 5fd5a03..936dac9 100644
--- a/examples/glsl-view/stream-controls.alv
+++ b/examples/glsl-view/stream-controls.alv
@@ -1,17 +1,17 @@
 ([1]import* glsl-view link-time)
 ([2]import osc)
 
-([3]def
-  *clock* ([4]clock false 120)
-  *oscout* ([5]osc/connect 'localhost' 9000))
+([5]def
+  *clock* ([3]clock false 120)
+  *oscout* ([4]osc/connect 'localhost' 9000))
 
-([6]def
-  paused? ([7]switch ([8]every 2) true false)
-  cam ([9]doto ([10]stream-source 'webcam' '2D' '/dev/video0')
-    ([11]freeze paused?)
-    ([12]step! ([13]every 0.5))))
+([13]def
+  paused? ([7]switch ([6]every 2) true false)
+  cam ([12]doto ([8]stream-source '2D' '/dev/video0')
+    ([9]freeze paused?)
+    ([11]step! ([10]every 0.5))))
 
-([14]draw $[15]shader"
+([15]draw $[14]shader"
 in vec2 uv;
 out vec4 color;
 
diff --git a/examples/glsl-view/stream.alv b/examples/glsl-view/stream.alv
index 1ca2c63..4f40645 100644
--- a/examples/glsl-view/stream.alv
+++ b/examples/glsl-view/stream.alv
@@ -1,12 +1,12 @@
 ([1]import* glsl-view time)
 ([2]import osc)
 
-([3]def *oscout* ([5]osc/connect 'localhost' 9000))
+([4]def *oscout* ([3]osc/connect 'localhost' 9000))
 
-([6]def cam ([7]stream-source 'webcam' '2D' '/dev/video0')
-        tst ([8]stream-source 'testpt' '2D' 'testsrc=size=1280x720:rate=30' 'lavfi'))
+([7]def cam ([5]stream-source '2D' '/dev/video0')
+        tst ([6]stream-source '2D' 'testsrc=size=1280x720:rate=30' 'lavfi'))
 
-([9]draw $[10]shader"
+([10]draw $[9]shader"
 in vec2 uv;
 out vec4 color;
 
@@ -14,7 +14,7 @@ void main() {
   vec3 cam = texture($cam , uv).rgb;
   vec3 tst = texture($tst , uv).rgb;
 
-  color.rgb = mix(cam, tst, $([11]lfo 1));
+  color.rgb = mix(cam, tst, $([8]lfo 1));
 
   color.a = 1.0;
 }")