lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2026-03-03 16:58:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed drawFunc to sceneFunc and drawHitFunc to hitFunc

Browse Source
This commit is contained in:
Eric Rowell
2014-01-04 23:34:01 -08:00
parent ff952bf958
commit 7e2c6c97f8
20 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Shape.js
View File

@@ -236,7 +236,7 @@
var canvas = can || this.getLayer().getCanvas(),
context = canvas.getContext(),
cachedCanvas = this._cache.canvas,
drawFunc = this.getDrawFunc(),
drawFunc = this.sceneFunc(),
hasShadow = this.hasShadow(),
stage, bufferCanvas, bufferContext;
@@ -293,7 +293,7 @@
drawHit: function(can) {
var canvas = can || this.getLayer().hitCanvas,
context = canvas.getContext(),
drawFunc = this.getDrawHitFunc() || this.getDrawFunc(),
drawFunc = this.hitFunc() || this.sceneFunc(),
cachedCanvas = this._cache.canvas,
cachedHitCanvas = cachedCanvas && cachedCanvas.hit;
@@ -475,7 +475,7 @@
* @returns {Number}
*/
Kinetic.Factory.addGetterSetter(Kinetic.Shape, 'drawFunc');
Kinetic.Factory.addGetterSetter(Kinetic.Shape, 'sceneFunc');
/**
* set draw function
@@ -494,7 +494,7 @@
* @returns {Function}
*/
Kinetic.Factory.addGetterSetter(Kinetic.Shape, 'drawHitFunc');
Kinetic.Factory.addGetterSetter(Kinetic.Shape, 'hitFunc');
/**
* set draw hit function used for hit detection

4
src/plugins/Label.js
View File

@@ -174,9 +174,9 @@
___init: function(config) {
Kinetic.Shape.call(this, config);
this.className = 'Tag';
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var width = this.getWidth(),
height = this.getHeight(),
pointerDirection = this.getPointerDirection(),

4
src/plugins/Path.js
View File

@@ -36,9 +36,9 @@
that.dataArray = Kinetic.Path.parsePathData(this.getData());
});
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function (context) {
_sceneFunc: function(context) {
var ca = this.dataArray,
closedPath = false;

4
src/plugins/RegularPolygon.js
View File

@@ -29,9 +29,9 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = 'RegularPolygon';
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var sides = this.attrs.sides,
radius = this.attrs.radius,
n, x, y;

4
src/plugins/Star.js
View File

@@ -31,9 +31,9 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = 'Star';
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var innerRadius = this.innerRadius(),
outerRadius = this.outerRadius(),
numPoints = this.numPoints();

4
src/plugins/TextPath.js
View File

@@ -65,9 +65,9 @@
// update text data for certain attr changes
this.on('textChange.kinetic textStroke.kinetic textStrokeWidth.kinetic', that._setTextData);
that._setTextData();
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
context.setAttr('font', this._getContextFont());
context.setAttr('textBaseline', 'middle');
context.setAttr('textAlign', 'left');

4
src/shapes/Arc.js
View File

@@ -32,9 +32,9 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = 'Arc';
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
context.beginPath();
context.arc(0, 0, this.getOuterRadius(), 0, this.getAngle(), this.getClockwise());
context.arc(0, 0, this.getInnerRadius(), this.getAngle(), 0, !this.getClockwise());

4
src/shapes/Circle.js
View File

@@ -40,9 +40,9 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = CIRCLE;
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
context.beginPath();
context.arc(0, 0, this.getRadius(), 0, PIx2, false);
context.closePath();

4
src/shapes/Ellipse.js
View File

@@ -21,9 +21,9 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = ELLIPSE;
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var r = this.getRadius();
context.beginPath();

8
src/shapes/Image.js
View File

@@ -36,13 +36,13 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = IMAGE;
this.setDrawFunc(this._drawFunc);
this.setDrawHitFunc(this._drawHitFunc);
this.sceneFunc(this._sceneFunc);
this.hitFunc(this._hitFunc);
},
_useBufferCanvas: function() {
return (this.hasShadow() || this.getAbsoluteOpacity() !== 1) && this.hasStroke();
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var width = this.getWidth(),
height = this.getHeight(),
image = this.getImage(),
@@ -69,7 +69,7 @@
context.drawImage.apply(context, params);
}
},
_drawHitFunc: function(context) {
_hitFunc: function(context) {
var width = this.getWidth(),
height = this.getHeight(),
imageHitRegion = this.imageHitRegion;

4
src/shapes/Line.js
View File

@@ -35,9 +35,9 @@
this._clearCache('tensionPoints');
});
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var points = this.getPoints(),
length = points.length,
tension = this.getTension(),

4
src/shapes/Rect.js
View File

@@ -25,9 +25,9 @@
___init: function(config) {
Kinetic.Shape.call(this, config);
this.className = 'Rect';
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var cornerRadius = this.getCornerRadius(),
width = this.getWidth(),
height = this.getHeight();

4
src/shapes/Ring.js
View File

@@ -32,9 +32,9 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = 'Ring';
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
context.beginPath();
context.arc(0, 0, this.getInnerRadius(), 0, PIx2, false);
context.moveTo(this.getOuterRadius(), 0);

8
src/shapes/Sprite.js
View File

@@ -82,10 +82,10 @@
this.setIndex(0);
});
this.setDrawFunc(this._drawFunc);
this.setDrawHitFunc(this._drawHitFunc);
this.sceneFunc(this._sceneFunc);
this.hitFunc(this._hitFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var anim = this.getAnimation(),
index = this.getIndex(),
f = this.getAnimations()[anim][index],
@@ -95,7 +95,7 @@
context.drawImage(image, f.x, f.y, f.width, f.height, 0, 0, f.width, f.height);
}
},
_drawHitFunc: function(context) {
_hitFunc: function(context) {
var anim = this.getAnimation(),
index = this.getIndex(),
f = this.getAnimations()[anim][index];

8
src/shapes/Text.js
View File

@@ -86,10 +86,10 @@
}
this._setTextData();
this.setDrawFunc(this._drawFunc);
this.setDrawHitFunc(this._drawHitFunc);
this.sceneFunc(this._sceneFunc);
this.hitFunc(this._hitFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
var p = this.getPadding(),
textHeight = this.getTextHeight(),
lineHeightPx = this.getLineHeight() * textHeight,
@@ -127,7 +127,7 @@
}
context.restore();
},
_drawHitFunc: function(context) {
_hitFunc: function(context) {
var width = this.getWidth(),
height = this.getHeight();

4
src/shapes/Wedge.js
View File

@@ -30,9 +30,9 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = 'Wedge';
this.setDrawFunc(this._drawFunc);
this.sceneFunc(this._sceneFunc);
},
_drawFunc: function(context) {
_sceneFunc: function(context) {
context.beginPath();
context.arc(0, 0, this.getRadius(), 0, this.getAngle(), this.getClockwise());
context.lineTo(0, 0);