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

changed offset to center

Browse Source
This commit is contained in:
Eric Rowell
2014-01-04 23:56:33 -08:00
parent 7e2c6c97f8
commit fae1c538f3
8 changed files with 93 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Node.js
View File

@@ -31,8 +31,8 @@
'skewXChange.kinetic',
'skewYChange.kinetic',
'rotationChange.kinetic',
'offsetXChange.kinetic',
'offsetYChange.kinetic',
'centerXChange.kinetic',
'centerYChange.kinetic',
'transformsEnabledChange.kinetic'
].join(SPACE);
@@ -654,11 +654,11 @@
getAbsolutePosition: function() {
var absoluteMatrix = this.getAbsoluteTransform().getMatrix(),
absoluteTransform = new Kinetic.Transform(),
offset = this.offset();
center = this.center();
// clone the matrix array
absoluteTransform.m = absoluteMatrix.slice();
absoluteTransform.translate(offset.x, offset.y);
absoluteTransform.translate(center.x, center.y);
return absoluteTransform.getTranslation();
},
@@ -713,8 +713,8 @@
rotation: this.getRotation(),
scaleX: this.getScaleX(),
scaleY: this.getScaleY(),
offsetX: this.getOffsetX(),
offsetY: this.getOffsetY(),
centerX: this.getCenterX(),
centerY: this.getCenterY(),
skewX: this.getSkewX(),
skewY: this.getSkewY()
};
@@ -724,8 +724,8 @@
this.attrs.rotation = 0;
this.attrs.scaleX = 1;
this.attrs.scaleY = 1;
this.attrs.offsetX = 0;
this.attrs.offsetY = 0;
this.attrs.centerX = 0;
this.attrs.centerY = 0;
this.attrs.skewX = 0;
this.attrs.skewY = 0;
@@ -1071,8 +1071,8 @@
scaleY = this.getScaleY(),
skewX = this.getSkewX(),
skewY = this.getSkewY(),
offsetX = this.getOffsetX(),
offsetY = this.getOffsetY();
centerX = this.getCenterX(),
centerY = this.getCenterY();
if(x !== 0 || y !== 0) {
m.translate(x, y);
@@ -1086,8 +1086,8 @@
if(scaleX !== 1 || scaleY !== 1) {
m.scale(scaleX, scaleY);
}
if(offsetX !== 0 || offsetY !== 0) {
m.translate(-1 * offsetX, -1 * offsetY);
if(centerX !== 0 || centerY !== 0) {
m.translate(-1 * centerX, -1 * centerY);
}
return m;
@@ -1726,35 +1726,35 @@
* @returns {Number}
*/
Kinetic.Factory.addPointGetterSetter(Kinetic.Node, 'offset', 0);
Kinetic.Factory.addPointGetterSetter(Kinetic.Node, 'center', 0);
/**
* get/set offset. A node's offset defines the position and rotation point
* get/set center. A node's center defines the position and rotation point
* @method
* @memberof Kinetic.Node.prototype
* @param {Object} offset
* @param {Number} offset.x
* @param {Number} offset.y
* @param {Object} center
* @param {Number} center.x
* @param {Number} center.y
* @returns {Object}
* @example
* // set x and y <br>
* shape.offset({<br>
* shape.center({<br>
* x: 20<br>
* y: 10<br>
* });<br><br>
*/
/**
* get/set offset x
* @name offsetX
* get/set center x
* @name centerX
* @memberof Kinetic.Node.prototype
* @param {Number} x
* @returns {Integer}
*/
/**
* get/set offset y
* @name offsetY
* get/set center y
* @name centerY
* @method
* @memberof Kinetic.Node.prototype
* @param {Number} y