From 0e135118fd0edd3ef613cb28cb573d12916dca98 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 21 Jun 2018 00:18:13 +0200
Subject: [PATCH] Improved GenImageFontAtlas()

---
 release/include/raylib.h               |   2 +-
 release/libs/win32/mingw32/libraylib.a | Bin 1116752 -> 1116822 bytes
 src/raylib.h                           |   2 +-
 src/text.c                             |  22 +++++++---------------
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/release/include/raylib.h b/release/include/raylib.h
index 49434d52..9a6e117f 100644
--- a/release/include/raylib.h
+++ b/release/include/raylib.h
@@ -965,7 +965,7 @@ RLAPI void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle dest
 RLAPI Font GetDefaultFont(void);                                                            // Get the default Font
 RLAPI Font LoadFont(const char *fileName);                                                  // Load font from file into GPU memory (VRAM)
 RLAPI CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int charsCount, bool sdf); // Load font data for further use
-RLAPI Image GenImageFontAtlas(CharInfo *chars, int fontSize, int charsCount, int packing);  // Generate image font atlas using chars info
+RLAPI Image GenImageFontAtlas(CharInfo *chars, int fontSize, int charsCount, int padding, int packMethod);  // Generate image font atlas using chars info
 RLAPI void UnloadFont(Font font);                                                           // Unload Font from GPU memory (VRAM)
 
 // Text drawing functions
