lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-12-04 19:08:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

point properties can now be set with an array of points or an array of numbers for convenience

Browse Source
This commit is contained in:
Eric Rowell
2012-05-08 22:11:37 -07:00
parent 40ebb21033
commit 622278a510
9 changed files with 160 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/GlobalObject.js
View File

@@ -128,8 +128,13 @@ Kinetic.GlobalObject = {
_isFunction: function(obj) {
return !!(obj && obj.constructor && obj.call && obj.apply);
},
_isArray: function(obj) {
return Object.prototype.toString.call(obj) == '[object Array]';
},
_isObject: function(obj) {
return obj === Object(obj);
},
_getPoint: function(arg) {
if(arg.length === 1) {
return arg[0];
}

59
src/Node.js
View File

@@ -170,28 +170,36 @@ Kinetic.Node.prototype = {
* config objects
*/
case 'centerOffset':
if(val.x !== undefined) {
this.attrs[key].x = val.x;
}
if(val.y !== undefined) {
this.attrs[key].y = val.y;
}
this._setPointAttr(key, val);
break;
case 'scale':
if(val.x !== undefined) {
this.attrs[key].x = val.x;
this._setPointAttr(key, val);
break;
case 'points':
/*
* if points contains an array of object, just set
* the attr normally
*/
if(Kinetic.GlobalObject._isObject(val[0])) {
this.attrs[key] = config[key];
}
if(val.y !== undefined) {
this.attrs[key].y = val.y;
else {
/*
* convert array of numbers into an array
* of objects containing x, y
*/
var arr = [];
for(var n = 0; n < val.length; n += 2) {
arr.push({
x: val[n],
y: val[n + 1]
});
}
this.attrs[key] = arr;
}
break;
case 'crop':
if(val.x !== undefined) {
this.attrs[key].x = val.x;
}
if(val.y !== undefined) {
this.attrs[key].y = val.y;
}
this._setPointAttr(key, val);
if(val.width !== undefined) {
this.attrs[key].width = val.width;
}
@@ -859,5 +867,24 @@ Kinetic.Node.prototype = {
if(!evt.cancelBubble && node.parent.nodeType !== 'Stage') {
this._handleEvent(node.parent, mouseoverParent, mouseoutParent, eventType, evt);
}
},
/**
* set point attr
*/
_setPointAttr: function(key, val) {
if(Kinetic.GlobalObject._isArray(val)) {
// val is an array
this.attrs[key].x = val[0];
this.attrs[key].y = val[1];
}
else {
// val is an object
if(val.x !== undefined) {
this.attrs[key].x = val.x;
}
if(val.y !== undefined) {
this.attrs[key].y = val.y;
}
}
}
};

2
src/shapes/Line.js
View File

@@ -9,7 +9,7 @@
*/
Kinetic.Line = function(config) {
this.setDefaultAttrs({
points: {},
points: [],
lineCap: 'butt',
dashArray: []
});

2
src/shapes/Polygon.js
View File

@@ -9,7 +9,7 @@
*/
Kinetic.Polygon = function(config) {
this.setDefaultAttrs({
points: {}
points: []
});
this.shapeType = "Polygon";

22
src/shapes/Star.js
View File

@@ -9,7 +9,7 @@
*/
Kinetic.Star = function(config) {
this.setDefaultAttrs({
points: [],
numPoints: 0,
innerRadius: 0,
outerRadius: 0
});
@@ -21,10 +21,10 @@ Kinetic.Star = function(config) {
this.applyLineJoin();
context.moveTo(0, 0 - this.attrs.outerRadius);
for(var n = 1; n < this.attrs.points * 2; n++) {
for(var n = 1; n < this.attrs.numPoints * 2; n++) {
var radius = n % 2 === 0 ? this.attrs.outerRadius : this.attrs.innerRadius;
var x = radius * Math.sin(n * Math.PI / this.attrs.points);
var y = -1 * radius * Math.cos(n * Math.PI / this.attrs.points);
var x = radius * Math.sin(n * Math.PI / this.attrs.numPoints);
var y = -1 * radius * Math.cos(n * Math.PI / this.attrs.numPoints);
context.lineTo(x, y);
}
context.closePath();
@@ -38,17 +38,17 @@ Kinetic.Star = function(config) {
*/
Kinetic.Star.prototype = {
/**
* set points array
* @param {Array} points
* set number of points
* @param {Integer} points
*/
setPoints: function(points) {
this.attrs.points = points;
setNumPoints: function(numPoints) {
this.attrs.numPoints = numPoints;
},
/**
* get points array
* get number of points
*/
getPoints: function() {
return this.attrs.points;
getNumPoints: function() {
return this.attrs.numPoints;
},
/**
* set outer radius