From 379c84c22ef886a38aca93b1f056d9f882a24fd2 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 26 Jul 2018 05:10:25 +0900 Subject: [PATCH] changed project structure so that they make sense Font tester tool (GDX only) is coming! --- .gitignore | 3 +- .idea/artifacts/FontDemoGDX.xml | 9 + .idea/artifacts/TerrarumSansBitmap.xml | 2 +- .idea/codeStyles/Project.xml | 9 + .idea/codeStyles/codeStyleConfig.xml | 5 + {demo/.idea => .idea}/kotlinc.xml | 4 + .../libraries/GdxLib.xml | 7 +- .idea/libraries/TesterLib.xml | 10 + .idea/libraries/lib.xml | 10 - .idea/markdown-navigator.xml | 71 ++ .../markdown-navigator/profiles_settings.xml | 3 + .idea/misc.xml | 68 -- .idea/modules.xml | 1 + .idea/workspace.xml | 553 ++++++------ BuildJAR_TerrarumSansBitmap.iml | 2 +- FontTestGDX/FontTestGDX.iml | 14 + demo/text.txt => FontTestGDX/demotext.txt | 0 FontTestGDX/lib/TerrarumSansBitmap.jar | Bin 0 -> 55148 bytes FontTestGDX/src/FontTestGDX.kt | 60 ++ TerrarumSansBitmap.jar | Bin 54306 -> 0 bytes demo/.idea/.name | 1 - demo/.idea/artifacts/unnamed.xml | 15 - demo/.idea/misc.xml | 6 - demo/.idea/modules.xml | 8 - demo/.idea/workspace.xml | 828 ------------------ demo/META-INF/MANIFEST.MF | 4 - demo/TerrarumSansDemo.iml | 25 - demo/config.properties | 1 - .../terrarum/imagefont/GameFontBase.kt | 700 --------------- .../terrarum/imagefont/GameFontDemo.kt | 97 -- 30 files changed, 476 insertions(+), 2040 deletions(-) create mode 100644 .idea/artifacts/FontDemoGDX.xml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml rename {demo/.idea => .idea}/kotlinc.xml (52%) rename demo/.idea/libraries/KotlinJavaRuntime.xml => .idea/libraries/GdxLib.xml (55%) create mode 100644 .idea/libraries/TesterLib.xml delete mode 100644 .idea/libraries/lib.xml create mode 100644 .idea/markdown-navigator.xml create mode 100644 .idea/markdown-navigator/profiles_settings.xml create mode 100644 FontTestGDX/FontTestGDX.iml rename demo/text.txt => FontTestGDX/demotext.txt (100%) create mode 100644 FontTestGDX/lib/TerrarumSansBitmap.jar create mode 100644 FontTestGDX/src/FontTestGDX.kt delete mode 100644 TerrarumSansBitmap.jar delete mode 100644 demo/.idea/.name delete mode 100644 demo/.idea/artifacts/unnamed.xml delete mode 100644 demo/.idea/misc.xml delete mode 100644 demo/.idea/modules.xml delete mode 100644 demo/.idea/workspace.xml delete mode 100644 demo/META-INF/MANIFEST.MF delete mode 100644 demo/TerrarumSansDemo.iml delete mode 100644 demo/config.properties delete mode 100644 demo/src/net/torvald/terrarum/imagefont/GameFontBase.kt delete mode 100644 demo/src/net/torvald/terrarum/imagefont/GameFontDemo.kt diff --git a/.gitignore b/.gitignore index 0698352..a1b30b5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ demo/out/* demo/lib/* demo/assets/* out/* -lib/* \ No newline at end of file +lib/* +Terrarum-sans-bitmap*.zip \ No newline at end of file diff --git a/.idea/artifacts/FontDemoGDX.xml b/.idea/artifacts/FontDemoGDX.xml new file mode 100644 index 0000000..9483570 --- /dev/null +++ b/.idea/artifacts/FontDemoGDX.xml @@ -0,0 +1,9 @@ + + + $PROJECT_DIR$/out/artifacts/FontDemoGDX + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/TerrarumSansBitmap.xml b/.idea/artifacts/TerrarumSansBitmap.xml index e693b18..c1de259 100644 --- a/.idea/artifacts/TerrarumSansBitmap.xml +++ b/.idea/artifacts/TerrarumSansBitmap.xml @@ -1,6 +1,6 @@ - $PROJECT_DIR$ + $PROJECT_DIR$/FontTestGDX/lib diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7478dc1 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/demo/.idea/kotlinc.xml b/.idea/kotlinc.xml similarity index 52% rename from demo/.idea/kotlinc.xml rename to .idea/kotlinc.xml index 0dd4b35..3c50bd3 100644 --- a/demo/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -3,4 +3,8 @@ + + \ No newline at end of file diff --git a/demo/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/GdxLib.xml similarity index 55% rename from demo/.idea/libraries/KotlinJavaRuntime.xml rename to .idea/libraries/GdxLib.xml index a83cacd..09fa810 100644 --- a/demo/.idea/libraries/KotlinJavaRuntime.xml +++ b/.idea/libraries/GdxLib.xml @@ -1,8 +1,6 @@ - + - - @@ -10,8 +8,9 @@ - + + \ No newline at end of file diff --git a/.idea/libraries/TesterLib.xml b/.idea/libraries/TesterLib.xml new file mode 100644 index 0000000..d20e73d --- /dev/null +++ b/.idea/libraries/TesterLib.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml deleted file mode 100644 index fa8838a..0000000 --- a/.idea/libraries/lib.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml new file mode 100644 index 0000000..3efe9d6 --- /dev/null +++ b/.idea/markdown-navigator.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml new file mode 100644 index 0000000..57927c5 --- /dev/null +++ b/.idea/markdown-navigator/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index cac86c6..0548357 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,73 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml index e68d521..46a4f1d 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4010717..7780478 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,10 +7,34 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + getG @@ -70,127 +111,83 @@ - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +