From 99f020564570c68aa779cecd8f13c01a92c06f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Mon, 14 Oct 2019 01:47:41 +0200
Subject: [PATCH] Draw weapon

---
 assets.h                  |  47 +++++++++++++++++
 assets/weapon_shotgun.png | Bin 0 -> 948 bytes
 main.c                    | 106 ++++++++++++++++++++++++++++++++++++++
 raycastlib.h              |   4 +-
 4 files changed, 155 insertions(+), 2 deletions(-)
 create mode 100644 assets/weapon_shotgun.png

diff --git a/assets.h b/assets.h
index 5384a90..14b5434 100644
--- a/assets.h
+++ b/assets.h
@@ -588,6 +588,53 @@ uint8_t SFG_backgrounds[][SFG_TEXTURE_SIZE * SFG_TEXTURE_SIZE] =
   }
 };
 
+SFG_PROGRAM_MEMORY
+uint8_t SFG_weaponImages[][SFG_TEXTURE_SIZE * SFG_TEXTURE_SIZE] =
+{
+  { // 0, shotgun
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,1,1,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,1,1,1,1,17,
+100,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,1,1,1,5,6,4,17,100,101,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,1,1,1,1,5,6,4,6,5,17,100,101,101,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,1,1,1,4,4,6,7,7,6,1,3,5,
+17,99,101,101,175,175,175,175,175,175,175,175,175,175,175,175,1,1,1,1,5,5,5,7,7,
+6,6,6,5,1,3,5,17,99,100,101,175,175,175,175,175,175,175,175,175,175,1,1,6,5,6,6,
+7,7,6,6,4,6,7,7,4,6,6,5,17,99,100,101,175,175,175,175,175,175,175,175,175,1,6,6,
+3,6,7,6,6,7,7,4,5,6,6,4,4,5,5,4,17,99,99,100,175,175,175,175,175,175,175,175,1,
+6,6,6,3,6,7,7,7,7,6,4,4,5,3,3,5,1,3,4,17,98,99,100,175,175,175,175,175,175,175,
+175,1,7,7,2,6,7,7,6,5,5,5,5,3,3,74,4,4,1,3,4,17,98,98,99,175,175,175,175,175,
+175,175,1,6,6,6,2,6,6,6,5,5,5,5,5,4,4,4,4,4,4,4,4,3,17,18,18,175,175,175,175,
+175,175,175,1,6,6,6,4,6,4,4,4,4,4,4,4,4,3,3,3,3,3,3,1,3,74,17,98,175,175,175,
+175,175,175,17,1,1,4,4,4,2,4,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,74,17,17,175,175,175,
+175,175,101,99,25,25,1,3,42,2,3,42,3,42,42,42,42,42,42,42,74,42,74,74,42,74,17,
+17,1,175,175,175,175,175,17,17,17,25,25,25,25,9,17,17,17,17,17,1,17,1,17,1,1,1,
+1,1,1,73,1,1,1,175,175,175,175,175,175,175,1,25,25,25,26,26,26,19,19,19,19,19,
+19,19,19,19,19,19,19,26,26,18,73,17,1,175,175,175,175,175,17,17,17,25,25,25,19,
+100,100,100,101,101,101,101,101,101,101,101,101,101,101,100,100,19,19,17,1,175,
+175,175,175,175,101,99,25,25,1,4,4,26,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,3,17,17,
+175,175,175,175,175,175,17,1,1,6,6,4,4,6,6,6,7,7,6,6,6,5,5,5,4,4,4,1,3,3,17,99,
+175,175,175,175,175,175,175,1,7,7,7,2,6,7,7,7,7,7,7,7,7,6,6,6,7,7,7,7,5,3,17,
+100,175,175,175,175,175,175,175,1,6,6,6,2,5,6,6,6,6,6,7,6,6,7,7,7,6,1,3,7,5,17,
+99,100,175,175,175,175,175,175,175,175,1,4,4,2,4,6,5,5,5,5,6,6,4,4,4,6,6,1,3,5,
+4,17,100,101,175,175,175,175,175,175,175,175,1,5,5,5,2,5,4,4,4,4,4,74,3,4,3,3,5,
+6,6,5,17,99,101,101,175,175,175,175,175,175,175,175,175,1,5,5,4,4,4,4,3,4,4,2,2,
+3,3,74,2,4,4,4,17,99,101,101,175,175,175,175,175,175,175,175,175,175,1,1,3,3,53,
+5,4,3,3,3,2,42,3,3,2,1,3,3,17,99,100,101,175,175,175,175,175,175,175,175,175,
+175,175,175,1,1,1,1,3,5,5,5,5,4,4,3,2,1,3,2,17,99,100,101,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,1,1,1,84,84,3,5,5,5,2,3,2,17,99,99,
+100,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+1,1,1,1,83,84,74,84,2,17,98,99,100,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,1,1,1,4,4,2,17,98,99,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,1,1,1,1,17,18,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,1,1,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175
+  }
+};
+
 uint8_t SFG_charToFontIndex(char c)
 {
   if (c >= 'a' && c <= 'z')
diff --git a/assets/weapon_shotgun.png b/assets/weapon_shotgun.png
new file mode 100644
index 0000000000000000000000000000000000000000..8da93ccb556c3bd4b1cc3d51f5e4d8c18f93f3e0
GIT binary patch
literal 948
zcmV;l155mgP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|dKH9|Sf+7PSBX02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00SIJL_t(o!|hfrbK5`=efAg#
z2nYlmC^#T+puix&puiyDK!8DiK%jwvenMfPfPsHNe?Wl2!a&1<fCB;t0t5mC3=VWA
z1=2}(@<~zBnPxiEL;5)FzI*%jt!4&z!3VB6K6w2H@NWV*eP2Uf3jlz;7C3!h|2+Wm
zTHxWa^qxIDmMx&SuG!Q!6e(}7*{2B68PJshPa>EYD4$IGUKM&WfW_3rbflVrTL}O#
zF~H&o#@VZsf-W>fvu6sB`D@APNKi_(&$3<SoffE1Zvompd7gW$y%~T_9@K%9-hH;q
zg8Qa`SWKzY=62&HR_B^p&KX3U)FmPUQ3rUt+rD3f_VoEazc^u*)z?OAuoZ*6szA>P
zR?7{flu$*j10rhgiD*y{gAAxbwTXGkFM_J)E?^Q1NGZV^x<xA5Z~j07br9aGp(<2c
z0!x1gyiLx&Zr<MoHi#}XRMB;Uh&xdHDj7|%Je#)x5GhBV=ibTP<gN(a#RF=$Oh_pQ
zyJ3_8KB14teMCSN>Y{BY0dVOLzOPJhKTkPCI(;t8`}AkKtVMj-AH3f7*h!*M;HUea
z-nZXww!tzCGC)La35e)|i9Q4UZ<Ei_D1(DOAf;@D(-)yD#y$h~o$Ccwu)5Gt3q4H(
zHh_Ej>e0NaflvpyEjuK{dB6SoR06<iv-F-b&BlLPnq(HZ1#`E&Y{z-OZLH}W_J={_
zB`<^GbM043i7G0g3*B|d6(83CQ8$3-NcB8uhL1atm}byW;nO!iBXq3ihK+aFACMRp
z24Ly8#xXYgeMhXopR3XR?)~Z)$7-{L*yrtZTnxFEwNckptS0yu0X+H45eVDe7I~gG
z<5yjp8Z@Mk;SvxL?tdJHZFRNw#AOx+Q3dFjLrUfW)P)|5)i<`80bWGP!IKDg>j=8+
zS!{E!s|YM!)gnBfpeqBm;E*>7N_4eVrw0JQI^f2-G|*K9U75B7GoJDno7|38-PE;B
zUK$|g&`+i310g$J3xKonST2YK057>e<2!-rGr*JXW7mv$619o@{|KR2h#7QMGw>T`
W1I3Uu*+Yi_0000<MNUMnLSTY0PM>4|

literal 0
HcmV?d00001

diff --git a/main.c b/main.c
index c9b3b23..82a4156 100755
--- a/main.c
+++ b/main.c
@@ -111,6 +111,19 @@ void SFG_init();
   #define SFG_MS_PER_FRAME 1
 #endif
 
+#define SFG_WEAPON_IMAGE_SCALE \
+  (SFG_GAME_RESOLUTION_X / (SFG_TEXTURE_SIZE * 5))
+
+#if SFG_WEAPON_IMAGE_SCALE == 0
+  #define SFG_WEAPON_IMAGE_SCALE 1
+#endif
+
+#define SFG_WEAPON_IMAGE_POSITION_X \
+  (SFG_GAME_RESOLUTION_X / 2 - (SFG_WEAPON_IMAGE_SCALE * SFG_TEXTURE_SIZE) / 2)
+
+#define SFG_WEAPON_IMAGE_POSITION_Y \
+  (SFG_GAME_RESOLUTION_Y - (SFG_WEAPON_IMAGE_SCALE * SFG_TEXTURE_SIZE))
+
 #define SFG_PLAYER_TURN_UNITS_PER_FRAME \
   ((SFG_PLAYER_TURN_SPEED * RCL_UNITS_PER_SQUARE) / (360 * SFG_FPS))
 
@@ -450,6 +463,96 @@ void SFG_pixelFunc(RCL_PixelInfo *pixel)
   }
 }
 
+/**
+  Draws image on screen, with transparency. This is faster than sprite drawing.
+  For performance sake drawing near screen edges is not pixel perfect.
+*/
+void SFG_blitImage(
+  const uint8_t *image,
+  int16_t posX,
+  int16_t posY,
+  uint8_t scale)
+{
+  if (scale == 0)
+    return;
+ 
+  uint16_t x0 = posX,
+           x1,
+           y0 = posY, 
+           y1;
+ 
+  uint8_t u0 = 0, v0 = 0;
+
+  if (posX < 0)
+  {
+    x0 = 0;
+    u0 = (-1 * posX) / scale;
+  }
+
+  posX += scale * SFG_TEXTURE_SIZE;
+
+  uint16_t limitX = SFG_GAME_RESOLUTION_X - scale;
+  uint16_t limitY = SFG_GAME_RESOLUTION_Y - scale;
+
+  x1 = posX >= 0 ?
+       (posX <= limitX ? posX : limitX)
+       : 0;
+
+  if (x1 >= SFG_GAME_RESOLUTION_X)
+    x1 = SFG_GAME_RESOLUTION_X - 1;
+
+  if (posY < 0)
+  {
+    y0 = 0;
+    v0 = (-1 * posY) / scale;
+  }
+
+  posY += scale * SFG_TEXTURE_SIZE;
+
+  y1 = posY >= 0 ?
+       (posY <= limitY ? posY : limitY)
+       : 0;
+
+  if (y1 >= SFG_GAME_RESOLUTION_Y)
+    y1 = SFG_GAME_RESOLUTION_Y - 1;
+
+  uint8_t u,v;
+
+  v = v0;
+
+  for (uint16_t y = y0; y < y1; y += scale)
+  {
+    u = u0;
+
+    for (uint16_t x = x0; x < x1; x += scale)
+    {
+      uint8_t color = SFG_getTexel(image,u,v);
+
+      if (color != SFG_TRANSPARENT_COLOR)
+      {
+        uint16_t sY = y;
+
+        for (uint8_t j = 0; j < scale; ++j)
+        {
+          uint16_t sX = x;
+
+          for (uint8_t i = 0; i < scale; ++i)
+          {
+            SFG_setGamePixel(sX,sY,color);
+            sX++;
+          }
+          
+          sY++;
+        }
+      }
+
+      u++;
+    }
+
+    v++;
+  }
+}
+
 #define SFG_MAX_SPRITE_SIZE SFG_GAME_RESOLUTION_X
 
 uint8_t SFG_spriteSamplingPoints[SFG_MAX_SPRITE_SIZE];
@@ -1257,6 +1360,9 @@ SFG_drawText("ammo",
 SFG_GAME_RESOLUTION_X - 10 - 4 * (SFG_FONT_CHARACTER_SIZE * SFG_FONT_SIZE_MEDIUM + 1)
 ,SFG_GAME_RESOLUTION_Y - 10 - SFG_FONT_CHARACTER_SIZE * SFG_FONT_SIZE_MEDIUM,SFG_FONT_SIZE_MEDIUM,7);
 
+SFG_blitImage(SFG_weaponImages[0],
+SFG_WEAPON_IMAGE_POSITION_X,SFG_WEAPON_IMAGE_POSITION_Y ,SFG_WEAPON_IMAGE_SCALE);
+
   }
 }
 
diff --git a/raycastlib.h b/raycastlib.h
index bc9906a..26f5cbc 100644
--- a/raycastlib.h
+++ b/raycastlib.h
@@ -154,8 +154,8 @@
 
 #define RCL_min(a,b) ((a) < (b) ? (a) : (b))
 #define RCL_max(a,b) ((a) > (b) ? (a) : (b))
-#define RCL_nonZero(v) (v + (v == 0)) ///< To prevent zero divisions.
-#define RCL_zeroClamp(x) (x * (x >= 0))
+#define RCL_nonZero(v) ((v) + ((v) == 0)) ///< To prevent zero divisions.
+#define RCL_zeroClamp(x) ((x) * ((x) >= 0))
 #define RCL_likely(cond)    __builtin_expect(!!(cond),1) 
 #define RCL_unlikely(cond)  __builtin_expect(!!(cond),0)