diff --git a/release/libs/win32/mingw32/libraylib.a b/release/libs/win32/mingw32/libraylib.a
index 3425c71aed98130df9eb86722b3fbe3d7b4f72b3..0bf3c42129d5bf6a3700448c84bd205fcdf150d6 100644
GIT binary patch
delta 5415
zcmc(j4NO$o702%z9>c)AVVD&K6)n0?7gmaIU>Ig9jVR*>endt53_1=leAsbBm~m~^
z_*{YN1V>p#E_G!WSKBmZH|k1#cD1|U2Y#d*ZE7tOx&~uyv>UgsZP|9!PS3lSxoX>_
zCDAO&&HcUqIrrRi&$&E&UTbl*?sGJ!MCW8@*|Lt0n=@R#iG-qWame51=CHT?qEByV
z{}md-kcZ;@5`5($W&7e2kcU>T|CvDiHW3YF$U|{{3BK}>vVHLh$U`gF3r|2ELcffC
zo#;gm`M(8BXiG&ec{mF^u5~rYd7^)muT`tQjwKtuwoX5yzUH`6bDS$#n`lGMx;Lu5
zl?ChlUZ1-*(_)r#mHyEh%yV|UDOEF(%ii1l>UgC)RkK(}-sloOUL+)Km(n#bqG0ea
zq7^A!Ya2uMFiT{Q?F}=vFk)cnl!lqHy~CfiDw|4TALLUdd(gi<R%vLDo7BzaD92Xo
zZ)glw<Scd7Ro7+aSgbjFmjv1ssZ{?9j<euDmFd&DEG4mAe=?Q^$x(wOCs`#+s`|4g
zZXTya>Q729LSFoKNo-P_bQmF?L#XN;e$Z|htL@MuWcdm9Y>OX{E4=y)!}VhbJ-$ws
zp;T;M6`R7H!u@Rt<KwQ!A=GjTp}ZT)U9WyjlYB;O0KcXKVhc=-UB+D(czA3On^m<_
z+yN8U6-*omI7BfxOXyRl#O6?mSQ2u;__8_FUEd}4=Knr)wl}}ue)i_&o81ws|Mush
zP>OgLVxV4wCkCO&Q)sievNxwD2H{QL=vT=;u{iJ`;1kn~M|)r+9>zSfs<96+&)9ed
zPTTYW$)@qXahF4Vq&cdQg6sK<4$-1+!*#)e{HO+TCp-W;2HgN{Fr>hPNz?|DdPLA>
z8)d~IuIv;l;9+@ah7j_I%lk^iVwhJpIbfclYgEH#JZG3E7H?VDR4m%e1Lm;tXt9_U
zRV+#{@|uI46V+TAFK<b0T9sn%3d|El?oqSxq!6`3(A0NvQ=p3e2TdT?_i)@*8CIoD
z@rfD!&zd%iQj<@#!M^!XGm-<FMNus|)JEhkf|v%1lzwS2d;8x*tB`6Bt>Wd;V0Lgl
zcAq#K+-;l1r$?9Sp*&pu1rb~<_6AZ%W8*8~a2WQQ7o5pk13Yb0<3Qk?Z*<@x=y~SL
z#*=(}4?j1&!!ehu@8;}R{P!V3Uc?zT*b3(iTnr?GoQ8dm_2cL6xyXwWsHA^^b5OT@
z@Kf(mcYjo5Wk7AS+8b4eYz5daEs!FDngEYF82sJw_|{|n2>AeY>S^pV?m7yMH!9C`
zet{5pXucmz0ri<4a)H<DyT$qoT>aUE=bEN=b6P*wTM?N4*MBz<b-+$<ng2ALC_ms4
zbxYJ-0BmaRYdXW>;7lFdwhTyIy*-xTEIx1n+Ga5-Nk(OsCaQ&8EVzQ?S7-qrC>F)W
z%cP5>Q>0<|%oBaOyjd)6467a8veI}IDhM|XBITI}p34nx8h0(27-J4sH2>dsYVb-)
z{?DNI8Jv0n66giUfZJy?HckwO%ffI-N2Dj@z=PM|UfUD68?X>g%Kr@B2+&jwJ+O{6
z_KPE-FYn2Zz=`!x{jJqSf($<q4u5elxDnx=f9el#UAQc)&zv&tbT|yR1u7eC5Z6F2
z;q2<KZXzirF9IgOW(Z~>mCiaR%y;kp1D_A;uW)($b_+j>4GaX&yaqB-MsUKPdG153
z)e5J$OZZc*PzrCl@i9W3=E*^fV}w2266JNB@R5%5DW4|@y5X@?lWWaW5$c+Xr9y*8
zSvgU-rsE9wc(i^Lzm<#n1Q$*g#%U6pv1hU{Ho5_t_<g*4vM@$-gTot^MGuRg18-ZD
z52Ga(q4W6aWTAlb;bD?6i7UrbB_WAx!OP$&nm>q88-8n%Aq5|jgzt<z{60cGunsMZ
zuhD!I&nE+R!28&T`y^pB*QtCh2?c^&*M!h2FeRcN0zs-si{1iSO|&MaonUktXfClL
zc<reLOGMrvLbD0I12l(Fh-qIj%Gee0JGq<q$*}k=MWEjR(G+e2%_m_-sx<-9q5`1B
zL|XtvH(3TmSL|bS7-$XgTlqFZ3kY=qEhIE)4?-?NZvx45aXsJ~B7O)&wF^MSMEe@3
zl+Y`CBQy?(`lSPv5o-?9RsfX~&CRr}K=epEnRZlW;uRpeNr;(m0nyO+nf5mz8d?W`
zL}?1iKs0nV5REdOS?2)JC`*}E3ZzDnp?6FS0MRfVKyH%%ai9u9rx{&f)DJ}aj`kr`
zN&FHSy#_=R%mt#6=Kxg^zjuKa$OQWVX?N}d(avgHBcbO5(KD3*(SS#QXcb~GLd!{%
zav*wB)-u}2Xd9zljP_&LpDsDX#19xvYKv?)1&HQ94T!Fo#b`dGB1X#@t!7lks5U|}
zY6YYP+4$o~6+Q)`=e!C;H@?lZzcB6SeuS#Y*)!fjXf2^yAbRIJfoN6v1Cb`)X-DV>
z#BalU>OtWATGUNYrQb5T!{{NSM~uXdNEN=z$jWFfqc?#(NPR<WW!ga?dZT{c0sGTp
ze!|T67$w0QjXGN2kJRHJ5M6Pd(H|In#poMGQHLTc5*UqP<etc|lhMaOQ;=GZ^Gv(U
z=sM6;Vl^E`XdO@@N&=#3r81fTM59zH?@bpbXbTgX;h&5s6=`4%Ld{VKZGBGJ4@ws_
z?WxaCL8*bNKUI!_vIZLpg;%*|Y=$WpL7AS~?|{7n4*yhnsKz)HQJjui*BdhzE<T2v
z3WY_{lOV~n_*S7%$!$^!=LnjZc=)&}^;cBDXN}F0or6~_5^Q74$XV;IsCCy>6}fzF
zFxaw?v!bR>B?)r}3?uP1oDhe9y-4UI-#cb}b)7zG`=ug5xm0BMUV-{mQsF9d*Jb9K
zt+{&_wI=S}+!8-(qr29pO1ZE>joa&URj&7v=PcC)J6jFIO%~+z)mFQ_l^(L%mP1y5
z++tv>?YYmp*lnsyN}0dZjhus9WSJ%8+~9YWL-;JSS$WWEIHIK=K{lnM-4OmAXI47=
z@kIjtA2{rSZ=db)+v1h@ZARY;>S-t6T*|wB#)W5yl10D5l(@EpUwXJKe2F(rNKi{t
zU0df{=c>uHTC%h86W)ZOPtGMv7Zqn(t=Ujvm#eNqMLTj<xn1QFaE=`-(WbG<Iq-4m
zD|eQcIX(V$)n1pk%<bIh^7yf!HI2eoqD}f_h^4x?{=;Ri)|4W6Ys=P`L#?dVEIT%9
zO~ZMzd?(oCr?zY;`CyQ;s@nC>?nKsR!!gv<vLKEXYPVuqfpa!V9}-;Qh&*Jg$6_Yv
z@{*;@2A!*@_IRdOLysW{1jHMnO~aItF{VFq>0tG^y_LQycWI_I+X7L`tLuDaDnl5R
SsUa7q#hThUGwzNx?fw@<0gWgC

delta 5313
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

diff --git a/src/raylib.h b/src/raylib.h
index 49434d52..9a6e117f 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -965,7 +965,7 @@ RLAPI void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle dest
 RLAPI Font GetDefaultFont(void);                                                            // Get the default Font
 RLAPI Font LoadFont(const char *fileName);                                                  // Load font from file into GPU memory (VRAM)
 RLAPI CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int charsCount, bool sdf); // Load font data for further use
-RLAPI Image GenImageFontAtlas(CharInfo *chars, int fontSize, int charsCount, int packing);  // Generate image font atlas using chars info
+RLAPI Image GenImageFontAtlas(CharInfo *chars, int fontSize, int charsCount, int padding, int packMethod);  // Generate image font atlas using chars info
 RLAPI void UnloadFont(Font font);                                                           // Unload Font from GPU memory (VRAM)
 
 // Text drawing functions
diff --git a/src/text.c b/src/text.c
index 3c3ff751..5e02a471 100644
--- a/src/text.c
+++ b/src/text.c
@@ -284,7 +284,7 @@ Font LoadFont(const char *fileName)
         font.baseSize = DEFAULT_TTF_FONTSIZE;
         font.charsCount = DEFAULT_TTF_NUMCHARS;
         font.chars = LoadFontData(fileName, font.baseSize, NULL, font.charsCount, false);
-        Image atlas = GenImageFontAtlas(font.chars, font.charsCount, font.baseSize, 0);
+        Image atlas = GenImageFontAtlas(font.chars, font.charsCount, font.baseSize, 4, 0);
         font.texture = LoadTextureFromImage(atlas);
         UnloadImage(atlas);
     }
@@ -398,20 +398,12 @@ CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int c
 
 // Generate image font atlas using chars info
 // NOTE: Packing method: 0-Default, 1-Skyline
-Image GenImageFontAtlas(CharInfo *chars, int charsCount, int fontSize, int packing)
+Image GenImageFontAtlas(CharInfo *chars, int charsCount, int fontSize, int padding, int packMethod)
 {
     Image atlas = { 0 };
     
-    int padding = 10;
-    
-    // Calculate atlas texture size based on fontSize
-    // NOTE: Font texture size is predicted (being as much conservative as possible)
-    // Predictive method consist of supposing same number of chars by line-column (sqrtf)
-    // and a maximum character width of 3/4 of fontSize... it worked ok with all my tests...
-    //float guessSize = ceilf((float)fontSize*3/4)*ceilf(sqrtf((float)charsCount));
-    //int textureSize = (int)powf(2, ceilf(logf((float)guessSize)/logf(2)));  // Calculate next POT
-    
-    // TODO: TEXTURE SIZE NOT GOOD ENOUGH! -> Calculate chars area -> guess texture size?
+    // Calculate texture size based on required pixel area
+    // NOTE: Texture is forced to be squared and POT
     float requiredArea = 0;
     for (int i = 0; i < charsCount; i++) requiredArea += ((chars[i].rec.width + 2*padding)*(chars[i].rec.height + 2*padding));
     float guessSize = sqrtf(requiredArea)*1.25f;
@@ -423,7 +415,7 @@ Image GenImageFontAtlas(CharInfo *chars, int charsCount, int fontSize, int packi
     atlas.format = UNCOMPRESSED_GRAYSCALE;
     atlas.mipmaps = 1;
 
-    if (packing == 0)   // Use basic packing algorythm
+    if (packMethod == 0)   // Use basic packing algorythm
     {
         int offsetX = padding;
         int offsetY = padding;
@@ -455,7 +447,7 @@ Image GenImageFontAtlas(CharInfo *chars, int charsCount, int fontSize, int packi
             }
         }
     }
-    else if (packing == 1)  // Use Skyline rect packing algorythm 
+    else if (packMethod == 1)  // Use Skyline rect packing algorythm (stb_pack_rect)
     {
         stbrp_context *context = (stbrp_context *)malloc(sizeof(*context));
         stbrp_node *nodes = (stbrp_node *)malloc(charsCount*sizeof(*nodes));
@@ -498,7 +490,7 @@ Image GenImageFontAtlas(CharInfo *chars, int charsCount, int fontSize, int packi
     }
     
     // Convert image data from GRAYSCALE to GRAY_ALPHA
-    //ImageAlphaMask(&atlas, atlas);    // WARNING: Not working in this case, requires manual operation
+    // WARNING: ImageAlphaMask(&atlas, atlas) does not work in this case, requires manual operation
     unsigned char *dataGrayAlpha = (unsigned char *)malloc(textureSize*textureSize*sizeof(unsigned char)*2); // Two channels
 
     for (int i = 0, k = 0; i < atlas.width*atlas.height; i++, k += 2)