somehow fixed issue #8

2026-03-07 20:01:52 +09:00 · 2018-08-09 19:32:30 +09:00
parent cdd0514ca0
commit ab0d483cb1
6 changed files with 47 additions and 40 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,6 +7,7 @@
  </component>
  <component name="ChangeListManager">
    <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$/FontTestGDX/demotext.txt" beforeDir="false" afterPath="$PROJECT_DIR$/FontTestGDX/demotext.txt" 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$/FontTestGDX/src/FontTestGDX.kt" beforeDir="false" afterPath="$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt" afterDir="false" />
@@ -31,8 +32,8 @@
          <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="true">
            <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="8256">
-                  <caret line="865" column="33" lean-forward="true" selection-start-line="865" selection-start-column="33" selection-end-line="865" selection-end-column="33" />
+                <state relative-caret-position="607">
+                  <caret line="579" column="72" selection-start-line="579" selection-start-column="72" selection-end-line="579" selection-end-column="72" />
                </state>
              </provider>
            </entry>
@@ -67,7 +68,7 @@
          <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="false">
            <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/slick2d/GameFontBase.kt">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="299">
+                <state relative-caret-position="-403">
                  <caret line="45" column="67" lean-forward="true" selection-start-line="45" selection-start-column="67" selection-end-line="45" selection-end-column="67" />
                </state>
              </provider>
@@ -77,11 +78,11 @@
      </split-first>
      <split-second>
        <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">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="507">
-                  <caret line="253" column="21" selection-start-line="253" selection-start-column="21" selection-end-line="253" selection-end-column="21" />
+                <state relative-caret-position="482">
+                  <caret line="208" column="47" selection-start-line="208" selection-start-column="47" selection-end-line="208" selection-end-column="47" />
                  <folding>
                    <element signature="e#0#384#0" expanded="true" />
                  </folding>
@@ -97,17 +98,17 @@
          <file leaf-file-name="demotext.txt" pinned="false" current-in-tab="false">
            <entry file="file://$PROJECT_DIR$/FontTestGDX/demotext.txt">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-1">
-                  <caret line="41" column="49" lean-forward="true" selection-start-line="41" selection-start-column="49" selection-end-line="41" selection-end-column="49" />
+                <state relative-caret-position="143">
+                  <caret line="11" column="35" selection-start-line="11" selection-start-column="35" selection-end-line="11" selection-end-column="35" />
                </state>
              </provider>
            </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="true">
            <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="468">
-                  <caret line="331" column="13" lean-forward="true" selection-start-line="331" selection-start-column="13" selection-end-line="331" selection-end-column="13" />
+                <state relative-caret-position="524">
+                  <caret line="440" column="31" selection-start-line="440" selection-start-column="31" selection-end-line="440" selection-end-column="31" />
                </state>
              </provider>
            </entry>
@@ -139,7 +140,6 @@
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>xHei</find>
      <find>not copy</find>
      <find>getColour</find>
      <find>.094</find>
@@ -169,6 +169,7 @@
      <find>!!</find>
      <find>ArrayList&lt;Int&gt;</find>
      <find>appConfig.height</find>
+      <find>textBuffer</find>
    </findStrings>
    <replaceStrings>
      <replace>.141</replace>
@@ -193,8 +194,8 @@
        <option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/slick2d/GameFontBase.kt" />
        <option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/GlyphProps.kt" />
        <option value="$PROJECT_DIR$/FontTestGDX/demotext.txt" />
-        <option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" />
        <option value="$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt" />
+        <option value="$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt" />
      </list>
    </option>
  </component>
@@ -466,6 +467,7 @@
  </component>
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1936" height="1216" extended-state="6" />
+    <editor active="true" />
    <layout>
      <window_info anchor="right" id="Palette" order="3" />
      <window_info anchor="bottom" id="TODO" order="6" />
@@ -477,7 +479,7 @@
      <window_info anchor="bottom" id="Version Control" order="7" />
      <window_info anchor="bottom" id="Terminal" order="7" />
      <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13859275" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.13859275" />
      <window_info anchor="bottom" id="Find" order="1" weight="0.32931355" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -854,13 +856,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/slick2d/GameFontBase.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="45" column="67" lean-forward="true" selection-start-line="45" selection-start-column="67" selection-end-line="45" selection-end-column="67" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/GlyphProps.kt">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="260">
