Updated Camera.Ignore so it works with the canvas renderer as well

photonstorm · photonstorm · commit fe2f82c22906 · 2017-08-15T23:51:37.000+01:00
diff --git a/v3/src/checksum.js b/v3/src/checksum.js
@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '3bd13fc0-81f1-11e7-b26f-e58093bce12c'
+build: '3cc5e4b0-820c-11e7-8573-1960fd3f13b3'
 };
 module.exports = CHECKSUM;
diff --git a/v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextCanvasRenderer.js b/v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextCanvasRenderer.js
@@ -3,7 +3,7 @@ var DynamicBitmapTextCanvasRenderer = function (renderer, src, interpolationPerc
     var text = src.text;
     var textLength = text.length;
 
-    if (this.renderMask !== this.renderFlags || textLength === 0)
+    if (src.renderMask !== src.renderFlags || textLength === 0 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js b/v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js
@@ -4,7 +4,10 @@ var tempMatrixChar = new TransformMatrix();
 
 var DynamicBitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
+    var text = src.text;
+    var textLength = text.length;
+
+    if (this.renderMask !== this.renderFlags || textLength === 0 || (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/bitmaptext/static/BitmapTextCanvasRenderer.js b/v3/src/gameobjects/bitmaptext/static/BitmapTextCanvasRenderer.js
@@ -3,7 +3,7 @@ var BitmapTextCanvasRenderer = function (renderer, src, interpolationPercentage,
     var text = src.text;
     var textLength = text.length;
 
-    if (this.renderMask !== this.renderFlags || textLength === 0)
+    if (src.renderMask !== src.renderFlags || textLength === 0 || (src.cameraFilter > 0 && (src.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,10 @@ var tempMatrix = new TransformMatrix();
 
 var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
+    var text = src.text;
+    var textLength = text.length;
+
+    if (this.renderMask !== this.renderFlags || textLength === 0 || (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/blitter/BlitterCanvasRenderer.js b/v3/src/gameobjects/blitter/BlitterCanvasRenderer.js
@@ -1,7 +1,7 @@
 
 var BlitterCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.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 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.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,11 +1,11 @@
 var EffectLayerWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
+
     renderer.effectRenderer.renderEffect(src, camera, src.renderTexture, src.width, src.height);
 };
 
 module.exports = EffectLayerWebGLRenderer;
- 
diff --git a/v3/src/gameobjects/graphics/GraphicsCanvasRenderer.js b/v3/src/gameobjects/graphics/GraphicsCanvasRenderer.js
@@ -3,7 +3,7 @@ var MATH_CONST = require('../../math/const');
 
 var GraphicsCanvasRenderer = function (renderer, src, interpolationPercentage, camera, renderTargetCtx)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (src.renderMask !== src.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 || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
+    if (this.renderMask !== this.renderFlags || (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/image/ImageCanvasRenderer.js b/v3/src/gameobjects/image/ImageCanvasRenderer.js
@@ -1,10 +1,12 @@
 
 var ImageCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask === this.renderFlags)
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
-        renderer.drawImage(src, camera);
+        return;
     }
+
+    renderer.drawImage(src, camera);
 };
 
 module.exports = ImageCanvasRenderer;
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 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
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 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.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 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/sprite/SpriteCanvasRenderer.js b/v3/src/gameobjects/sprite/SpriteCanvasRenderer.js
@@ -1,10 +1,12 @@
 
 var SpriteCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask === this.renderFlags)
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
-        renderer.drawImage(src, camera);
+        return;
     }
+
+    renderer.drawImage(src, camera);
 };
 
 module.exports = SpriteCanvasRenderer;
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 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/text/static/TextCanvasRenderer.js b/v3/src/gameobjects/text/static/TextCanvasRenderer.js
@@ -1,6 +1,6 @@
 var TextCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (src.renderMask !== src.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 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/tilemap/dynamic/TilemapCanvasRenderer.js b/v3/src/gameobjects/tilemap/dynamic/TilemapCanvasRenderer.js
@@ -1,9 +1,11 @@
 var TilemapCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
+
+    //  TODO :)
 };
 
 module.exports = TilemapCanvasRenderer;
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 || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
+    if (this.renderMask !== this.renderFlags || (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/tilemap/static/StaticTilemapCanvasRenderer.js b/v3/src/gameobjects/tilemap/static/StaticTilemapCanvasRenderer.js
@@ -1,9 +1,11 @@
 var StaticTilemapCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
+
+    //  TODO :)
 };
 
 module.exports = StaticTilemapCanvasRenderer;
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 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }
diff --git a/v3/src/gameobjects/tilesprite/TileSpriteCanvasRenderer.js b/v3/src/gameobjects/tilesprite/TileSpriteCanvasRenderer.js
@@ -1,7 +1,7 @@
 
 var TileSpriteCanvasRenderer = function (renderer, src, interpolationPercentage, camera)
 {
-    if (this.renderMask !== this.renderFlags)
+    if (src.renderMask !== src.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 || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
+    if (src.renderMask !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
     {
         return;
     }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ var DynamicBitmapTextCanvasRenderer = function (renderer, src, interpolationPerc`
`3`	`3`	`var text = src.text;`
`4`	`4`	`var textLength = text.length;`
`5`	`5`
`6`		`- if (this.renderMask !== this.renderFlags \|\| textLength === 0)`
	`6`	`+ if (src.renderMask !== src.renderFlags \|\| textLength === 0 \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
`7`	`7`	`{`
`8`	`8`	`return;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,10 @@ var tempMatrixChar = new TransformMatrix();`
`4`	`4`
`5`	`5`	`var DynamicBitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)`
`6`	`6`	`{`
`7`		`- if (this.renderMask !== this.renderFlags \|\| (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))`
	`7`	`+ var text = src.text;`
	`8`	`+ var textLength = text.length;`
	`9`	`+`
	`10`	`+ if (this.renderMask !== this.renderFlags \|\| textLength === 0 \|\| (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))`
`8`	`11`	`{`
`9`	`12`	`return;`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ var BitmapTextCanvasRenderer = function (renderer, src, interpolationPercentage,`
`3`	`3`	`var text = src.text;`
`4`	`4`	`var textLength = text.length;`
`5`	`5`
`6`		`- if (this.renderMask !== this.renderFlags \|\| textLength === 0)`
	`6`	`+ if (src.renderMask !== src.renderFlags \|\| textLength === 0 \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
`7`	`7`	`{`
`8`	`8`	`return;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,10 @@ var tempMatrix = new TransformMatrix();`
`3`	`3`
`4`	`4`	`var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)`
`5`	`5`	`{`
`6`		`- if (this.renderMask !== this.renderFlags \|\| (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))`
	`6`	`+ var text = src.text;`
	`7`	`+ var textLength = text.length;`
	`8`	`+`
	`9`	`+ if (this.renderMask !== this.renderFlags \|\| textLength === 0 \|\| (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))`
`7`	`10`	`{`
`8`	`11`	`return;`
`9`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`var BlitterCanvasRenderer = function (renderer, src, interpolationPercentage, camera)`
`3`	`3`	`{`
`4`		`- if (this.renderMask !== this.renderFlags)`
	`4`	`+ if (src.renderMask !== src.renderFlags \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
`5`	`5`	`{`
`6`	`6`	`return;`
`7`	`7`	`}`
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 \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
	`3`	`+ if (src.renderMask !== src.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,11 +1,11 @@`
`1`	`1`	`var EffectLayerWebGLRenderer = function (renderer, src, interpolationPercentage, camera)`
`2`	`2`	`{`
`3`		`- if (this.renderMask !== this.renderFlags \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
	`3`	`+ if (src.renderMask !== src.renderFlags \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
`4`	`4`	`{`
`5`	`5`	`return;`
`6`	`6`	`}`
	`7`	`+`
`7`	`8`	`renderer.effectRenderer.renderEffect(src, camera, src.renderTexture, src.width, src.height);`
`8`	`9`	`};`
`9`	`10`
`10`	`11`	`module.exports = EffectLayerWebGLRenderer;`
`11`		`-`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ var MATH_CONST = require('../../math/const');`
`3`	`3`
`4`	`4`	`var GraphicsCanvasRenderer = function (renderer, src, interpolationPercentage, camera, renderTargetCtx)`
`5`	`5`	`{`
`6`		`- if (this.renderMask !== this.renderFlags)`
	`6`	`+ if (src.renderMask !== src.renderFlags \|\| (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))`
`7`	`7`	`{`
`8`	`8`	`return;`
`9`	`9`	`}`
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 \|\| (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))`
	`30`	`+ if (this.renderMask !== this.renderFlags \|\| (this.cameraFilter > 0 && (this.cameraFilter & camera._id)))`
`31`	`31`	`{`
`32`	`32`	`return;`
`33`	`33`	`}`