rewrote intersects method, which now leverages the new getIntersectio…

…n method. fixed up unit tests. also fixed bug with getIntersection method
AndradaDevelopers · Aug 19, 2012 · e19dae3 · e19dae3
1 parent f944409
commit e19dae3
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 141 deletions.
diff --git a/dist/kinetic-core.js b/dist/kinetic-core.js
@@ -3048,18 +3048,15 @@ Kinetic.Stage = Kinetic.Container.extend({
 
                 return {
                     shape: shape,
-                    pixels: p
+                    pixel: p
                 };
             }
             // if no shape mapped to that pixel, return pixel array
             else if(p[0] > 0 || p[1] > 0 || p[2] > 0 || p[3] > 0) {
                 return {
-                    pixels: p
+                    pixel: p
                 };
             }
-            else {
-                return null;
-            }
         }
 
         return null;
@@ -3157,7 +3154,7 @@ Kinetic.Stage = Kinetic.Container.extend({
         if(obj) {
             var shape = obj.shape;
             if(shape) {
-                if(!go.drag.moving && obj.pixels[3] === 255 && (!this.targetShape || this.targetShape._id !== shape._id)) {
+                if(!go.drag.moving && obj.pixel[3] === 255 && (!this.targetShape || this.targetShape._id !== shape._id)) {
                     if(this.targetShape) {
                         this.targetShape._handleEvent('mouseout', evt, shape);
                     }
@@ -4100,11 +4097,11 @@ Kinetic.Shape = Kinetic.Node.extend({
     intersects: function() {
         var pos = Kinetic.Type._getXY(Array.prototype.slice.call(arguments));
         var stage = this.getStage();
-
-        // TODO: need to re-implement
-
-        // default
-        return false;
+        var bufferCanvas = stage.bufferCanvas;
+        bufferCanvas.clear();
+        this._draw(bufferCanvas);
+        var obj = stage.getIntersection(pos);
+        return !!(obj && obj.pixel[3] > 0);
     },
     _draw: function(canvas) {
         if(this.attrs.drawFunc) {
@@ -4158,7 +4155,7 @@ Kinetic.Shape = Kinetic.Node.extend({
                     this.attrs[key] = '';
                 }
 
-				// image is a special case
+                // image is a special case
                 if('image' in this.attrs) {
                     attrs.image = this.attrs.image;
 
@@ -4182,7 +4179,7 @@ Kinetic.Shape = Kinetic.Node.extend({
                     var key = bothLists[n];
                     this.attrs[key] = attrs[key];
                 }
-                
+
                 // image is a special case
                 this.attrs.image = attrs.image;
             }

diff --git a/dist/kinetic-core.min.js b/dist/kinetic-core.min.js
diff --git a/src/Shape.js b/src/Shape.js
@@ -313,11 +313,11 @@ Kinetic.Shape = Kinetic.Node.extend({
     intersects: function() {
         var pos = Kinetic.Type._getXY(Array.prototype.slice.call(arguments));
         var stage = this.getStage();
-
-        // TODO: need to re-implement
-
-        // default
-        return false;
+        var bufferCanvas = stage.bufferCanvas;
+        bufferCanvas.clear();
+        this._draw(bufferCanvas);
+        var obj = stage.getIntersection(pos);
+        return !!(obj && obj.pixel[3] > 0);
     },
     _draw: function(canvas) {
         if(this.attrs.drawFunc) {
@@ -371,7 +371,7 @@ Kinetic.Shape = Kinetic.Node.extend({
                     this.attrs[key] = '';
                 }
 
-				// image is a special case
+                // image is a special case
                 if('image' in this.attrs) {
                     attrs.image = this.attrs.image;
 
@@ -395,7 +395,7 @@ Kinetic.Shape = Kinetic.Node.extend({
                     var key = bothLists[n];
                     this.attrs[key] = attrs[key];
                 }
-                
+
                 // image is a special case
                 this.attrs.image = attrs.image;
             }

diff --git a/src/Stage.js b/src/Stage.js
@@ -369,18 +369,15 @@ Kinetic.Stage = Kinetic.Container.extend({
 
                 return {
                     shape: shape,
-                    pixels: p
+                    pixel: p
                 };
             }
             // if no shape mapped to that pixel, return pixel array
             else if(p[0] > 0 || p[1] > 0 || p[2] > 0 || p[3] > 0) {
                 return {
-                    pixels: p
+                    pixel: p
                 };
             }
-            else {
-                return null;
-            }
         }
 
         return null;
@@ -478,7 +475,7 @@ Kinetic.Stage = Kinetic.Container.extend({
         if(obj) {
             var shape = obj.shape;
             if(shape) {
-                if(!go.drag.moving && obj.pixels[3] === 255 && (!this.targetShape || this.targetShape._id !== shape._id)) {
+                if(!go.drag.moving && obj.pixel[3] === 255 && (!this.targetShape || this.targetShape._id !== shape._id)) {
                     if(this.targetShape) {
                         this.targetShape._handleEvent('mouseout', evt, shape);
                     }

diff --git a/tests/js/manualTests.js b/tests/js/manualTests.js
@@ -444,6 +444,11 @@ Test.prototype.tests = {
         layer.add(greenEllipse);
 
         stage.add(layer);
+
+        //greenEllipse.hide();
+        layer.draw();
+
+        //document.body.appendChild(layer.bufferCanvas.element);
     },
     'EVENTS - move mouse from shape in one group to shape in another group': function(containerId) {
         var stage = new Kinetic.Stage({