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

colorLib: rename builders to match current Paint format names

Browse Source
This commit is contained in:
Cosimo Lupo 2020-10-09 18:30:50 +01:00
parent fdf6a5c1fc
commit a2aaf41a7e
No known key found for this signature in database
GPG Key ID: 179A8F0895A02F4F
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/fontTools/colorLib/builder.py
View File

@ -332,7 +332,7 @@ def buildColorIndex(
return self return self
def buildSolidColorPaint( def buildPaintSolid(
paletteIndex: int, alpha: _ScalarInput = _DEFAULT_ALPHA paletteIndex: int, alpha: _ScalarInput = _DEFAULT_ALPHA
) -> ot.Paint: ) -> ot.Paint:
self = ot.Paint() self = ot.Paint()
@ -396,7 +396,7 @@ def _to_color_line(obj):
raise TypeError(obj) raise TypeError(obj)
def buildLinearGradientPaint( def buildPaintLinearGradient(
colorLine: _ColorLineInput, colorLine: _ColorLineInput,
p0: _PointTuple, p0: _PointTuple,
p1: _PointTuple, p1: _PointTuple,
@ -431,7 +431,7 @@ def buildAffine2x3(
return self return self
def buildRadialGradientPaint( def buildPaintRadialGradient(
colorLine: _ColorLineInput, colorLine: _ColorLineInput,
c0: _PointTuple, c0: _PointTuple,
c1: _PointTuple, c1: _PointTuple,
@ -488,9 +488,9 @@ def buildPaintComposite(
_PAINT_BUILDERS = { _PAINT_BUILDERS = {
1: buildSolidColorPaint, 1: buildPaintSolid,
2: buildLinearGradientPaint, 2: buildPaintLinearGradient,
3: buildRadialGradientPaint, 3: buildPaintRadialGradient,
4: buildPaintGlyph, 4: buildPaintGlyph,
5: buildPaintColorGlyph, 5: buildPaintColorGlyph,
6: buildPaintTransform, 6: buildPaintTransform,
@ -503,7 +503,7 @@ def buildPaint(paint: _PaintInput) -> ot.Paint:
return paint return paint
elif isinstance(paint, int): elif isinstance(paint, int):
paletteIndex = paint paletteIndex = paint
return buildSolidColorPaint(paletteIndex) return buildPaintSolid(paletteIndex)
elif isinstance(paint, tuple): elif isinstance(paint, tuple):
layerGlyph, paint = paint layerGlyph, paint = paint
return buildPaintGlyph(layerGlyph, paint) return buildPaintGlyph(layerGlyph, paint)

32
Tests/colorLib/builder_test.py
View File

@ -205,20 +205,20 @@ def test_buildColorIndex():
assert c.Alpha.varIdx == 2 assert c.Alpha.varIdx == 2
def test_buildSolidColorPaint(): def test_buildPaintSolid():
p = builder.buildSolidColorPaint(0) p = builder.buildPaintSolid(0)
assert p.Format == 1 assert p.Format == 1
assert p.Color.PaletteIndex == 0 assert p.Color.PaletteIndex == 0
assert p.Color.Alpha.value == 1.0 assert p.Color.Alpha.value == 1.0
assert p.Color.Alpha.varIdx == 0 assert p.Color.Alpha.varIdx == 0
p = builder.buildSolidColorPaint(1, alpha=0.5) p = builder.buildPaintSolid(1, alpha=0.5)
assert p.Format == 1 assert p.Format == 1
assert p.Color.PaletteIndex == 1 assert p.Color.PaletteIndex == 1
assert p.Color.Alpha.value == 0.5 assert p.Color.Alpha.value == 0.5
assert p.Color.Alpha.varIdx == 0 assert p.Color.Alpha.varIdx == 0
p = builder.buildSolidColorPaint(3, alpha=builder.VariableFloat(0.5, varIdx=2)) p = builder.buildPaintSolid(3, alpha=builder.VariableFloat(0.5, varIdx=2))
assert p.Format == 1 assert p.Format == 1
assert p.Color.PaletteIndex == 3 assert p.Color.PaletteIndex == 3
assert p.Color.Alpha.value == 0.5 assert p.Color.Alpha.value == 0.5
@ -294,7 +294,7 @@ def test_buildAffine2x3():
assert matrix.dy == builder.VariableFloat(-3.0) assert matrix.dy == builder.VariableFloat(-3.0)
def test_buildLinearGradientPaint(): def test_buildPaintLinearGradient():
color_stops = [ color_stops = [
builder.buildColorStop(0.0, 0), builder.buildColorStop(0.0, 0),
builder.buildColorStop(0.5, 1), builder.buildColorStop(0.5, 1),
@ -304,23 +304,23 @@ def test_buildLinearGradientPaint():
p0 = (builder.VariableInt(100), builder.VariableInt(200)) p0 = (builder.VariableInt(100), builder.VariableInt(200))
p1 = (builder.VariableInt(150), builder.VariableInt(250)) p1 = (builder.VariableInt(150), builder.VariableInt(250))
gradient = builder.buildLinearGradientPaint(color_line, p0, p1) gradient = builder.buildPaintLinearGradient(color_line, p0, p1)
assert gradient.Format == 2 assert gradient.Format == 2
assert gradient.ColorLine == color_line assert gradient.ColorLine == color_line
assert (gradient.x0, gradient.y0) == p0 assert (gradient.x0, gradient.y0) == p0
assert (gradient.x1, gradient.y1) == p1 assert (gradient.x1, gradient.y1) == p1
assert (gradient.x2, gradient.y2) == p1 assert (gradient.x2, gradient.y2) == p1
gradient = builder.buildLinearGradientPaint({"stops": color_stops}, p0, p1) gradient = builder.buildPaintLinearGradient({"stops": color_stops}, p0, p1)
assert gradient.ColorLine.Extend == builder.ExtendMode.PAD assert gradient.ColorLine.Extend == builder.ExtendMode.PAD
assert gradient.ColorLine.ColorStop == color_stops assert gradient.ColorLine.ColorStop == color_stops
gradient = builder.buildLinearGradientPaint(color_line, p0, p1, p2=(150, 230)) gradient = builder.buildPaintLinearGradient(color_line, p0, p1, p2=(150, 230))
assert (gradient.x2.value, gradient.y2.value) == (150, 230) assert (gradient.x2.value, gradient.y2.value) == (150, 230)
assert (gradient.x2, gradient.y2) != (gradient.x1, gradient.y1) assert (gradient.x2, gradient.y2) != (gradient.x1, gradient.y1)
def test_buildRadialGradientPaint(): def test_buildPaintRadialGradient():
color_stops = [ color_stops = [
builder.buildColorStop(0.0, 0), builder.buildColorStop(0.0, 0),
builder.buildColorStop(0.5, 1), builder.buildColorStop(0.5, 1),
@ -332,7 +332,7 @@ def test_buildRadialGradientPaint():
r0 = builder.VariableInt(10) r0 = builder.VariableInt(10)
r1 = builder.VariableInt(5) r1 = builder.VariableInt(5)
gradient = builder.buildRadialGradientPaint(color_line, c0, c1, r0, r1) gradient = builder.buildPaintRadialGradient(color_line, c0, c1, r0, r1)
assert gradient.Format == 3 assert gradient.Format == 3
assert gradient.ColorLine == color_line assert gradient.ColorLine == color_line
assert (gradient.x0, gradient.y0) == c0 assert (gradient.x0, gradient.y0) == c0
@ -340,7 +340,7 @@ def test_buildRadialGradientPaint():
assert gradient.r0 == r0 assert gradient.r0 == r0
assert gradient.r1 == r1 assert gradient.r1 == r1
gradient = builder.buildRadialGradientPaint({"stops": color_stops}, c0, c1, r0, r1) gradient = builder.buildPaintRadialGradient({"stops": color_stops}, c0, c1, r0, r1)
assert gradient.ColorLine.Extend == builder.ExtendMode.PAD assert gradient.ColorLine.Extend == builder.ExtendMode.PAD
assert gradient.ColorLine.ColorStop == color_stops assert gradient.ColorLine.ColorStop == color_stops
@ -351,14 +351,14 @@ def test_buildPaintGlyph():
assert layer.Paint.Format == 1 assert layer.Paint.Format == 1
assert layer.Paint.Color.PaletteIndex == 2 assert layer.Paint.Color.PaletteIndex == 2
layer = builder.buildPaintGlyph("a", builder.buildSolidColorPaint(3, 0.9)) layer = builder.buildPaintGlyph("a", builder.buildPaintSolid(3, 0.9))
assert layer.Paint.Format == 1 assert layer.Paint.Format == 1
assert layer.Paint.Color.PaletteIndex == 3 assert layer.Paint.Color.PaletteIndex == 3
assert layer.Paint.Color.Alpha.value == 0.9 assert layer.Paint.Color.Alpha.value == 0.9
layer = builder.buildPaintGlyph( layer = builder.buildPaintGlyph(
"a", "a",
builder.buildLinearGradientPaint( builder.buildPaintLinearGradient(
{"stops": [(0.0, 3), (1.0, 4)]}, (100, 200), (150, 250) {"stops": [(0.0, 3), (1.0, 4)]}, (100, 200), (150, 250)
), ),
) )
@ -374,7 +374,7 @@ def test_buildPaintGlyph():
layer = builder.buildPaintGlyph( layer = builder.buildPaintGlyph(
"a", "a",
builder.buildRadialGradientPaint( builder.buildPaintRadialGradient(
{ {
"stops": [ "stops": [
(0.0, 5), (0.0, 5),
@ -467,7 +467,7 @@ def test_buildLayerV1List():
"r1": 10, "r1": 10,
}, },
), ),
builder.buildPaintGlyph("e", builder.buildSolidColorPaint(8)), builder.buildPaintGlyph("e", builder.buildPaintSolid(8)),
] ]
layers = builder.buildLayerV1List(layers) layers = builder.buildLayerV1List(layers)
@ -546,7 +546,7 @@ def test_split_color_glyphs_by_version():
assert not colorGlyphsV1 assert not colorGlyphsV1
colorGlyphs = { colorGlyphs = {
"a": [("b", builder.buildSolidColorPaint(paletteIndex=0, alpha=0.0))] "a": [("b", builder.buildPaintSolid(paletteIndex=0, alpha=0.0))]
} }
colorGlyphsV0, colorGlyphsV1 = builder._split_color_glyphs_by_version(colorGlyphs) colorGlyphsV0, colorGlyphsV1 = builder._split_color_glyphs_by_version(colorGlyphs)