Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-23 20:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rotation point now works after flipY.

Browse source
This commit is contained in:
Maciej Gajewski 2012-05-29 13:04:25 +02:00
parent 1d037645b9
commit 752339aa3e
2 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/canvas.class.js
View file

@ -531,7 +531,7 @@
? 'scaleX'
: (corner === 'mt' || corner === 'mb')
? 'scaleY'
: (corner === 'mtr')
: (corner === 'mtr' || corner === 'mbr')
? 'rotate'
: (target.hasRotatingPoint)
? 'scale'
@ -787,7 +787,7 @@
else {
if (corner in cursorMap) {
s.cursor = cursorMap[corner];
} else if (corner === 'mtr') {
} else if (corner === 'mtr' || corner === 'mbr') {
s.cursor = this.ROTATION_CURSOR
} else {
s.cursor = this.CURSOR;

44
src/object.class.js
View file

@ -535,6 +535,10 @@
x: tl.x + (this.currentWidth/2 * cosTh),
y: tl.y + (this.currentWidth/2 * sinTh)
};
var mbr = {
x: tl.x + (this.currentWidth/2 * cosTh),
y: tl.y + (this.currentWidth/2 * sinTh)
};
// debugging
@ -551,7 +555,7 @@
// }, 50);
// clockwise
this.oCoords = { tl: tl, tr: tr, br: br, bl: bl, ml: ml, mt: mt, mr: mr, mb: mb, mtr: mtr };
this.oCoords = { tl: tl, tr: tr, br: br, bl: bl, ml: ml, mt: mt, mr: mr, mb: mb, mtr: mtr, mbr: mbr };
// set coordinates of the draggable boxes in the corners used to scale/rotate the image
this._setCornerCoords();
@ -1199,22 +1203,44 @@
}
};
var rotationPointDistance = 40;
coords.mtr.corner = {
tl: {
x: coords.mtr.x - sinHalfOffset + (sinTh * 40),
y: coords.mtr.y - cosHalfOffset - (cosTh * 40)
x: coords.mtr.x - sinHalfOffset + (sinTh * rotationPointDistance),
y: coords.mtr.y - cosHalfOffset - (cosTh * rotationPointDistance)
},
tr: {
x: coords.mtr.x + cosHalfOffset + (sinTh * 40),
y: coords.mtr.y - sinHalfOffset - (cosTh * 40)
x: coords.mtr.x + cosHalfOffset + (sinTh * rotationPointDistance),
y: coords.mtr.y - sinHalfOffset - (cosTh * rotationPointDistance)
},
bl: {
x: coords.mtr.x - cosHalfOffset + (sinTh * 40),
y: coords.mtr.y + sinHalfOffset - (cosTh * 40)
x: coords.mtr.x - cosHalfOffset + (sinTh * rotationPointDistance),
y: coords.mtr.y + sinHalfOffset - (cosTh * rotationPointDistance)
},
br: {
x: coords.mtr.x + sinHalfOffset + (sinTh * 40),
y: coords.mtr.y + cosHalfOffset - (cosTh * 40)
x: coords.mtr.x + sinHalfOffset + (sinTh * rotationPointDistance),
y: coords.mtr.y + cosHalfOffset - (cosTh * rotationPointDistance)
}
};
var bottomRotationPointDistance = (-rotationPointDistance - this.currentHeight);
coords.mbr.corner = {
tl: {
x: coords.mbr.x - sinHalfOffset + (sinTh * bottomRotationPointDistance),
y: coords.mbr.y - cosHalfOffset - (cosTh * bottomRotationPointDistance)
},
tr: {
x: coords.mbr.x + cosHalfOffset + (sinTh * bottomRotationPointDistance),
y: coords.mbr.y - sinHalfOffset - (cosTh * bottomRotationPointDistance)
},
bl: {
x: coords.mbr.x - cosHalfOffset + (sinTh * bottomRotationPointDistance),
y: coords.mbr.y + sinHalfOffset - (cosTh * bottomRotationPointDistance)
},
br: {
x: coords.mbr.x + sinHalfOffset + (sinTh * bottomRotationPointDistance),
y: coords.mbr.y + cosHalfOffset - (cosTh * bottomRotationPointDistance)
}
};
},