Merge branch 'multis'

1 files changed, 33 insertions, 18 deletions

diff --git a/src/ft_draw_sprite_extra.c b/src/ft_draw_sprite_extra.c
index 73b8959..f6a148c 100644
--- a/src/ft_draw_sprite_extra.c
+++ b/src/ft_draw_sprite_extra.c
@@ -13,6 +13,7 @@
 #include <libft.h>
 #include <cub3d.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 
@@ -40,29 +41,43 @@ void
 		sprite->drawendx = cl->wlist.x_size - 1;
 }
 
+static void
+  ft_init_sprite(t_cub *cl, t_sprite *sprite)
+{
+  sprite->invdet = 1.0 / (cl->plist.plane_x * cl->plist.dir_y
+    - cl->plist.dir_x * cl->plist.plane_y);
+  sprite->transformx = sprite->invdet * (cl->plist.dir_y * sprite->spritex
+    - cl->plist.dir_x * sprite->spritey);
+  sprite->transformy = sprite->invdet * (-cl->plist.plane_y * sprite->spritex
+      + cl->plist.plane_x * sprite->spritey);
+  sprite->spritescreenx = (int)(cl->wlist.x_size / 2) *
+    (1 + sprite->transformx / sprite->transformy);
+}
+
 void
 	ft_calc_sprite(t_cub *cl)
 {
 	t_sprite	sprite;
 	int32_t		i;
+	int32_t		j;
 
 	i = 0;
-	while (i < cl->mlist.sprite_nbr)
-	{
-		sprite = cl->sprites[i];
-		sprite.spritey = sprite.s_pos_x - (cl->plist.pos_x - 0.5);
-		sprite.spritex = sprite.s_pos_y - (cl->plist.pos_y - 0.5);
-		sprite.invdet = 1.0 / (cl->plist.plane_x * cl->plist.dir_y
-			- cl->plist.dir_x * cl->plist.plane_y);
-		sprite.transformx = sprite.invdet * (cl->plist.dir_y * sprite.spritex
-			- cl->plist.dir_x * sprite.spritey);
-		sprite.transformy = sprite.invdet * (-cl->plist.plane_y * sprite.spritex
-			+ cl->plist.plane_x * sprite.spritey);
-		sprite.spritescreenx = (int)(cl->wlist.x_size / 2) *
-			(1 + sprite.transformx / sprite.transformy);
-		ft_sprite_height(cl, &sprite);
-		ft_sprite_width(cl, &sprite);
-		ft_draw_sprite(cl, &sprite);
-		i++;
-	}
+	j = 0;
+	while (j < cl->mlist.sprite_var - 1)
+    {
+      while (i < cl->mlist.sprite_nbr)
+      {
+        sprite = cl->sprites[j][i];
+        sprite.current_sprite = (j == 0) ? 4 : j + 7;
+        sprite.spritey = sprite.s_pos_x - (cl->plist.pos_x - 0.5);
+        sprite.spritex = sprite.s_pos_y - (cl->plist.pos_y - 0.5);
+        ft_init_sprite(cl, &sprite);
+        ft_sprite_height(cl, &sprite);
+        ft_sprite_width(cl, &sprite);
+        ft_draw_sprite(cl, &sprite);
+        i++;
+      }
+      i = 0;
+      j++;
+    }
 }