marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove skewX(0) and skewY(0) too. How do they stack?

Browse source
This commit is contained in:
Johan Sundström 2011-02-21 02:48:07 -08:00
parent f45173f4ee
commit 5f18a23fd7
3 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scour.py
View file

@ -2300,6 +2300,14 @@ def optimizeTransform(transform):
The transformation list is modified in-place.
"""
# FIXME: reordering these would optimize even more cases:
# first: Fold consecutive runs of the same transformation
# extra: Attempt to cast between types to create sameness:
# "matrix(0 1 -1 0 0 0) rotate(180) scale(-1)" all
# are rotations (90, 180, 180) -- thus "rotate(90)"
# second: Simplify transforms where numbers are optional.
# third: Attempt to simplify any single remaining matrix()
#
# if there's only one transformation and it's a matrix,
# try to make it a shorter non-matrix transformation
# NOTE: as matrix(a b c d e f) in SVG means the matrix:
@ -2373,8 +2381,17 @@ def optimizeTransform(transform):
# rotations followed immediately by other rotations,
# scaling followed immediately by other scaling,
# are safe to add.
# A matrix followed immediately by another matrix
# would be safe to multiply together, too.
# Identity skewX/skewY are safe to remove, but how do they accrete?
# |¯ 1 0 0 ¯|
# | tan(A) 1 0 | skews X coordinates by angle A
# |_ 0 0 1 _|
#
# |¯ 1 tan(A) 0 ¯|
# | 0 1 0 | skews Y coordinates by angle A
# |_ 0 0 1 _|
#
# FIXME: A matrix followed immediately by another matrix
# would be safe to multiply together, too.
i = 1
while i < len(transform):
[currType, currArgs] = transform[i]
@ -2414,6 +2431,11 @@ def optimizeTransform(transform):
# Identity scale!
i -= 1
del transform[i]
elif ((currType == 'skewX' or currType == 'skewY')
and len(currArgs) == 1 and currArgs[0] == 0):
# Identity skew!
i -= 1
del transform[i]
else:
i += 1