Skip to content

Commit

Permalink
Merge pull request #945 from edemaine/pointarray-transform
Browse files Browse the repository at this point in the history
Add PointArray.transform by analogy to Point.transform
  • Loading branch information
Fuzzyma authored Dec 14, 2018
2 parents 33e82b7 + 7955400 commit f2eb246
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
28 changes: 28 additions & 0 deletions spec/spec/pointarray.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
describe('PointArray', function() {
const squareString = '0,0 1,0 1,1 0,1';
const square = new SVG.PointArray(squareString)

describe('toString()', function() {
it('round trips with string', () => {
expect(square.toString()).toEqual(squareString)
})
})

describe('transform()', function() {
it('translates correctly', () => {
const translation = new SVG.Matrix().translate(2,1)
const newSquare = square.transform(translation)
expect(newSquare.toString()).toEqual('2,1 3,1 3,2 2,2')
})

it('transforms like Point', () => {
const matrix = new SVG.Matrix(1, 2, 3, 4, 5, 6)
const newSquare = square.transform(matrix)
for (let i = 0; i < square.length; i++) {
const squarePoint = new SVG.Point(square[i])
const newSquarePoint = new SVG.Point(newSquare[i])
expect(squarePoint.transform(matrix)).toEqual(newSquarePoint)
}
})
})
})
17 changes: 17 additions & 0 deletions src/types/PointArray.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,23 @@ extend(PointArray, {
return points
},

// transform points with matrix (similar to Point.transform)
transform (m) {
const points = []

for (let i = 0; i < this.length; i++) {
const point = this[i]
// Perform the matrix multiplication
points.push([
m.a * point[0] + m.c * point[1] + m.e,
m.b * point[0] + m.d * point[1] + m.f
])
}

// Return the required point
return new PointArray(points)
},

// Move point string
move (x, y) {
var box = this.bbox()
Expand Down

0 comments on commit f2eb246

Please sign in to comment.