mirror of
https://github.com/curioustorvald/Terrarum-sans-bitmap.git
synced 2026-03-07 20:01:52 +09:00
this should fix issue #11
If performance is not a concern (which is WIP)
This commit is contained in:
144
.idea/workspace.xml
generated
144
.idea/workspace.xml
generated
@@ -8,6 +8,9 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="22c5bc80-996c-4846-b173-7dc8c2096fe3" name="Default" comment="">
|
<list default="true" id="22c5bc80-996c-4846-b173-7dc8c2096fe3" name="Default" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/FontTestGDX/lib/TerrarumSansBitmap.jar" beforeDir="false" afterPath="$PROJECT_DIR$/FontTestGDX/lib/TerrarumSansBitmap.jar" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/TerrarumSansBitmap.jar" beforeDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<ignored path="$PROJECT_DIR$/out/" />
|
<ignored path="$PROJECT_DIR$/out/" />
|
||||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||||
@@ -27,8 +30,8 @@
|
|||||||
<file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="true">
|
<file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
|
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="13">
|
<state relative-caret-position="313">
|
||||||
<caret line="275" column="127" selection-start-line="275" selection-start-column="36" selection-end-line="275" selection-end-column="127" />
|
<caret line="726" lean-forward="true" selection-start-line="726" selection-end-line="726" />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@@ -36,8 +39,8 @@
|
|||||||
<file leaf-file-name="TextureRegionPack.kt" pinned="false" current-in-tab="false">
|
<file leaf-file-name="TextureRegionPack.kt" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt">
|
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="728">
|
<state relative-caret-position="338">
|
||||||
<caret line="80" column="30" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" />
|
<caret line="50" column="38" selection-start-line="50" selection-start-column="38" selection-end-line="50" selection-end-column="38" />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@@ -64,11 +67,11 @@
|
|||||||
</split-first>
|
</split-first>
|
||||||
<split-second>
|
<split-second>
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||||
<file leaf-file-name="FontTestGDX.kt" pinned="false" current-in-tab="true">
|
<file leaf-file-name="FontTestGDX.kt" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt">
|
<entry file="file://$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="338">
|
<state relative-caret-position="429">
|
||||||
<caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
|
<caret line="33" column="38" selection-start-line="33" selection-start-column="38" selection-end-line="33" selection-end-column="38" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#384#0" expanded="true" />
|
<element signature="e#0#384#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
@@ -76,11 +79,16 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
|
<file leaf-file-name="demo.PNG" pinned="false" current-in-tab="true">
|
||||||
|
<entry file="file://$PROJECT_DIR$/demo.PNG">
|
||||||
|
<provider selected="true" editor-type-id="images" />
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
<file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="false">
|
<file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
|
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="7644">
|
<state relative-caret-position="-190">
|
||||||
<caret line="619" column="28" selection-start-line="619" selection-start-column="28" selection-end-line="619" selection-end-column="28" />
|
<caret line="624" column="40" selection-start-line="624" selection-start-column="28" selection-end-line="624" selection-end-column="40" />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@@ -97,8 +105,8 @@
|
|||||||
<file leaf-file-name="demotext.txt" pinned="false" current-in-tab="false">
|
<file leaf-file-name="demotext.txt" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/demotext.txt">
|
<entry file="file://$PROJECT_DIR$/demotext.txt">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1391">
|
<state relative-caret-position="416">
|
||||||
<caret line="107" column="36" selection-start-line="107" selection-start-column="36" selection-end-line="107" selection-end-column="36" />
|
<caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@@ -153,8 +161,6 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="FindInProjectRecents">
|
<component name="FindInProjectRecents">
|
||||||
<findStrings>
|
<findStrings>
|
||||||
<find>glyphWidthBuffer</find>
|
|
||||||
<find>GlyphProps.LE</find>
|
|
||||||
<find>buildWidthTable</find>
|
<find>buildWidthTable</find>
|
||||||
<find>lastNonDiacriticChar</find>
|
<find>lastNonDiacriticChar</find>
|
||||||
<find>c.toInt()</find>
|
<find>c.toInt()</find>
|
||||||
@@ -183,6 +189,8 @@
|
|||||||
<find>xyswap</find>
|
<find>xyswap</find>
|
||||||
<find>isXYSwapped</find>
|
<find>isXYSwapped</find>
|
||||||
<find>xySw</find>
|
<find>xySw</find>
|
||||||
|
<find>getWidth</find>
|
||||||
|
<find>getWidthOfCharSeq</find>
|
||||||
</findStrings>
|
</findStrings>
|
||||||
<replaceStrings>
|
<replaceStrings>
|
||||||
<replace>.141</replace>
|
<replace>.141</replace>
|
||||||
@@ -209,24 +217,26 @@
|
|||||||
<option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/GlyphProps.kt" />
|
<option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/GlyphProps.kt" />
|
||||||
<option value="$PROJECT_DIR$/README.md" />
|
<option value="$PROJECT_DIR$/README.md" />
|
||||||
<option value="$PROJECT_DIR$/CONTRIBUTING.md" />
|
<option value="$PROJECT_DIR$/CONTRIBUTING.md" />
|
||||||
|
<option value="$PROJECT_DIR$/testtext.txt" />
|
||||||
|
<option value="$PROJECT_DIR$/demotext.txt" />
|
||||||
|
<option value="$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt" />
|
||||||
<option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt" />
|
<option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt" />
|
||||||
<option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" />
|
<option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" />
|
||||||
<option value="$PROJECT_DIR$/testtext.txt" />
|
|
||||||
<option value="$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt" />
|
|
||||||
<option value="$PROJECT_DIR$/demotext.txt" />
|
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectFrameBounds" extendedState="6">
|
<component name="ProjectFrameBounds" extendedState="7">
|
||||||
<option name="x" value="-7" />
|
<option name="x" value="1974" />
|
||||||
<option name="width" value="974" />
|
<option name="y" value="-8" />
|
||||||
<option name="height" value="1207" />
|
<option name="width" value="1874" />
|
||||||
|
<option name="height" value="1216" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectView">
|
<component name="ProjectView">
|
||||||
<navigator proportions="" version="1">
|
<navigator proportions="" version="1">
|
||||||
<foldersAlwaysOnTop value="true" />
|
<foldersAlwaysOnTop value="true" />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
|
<pane id="Scope" />
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<expand>
|
<expand>
|
||||||
@@ -268,7 +278,6 @@
|
|||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="PackagesPane" />
|
<pane id="PackagesPane" />
|
||||||
<pane id="Scope" />
|
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
@@ -492,11 +501,11 @@
|
|||||||
</todo-panel>
|
</todo-panel>
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-7" y="0" width="974" height="1207" extended-state="7" />
|
<frame x="1974" y="-8" width="1874" height="1216" extended-state="7" />
|
||||||
<editor active="true" />
|
|
||||||
<layout>
|
<layout>
|
||||||
<window_info anchor="right" id="Palette" order="3" />
|
<window_info anchor="right" id="Palette" order="3" />
|
||||||
<window_info anchor="bottom" id="TODO" order="6" />
|
<window_info anchor="bottom" id="TODO" order="6" />
|
||||||
|
<window_info active="true" anchor="bottom" id="Messages" order="7" visible="true" weight="0.32745826" />
|
||||||
<window_info anchor="right" id="Palette	" order="3" />
|
<window_info anchor="right" id="Palette	" order="3" />
|
||||||
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
||||||
<window_info anchor="right" id="Maven Projects" order="3" />
|
<window_info anchor="right" id="Maven Projects" order="3" />
|
||||||
@@ -504,7 +513,7 @@
|
|||||||
<window_info anchor="bottom" id="Version Control" order="7" />
|
<window_info anchor="bottom" id="Version Control" order="7" />
|
||||||
<window_info anchor="bottom" id="Terminal" order="7" />
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
||||||
<window_info id="Designer" order="2" />
|
<window_info id="Designer" order="2" />
|
||||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13019694" />
|
<window_info content_ui="combo" id="Project" order="0" weight="0.090959206" />
|
||||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||||
<window_info id="UI Designer" order="2" />
|
<window_info id="UI Designer" order="2" />
|
||||||
@@ -513,22 +522,21 @@
|
|||||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||||
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
|
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
|
||||||
<window_info anchor="bottom" id="Messages" order="7" weight="0.32745826" />
|
|
||||||
<window_info anchor="bottom" id="Message" order="0" />
|
<window_info anchor="bottom" id="Message" order="0" />
|
||||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32931355" />
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32931355" />
|
||||||
</layout>
|
</layout>
|
||||||
<layout-to-restore>
|
<layout-to-restore>
|
||||||
<window_info anchor="right" id="Palette" order="3" />
|
<window_info anchor="right" id="Palette" order="3" />
|
||||||
<window_info anchor="bottom" id="Message" order="0" />
|
|
||||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||||
<window_info anchor="bottom" id="Run" order="2" weight="0.2591522" />
|
<window_info anchor="bottom" id="Run" order="2" weight="0.2591522" />
|
||||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
||||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12633263" />
|
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12633263" />
|
||||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||||
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
|
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
|
||||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||||
<window_info anchor="bottom" id="TODO" order="6" />
|
<window_info anchor="bottom" id="TODO" order="6" />
|
||||||
|
<window_info anchor="bottom" id="Version Control" order="9" />
|
||||||
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32931355" />
|
||||||
<window_info id="Designer" order="2" />
|
<window_info id="Designer" order="2" />
|
||||||
<window_info id="UI Designer" order="3" />
|
<window_info id="UI Designer" order="3" />
|
||||||
<window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.2773655" />
|
<window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.2773655" />
|
||||||
@@ -536,8 +544,8 @@
|
|||||||
<window_info anchor="bottom" id="Terminal" order="7" />
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
||||||
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
|
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
|
||||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||||
<window_info anchor="bottom" id="Version Control" order="9" />
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32931355" />
|
<window_info anchor="bottom" id="Message" order="0" />
|
||||||
<window_info anchor="bottom" id="Messages" order="10" weight="0.32745826" />
|
<window_info anchor="bottom" id="Messages" order="10" weight="0.32745826" />
|
||||||
<window_info anchor="right" id="Maven Projects" order="5" />
|
<window_info anchor="right" id="Maven Projects" order="5" />
|
||||||
<window_info id="Favorites" order="4" side_tool="true" />
|
<window_info id="Favorites" order="4" side_tool="true" />
|
||||||
@@ -556,25 +564,6 @@
|
|||||||
<option name="FILTER_TARGETS" value="false" />
|
<option name="FILTER_TARGETS" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$PROJECT_DIR$/CONTRIBUTORS.txt">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state>
|
|
||||||
<caret column="23" selection-start-column="23" selection-end-column="23" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/README.md">
|
|
||||||
<provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
|
|
||||||
<state split_layout="FIRST">
|
|
||||||
<first_editor relative-caret-position="143">
|
|
||||||
<caret line="11" column="175" selection-start-line="11" selection-start-column="175" selection-end-line="11" selection-end-column="175" />
|
|
||||||
</first_editor>
|
|
||||||
<second_editor>
|
|
||||||
<js_state />
|
|
||||||
</second_editor>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/README.md">
|
<entry file="file://$PROJECT_DIR$/README.md">
|
||||||
<provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
|
<provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
|
||||||
<state split_layout="SPLIT">
|
<state split_layout="SPLIT">
|
||||||
@@ -899,30 +888,6 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="728">
|
|
||||||
<caret line="80" column="30" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="7644">
|
|
||||||
<caret line="619" column="28" selection-start-line="619" selection-start-column="28" selection-end-line="619" selection-end-column="28" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="338">
|
|
||||||
<caret line="26" column="36" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#384#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/testtext.txt">
|
<entry file="file://$PROJECT_DIR$/testtext.txt">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="117">
|
<state relative-caret-position="117">
|
||||||
@@ -930,10 +895,40 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/testing.PNG">
|
||||||
|
<provider selected="true" editor-type-id="images" />
|
||||||
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/demotext.txt">
|
<entry file="file://$PROJECT_DIR$/demotext.txt">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1391">
|
<state relative-caret-position="416">
|
||||||
<caret line="107" column="36" selection-start-line="107" selection-start-column="36" selection-end-line="107" selection-end-column="36" />
|
<caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/TextureRegionPack.kt">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="338">
|
||||||
|
<caret line="50" column="38" selection-start-line="50" selection-start-column="38" selection-end-line="50" selection-end-column="38" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="429">
|
||||||
|
<caret line="33" column="38" selection-start-line="33" selection-start-column="38" selection-end-line="33" selection-end-column="38" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#384#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/demo.PNG">
|
||||||
|
<provider selected="true" editor-type-id="images" />
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="313">
|
||||||
|
<caret line="726" lean-forward="true" selection-start-line="726" selection-end-line="726" />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@@ -996,6 +991,7 @@
|
|||||||
<option name="proportions">
|
<option name="proportions">
|
||||||
<list>
|
<list>
|
||||||
<option value="0.32068965" />
|
<option value="0.32068965" />
|
||||||
|
<option value="0.6" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</splitter-proportions>
|
</splitter-proportions>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -619,10 +619,15 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
|
|||||||
else if (sheetID == SHEET_HANGUL) {
|
else if (sheetID == SHEET_HANGUL) {
|
||||||
// Flookahead for {I, P, F}
|
// Flookahead for {I, P, F}
|
||||||
|
|
||||||
val cNext = if (index + 1 <= textBuffer.size) textBuffer[index + 1] else 0
|
val cNext = if (index + 1 < textBuffer.size) textBuffer[index + 1] else 0
|
||||||
val cNextNext = if (index + 2 <= textBuffer.size) textBuffer[index + 2] else 0
|
val cNextNext = if (index + 2 < textBuffer.size) textBuffer[index + 2] else 0
|
||||||
|
|
||||||
val hangulLength = if (isHangulJongseong(cNextNext)) 3 else 2
|
val hangulLength = if (isHangulJongseong(cNextNext) && isHangulJungseong(cNext))
|
||||||
|
3
|
||||||
|
else if (isHangulJungseong(cNext))
|
||||||
|
2
|
||||||
|
else
|
||||||
|
1
|
||||||
|
|
||||||
val (indices, rows) = toHangulIndexAndRow(c, cNext, cNextNext)
|
val (indices, rows) = toHangulIndexAndRow(c, cNext, cNextNext)
|
||||||
|
|
||||||
@@ -1033,7 +1038,62 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo
|
|||||||
private val glyphLayout = GlyphLayout()
|
private val glyphLayout = GlyphLayout()
|
||||||
|
|
||||||
fun getWidth(text: String): Int {
|
fun getWidth(text: String): Int {
|
||||||
return getWidthOfCharSeq(text.toCodePoints()).sum()
|
var s = text.toCodePoints()
|
||||||
|
var len = 0
|
||||||
|
|
||||||
|
var i = 0
|
||||||
|
while (i <= s.lastIndex) {
|
||||||
|
val chr = s[i]
|
||||||
|
val ctype = getSheetType(s[i])
|
||||||
|
|
||||||
|
var len2 = 0
|
||||||
|
if (variableWidthSheets.contains(ctype)) {
|
||||||
|
if (!glyphProps.containsKey(chr)) {
|
||||||
|
System.err.println("[TerrarumSansBitmap] no width data for glyph number ${Integer.toHexString(chr.toInt()).toUpperCase()}")
|
||||||
|
len2 = W_LATIN_WIDE
|
||||||
|
}
|
||||||
|
|
||||||
|
val prop = glyphProps[chr] ?: nullProp
|
||||||
|
|
||||||
|
if (!prop.writeOnTop)
|
||||||
|
len2 = prop.width
|
||||||
|
}
|
||||||
|
else if (isColourCode(chr) || isCharsetOverride(chr))
|
||||||
|
len2 = 0
|
||||||
|
else if (ctype == SHEET_CJK_PUNCT)
|
||||||
|
len2 = W_ASIAN_PUNCT
|
||||||
|
else if (ctype == SHEET_HANGUL) {
|
||||||
|
// hangul IPF canonical and special cases
|
||||||
|
val cNext = if (i + 1 < s.size) s[i + 1] else 0
|
||||||
|
val cNextNext = if (i + 2 < s.size) s[i + 2] else 0
|
||||||
|
val hangulLength = if (isHangulJongseong(cNextNext) && isHangulJungseong(cNext))
|
||||||
|
3
|
||||||
|
else if (isHangulJungseong(cNext))
|
||||||
|
2
|
||||||
|
else
|
||||||
|
1
|
||||||
|
|
||||||
|
len2 = W_HANGUL
|
||||||
|
i += hangulLength - 1
|
||||||
|
}
|
||||||
|
else if (ctype == SHEET_KANA)
|
||||||
|
len2 = W_KANA
|
||||||
|
else if (unihanWidthSheets.contains(ctype))
|
||||||
|
len2 = W_UNIHAN
|
||||||
|
else if (ctype == SHEET_CUSTOM_SYM)
|
||||||
|
len2 = SIZE_CUSTOM_SYM
|
||||||
|
else
|
||||||
|
len2 = W_LATIN_WIDE
|
||||||
|
|
||||||
|
|
||||||
|
len += len2 * scale
|
||||||
|
|
||||||
|
if (i < s.lastIndex) len += interchar
|
||||||
|
|
||||||
|
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return len
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user