AriasCreations/furware
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Removed "guessing char" method for determining per-font Y-offset

Browse source 
- Instead added "setBaselineOffset" script function to set a common baseline for all fonts
- Now using text_path instead of show_text pycairo function for subpixel-precise text positioning
- Updated autoShrink logic
- Increased size of some special characters
- Small updates to font.confs and default chains
This commit is contained in:
Ochi Wolfe 2013-08-31 23:18:24 +02:00
parent 3327051521
commit 70c04baf9c
18 changed files with 78 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TextureCreator/fonts/AnonymousPro-Bold/font.conf
View file

@ -1,2 +1,2 @@
offset 2 0 abs abs
scale 0.8125 cellHeight
offset 2 1 abs abs

2
TextureCreator/fonts/AnonymousPro/font.conf
View file

@ -1,2 +1,2 @@
offset 2 0 abs abs
scale 0.8125 cellHeight
offset 2 1 abs abs

2
TextureCreator/fonts/DejaVu-Bold/font.conf
View file

@ -1 +1 @@
offset -1 -1 abs abs

70
TextureCreator/fonts/DejaVu/font.conf
View file

@ -1,41 +1,29 @@
offset -1 -1 abs abs
charOffset ⚠ 0 -4 1 1
charOffset ▲ 0 -4 1 1
charOffset ◀ 0 -4 1 1
charOffset ▼ 0 -4 1 1
charOffset ▶ 0 -4 1 1
charOffset ○ 0 -4 1 1
charOffset ◔ 0 -4 1 1
charOffset ◑ 0 -4 1 1
charOffset ◕ 0 -4 1 1
charOffset ● 0 -4 1 1
charOffset ↑ 1 -4 1 1
charOffset ← 1 -4 1 1
charOffset ↓ 1 -4 1 1
charOffset → 1 -4 1 1
charOffset ↺ 1 0 1 1
charOffset ↻ 1 0 1 1
charOffset ☐ 1 -5 1 1
charOffset ☑ 1 -5 1 1
charOffset ☒ 1 -5 1 1
charOffset ✔ 1 0 1 1
charOffset ✘ 1 0 1 1
charOffset ⚀ 1 -4 1 1
charOffset ⚁ 1 -4 1 1
charOffset ⚂ 1 -4 1 1
charOffset ⚃ 1 -4 1 1
charOffset ⚄ 1 -4 1 1
charOffset ⚅ 1 -4 1 1
charOffset ☺ 0 -1 1 1
charOffset ☹ 0 -1 1 1
charOffset ♪ 1 0 1 1
charOffset ♫ 1 0 1 1
charOffset ♠ 1 0 1 1
charOffset ♣ 1 0 1 1
charOffset ♥ 0 0 1 1
charOffset ♦ 1 0 1 1
charOffset ↕ 1 0 1 1
charOffset ↔ 1 0 1 1
charOffset ♀ 1 0 1 1
charOffset ♂ 0 0 1 1
charSettings ⚠ 0 -5 1 1
charSettings ▲ 0 -5 1 1
charSettings ◀ 0 -5 1 1
charSettings ▼ 0 -5 1 1
charSettings ▶ 0 -5 1 1
charSettings ○ 0 -5 1 1
charSettings ◔ 0 -5 1 1
charSettings ◑ 0 -5 1 1
charSettings ◕ 0 -5 1 1
charSettings ● 0 -5 1 1
charSettings ↑ 0 -5 1 1
charSettings ← 0 -5 1 1
charSettings ↓ 0 -5 1 1
charSettings → 0 -5 1 1
charSettings ↕ 0 -5 1 1
charSettings ↔ 0 -5 1 1
charSettings ↺ 0 -6 1 1
charSettings ↻ 0 -6 1 1
charSettings ☐ 0 -4 1.1 1.1
charSettings ☑ 0 -4 1.08 1.08
charSettings ☒ 0 -4 1.15 1.15
charSettings ⚀ 0 -3 1.1 1.1
charSettings ⚁ 0 -3 1.1 1.1
charSettings ⚂ 0 -3 1.1 1.1
charSettings ⚃ 0 -3 1.1 1.1
charSettings ⚄ 0 -3 1.1 1.1
charSettings ⚅ 0 -3 1.1 1.1
charSettings ✔ 0 -3 1 1
charSettings ✘ 0 -3 1 1

