[2021/01/17-Inchar] Font add

Makefile

@@ -15,14 +15,16 @@ EXTRA_OUTPUT_FILES := servefiles
 
 BUILD_FLAGS := -Wno-format-truncation
 
-VERSION_PARTS := $(subst ., ,$(shell git describe --tags --abbrev=0))
+VERSION_PARTS := 2.6.0 # $(subst ., ,$(shell git describe --tags --abbrev=0))
 
-VERSION_MAJOR := $(word 1, $(VERSION_PARTS))
-VERSION_MINOR := $(word 2, $(VERSION_PARTS))
-VERSION_MICRO := $(word 3, $(VERSION_PARTS))
+VERSION_MAJOR := 2#$(word 1, $(VERSION_PARTS))
+VERSION_MINOR := 6#$(word 2, $(VERSION_PARTS))
+VERSION_MICRO := 0#$(word 3, $(VERSION_PARTS))
 
-DESCRIPTION := 3DS開源程式管理器.
-AUTHOR := Steveice10 Rintim+OasisAkari
+CHINESE_VERSION := Build 9
+
+DESCRIPTION := 3DS开源应用管理器.
+AUTHOR := Steveice10 Theopse
 
 PRODUCT_CODE := CTR-P-CFBI
 UNIQUE_ID := 0xF8001

README.md

@@ -1,14 +1,14 @@
-# FBI-i18n-zh-tw
+# FBI-i18n-zh-cn
 
-FBI是一個開源的3DS程式管理器。
+FBI是一个开源的3DS应用管理器。
 
-本倉庫為FBI的繁體漢化版本，部分詞彙因兼容原字庫做簡化或改詞處理。
+本仓库為FBI的简体汉化版本。
 
-原倉庫: https://github.com/Steveice10/FBI/
+原仓库: https://github.com/Steveice10/FBI/
 
 ---
 
-## 特性
+## 特性（等待翻译）
 
 * Browse and modify the SD card, TWL photos, TWL sounds, save data, and ext save data.
 * Export, import, and erase save data from DS cartridges.
@@ -23,7 +23,7 @@ FBI是一個開源的3DS程式管理器。
   * Dump the raw NAND image to the SD card.
   * Launch titles installed to the system.
 
