MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No need to check for rune.uint32 > SP.uint32 because typeset alreayd does.

Browse source
This commit is contained in:
treeform 2021-10-01 10:18:12 -07:00
parent c0f31b276f
commit 8a88cd29fa
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/pixie/fonts.nim
View file

@ -107,31 +107,27 @@ proc isCCW(typeface: Typeface): bool {.inline.} =
proc hasGlyph*(typeface: Typeface, rune: Rune): bool {.inline.} = proc hasGlyph*(typeface: Typeface, rune: Rune): bool {.inline.} =
## Returns if there is a glyph for this rune. ## Returns if there is a glyph for this rune.
if rune.uint32 > SP.uint32: # Empty paths for control runes (not tofu) if typeface.opentype != nil:
if typeface.opentype != nil: typeface.opentype.hasGlyph(rune)
typeface.opentype.hasGlyph(rune)
else:
typeface.svgFont.hasGlyph(rune)
else: else:
false typeface.svgFont.hasGlyph(rune)
proc getGlyphPath*( proc getGlyphPath*(
typeface: Typeface, rune: Rune typeface: Typeface, rune: Rune
): Path {.inline, raises: [PixieError].} = ): Path {.inline, raises: [PixieError].} =
## The glyph path for the rune. ## The glyph path for the rune.
result = newPath() result = newPath()
if rune.uint32 > SP.uint32: # Empty paths for control runes (not tofu) if typeface.hasGlyph(rune):
if typeface.hasGlyph(rune): if typeface.opentype != nil:
if typeface.opentype != nil: result.addPath(typeface.opentype.getGlyphPath(rune))
result.addPath(typeface.opentype.getGlyphPath(rune))
else:
result.addPath(typeface.svgFont.getGlyphPath(rune))
else: else:
for fallback in typeface.fallbacks: result.addPath(typeface.svgFont.getGlyphPath(rune))
if fallback.hasGlyph(rune): else:
result = fallback.getGlyphPath(rune) for fallback in typeface.fallbacks:
let ratio = typeface.scale / fallback.scale if fallback.hasGlyph(rune):
result.transform(scale(vec2(ratio, ratio))) result = fallback.getGlyphPath(rune)
let ratio = typeface.scale / fallback.scale
result.transform(scale(vec2(ratio, ratio)))
proc getAdvance*(typeface: Typeface, rune: Rune): float32 {.inline, raises: [].} = proc getAdvance*(typeface: Typeface, rune: Rune): float32 {.inline, raises: [].} =
## The advance for the rune in pixels. ## The advance for the rune in pixels.
@ -153,7 +149,6 @@ proc getAdvance*(typeface: Typeface, rune: Rune): float32 {.inline, raises: [].}
else: else:
return typeface.svgFont.getAdvance(rune) return typeface.svgFont.getAdvance(rune)
proc getKerningAdjustment*( proc getKerningAdjustment*(
typeface: Typeface, left, right: Rune typeface: Typeface, left, right: Rune
): float32 {.inline, raises: [].} = ): float32 {.inline, raises: [].} =