1
TextureCreator/fonts/EnvyCodeR/font.conf
View file

@ -1,2 +1 @@
scale 0.8125 cellHeight
offset 0 -1 abs abs

1
TextureCreator/fonts/FreeFont/font.conf
View file

@ -1,2 +1 @@
scale 0.6875 cellHeight
offset 0 4 abs abs

11
TextureCreator/fonts/FreeSerif/font.conf
View file

@ -1,7 +1,8 @@
offset 0 0 abs abs
scale 0.625 cellHeight
charOffset ℹ 0 -1 1 1
charOffset ∡ 0 -4 1 1
charOffset ⌛ -1 0 1 1
charOffset ⌚ -1 0 1 1
charSettings ℹ 0 -2 1.1 1.1
charSettings ❌ 0 -4 1 1
charSettings ⌖ 0 0 1.3 1.3
charSettings ∡ 0 -7 1.2 1.2
charSettings ⌛ 0 0 1.2 1.2
charSettings ⌚ 0 -3 1.1 1.1

2
TextureCreator/fonts/Liberation-Bold/font.conf
View file

@ -1 +1 @@
offset -1 1 abs abs

2
TextureCreator/fonts/Liberation/font.conf
View file

@ -1 +1 @@
offset -1 1 abs abs

2
TextureCreator/fonts/Luxi-Bold/font.conf
View file

@ -1 +1 @@
offset -1 -1 abs abs

2
TextureCreator/fonts/Luxi/font.conf
View file

@ -1 +1 @@
offset -1 -1 abs abs

1
TextureCreator/fonts/Monofur/font.conf
View file

@ -1,2 +1 @@
scale 0.875 cellHeight
offset 0 -2 abs abs

2
TextureCreator/fonts/ProFont/font.conf
View file

@ -1,2 +1,2 @@
scale 0.875 cellHeight
offset 2 0 abs abs
scale 0.875 cellHeight

64
TextureCreator/lib/TexturePainter.py
View file

