scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-22 21:42:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #267 from fsih/updateCenter

Browse source 
Fix point rotation point is relative to, which is not viewBox upper left
This commit is contained in:
DD Liu 2018-01-26 17:30:40 -05:00 committed by GitHub
commit 02e7d96e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/containers/paper-canvas.jsx
View file

@ -98,6 +98,20 @@ class PaperCanvas extends React.Component {
svg = svg.replace(
'<svg ', '<svg xmlns="http://www.w3.org/2000/svg" ');
}
// Get the origin which the viewBox is defined relative to. During import, Paper will translate
// the viewBox to start at (0, 0), and we need to translate it back for some costumes to render
// correctly.
const parser = new DOMParser();
const svgDom = parser.parseFromString(svg, 'text/xml');
const viewBox = svgDom.documentElement.attributes.viewBox ?
svgDom.documentElement.attributes.viewBox.value.match(/\S+/g) : null;
if (viewBox) {
for (let i = 0; i < viewBox.length; i++) {
viewBox[i] = parseFloat(viewBox[i]);
}
}
paper.project.importSVG(svg, {
expandShapes: true,
onLoad: function (item) {
@ -131,8 +145,12 @@ class PaperCanvas extends React.Component {
ensureClockwise(item);
if (typeof rotationCenterX !== 'undefined' && typeof rotationCenterY !== 'undefined') {
let rotationPoint = new paper.Point(rotationCenterX, rotationCenterY);
if (viewBox && viewBox.length >= 2 && !isNaN(viewBox[0]) && !isNaN(viewBox[1])) {
rotationPoint = rotationPoint.subtract(viewBox[0], viewBox[1]);
}
item.translate(paper.project.view.center
.subtract(rotationCenterX, rotationCenterY));
.subtract(rotationPoint));
} else {
// Center
item.translate(paper.project.view.center