From c8a544ebad27f541c38e6b7066e0f97f761b957f Mon Sep 17 00:00:00 2001 From: GEEKiDoS Date: Thu, 24 Dec 2020 13:51:54 +0800 Subject: [PATCH 1/2] Fix crash while building font --- src/IW5/Assets/FontDef.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/IW5/Assets/FontDef.cpp b/src/IW5/Assets/FontDef.cpp index 28b3037..9b73d7e 100644 --- a/src/IW5/Assets/FontDef.cpp +++ b/src/IW5/Assets/FontDef.cpp @@ -126,16 +126,16 @@ namespace ZoneTool for (int i = 0; i < font->glyphCount; i++) { - font->glyphs[i].letter = fontdata["glyphs"][i].get(); - font->glyphs[i].x0 = fontdata["glyphs"][i].get(); - font->glyphs[i].y0 = fontdata["glyphs"][i].get(); - font->glyphs[i].dx = fontdata["glyphs"][i].get(); - font->glyphs[i].pixelWidth = fontdata["glyphs"][i].get(); - font->glyphs[i].pixelHeight = fontdata["glyphs"][i].get(); - font->glyphs[i].s0, fontdata["glyphs"][i].get(); - font->glyphs[i].t0, fontdata["glyphs"][i].get(); - font->glyphs[i].s1, fontdata["glyphs"][i].get(); - font->glyphs[i].t1, fontdata["glyphs"][i].get(); + font->glyphs[i].letter = fontdata["glyphs"][i]["letter"].get(); + font->glyphs[i].x0 = fontdata["glyphs"][i]["x0"].get(); + font->glyphs[i].y0 = fontdata["glyphs"][i]["y0"].get(); + font->glyphs[i].dx = fontdata["glyphs"][i]["dx"].get(); + font->glyphs[i].pixelWidth = fontdata["glyphs"][i]["pixelWidth"].get(); + font->glyphs[i].pixelHeight = fontdata["glyphs"][i]["pixelHeight"].get(); + font->glyphs[i].s0, fontdata["glyphs"][i]["s0"].get(); + font->glyphs[i].t0, fontdata["glyphs"][i]["t0"].get(); + font->glyphs[i].s1, fontdata["glyphs"][i]["s1"].get(); + font->glyphs[i].t1, fontdata["glyphs"][i]["t1"].get(); } return font; From f4c132b3018bb737e3ee685411b72677fd31fe67 Mon Sep 17 00:00:00 2001 From: GEEKiDoS Date: Thu, 24 Dec 2020 21:05:51 +0800 Subject: [PATCH 2/2] Fix font uv not set to Font_s properly --- src/IW5/Assets/FontDef.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/IW5/Assets/FontDef.cpp b/src/IW5/Assets/FontDef.cpp index 9b73d7e..557ebe1 100644 --- a/src/IW5/Assets/FontDef.cpp +++ b/src/IW5/Assets/FontDef.cpp @@ -132,10 +132,10 @@ namespace ZoneTool font->glyphs[i].dx = fontdata["glyphs"][i]["dx"].get(); font->glyphs[i].pixelWidth = fontdata["glyphs"][i]["pixelWidth"].get(); font->glyphs[i].pixelHeight = fontdata["glyphs"][i]["pixelHeight"].get(); - font->glyphs[i].s0, fontdata["glyphs"][i]["s0"].get(); - font->glyphs[i].t0, fontdata["glyphs"][i]["t0"].get(); - font->glyphs[i].s1, fontdata["glyphs"][i]["s1"].get(); - font->glyphs[i].t1, fontdata["glyphs"][i]["t1"].get(); + font->glyphs[i].s0 = fontdata["glyphs"][i]["s0"].get(); + font->glyphs[i].t0 = fontdata["glyphs"][i]["t0"].get(); + font->glyphs[i].s1 = fontdata["glyphs"][i]["s1"].get(); + font->glyphs[i].t1 = fontdata["glyphs"][i]["t1"].get(); } return font;