Merge pull request #2 from dawidgorny/master

Added offset uniform to Textured material
pex-gl · Oct 26, 2014 · 1a82df9 · 1a82df9
2 parents c790d3a + f0abfca
commit 1a82df9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Textured.glsl b/lib/Textured.glsl
@@ -2,13 +2,15 @@
 
 uniform mat4 projectionMatrix;
 uniform mat4 modelViewMatrix;
+uniform vec2 offset;
 attribute vec3 position;
 attribute vec2 texCoord;
 varying vec2 vTexCoord;
 
 void main() {
   gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
   vTexCoord = texCoord;
+  vTexCoord += offset;
 }
 
 #endif

diff --git a/lib/Textured.js b/lib/Textured.js
@@ -16,7 +16,8 @@ function Textured(uniforms) {
   var program = new Program(TexturedGLSL);
   var defaults = {
     scale: new Vec2(1, 1),
-    color: new Color(1, 1, 1, 1)
+    color: new Color(1, 1, 1, 1),
+    offset: new Vec2(0,0)
   };
   uniforms = merge(defaults, uniforms);
   Material.call(this, program, uniforms);