made isPointInShape() a public method for the purpose of collision detection

dist/kinetic-core.js

@@ -3,7 +3,7 @@
  * http://www.kineticjs.com/
  * Copyright 2012, Eric Rowell
  * Licensed under the MIT or GPL Version 2 licenses.
- * Date: Apr 14 2012
+ * Date: Apr 15 2012
  *
  * Copyright (C) 2011 - 2012 by Eric Rowell
  *
@@ -1492,7 +1492,7 @@ Kinetic.Stage.prototype = {
             this.targetFound = true;
         }
 
-        if(shape.attrs.visible && pos !== undefined && shape._isPointInShape(pos)) {
+        if(shape.attrs.visible && pos !== undefined && shape.isPointInShape(pos)) {
             // handle onmousedown
             if(!isDragging && this.mouseDown) {
                 this.mouseDown = false;
@@ -2288,6 +2288,27 @@ Kinetic.Shape.prototype = {
     clearData: function() {
         this.data = [];
     },
+    /**
+     * custom isPointInPath method which can use path detection
+     * or pixel detection
+     */
+    isPointInShape: function(pos) {
+        var stage = this.getStage();
+
+        if(this.attrs.detectionType === 'path') {
+            var pathLayer = stage.pathLayer;
+            var pathLayerContext = pathLayer.getContext();
+
+            this._draw(pathLayer);
+
+            return pathLayerContext.isPointInPath(pos.x, pos.y);
+        }
+        else {
+            var w = stage.attrs.width;
+            var alpha = this.data[((w * pos.y) + pos.x) * 4 + 3];
+            return (alpha !== undefined && alpha !== 0);
+        }
+    },
     /**
      * draw shape
      * @param {Layer} layer Layer that the shape will be drawn on
@@ -2327,27 +2348,6 @@ Kinetic.Shape.prototype = {
             this.drawFunc.call(this);
             context.restore();
         }
-    },
-    /**
-     * custom isPointInPath method which can use path detection
-     * or pixel detection
-     */
-    _isPointInShape: function(pos) {
-        var stage = this.getStage();
-
-        if(this.attrs.detectionType === 'path') {
-            var pathLayer = stage.pathLayer;
-            var pathLayerContext = pathLayer.getContext();
-
-            this._draw(pathLayer);
-
-            return pathLayerContext.isPointInPath(pos.x, pos.y);
-        }
-        else {
-            var w = stage.attrs.width;
-            var alpha = this.data[((w * pos.y) + pos.x) * 4 + 3];
-            return (alpha !== undefined && alpha !== 0);
-        }
     }
 };
 // extend Node

src/Shape.js

@@ -173,6 +173,27 @@ Kinetic.Shape.prototype = {
     clearData: function() {
         this.data = [];
     },
+    /**
+     * custom isPointInPath method which can use path detection
+     * or pixel detection
+     */
+    isPointInShape: function(pos) {
+        var stage = this.getStage();
+
+        if(this.attrs.detectionType === 'path') {
+            var pathLayer = stage.pathLayer;
+            var pathLayerContext = pathLayer.getContext();
+
+            this._draw(pathLayer);
+
+            return pathLayerContext.isPointInPath(pos.x, pos.y);
+        }
+        else {
+            var w = stage.attrs.width;
+            var alpha = this.data[((w * pos.y) + pos.x) * 4 + 3];
+            return (alpha !== undefined && alpha !== 0);
+        }
+    },
     /**
      * draw shape
      * @param {Layer} layer Layer that the shape will be drawn on
@@ -212,27 +233,6 @@ Kinetic.Shape.prototype = {
             this.drawFunc.call(this);
             context.restore();
         }
-    },
-    /**
-     * custom isPointInPath method which can use path detection
-     * or pixel detection
-     */
-    _isPointInShape: function(pos) {
-        var stage = this.getStage();
-
-        if(this.attrs.detectionType === 'path') {
-            var pathLayer = stage.pathLayer;
-            var pathLayerContext = pathLayer.getContext();
-
-            this._draw(pathLayer);
-
-            return pathLayerContext.isPointInPath(pos.x, pos.y);
-        }
-        else {
-            var w = stage.attrs.width;
-            var alpha = this.data[((w * pos.y) + pos.x) * 4 + 3];
-            return (alpha !== undefined && alpha !== 0);
-        }
     }
 };
 // extend Node

src/Stage.js

@@ -364,7 +364,7 @@ Kinetic.Stage.prototype = {
             this.targetFound = true;
         }
 
-        if(shape.attrs.visible && pos !== undefined && shape._isPointInShape(pos)) {
+        if(shape.attrs.visible && pos !== undefined && shape.isPointInShape(pos)) {
             // handle onmousedown
             if(!isDragging && this.mouseDown) {
                 this.mouseDown = false;

tests/js/unitTests.js

@@ -1281,6 +1281,51 @@ Test.prototype.tests = {
         star.setDetectionType('pixel');
         test(star.getDetectionType() === 'pixel', 'detection type should be pixel');
     },
+    'SHAPES - test isPointInPath()': function(containerId) {
+        var stage = new Kinetic.Stage({
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+        var layer = new Kinetic.Layer();
+        var rect = new Kinetic.Rect({
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
+        layer.add(rect);
+        stage.add(layer);
+
+        test(rect.isPointInShape({
+            x: 200,
+            y: 100
+        }) === true, 'problem with point in shape');
+
+        test(rect.isPointInShape({
+            x: 199,
+            y: 99
+        }) === false, 'problem with point in shape');
+
+        test(rect.isPointInShape({
+            x: 250,
+            y: 125
+        }) === true, 'problem with point in shape');
+
+        test(rect.isPointInShape({
+            x: 300,
+            y: 150
+        }) === true, 'problem with point in shape');
+
+        test(rect.isPointInShape({
+            x: 301,
+            y: 151
+        }) === false, 'problem with point in shape');
+    },
     'Text - add text': function(containerId) {
         var stage = new Kinetic.Stage({
             container: containerId,