[#943] fix a regression with nested containers and floating objects

melonjs · Oct 28, 2018 · d57fee8 · d57fee8
1 parent 4b84b1c
commit d57fee8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/camera/camera2d.js b/src/camera/camera2d.js
@@ -575,10 +575,11 @@
          * @memberOf me.Camera2d
          * @function
          * @param {me.Renderable} object
+         * @param {Boolean} [floating===object.floating] if visibility check should be done against screen coordinates
          * @return {Boolean}
          */
-        isVisible : function (obj) {
-            if (obj.floating === true) {
+        isVisible : function (obj, floating) {
+            if (floating === true || obj.floating === true) {
                 // check against screen coordinates
                 return me.video.renderer.overlaps(obj.getBounds());
             } else {

diff --git a/src/particles/particlecontainer.js b/src/particles/particlecontainer.js
@@ -68,7 +68,7 @@
             var viewport = me.game.viewport;
             for (var i = this.children.length - 1; i >= 0; --i) {
                 var particle = this.children[i];
-                particle.inViewport = viewport.isVisible(particle);
+                particle.inViewport = viewport.isVisible(particle, this.floating);
                 if (!particle.update(dt)) {
                     this.removeChildNow(particle);
                 }

diff --git a/src/renderable/container.js b/src/renderable/container.js
@@ -314,7 +314,7 @@
         },
 
         /**
-         * Returns the next child within the container or undefined if none 
+         * Returns the next child within the container or undefined if none
          * @name getNextChild
          * @memberOf me.Container
          * @function
@@ -811,7 +811,7 @@
                     obj.inViewport = false;
                     // iterate through all cameras
                     me.state.current().cameras.forEach(function(camera) {
-                        obj.inViewport |= camera.isVisible(obj);
+                        obj.inViewport |= camera.isVisible(obj, isFloating);
                     });
 
                     // update our object

diff --git a/src/video/renderer.js b/src/video/renderer.js
@@ -239,10 +239,10 @@
          * @param  {me.Rect} rect
          * @return {boolean} true if overlaps
          */
-        overlaps : function (rect)    {
+        overlaps : function (rect) {
             return (
-                rect.left < this.getWidth() && rect.right >= 0 &&
-                rect.top < this.getHeight() && rect.bottom >= 0
+                rect.left < this.getWidth() && rect.right > 0 &&
+                rect.top < this.getHeight() && rect.bottom > 0
             );
         },