-## 編譯
+## 编译
 
  - 需要 [devkitARM](http://sourceforge.net/projects/devkitpro/files/devkitARM/) 中的 3ds-curl, 3ds-zlib, 和 3ds-jansson
 
@@ -35,13 +35,13 @@ make
 ```
 
 
-## 感謝
+## 感谢
 
 感謝原作者 [Steveice10](https://github.com/Steveice10) 提供 FBI
 
-[OasisAkari](https://github.com/OasisAkari) (一只火狐) : 用詞修正
+[OasisAkari](https://github.com/OasisAkari) (一只火狐) : 协助汉化
 
-[OoLaLa](https://github.com/OoLaLa-yy) : 協助漢化
+ADVance 汉化组 : 提供字库
 
 >Banner: Originally created by [OctopusRift](http://gbatemp.net/members/octopusrift.356526/), touched up by [Apache Thunder](https://gbatemp.net/members/apache-thunder.105648/), updated for new logo by [PabloMK7](http://gbatemp.net/members/pablomk7.345712/).
 

source/core/screen.c

@@ -29,6 +29,8 @@ static float font_scale;
 
 static u8 base_alpha = 0xFF;
 
+static CFNT_s* font_ttf=NULL;
+
 static u32 color_config[MAX_COLORS] = {0xFF000000};
 
 static struct {
@@ -154,7 +156,11 @@ void screen_init() {
         return;
     }
 
-    TGLP_s* glyphInfo = fontGetGlyphInfo(NULL);
+    //TGLP_s* glyphInfo = fontGetGlyphInfo(NULL);
+
+	fontFixPointers(font_ttf);
+    TGLP_s* glyphInfo = font_ttf->finf.tglp;
+    
 
     glyph_count = glyphInfo->nSheets;
     glyph_sheets = calloc(glyph_count, sizeof(C3D_Tex));
@@ -165,7 +171,8 @@ void screen_init() {
 
     for(int i = 0; i < glyph_count; i++) {
         C3D_Tex* tex = &glyph_sheets[i];
-        tex->data = fontGetGlyphSheetTex(NULL, i);
+        //tex->data = fontGetGlyphSheetTex(NULL, i);
+		tex->data = &glyphInfo->sheetData[glyphInfo->sheetSize*i];
         tex->fmt = (GPU_TEXCOLOR) glyphInfo->sheetFmt;
         tex->size = glyphInfo->sheetSize;
         tex->width = glyphInfo->sheetWidth;
@@ -508,7 +515,8 @@ void screen_draw_texture_crop(u32 id, float x, float y, float width, float heigh
 }
 
 float screen_get_font_height(float scaleY) {
-    return scaleY * fontGetInfo(NULL)->lineFeed;
+    //return scaleY * fontGetInfo(NULL)->lineFeed;
+	return scaleY * fontGetInfo(font_ttf)->lineFeed;
 }
 
 #define MAX_LINES 64
@@ -575,12 +583,14 @@ static void screen_wrap_string(u32* lines, float* lineWidths, float* lineHeights
             lastAlignPos = linePos;
         }
 
-        charWidth *= scaleX * fontGetCharWidthInfo(NULL, fontGlyphIndexFromCodePoint(NULL, code))->charWidth;
+        //charWidth *= scaleX * fontGetCharWidthInfo(NULL, fontGlyphIndexFromCodePoint(NULL, code))->charWidth;
+		charWidth *= scaleX * fontGetCharWidthInfo(font_ttf, fontGlyphIndexFromCodePoint(font_ttf, code))->charWidth;
 
         if(code == '\n' || (wordWrap && lw + charWidth >= maxWidth)) {
             if(code == '\n') {
                 linePos++;
-                lh = scaleY * fontGetInfo(NULL)->lineFeed;
+                //lh = scaleY * fontGetInfo(NULL)->lineFeed;
+				lh = scaleY * fontGetInfo(font_ttf)->lineFeed;
             }
 
             u32 oldLinePos = linePos;
@@ -617,7 +627,8 @@ static void screen_wrap_string(u32* lines, float* lineWidths, float* lineHeights
             }
 
             lw += charWidth;
-            lh = scaleY * fontGetInfo(NULL)->lineFeed;
+            //lh = scaleY * fontGetInfo(NULL)->lineFeed;
+			lh = scaleY * fontGetInfo(font_ttf)->lineFeed;
 
             linePos++;
         }
@@ -709,10 +720,11 @@ static void screen_draw_string_internal(const char* text, float x, float y, floa
                 }
 
                 fontGlyphPos_s data;
-                fontCalcGlyphPos(&data, NULL, fontGlyphIndexFromCodePoint(NULL, code), GLYPH_POS_CALC_VTXCOORD, scaleX * font_scale, scaleY * font_scale);
-
+                //fontCalcGlyphPos(&data, NULL, fontGlyphIndexFromCodePoint(NULL, code), GLYPH_POS_CALC_VTXCOORD, scaleX * font_scale, scaleY * font_scale);
+				fontCalcGlyphPos(&data, font_ttf, fontGlyphIndexFromCodePoint(font_ttf, code), GLYPH_POS_CALC_VTXCOORD, scaleX * font_scale, scaleY * font_scale);	
                 if(data.sheetIndex >= glyph_count) {
-                    fontCalcGlyphPos(&data, NULL, fontGlyphIndexFromCodePoint(NULL, 0xFFFD), GLYPH_POS_CALC_VTXCOORD, scaleX * font_scale, scaleY * font_scale);
+                    //fontCalcGlyphPos(&data, NULL, fontGlyphIndexFromCodePoint(NULL, 0xFFFD), GLYPH_POS_CALC_VTXCOORD, scaleX * font_scale, scaleY * font_scale);
+					fontCalcGlyphPos(&data, font_ttf, fontGlyphIndexFromCodePoint(font_ttf, 0xFFFD), GLYPH_POS_CALC_VTXCOORD, scaleX * font_scale, scaleY * font_scale);
                 }
 
                 if(data.sheetIndex < glyph_count && data.sheetIndex != lastSheet) {

source/core/ui/ui.c

@@ -150,7 +150,7 @@ static void ui_draw_top(ui_view* ui) {
     screen_set_base_alpha(ui_fade_alpha);
 
     char verText[64];
-    snprintf(verText, 64, "Ver. %d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
+    snprintf(verText, 64, "\nVer. %d.%d.%d\n(Chinese Build 9)", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
 
     float verWidth;
     float verHeight;

source/fbi/update.c

@@ -18,7 +18,7 @@ static void update_check_update(ui_view* view, void* data, float* progress, char
     Result res = 0;
 
     json_t* json = NULL;
-    if(R_SUCCEEDED(res = http_download_json("https://api.github.com/repos/qianxu2001/fbi-i18n-zh-cn/releases/latest", &json, 16 * 1024))) {
+    if(R_SUCCEEDED(res = http_download_json(/*"https://api.github.com/repos/Theopse/fbi-i18n-zh-cn/releases/latest"*/ "https://null", &json, 16 * 1024))) {
         if(json_is_object(json)) {
             json_t* name = json_object_get(json, "name");
             json_t* assets = json_object_get(json, "assets");