Kana: 'he' (for both) and Katakana 'ki' adjusted; sample update

This commit is contained in:
minjaesong
2017-06-27 11:32:07 +09:00
parent e894471b0d
commit 59ee8e5a48
4 changed files with 7 additions and 6 deletions

View File

@@ -6,6 +6,7 @@
<element id="directory" name="META-INF"> <element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" /> <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
</element> </element>
<element id="dir-copy" path="$PROJECT_DIR$/src" />
</root> </root>
</artifact> </artifact>
</component> </component>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 180 KiB

After

Width:  |  Height:  |  Size: 180 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

@@ -388,9 +388,9 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
textBuffer.forEachIndexed { index, c -> textBuffer.forEachIndexed { index, c ->
val sheetID = getSheetType(c) val sheetID = getSheetType(c)
val sheetXY = getSheetwisePosition(c) val (sheetX, sheetY) = getSheetwisePosition(c)
//println("[TerrarumSansBitmap] sprite: $sheetID:${sheetXY[0]}x${sheetXY[1]}") //println("[TerrarumSansBitmap] sprite: $sheetID:${sheetX}x${sheetY}")
if (sheetID == SHEET_HANGUL) { if (sheetID == SHEET_HANGUL) {
val hangulSheet = sheets[SHEET_HANGUL] val hangulSheet = sheets[SHEET_HANGUL]
@@ -439,7 +439,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
if (!noShadow) { if (!noShadow) {
batch.color = shadowCol batch.color = shadowCol
batch.draw( batch.draw(
sheets[sheetID].get(sheetXY[0], sheetXY[1]), sheets[sheetID].get(sheetX, sheetY),
x + textBWidth[index] + 1 + offset, x + textBWidth[index] + 1 + offset,
y + (if (sheetID == SHEET_UNIHAN) // evil exceptions y + (if (sheetID == SHEET_UNIHAN) // evil exceptions
offsetUnihan offsetUnihan
@@ -449,7 +449,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
0) * if (flipY) 1 else -1 0) * if (flipY) 1 else -1
) )
batch.draw( batch.draw(
sheets[sheetID].get(sheetXY[0], sheetXY[1]), sheets[sheetID].get(sheetX, sheetY),
x + textBWidth[index] + offset, x + textBWidth[index] + offset,
y + (if (sheetID == SHEET_UNIHAN) // evil exceptions y + (if (sheetID == SHEET_UNIHAN) // evil exceptions
offsetUnihan + 1 offsetUnihan + 1
@@ -459,7 +459,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
1) * if (flipY) 1 else -1 1) * if (flipY) 1 else -1
) )
batch.draw( batch.draw(
sheets[sheetID].get(sheetXY[0], sheetXY[1]), sheets[sheetID].get(sheetX, sheetY),
x + textBWidth[index] + 1 + offset, x + textBWidth[index] + 1 + offset,
y + (if (sheetID == SHEET_UNIHAN) // evil exceptions y + (if (sheetID == SHEET_UNIHAN) // evil exceptions
offsetUnihan + 1 offsetUnihan + 1
@@ -473,7 +473,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
batch.color = mainCol batch.color = mainCol
batch.draw( batch.draw(
sheets[sheetID].get(sheetXY[0], sheetXY[1]), sheets[sheetID].get(sheetX, sheetY),
x + textBWidth[index] + offset, x + textBWidth[index] + offset,
y + y +
if (sheetID == SHEET_UNIHAN) // evil exceptions if (sheetID == SHEET_UNIHAN) // evil exceptions