lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-09-19 02:37:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

removed radian angle attrs. All rotations are set in degrees now

Browse Source
This commit is contained in:
Eric Rowell
2014-01-06 21:37:46 -08:00
parent ceddf561fc
commit 66b65f1c19
9 changed files with 82 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/unit/Node-test.js
View File

@@ -712,14 +712,14 @@ suite('Node', function() {
fill: 'green',
stroke: 'black',
strokeWidth: 4,
rotationDeg: 10
rotation: 10
});
assert.equal(rect.getRotationDeg(), 10);
rect.setRotationDeg(20);
assert.equal(rect.getRotationDeg(), 20);
rect.rotateDeg(20);
assert.equal(rect.getRotationDeg(), 40);
assert.equal(rect.rotation(), 10);
rect.rotation(20);
assert.equal(rect.rotation(), 20);
rect.rotate(20);
assert.equal(rect.rotation(), 40);
layer.add(rect);
stage.add(layer);
@@ -774,14 +774,14 @@ suite('Node', function() {
x: 0.5,
y: 0.5
},
rotation: 20 * Math.PI / 180
rotation: 20
});
assert.equal(rect.getPosition().x, 200);
assert.equal(rect.getPosition().y, 100);
assert.equal(rect.getScale().x, 0.5);
assert.equal(rect.getScale().y, 0.5);
assert.equal(rect.getRotation(), 20 * Math.PI / 180);
assert.equal(rect.getRotation(), 20);
rect.setScale({x:2, y:0.3});
assert.equal(rect.getScale().x, 2);
@@ -1160,14 +1160,14 @@ suite('Node', function() {
fill: 'green',
stroke: 'black',
strokeWidth: 4,
rotationDeg: 10
rotation: 10
});
assert.equal(rect.getRotationDeg(), 10);
rect.setRotationDeg(20);
assert.equal(rect.getRotationDeg(), 20);
rect.rotateDeg(20);
assert.equal(rect.getRotationDeg(), 40);
assert.equal(rect.rotation(), 10);
rect.rotation(20);
assert.equal(rect.rotation(), 20);
rect.rotate(20);
assert.equal(rect.rotation(), 40);
layer.add(rect);
stage.add(layer);
@@ -1513,7 +1513,7 @@ suite('Node', function() {
//console.log(rect.getAbsoluteTransform().getTranslation())
stage.rotate(Math.PI / 3);
stage.rotate(180 / 3);
stage.setScale({x:0.5, y:0.5});
stage.draw();
@@ -1568,7 +1568,7 @@ suite('Node', function() {
var group = new Kinetic.Group({
name: 'groupName',
id: 'groupId',
rotationDeg: 45,
rotation: 45,
center: {x:side / 2, y:side / 2},
x: diagonal / 2,
y: diagonal / 2
@@ -1895,7 +1895,7 @@ suite('Node', function() {
});
var group = new Kinetic.Group({
x: 100,
rotationDeg: 90
rotation: 90
});
var rect = new Kinetic.Rect({
@@ -2843,9 +2843,6 @@ suite('Node', function() {
circle.rotation(2);
assert.equal(circle.rotation(), 2);
circle.rotationDeg(3);
assert.equal(Math.round(circle.rotationDeg()), 3);
circle.scale({x: 2, y: 2});
assert.equal(circle.scale().x, 2);
assert.equal(circle.scale().y, 2);
@@ -3074,7 +3071,7 @@ suite('Node', function() {
x: 100,
y: 100,
draggable: true,
rotationDeg: 20,
rotation: 20,
scaleX: 2,
scaleY: 2
});

8
test/unit/Shape-test.js
View File

@@ -193,7 +193,7 @@ suite('Shape', function() {
fillPatternY: -30,
fillPatternScale: {x: 0.5, y:0.5},
fillPatternOffset: {x: 219, y: 150},
fillPatternRotation: Math.PI * 0.5,
fillPatternRotation: 90,
fillPatternRepeat: 'no-repeat',
stroke: 'blue',
@@ -217,11 +217,11 @@ suite('Shape', function() {
assert.equal(star.getFillPatternScale().y, 0.5, 'star fill scale y should be 0.5');
assert.equal(star.getFillPatternOffset().x, 219, 'star fill offset x should be 219');
assert.equal(star.getFillPatternOffset().y, 150, 'star fill offset y should be 150');
assert.equal(star.getFillPatternRotation(), Math.PI * 0.5, 'star fill rotation should be Math.PI * 0.5');
assert.equal(star.getFillPatternRotation(), 90, 'star fill rotation should be 90');
star.setFillPatternRotationDeg(180);
star.setFillPatternRotation(180);
assert.equal(star.getFillPatternRotation(), Math.PI, 'star fill rotation should be Math.PI');
assert.equal(star.getFillPatternRotation(), 180, 'star fill rotation should be 180');
star.setFillPatternScale({x:1, y:1});

29
test/unit/shapes/Arc-test.js
View File

@@ -1,4 +1,4 @@
suite('AnnularSection', function() {
suite('Arc', function() {
// ======================================================
test('add arc', function() {
var stage = addStage();
@@ -8,7 +8,7 @@ suite('AnnularSection', function() {
y: 100,
innerRadius: 50,
outerRadius: 80,
angle: Math.PI * 0.4,
angle: 90,
fill: 'green',
stroke: 'black',
strokeWidth: 4,
@@ -23,30 +23,7 @@ suite('AnnularSection', function() {
var trace = layer.getContext().getTrace();
//console.log(trace);
assert.equal(trace, 'clearRect(0,0,578,200);save();transform(1,0,0,1,100,100);beginPath();arc(0,0,80,0,1.257,false);arc(0,0,50,1.257,0,true);closePath();fillStyle=green;fill();lineWidth=4;strokeStyle=black;stroke();restore();');
assert.equal(trace, 'clearRect(0,0,578,200);save();transform(1,0,0,1,100,100);beginPath();arc(0,0,80,0,1.571,false);arc(0,0,50,1.571,0,true);closePath();fillStyle=green;fill();lineWidth=4;strokeStyle=black;stroke();restore();');
});
// ======================================================
test('set annular section angle using degrees', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var arc = new Kinetic.Arc({
x: 100,
y: 100,
innerRadius: 50,
outerRadius: 80,
angleDeg: 90,
fill: 'green',
stroke: 'black',
strokeWidth: 4,
name: 'myArc',
draggable: true,
lineJoin: 'round'
});
layer.add(arc);
stage.add(layer);
assert.equal(arc.getAngle(), Math.PI / 2);
});
});

24
test/unit/shapes/Wedge-test.js
View File

@@ -7,7 +7,7 @@ suite('Wedge', function() {
x: 100,
y: 100,
radius: 70,
angle: Math.PI * 0.4,
angle: 180 * 0.4,
fill: 'green',
stroke: 'black',
strokeWidth: 4,
@@ -25,26 +25,4 @@ suite('Wedge', function() {
assert.equal(trace, 'clearRect(0,0,578,200);save();transform(1,0,0,1,100,100);beginPath();arc(0,0,70,0,1.257,false);lineTo(0,0);closePath();fillStyle=green;fill();lineWidth=4;strokeStyle=black;stroke();restore();');
});
// ======================================================
test('set wedge angle using degrees', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var wedge = new Kinetic.Wedge({
x: 100,
y: 100,
radius: 70,
angleDeg: 90,
fill: 'green',
stroke: 'black',
strokeWidth: 4,
name: 'myCircle',
draggable: true,
lineJoin: 'round'
});
layer.add(wedge);
stage.add(layer);
assert.equal(wedge.getAngle(), Math.PI / 2);
});
});