Behdad Esfahbod 2018-11-08 14:36:40 -05:00
parent 84580fee64
commit bc7f5ee73f

View File

@ -109,7 +109,7 @@ class OnlineVarStoreBuilder(object):
# Full array. Start new one.
self._set_VarData()
return self.storeDeltas(deltas)
VarData_add_item(self._data, deltas)
self._data.add_item(deltas)
varIdx = (self._outer << 16) + inner
self._cache[deltas] = varIdx
@ -127,10 +127,14 @@ def VarData_add_item(self, deltas):
deltas = tuple(deltas)
self.Item.append(deltas)
ot.VarData.add_item = VarData_add_item
def VarRegion_get_support(self, fvar_axes):
return {fvar_axes[i].axisTag: (reg.StartCoord,reg.PeakCoord,reg.EndCoord)
for i,reg in enumerate(self.VarRegionAxis)}
ot.VarRegion.get_support = VarRegion_get_support
class VarStoreInstancer(object):
def __init__(self, varstore, fvar_axes, location={}):
@ -150,7 +154,7 @@ class VarStoreInstancer(object):
def _getScalar(self, regionIdx):
scalar = self._scalars.get(regionIdx)
if scalar is None:
support = VarRegion_get_support(self._regions[regionIdx], self.fvar_axes)
support = self._regions[regionIdx].get_support(self.fvar_axes)
scalar = supportScalar(self.location, support)
self._scalars[regionIdx] = scalar
return scalar