move the test on floating coordinates to the me.Camera2d.isVisible() …

…function also allow for #943 to be fixed in a single place, and makes other code cleaner
melonjs · Sep 27, 2018 · 571264e · 571264e
1 parent 1532ee2
commit 571264e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/src/camera/camera2d.js b/src/camera/camera2d.js
@@ -573,7 +573,12 @@
          * @return {Boolean}
          */
         isVisible : function (obj) {
-            return obj.getBounds().overlaps(this);
+            if (obj.floating === true) {
+                // #943
+                return true;
+            } else {
+                return obj.getBounds().overlaps(this);
+            }
         },
 
         /**

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 = this.floating || viewport.isVisible(particle);
+                particle.inViewport = viewport.isVisible(particle);
                 if (!particle.update(dt)) {
                     this.removeChildNow(particle);
                 }

diff --git a/src/renderable/container.js b/src/renderable/container.js
@@ -796,7 +796,7 @@
                     obj.inViewport = false;
                     // iterate through all cameras
                     me.state.current().cameras.forEach(function(camera) {
-                        obj.inViewport |= isFloating || camera.isVisible(obj);
+                        obj.inViewport |= camera.isVisible(obj);
                     });
 
                     // update our object

diff --git a/tests/spec/camera-spec.js b/tests/spec/camera-spec.js
@@ -33,4 +33,22 @@ describe("me.Camera2d", function () {
         expect( result.x ).toBeCloseTo(250);
         expect( result.y ).toBeCloseTo(150);
     });
+
+    it("isVisible function test", function () {
+        // default camera
+        var camera = new me.Camera2d(0, 0, 1000, 1000);
+        var obj = new me.Renderable(0, 0, 10, 10);
+
+        // check if obj is visible
+        expect(camera.isVisible(obj)).toEqual(true);
+        // update position so that it's not just 0
+        camera.move(100, 100);
+        // check if obj is visible
+        expect(camera.isVisible(obj)).toEqual(false);
+        // set as floating
+        obj.floating = true;
+        // should be visible again
+        expect(camera.isVisible(obj)).toEqual(true);
+
+    });
 });