From 81d66c4075bd76f115e1c7cf0b6959675332ba97 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Thu, 4 Jun 2020 10:24:39 +0900 Subject: [PATCH] Enable text anti-aliasing by default To disable it, use -noantialias command-line option. --- .editorconfig | 2 +- README.md | 6 +++--- .../main/java/io/github/kichikuou/system3/GameActivity.kt | 2 +- src/sdlmain.cpp | 4 ++-- src/sys/ags_text.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.editorconfig b/.editorconfig index d65a0fa..2f3d343 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,7 +4,7 @@ root = true [*] charset = utf-8 -[*.{h,c}] +[*.{h,cpp}] indent_style = tab indent_size = 4 diff --git a/README.md b/README.md index 1a6cb16..c34ebcc 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ This is a SDL2 port of [System3 for Win32](http://takeda-toshiya.my.coocan.jp/al ### Windows (MSYS2 mingw64) - $ pacman -S cmake mingw-w64-x86_64-cmake mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf + $ pacman -S mingw-w64-x86_64-cmake mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf $ mkdir -p out/debug $ cd out/debug $ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../src/ @@ -51,8 +51,8 @@ system3 [options] ### Options -#### `-antialias` -Enables text anti-aliasing. +#### `-noantialias` +Disables text anti-aliasing. #### `-fontfile` _filename_ Specifies a font file used to render text. `.ttf` and `.otf` files are supported. diff --git a/android/app/src/main/java/io/github/kichikuou/system3/GameActivity.kt b/android/app/src/main/java/io/github/kichikuou/system3/GameActivity.kt index efc9390..362f4d4 100644 --- a/android/app/src/main/java/io/github/kichikuou/system3/GameActivity.kt +++ b/android/app/src/main/java/io/github/kichikuou/system3/GameActivity.kt @@ -60,7 +60,7 @@ class GameActivity : SDLActivity() { } override fun getArguments(): Array { - return arrayOf("-antialias", + return arrayOf( "-gamedir", intent.getStringExtra(EXTRA_GAME_ROOT), "-savedir", intent.getStringExtra(EXTRA_SAVE_DIR) + "/@") } diff --git a/src/sdlmain.cpp b/src/sdlmain.cpp index 80a80a2..49293b1 100644 --- a/src/sdlmain.cpp +++ b/src/sdlmain.cpp @@ -40,8 +40,8 @@ int main(int argc, char *argv[]) for (int i = 1; i < argc; i++) { if (strcmp(argv[i], "-gamedir") == 0) chdir(argv[++i]); - else if (strcmp(argv[i], "-antialias") == 0) - ags_setAntialiasedStringMode(1); + else if (strcmp(argv[i], "-noantialias") == 0) + ags_setAntialiasedStringMode(0); else if (strcmp(argv[i], "-savedir") == 0) save_dir = argv[++i]; else if (strcmp(argv[i], "-fontfile") == 0) diff --git a/src/sys/ags_text.cpp b/src/sys/ags_text.cpp index eea062c..ca61060 100644 --- a/src/sys/ags_text.cpp +++ b/src/sys/ags_text.cpp @@ -9,7 +9,7 @@ #include "utfsjis.h" #include "texthook.h" -static bool antialias = false; +static bool antialias = true; void AGS::draw_text(const char* string) {