shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[varLib.models] Add VariationModel.interpolateFromDeltasAndScalars()

Browse Source
This commit is contained in:
Behdad Esfahbod 2017-05-23 00:45:53 -07:00
parent 489c80c83b
commit 53b7ea4612
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/fontTools/varLib/models.py
View File

@ -267,8 +267,7 @@ class VariationModel(object):
def getScalars(self, loc): def getScalars(self, loc):
return [supportScalar(loc, support) for support in self.supports] return [supportScalar(loc, support) for support in self.supports]
def interpolateFromDeltas(self, loc, deltas): def interpolateFromDeltasAndScalars(self, deltas, scalars):
scalars = self.getScalars(loc)
v = None v = None
assert len(deltas) == len(scalars) assert len(deltas) == len(scalars)
for i,(delta,scalar) in enumerate(zip(deltas, scalars)): for i,(delta,scalar) in enumerate(zip(deltas, scalars)):
@ -280,6 +279,10 @@ class VariationModel(object):
v += contribution v += contribution
return v return v
def interpolateFromDeltas(self, loc, deltas):
scalars = self.getScalars(loc)
return self.interpolateFromDeltasAndScalars(deltas, scalars)
def interpolateFromMasters(self, loc, masterValues): def interpolateFromMasters(self, loc, masterValues):
deltas = self.getDeltas(masterValues) deltas = self.getDeltas(masterValues)
return self.interpolateFromDeltas(loc, deltas) return self.interpolateFromDeltas(loc, deltas)