@@ -868,20 +863,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/FontTestGDX/demotext.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1">
-          <caret line="41" column="49" lean-forward="true" selection-start-line="41" selection-start-column="49" selection-end-line="41" selection-end-column="49" />
-        </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="468">
-          <caret line="331" column="13" lean-forward="true" selection-start-line="331" selection-start-column="13" selection-end-line="331" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
    <entry file="jar://$PROJECT_DIR$/lib/gdx.jar!/com/badlogic/gdx/graphics/glutils/GLFrameBuffer.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="2379">
@@ -907,19 +888,40 @@
        </state>
      </provider>
    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarumsansbitmap/slick2d/GameFontBase.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-403">
+          <caret line="45" column="67" lean-forward="true" selection-start-line="45" selection-start-column="67" selection-end-line="45" selection-end-column="67" />
+        </state>
+      </provider>
+    </entry>
    <entry file="file://$PROJECT_DIR$/demo.PNG">
      <provider selected="true" editor-type-id="images" />
    </entry>
+    <entry file="file://$PROJECT_DIR$/FontTestGDX/demotext.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="143">
+          <caret line="11" column="35" selection-start-line="11" selection-start-column="35" selection-end-line="11" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
    <entry file="file://$PROJECT_DIR$/FontTestGDX/src/FontTestGDX.kt">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="507">
-          <caret line="253" column="21" selection-start-line="253" selection-start-column="21" selection-end-line="253" selection-end-column="21" />
+        <state relative-caret-position="482">
+          <caret line="208" column="47" selection-start-line="208" selection-start-column="47" selection-end-line="208" selection-end-column="47" />
          <folding>
            <element signature="e#0#384#0" expanded="true" />
          </folding>
        </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="524">
+          <caret line="440" column="31" selection-start-line="440" selection-start-column="31" selection-end-line="440" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
  </component>
  <component name="masterDetails">
    <states>
--- a/FontTestGDX/demotext.txt
+++ b/FontTestGDX/demotext.txt
@@ -32,7 +32,7 @@ How multilingual? Real multilingual!
    􌿽Příliš žluťoučký kůň úpěl ďábelské ódy􀀀
    􌿽Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Walther spillede på xylofon􀀀
    􌿽Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich􀀀
-    􌿽διαφυλάξτε γενικά τη ζωή σας από βαθειά ψυχικά τραύματα􀀀
+    􌿽ζαφείρι δέξου πάγκαλο, βαθων ψυχης το σημα􀀀
    􌿽ΔΙΑΦΥΛΆΞΤΕ ΓΕΝΙΚΆ ΤΗ ΖΩΉ ΣΑΣ ΑΠΌ ΒΑΘΕΙΆ ΨΥΧΙΚΆ ΤΡΑΎΜΑΤΑ􀀀
    􌿽სწრაფი ყავისფერი მელა გადაახტა ზარმაც ძაღლს􀀀
    􌿽Kæmi ný öxi hér, ykist þjófum nú bæði víl og ádrepa􀀀
--- a/FontTestGDX/lib/TerrarumSansBitmap.jar
+++ b/FontTestGDX/lib/TerrarumSansBitmap.jar
--- a/FontTestGDX/src/FontTestGDX.kt
+++ b/FontTestGDX/src/FontTestGDX.kt
@@ -204,6 +204,9 @@ class FontTestGDX : Game() {
        batch.begin()
        batch.color = Color.WHITE
        batch.draw(tex, 0f, (TEXH.toFloat()/appConfig.height)*TEXH - scrollOffsetY, TEXW.toFloat(), -(TEXH.toFloat() / appConfig.height) * TEXH.toFloat())
+
+
+        font.draw(batch, "TESTTESTTEST", 0f, 0f)
        batch.end()
    }

--- a/demo.PNG
+++ b/demo.PNG
--- a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
+++ b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
@@ -411,8 +411,9 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo

    private var nullProp = GlyphProps(15, 0)

-    override fun draw(batch: Batch, str: CharSequence, x: Float, y: Float): GlyphLayout? {
-        val str = str.toCodePoints()
+
+    override fun draw(batch: Batch, charSeq: CharSequence, x: Float, y: Float): GlyphLayout? {
+        val str = charSeq.toCodePoints()

        fun Int.flipY() = this * if (flipY) 1 else -1

@@ -424,6 +425,7 @@ class GameFontBase(fontDir: String, val noShadow: Boolean = false, val flipY: Bo

        if (textBuffer != str) {
            textBuffer = str
+            //println(textBuffer)
            val widths = getWidthOfCharSeq(str)

            glyphWidthBuffer = widths