Added camera gameobject filtering

bitnenfer · bitnenfer · commit 9856200fdfde · 2017-08-15T16:42:04.000-03:00
diff --git a/v3/src/camera/Camera.js b/v3/src/camera/Camera.js
@@ -61,6 +61,8 @@ var Camera = new Class({
 
         //  Follow
         this._follow = null;
+
+        this._id = 0;
     },
 
     cameraToScreen: require('./components/CameraToScreen'),
@@ -71,6 +73,7 @@ var Camera = new Class({
     destroy: require('./components/Destroy'),
     fade: require('./components/Fade'),
     flash: require('./components/Flash'),
+    ignore: require('./components/Ignore'),
     preRender: require('./components/PreRender'),
     removeBounds: require('./components/RemoveBounds'),
     setBackgroundColor: require('./components/SetBackgroundColor'),
diff --git a/v3/src/camera/components/Ignore.js b/v3/src/camera/components/Ignore.js
@@ -0,0 +1,16 @@
+var Ignore = function (gameObjectOrArray)
+{
+    if (gameObjectOrArray instanceof Array)
+    {
+        for (var index = 0; index < gameObjectOrArray.length; ++index)
+        {
+            gameObjectOrArray[index].cameraFilter |= this._id;
+        }
+    }
+    else
+    {
+        gameObjectOrArray.cameraFilter |= this._id;
+    }
+};
+
+module.exports = Ignore;
diff --git a/v3/src/checksum.js b/v3/src/checksum.js
@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '37876e10-8162-11e7-b191-e9a855a11647'
+build: '3bd13fc0-81f1-11e7-b26f-e58093bce12c'
 };
 module.exports = CHECKSUM;
diff --git a/v3/src/gameobjects/GameObject.js b/v3/src/gameobjects/GameObject.js
@@ -23,6 +23,7 @@ var GameObject = new Class({
         //  Will Render bitmask flags for the components Visible, Alpha, Transform and Texture respectively
         this.renderMask = 15;
         this.renderFlags = 15;
+        this.cameraFilter = 0;
 
         this.input = null;
 
diff --git a/v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js b/v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js
@@ -4,7 +4,7 @@ var tempMatrixChar = new TransformMatrix();
 
 var DynamicBitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js b/v3/src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js
@@ -3,7 +3,7 @@ var tempMatrix = new TransformMatrix();
 
 var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/blitter/BlitterWebGLRenderer.js b/v3/src/gameobjects/blitter/BlitterWebGLRenderer.js
@@ -1,6 +1,6 @@
 var BlitterWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/effectlayer/EffectLayerWebGLRenderer.js b/v3/src/gameobjects/effectlayer/EffectLayerWebGLRenderer.js
@@ -1,6 +1,6 @@
 var EffectLayerWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/graphics/GraphicsWebGLRenderer.js b/v3/src/gameobjects/graphics/GraphicsWebGLRenderer.js
@@ -27,7 +27,7 @@ var Path = function (x, y, width, rgb, alpha)
 
 var GraphicsWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera, forceRenderTarget)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/image/ImageWebGLRenderer.js b/v3/src/gameobjects/image/ImageWebGLRenderer.js
@@ -1,6 +1,6 @@
 var ImageWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/lightlayer/DeferredRenderer.js b/v3/src/gameobjects/lightlayer/DeferredRenderer.js
@@ -1,11 +1,13 @@
+var VertexBuffer = require('../../renderer/webgl/resources/VertexBuffer');
+
 var DeferredRenderer = function (renderer, lightLayer, interpolationPercentage, camera)
 {
     var spriteList = lightLayer.sprites;
     var length = spriteList.length;
     var batch = renderer.spriteBatch;
     var gl = renderer.gl;
 
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || length === 0 || (lightLayer.cameraFilter > 0 && (lightLayer.cameraFilter & camera._id)))
     {
         return;
     }
@@ -149,12 +151,12 @@ var DeferredRenderer = function (renderer, lightLayer, interpolationPercentage,
     renderer.setTexture({texture: lightLayer.gBufferNormalTex}, 1);
 
     gl.bindFramebuffer(gl.FRAMEBUFFER, null);
-    gl.useProgram(lightLayer.lightPassShader.program);
+    lightLayer.lightPassShader.bind();
     gl.bindBuffer(gl.ARRAY_BUFFER, lightLayer.lightPassVBO);
     gl.enableVertexAttribArray(0);
     gl.vertexAttribPointer(0, 2, gl.FLOAT, false, Float32Array.BYTES_PER_ELEMENT, 0);
     gl.drawArrays(gl.TRIANGLES, 0, 3);
-
+    VertexBuffer.SetDirty();
     batch.bind();
 };
 
diff --git a/v3/src/gameobjects/lightlayer/ForwardRenderer.js b/v3/src/gameobjects/lightlayer/ForwardRenderer.js
@@ -4,7 +4,7 @@ var ForwardRenderer = function (renderer, lightLayer, interpolationPercentage, c
     var length = spriteList.length;
     var batch = renderer.spriteBatch;
 
-    if (this.renderMask !== this.renderFlags || length === 0)
+    if (this.renderMask !== this.renderFlags || length === 0  || (lightLayer.cameraFilter > 0 && (lightLayer.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/lightlayer/LightLayer.js b/v3/src/gameobjects/lightlayer/LightLayer.js
@@ -10,6 +10,7 @@ var TexturedAndNormalizedTintedShader = require('../../renderer/webgl/shaders/Te
 var Const = require('./Const');
 var Matrix = require('../components/TransformMatrix');
 var TempMatrix = new Matrix();
+var VertexBuffer = require('../../renderer/webgl/resources/VertexBuffer');
 
 // http://cpetry.github.io/NormalMap-Online/
 
@@ -267,6 +268,7 @@ var LightLayer = new Class({
             }
 
             gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+            VertexBuffer.SetDirty();
         }
 
         this.setOrigin(0, 0);
@@ -392,18 +394,22 @@ var LightLayer = new Class({
             var point = {x: 0, y: 0};
             var height = renderer.height;
             var cameraMatrix = camera.matrix;
-            shader.setConstantFloat4(this.uCameraLoc, camera.x, camera.y, camera.rotation, camera.zoom);
-            shader.setConstantFloat2(this.uResolutionLoc, renderer.width, renderer.height);
-            shader.setConstantFloat3(this.ambientLightColorLoc, this.ambientLightColorR, this.ambientLightColorG, this.ambientLightColorB);
+            var gl = this.gl;
+
+            shader.bind();
+
+            gl.uniform2f(this.uResolutionLoc, renderer.width, renderer.height);
+            gl.uniform3f(this.ambientLightColorLoc, this.ambientLightColorR, this.ambientLightColorG, this.ambientLightColorB);
+            gl.uniform4f(this.uCameraLoc, camera.x, camera.y, camera.rotation, camera.zoom);
 
             for (var index = 0; index < length; ++index)
             {
                 var light = lights[index];
                 cameraMatrix.transformPoint(light.x, light.y, point);
-                shader.setConstantFloat3(locations[index].position, point.x - (camera.scrollX * light.scrollFactorX * camera.zoom), height - (point.y - (camera.scrollY * light.scrollFactorY) * camera.zoom), light.z);
-                shader.setConstantFloat3(locations[index].color, light.r, light.g, light.b);
-                shader.setConstantFloat1(locations[index].attenuation, light.attenuation);
-                shader.setConstantFloat1(locations[index].radius, light.radius);
+                gl.uniform1f(locations[index].attenuation, light.attenuation);
+                gl.uniform1f(locations[index].radius, light.radius);
+                gl.uniform3f(locations[index].position, point.x - (camera.scrollX * light.scrollFactorX * camera.zoom), height - (point.y - (camera.scrollY * light.scrollFactorY) * camera.zoom), light.z);
+                gl.uniform3f(locations[index].color, light.r, light.g, light.b);
             }
         }
     }
diff --git a/v3/src/gameobjects/mesh/MeshWebGLRenderer.js b/v3/src/gameobjects/mesh/MeshWebGLRenderer.js
@@ -1,6 +1,6 @@
 var MeshWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/renderpass/RenderPassWebGLRenderer.js b/v3/src/gameobjects/renderpass/RenderPassWebGLRenderer.js
@@ -1,6 +1,6 @@
 var RenderPassWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/sprite/SpriteWebGLRenderer.js b/v3/src/gameobjects/sprite/SpriteWebGLRenderer.js
@@ -1,6 +1,6 @@
 var SpriteWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/text/static/TextWebGLRenderer.js b/v3/src/gameobjects/text/static/TextWebGLRenderer.js
@@ -1,6 +1,6 @@
 var TextWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/tilemap/dynamic/TilemapWebGLRenderer.js b/v3/src/gameobjects/tilemap/dynamic/TilemapWebGLRenderer.js
@@ -1,6 +1,6 @@
 var TilemapWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/tilemap/static/StaticTilemapWebGLRenderer.js b/v3/src/gameobjects/tilemap/static/StaticTilemapWebGLRenderer.js
@@ -1,6 +1,6 @@
 var StaticTilemapWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/tilesprite/TileSpriteWebGLRenderer.js b/v3/src/gameobjects/tilesprite/TileSpriteWebGLRenderer.js
@@ -1,6 +1,6 @@
 var TileSpriteWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/plugins/CameraManager.js b/v3/src/plugins/CameraManager.js
@@ -12,6 +12,7 @@ var CameraManager = new Class({
     function CameraManager (scene)
     {
         //  The Scene that owns this plugin
+        this.currentCameraId = 1;
         this.scene = scene;
 
         this.cameras = [];
@@ -30,6 +31,7 @@ var CameraManager = new Class({
 
         //  Set the default camera
         this.main = this.cameras[0];
+
     },
 
     /*
@@ -144,6 +146,9 @@ var CameraManager = new Class({
             this.main = camera;
         }
 
+        camera._id = this.currentCameraId;
+        this.currentCameraId = this.currentCameraId << 1;
+
         return camera;
     },
 
diff --git a/v3/src/renderer/webgl/WebGLRenderer.js b/v3/src/renderer/webgl/WebGLRenderer.js
@@ -130,6 +130,7 @@ var WebGLRenderer = new Class({
         this.tileBatch = this.addRenderer(new TileBatch(this.game, gl, this));
         this.tilemapRenderer = this.addRenderer(new TilemapRenderer(this.game, gl, this));
         this.currentRenderer = this.spriteBatch;
+        this.currentVertexBuffer = null;
         this.setBlendMode(0);
         this.resize(this.width, this.height);
     },
diff --git a/v3/src/renderer/webgl/resources/IndexBuffer.js b/v3/src/renderer/webgl/resources/IndexBuffer.js
@@ -1,5 +1,5 @@
 var Class = require('../../../utils/Class');
-
+var CurrentIndexBuffer = null;
 var IndexBuffer = new Class({
 
     initialize:
@@ -14,8 +14,11 @@ var IndexBuffer = new Class({
     bind: function ()
     {
         var gl = this.gl;
-
-        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.bufferObject);
+        if (CurrentIndexBuffer !== this)
+        {
+            CurrentIndexBuffer = this;
+            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.bufferObject);
+        }
 
         return this;
     },
@@ -24,12 +27,21 @@ var IndexBuffer = new Class({
     {
         var gl = this.gl;
 
-        gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.bufferObject);
+        if (CurrentIndexBuffer !== this)
+        {
+            CurrentIndexBuffer = this;
+            gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.bufferObject);
+        }
         gl.bufferSubData(gl.ELEMENT_ARRAY_BUFFER, offset, bufferData);
 
         return this;
     }
 
 });
 
+IndexBuffer.SetDirty = function ()
+{
+    CurrentIndexBuffer = null;
+};
+
 module.exports = IndexBuffer;
diff --git a/v3/src/renderer/webgl/resources/Shader.js b/v3/src/renderer/webgl/resources/Shader.js
diff --git a/v3/src/renderer/webgl/resources/VertexBuffer.js b/v3/src/renderer/webgl/resources/VertexBuffer.js

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ var tempMatrixChar = new TransformMatrix();`
`4`	`4`
`5`	`5`	`var DynamicBitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)`
`6`	`6`	`{`
`7`		`- if (this.renderMask !== this.renderFlags)`
	`7`	`+ if (this.renderMask !== this.renderFlags \|\| (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))`
`8`	`8`	`{`
`9`	`9`	`return;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ var tempMatrix = new TransformMatrix();`
`3`	`3`
`4`	`4`	`var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)`
`5`	`5`	`{`
`6`		`- if (this.renderMask !== this.renderFlags)`
	`6`	`+ if (this.renderMask !== this.renderFlags \|\| (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))`
`7`	`7`	`{`
`8`	`8`	`return;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`var BlitterWebGLRenderer = function (renderer, src, interpolationPercentage, camera)`
`2`	`2`	`{`
`3`		`- if (this.renderMask !== this.renderFlags)`
	`3`	`+ if (this.renderMask !== this.renderFlags \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
`4`	`4`	`{`
`5`	`5`	`return;`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`var EffectLayerWebGLRenderer = function (renderer, src, interpolationPercentage, camera)`
`2`	`2`	`{`
`3`		`- if (this.renderMask !== this.renderFlags)`
	`3`	`+ if (this.renderMask !== this.renderFlags \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
`4`	`4`	`{`
`5`	`5`	`return;`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ var Path = function (x, y, width, rgb, alpha)`
`27`	`27`
`28`	`28`	`var GraphicsWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera, forceRenderTarget)`
`29`	`29`	`{`
`30`		`- if (this.renderMask !== this.renderFlags)`
	`30`	`+ if (this.renderMask !== this.renderFlags \|\| (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))`
`31`	`31`	`{`
`32`	`32`	`return;`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`var ImageWebGLRenderer = function (renderer, src, interpolationPercentage, camera)`
`2`	`2`	`{`
`3`		`- if (this.renderMask !== this.renderFlags)`
	`3`	`+ if (this.renderMask !== this.renderFlags \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
`4`	`4`	`{`
`5`	`5`	`return;`
`6`	`6`	`}`