StaticTilemap position + scrollFactor

Author: bitnenfer

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '0ead5460-4cc8-11e7-b402-85a6b30f7408'
+build: 'b0c28c60-4d28-11e7-bd40-53a521c25ff2'
 };
 module.exports = CHECKSUM;

v3/src/gameobjects/tilemap/static/StaticTilemap.js

@@ -42,6 +42,8 @@ var StaticTilemap = new Class({
         this.mapHeight = mapHeight;
         this.dirty = true;
         this.vertexCount = 0;
+        this.scrollFactorX = 1.0;
+        this.scrollFactorY = 1.0;
         this.setTexture(texture, frame);
         this.setPosition(x, y);
         this.setSizeToFrame();
@@ -145,6 +147,8 @@ var StaticTilemap = new Class({
                 this.dirty = false;
             }
             this.tilemapRenderer.shader.setConstantFloat2(this.tilemapRenderer.scrollLocation, -scrollX, -scrollY);
+            this.tilemapRenderer.shader.setConstantFloat2(this.tilemapRenderer.scrollFactorLocation, this.scrollFactorX, this.scrollFactorY);
+            this.tilemapRenderer.shader.setConstantFloat2(this.tilemapRenderer.tilemapPositionLocation, this.x, this.y);
         }
     }
 

v3/src/renderer/webgl/renderers/tilemaprenderer/TilemapRenderer.js

@@ -48,10 +48,14 @@ TilemapRenderer.prototype = {
         var shader = this.manager.resourceManager.createShader('TilemapShader', TilemapShader);
         var viewMatrixLocation = shader.getUniformLocation('u_view_matrix');
         var scrollLocation = shader.getUniformLocation('u_scroll');
+        var scrollFactorLocation = shader.getUniformLocation('u_scroll_factor');
+        var tilemapPositionLocation = shader.getUniformLocation('u_tilemap_position');
 
         this.shader = shader;
         this.viewMatrixLocation = viewMatrixLocation;
         this.scrollLocation = scrollLocation;
+        this.scrollFactorLocation = scrollFactorLocation;
+        this.tilemapPositionLocation = tilemapPositionLocation;
 
         this.resize(this.width, this.height, this.game.config.resolution);
     },

v3/src/renderer/webgl/shaders/TilemapShader.js

@@ -2,11 +2,13 @@ module.exports = {
     vert: [
         'uniform mat4 u_view_matrix;',
         'uniform vec2 u_scroll;',
+        'uniform vec2 u_scroll_factor;',
+        'uniform vec2 u_tilemap_position;',
         'attribute vec2 a_position;',
         'attribute vec2 a_tex_coord;',
         'varying vec2 v_tex_coord;',
         'void main () {',
-        '   gl_Position = u_view_matrix * vec4(a_position + u_scroll, 1.0, 1.0);',
+        '   gl_Position = u_view_matrix * vec4(u_tilemap_position + a_position + (u_scroll * u_scroll_factor), 1.0, 1.0);',
         '   v_tex_coord = a_tex_coord;',
         '}'
     ].join('\n'),