From 3a2912f4082fcda6816c83186d05e4adafdc5a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Szostak?= Date: Tue, 23 Apr 2024 19:09:51 +0200 Subject: [PATCH 1/2] Added support for numbers --- fremen-assets/0.png | Bin 0 -> 102 bytes fremen-assets/1.png | Bin 0 -> 113 bytes fremen-assets/2.png | Bin 0 -> 140 bytes fremen-assets/3.png | Bin 0 -> 148 bytes fremen-assets/4.png | Bin 0 -> 125 bytes fremen-assets/5.png | Bin 0 -> 135 bytes fremen-assets/6.png | Bin 0 -> 124 bytes fremen-assets/7.png | Bin 0 -> 122 bytes fremen-assets/8.png | Bin 0 -> 125 bytes fremen-assets/9.png | Bin 0 -> 120 bytes src/main.c | 58 +++++++++++++++++++++++++++++++++++++++++--- 11 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 fremen-assets/0.png create mode 100644 fremen-assets/1.png create mode 100644 fremen-assets/2.png create mode 100644 fremen-assets/3.png create mode 100644 fremen-assets/4.png create mode 100644 fremen-assets/5.png create mode 100644 fremen-assets/6.png create mode 100644 fremen-assets/7.png create mode 100644 fremen-assets/8.png create mode 100644 fremen-assets/9.png diff --git a/fremen-assets/0.png b/fremen-assets/0.png new file mode 100644 index 0000000000000000000000000000000000000000..485183e6200acc324c3e8e92b796b623e31ee0ef GIT binary patch literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|6g*uVLo9le y6C_v<%W7!O_!Ayv@U!2aS9q_CF&CRD1B3q+rnj!HK_`G}89ZJ6T-G@yGywp078%0; literal 0 HcmV?d00001 diff --git a/fremen-assets/1.png b/fremen-assets/1.png new file mode 100644 index 0000000000000000000000000000000000000000..2688c704321eaa7cba827d365a23ba9b36a92889 GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|v^`xMLo9le z6C~z2cpiLWzcFhj+a1v@#f%%*Em+IlQONo>*5QQcm%@V&*cfh^u!q(lDW>JTYKo+Tn8GoE mIU5~J9ZraDDL?ptonh4hnL>-Fj~js|GI+ZBxvX literal 0 HcmV?d00001 diff --git a/fremen-assets/3.png b/fremen-assets/3.png new file mode 100644 index 0000000000000000000000000000000000000000..dba30941a536c025722f0ab666e69fcb0387ae4b GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|{5)M8Lo9le z6Bd{S1R4DF@2XM@;yI|+caDCounsR<&I rO~wK%nK}wtb7LKPv@_l}9pq=2T`1WhRwHi*G?~HE)z4*}Q$iB}J$^4z literal 0 HcmV?d00001 diff --git a/fremen-assets/4.png b/fremen-assets/4.png new file mode 100644 index 0000000000000000000000000000000000000000..4d44807916b92fbc18351947bf8a2e69e202b6b0 GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|%spKkLo9le z6C^%02+m(Jsp(|B#P55}#uZl|UG3pFn3$rq(!ulK6Z?&NiWwISF7%u>xV5xdkcHuh Xhw$2YpY?lyMlg7~`njxgN@xNAuhuE_ literal 0 HcmV?d00001 diff --git a/fremen-assets/5.png b/fremen-assets/5.png new file mode 100644 index 0000000000000000000000000000000000000000..ddcf45bba1aa040934a3f84d6f3f84a4965c524f GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|96eneLo9le z6C_wgnB7VkRaqzh|6y{cx`54@|Kcpplfoe`Qy71U2<0;99aWKR@MS*9wjf*SG($>n ginPPVv{_6Hd;Uq@O`5kf7HAlQr>mdKI;Vst0MWK51poj5 literal 0 HcmV?d00001 diff --git a/fremen-assets/6.png b/fremen-assets/6.png new file mode 100644 index 0000000000000000000000000000000000000000..e878cb47d7171fe221c508099c8dd0c259a727e8 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|%sgEjLo9le z6C^SYbestcGWgl=|8XySy2Qn!Gdec1&UTx`sCQlPDbp&(oOKIsupU0p5a__lz)*65 Wv-!d|6>yPBTqE$9`Okm&f%_BN&==ktM`4HMojW?*8l)E5w{ Tv*(ls>SyqD^>bP0l+XkKxNRi+ literal 0 HcmV?d00001 diff --git a/fremen-assets/8.png b/fremen-assets/8.png new file mode 100644 index 0000000000000000000000000000000000000000..b11820438f3c80b388841b76356d93916d58391a GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|%spKkLo9le z6C|!UcpiLWe{>e7sHsEGBb-h%n!A3B9|Ib1orwb*$47#Lo) W2)6PaiGBbyg2B_(&t;ucLK6TD9wmbS literal 0 HcmV?d00001 diff --git a/fremen-assets/9.png b/fremen-assets/9.png new file mode 100644 index 0000000000000000000000000000000000000000..856b80a1ed6401c5bfbec341b8448f910d668c43 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|j67W&Lo9le z6C_xBcBo7d@%g9x`Ms@0bFi-C*%vjpb~j8&JkijZ6Wrd<$ildfK}L;%p>zuG{pJla Q6+qn#p00i_>zopr08Dx#@Bjb+ literal 0 HcmV?d00001 diff --git a/src/main.c b/src/main.c index cd33b7a..5d09007 100644 --- a/src/main.c +++ b/src/main.c @@ -54,7 +54,17 @@ enum Character { E, I, O, - U + U, + c_0, + c_1, + c_2, + c_3, + c_4, + c_5, + c_6, + c_7, + c_8, + c_9 }; void transcript(char* message, int *charcters){ @@ -165,6 +175,36 @@ void transcript(char* message, int *charcters){ case 'u': charcters[i] = U; break; + case '0': + charcters[i] = c_0; + break; + case '1': + charcters[i] = c_1; + break; + case '2': + charcters[i] = c_2; + break; + case '3': + charcters[i] = c_3; + break; + case '4': + charcters[i] = c_4; + break; + case '5': + charcters[i] = c_5; + break; + case '6': + charcters[i] = c_6; + break; + case '7': + charcters[i] = c_7; + break; + case '8': + charcters[i] = c_8; + break; + case '9': + charcters[i] = c_9; + break; default: break; } @@ -251,14 +291,24 @@ int main(int argc, char *argv[]){ characters_img[25] = LoadImage(concat(executablePath,"fremen-assets/I.png")); characters_img[26] = LoadImage(concat(executablePath,"fremen-assets/O.png")); characters_img[27] = LoadImage(concat(executablePath,"fremen-assets/U.png")); + characters_img[28] = LoadImage(concat(executablePath,"fremen-assets/0.png")); + characters_img[29] = LoadImage(concat(executablePath,"fremen-assets/1.png")); + characters_img[30] = LoadImage(concat(executablePath,"fremen-assets/2.png")); + characters_img[31] = LoadImage(concat(executablePath,"fremen-assets/3.png")); + characters_img[32] = LoadImage(concat(executablePath,"fremen-assets/4.png")); + characters_img[33] = LoadImage(concat(executablePath,"fremen-assets/5.png")); + characters_img[34] = LoadImage(concat(executablePath,"fremen-assets/6.png")); + characters_img[35] = LoadImage(concat(executablePath,"fremen-assets/7.png")); + characters_img[36] = LoadImage(concat(executablePath,"fremen-assets/8.png")); + characters_img[37] = LoadImage(concat(executablePath,"fremen-assets/9.png")); - for(int i = 0; i <= 27; i++){ + for(int i = 0; i <= 37; i++){ ImageResizeNN(&characters_img[i], CHAR_WIDTH, CHAR_HEIGHT); } Texture2D characters_tex[28] = {0}; - for(int i = 0; i <= 27; i++){ + for(int i = 0; i <= 37; i++){ characters_tex[i] = LoadTextureFromImage(characters_img[i]); } @@ -352,7 +402,7 @@ int main(int argc, char *argv[]){ //INPUT } - for(int i = 0; i <= 27; i++){ + for(int i = 0; i <= 37; i++){ UnloadImage(characters_img[i]); UnloadTexture(characters_tex[i]); } From c43ad166871d975ba7fa597488dc2eefddb5e3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Szostak?= Date: Tue, 23 Apr 2024 19:20:08 +0200 Subject: [PATCH 2/2] Fixed array bounds --- fremen-assets/{0.png => c_0.png} | Bin fremen-assets/{1.png => c_1.png} | Bin fremen-assets/{2.png => c_2.png} | Bin fremen-assets/{3.png => c_3.png} | Bin fremen-assets/{4.png => c_4.png} | Bin fremen-assets/{5.png => c_5.png} | Bin fremen-assets/{6.png => c_6.png} | Bin fremen-assets/{7.png => c_7.png} | Bin fremen-assets/{8.png => c_8.png} | Bin fremen-assets/{9.png => c_9.png} | Bin src/main.c | 24 ++++++++++++------------ 11 files changed, 12 insertions(+), 12 deletions(-) rename fremen-assets/{0.png => c_0.png} (100%) rename fremen-assets/{1.png => c_1.png} (100%) rename fremen-assets/{2.png => c_2.png} (100%) rename fremen-assets/{3.png => c_3.png} (100%) rename fremen-assets/{4.png => c_4.png} (100%) rename fremen-assets/{5.png => c_5.png} (100%) rename fremen-assets/{6.png => c_6.png} (100%) rename fremen-assets/{7.png => c_7.png} (100%) rename fremen-assets/{8.png => c_8.png} (100%) rename fremen-assets/{9.png => c_9.png} (100%) diff --git a/fremen-assets/0.png b/fremen-assets/c_0.png similarity index 100% rename from fremen-assets/0.png rename to fremen-assets/c_0.png diff --git a/fremen-assets/1.png b/fremen-assets/c_1.png similarity index 100% rename from fremen-assets/1.png rename to fremen-assets/c_1.png diff --git a/fremen-assets/2.png b/fremen-assets/c_2.png similarity index 100% rename from fremen-assets/2.png rename to fremen-assets/c_2.png diff --git a/fremen-assets/3.png b/fremen-assets/c_3.png similarity index 100% rename from fremen-assets/3.png rename to fremen-assets/c_3.png diff --git a/fremen-assets/4.png b/fremen-assets/c_4.png similarity index 100% rename from fremen-assets/4.png rename to fremen-assets/c_4.png diff --git a/fremen-assets/5.png b/fremen-assets/c_5.png similarity index 100% rename from fremen-assets/5.png rename to fremen-assets/c_5.png diff --git a/fremen-assets/6.png b/fremen-assets/c_6.png similarity index 100% rename from fremen-assets/6.png rename to fremen-assets/c_6.png diff --git a/fremen-assets/7.png b/fremen-assets/c_7.png similarity index 100% rename from fremen-assets/7.png rename to fremen-assets/c_7.png diff --git a/fremen-assets/8.png b/fremen-assets/c_8.png similarity index 100% rename from fremen-assets/8.png rename to fremen-assets/c_8.png diff --git a/fremen-assets/9.png b/fremen-assets/c_9.png similarity index 100% rename from fremen-assets/9.png rename to fremen-assets/c_9.png diff --git a/src/main.c b/src/main.c index 5d09007..30d6abe 100644 --- a/src/main.c +++ b/src/main.c @@ -261,7 +261,7 @@ int main(int argc, char *argv[]){ InitWindow(SCREEN_WIDTH, SCREEN_HEIGHT, "Fremen Transcriptor"); SetTargetFPS(60); - Image characters_img[28] = {0}; + Image characters_img[38] = {0}; characters_img[0] = GenImageColor(1, 1, WHITE); characters_img[1] = LoadImage(concat(executablePath,"fremen-assets/B.png")); @@ -291,22 +291,22 @@ int main(int argc, char *argv[]){ characters_img[25] = LoadImage(concat(executablePath,"fremen-assets/I.png")); characters_img[26] = LoadImage(concat(executablePath,"fremen-assets/O.png")); characters_img[27] = LoadImage(concat(executablePath,"fremen-assets/U.png")); - characters_img[28] = LoadImage(concat(executablePath,"fremen-assets/0.png")); - characters_img[29] = LoadImage(concat(executablePath,"fremen-assets/1.png")); - characters_img[30] = LoadImage(concat(executablePath,"fremen-assets/2.png")); - characters_img[31] = LoadImage(concat(executablePath,"fremen-assets/3.png")); - characters_img[32] = LoadImage(concat(executablePath,"fremen-assets/4.png")); - characters_img[33] = LoadImage(concat(executablePath,"fremen-assets/5.png")); - characters_img[34] = LoadImage(concat(executablePath,"fremen-assets/6.png")); - characters_img[35] = LoadImage(concat(executablePath,"fremen-assets/7.png")); - characters_img[36] = LoadImage(concat(executablePath,"fremen-assets/8.png")); - characters_img[37] = LoadImage(concat(executablePath,"fremen-assets/9.png")); + characters_img[28] = LoadImage(concat(executablePath,"fremen-assets/c_0.png")); + characters_img[29] = LoadImage(concat(executablePath,"fremen-assets/c_1.png")); + characters_img[30] = LoadImage(concat(executablePath,"fremen-assets/c_2.png")); + characters_img[31] = LoadImage(concat(executablePath,"fremen-assets/c_3.png")); + characters_img[32] = LoadImage(concat(executablePath,"fremen-assets/c_4.png")); + characters_img[33] = LoadImage(concat(executablePath,"fremen-assets/c_5.png")); + characters_img[34] = LoadImage(concat(executablePath,"fremen-assets/c_6.png")); + characters_img[35] = LoadImage(concat(executablePath,"fremen-assets/c_7.png")); + characters_img[36] = LoadImage(concat(executablePath,"fremen-assets/c_8.png")); + characters_img[37] = LoadImage(concat(executablePath,"fremen-assets/c_9.png")); for(int i = 0; i <= 37; i++){ ImageResizeNN(&characters_img[i], CHAR_WIDTH, CHAR_HEIGHT); } - Texture2D characters_tex[28] = {0}; + Texture2D characters_tex[38] = {0}; for(int i = 0; i <= 37; i++){ characters_tex[i] = LoadTextureFromImage(characters_img[i]);