@ -27,11 +27,12 @@ SCRIPTS_DIR = "scripts"
class GridConfig:
def __init__(self, args):
self.imageSize = (args[0], args[1])
self.cellSize = (32, 64)
self.begin = (32, 44)
self.spacing = (40, 72)
self.cellCount = (25, 14)
self.imageSize = (args[0], args[1])
self.cellSize = (32, 64)
self.begin = (32, 44)
self.spacing = (40, 72)
self.cellCount = (25, 14)
self.baselineOffset = 18.0
class CharConfig:
def __init__(self, args):
@ -44,10 +45,9 @@ class FontConfig:
def __init__(self, fontConfPath):
self.offsetX = 0
self.offsetY = 0
self.offsetXUnit = ""
self.offsetYUnit = ""
self.offsetXUnit = "abs"
self.offsetYUnit = "abs"
self.perCharConfigs = {}
self.guessingChar = "X"
self.scale = 0.75
self.scaleUnit = "cellHeight"
self.autoShrink = False
@ -59,19 +59,16 @@ class FontConfig:
while fontConf.more():
if fontConf.getCmd() == "offset":
[self.offsetX, self.offsetY, self.offsetXUnit, self.offsetYUnit] = fontConf.getArgs([int, int, str, str])
[self.offsetX, self.offsetY, self.offsetXUnit, self.offsetYUnit] = fontConf.getArgs([float, float, str, str])
elif fontConf.getCmd() == "scale":
[self.scale, self.scaleUnit] = fontConf.getArgs([float, str])
elif fontConf.getCmd() == "guessingChar":
self.guessingChar = fontConf.getArgs([unicode])[0]
elif fontConf.getCmd() == "enableAutoShrink":
self.autoShrink = True
elif fontConf.getCmd() == "charOffset":
args = fontConf.getArgs([unicode, int, int, float, float])
elif fontConf.getCmd() == "charSettings":
args = fontConf.getArgs([unicode, float, float, float, float])
self.perCharConfigs[args[0]] = CharConfig(args[1:])
def getCharConfig(self, char):
@ -134,6 +131,10 @@ class TexturePainter:
elif script.getCmd() == "setCellCount":
self.gridConfig.cellCount = script.getArgs([int, int])
elif script.getCmd() == "setBaselineOffset":
args = script.getArgs([float, str])
self.gridConfig.baselineOffset = args[0] * self.convertScaleUnit(args[1])
elif script.getCmd() == "drawLineBetweenCells":
self.lineBetweenCells(*[int(arg) for arg in script.getArgs([int, int, int, int, int, int, int, int, int])])
@ -234,37 +235,28 @@ class TexturePainter:
self.cairoContext.set_font_size(self.fontSize)
self.fontExtents = FontExtents(self.cairoContext)
self.fontExtents.update(self.fontConfig.guessingChar)
self.guessedYOffset = self.fontExtents.ySize / 2
def jumpToCell(self, x, y):
self.currentCol = int(x)
self.currentRow = int(y)
def drawChar(self, char):
fontSizeX = self.fontSize
fontSizeY = self.fontSize
if self.fontConfig.autoShrink:
self.cairoContext.set_font_size(1)
self.fontExtents.update(char)
if self.fontExtents.xSize > 0:
widthGuess = self.gridConfig.cellSize[0] / self.fontExtents.xSize
if widthGuess < self.fontSize:
fontSizeX = widthGuess
charConfig = self.fontConfig.getCharConfig(char)
fontSizeX *= charConfig.scaleX
fontSizeY *= charConfig.scaleY
fontSizeX = self.fontSize * charConfig.scaleX
fontSizeY = self.fontSize * charConfig.scaleY
self.cairoContext.set_font_matrix(cairo.Matrix(xx = fontSizeX, yy = fontSizeY))
self.fontExtents.update(char)
xOffset = -self.fontExtents.xAdvance / 2
yOffset = self.guessedYOffset
if self.fontConfig.autoShrink:
if self.fontExtents.xSize > self.gridConfig.cellSize[0]:
fontSizeX *= self.gridConfig.cellSize[0] / self.fontExtents.xSize
self.cairoContext.set_font_matrix(cairo.Matrix(xx = fontSizeX, yy = fontSizeY))
self.fontExtents.update(char)
xOffset = -self.fontExtents.xAdvance / 2.0
yOffset = self.gridConfig.baselineOffset
xOffset += self.fontConfig.offsetX * self.convertScaleUnit(self.fontConfig.offsetXUnit)
yOffset += self.fontConfig.offsetY * self.convertScaleUnit(self.fontConfig.offsetYUnit)
@ -276,8 +268,10 @@ class TexturePainter:
y = self.gridConfig.begin[1] + self.currentRow * self.gridConfig.spacing[1] + yOffset
self.cairoContext.move_to(x, y)
self.cairoContext.show_text(char)
self.cairoContext.text_path(char)
self.cairoContext.fill()
self.currentCol += 1
if self.currentCol >= self.gridConfig.cellCount[0]:
self.currentRow += 1

3
TextureCreator/scripts/_default1024.chain
View file

@ -1,6 +1,7 @@
init 1024 1024 1.0 1.0
setOutputNameSuffix -1024
runScript _init1024.script
runScript _init.script
runScript _basic.script
runScript _extended.script
runScript _special.script

3
TextureCreator/scripts/_default512.chain
View file

@ -1,6 +1,7 @@
init 1024 1024 0.5 0.5
setOutputNameSuffix -512
runScript _init512.script
runScript _init.script
runScript _basic.script
runScript _extended.script
runScript _special.script

3
TextureCreator/scripts/_init1024.script → TextureCreator/scripts/_init.script
View file

@ -1,4 +1,3 @@
init 1024 1024 1.0 1.0
jumpToCell 0 0
setCellSize 32 64
@ -6,6 +5,8 @@ setCellOffset 32 44
setCellSpacing 40 72
setCellCount 25 14
setBaselineOffset 18 abs
# Un-comment the "debugGrid" line to draw a
# positioning helper grid in the textures.
#drawDebugGrid

11
TextureCreator/scripts/_init512.script
View file

@ -1,11 +0,0 @@
init 1024 1024 0.5 0.5
jumpToCell 0 0
setCellSize 32 64
setCellOffset 32 44
setCellSpacing 40 72
setCellCount 25 14
# Un-comment the "debugGrid" line to draw a
# positioning helper grid in the textures.
#drawDebugGrid