make sprites real vars, adapt code and implement MDT_ENTITY_Draw

joecarl · joecarl · commit 3b66268562f0 · 2023-03-04T13:24:12.000+01:00
diff --git a/examples/assets/sprites.c b/examples/assets/sprites.c
diff --git a/examples/example_mario.c b/examples/example_mario.c
@@ -23,6 +23,18 @@
 #include "mdt/examples/assets/sprites.h"
 
 
+static void DrawPipe(int x, int y, uint16_t height) {
+
+	MDT_DrawBitmap(&mario_pipe_spr0, x, y);
+
+	uint16_t i;
+	for (i = 0; i < height; i++) {
+		MDT_DrawBitmap(&mario_pipe_spr1, x, y + i + 11);
+	}
+
+}
+
+
 void MDT_EXAMPLE_mario(void) {
 
 	MDT_GRAPHICS_InitTypeDef graphicsCfg = {
@@ -38,15 +50,17 @@ void MDT_EXAMPLE_mario(void) {
 
 	MDT_USB_INPUT_Init();
 
-	MDT_BITMAP main_bmp;
-
 	uint8_t bgcolor = 0b00100111;
 
 	MDT_ENTITY mario;
 	MDT_ENTITY_Init(&mario);
 	mario.speed = 2;
 	mario.x = 30;
 	mario.y = 106;
+	mario.sprites[0] = &mario_spr0;
+	mario.sprites[1] = &mario_spr1;
+	mario.sprites[2] = &mario_spr2;
+	mario.sprites[3] = &mario_spr3;
 
 	uint32_t time = MDT_GetMs();
 
@@ -68,52 +82,29 @@ void MDT_EXAMPLE_mario(void) {
 		if (MDT_USB_INPUT_IsKbdKeyPressed(KEY_D)) right = 1; else right = 0;
 		if (MDT_USB_INPUT_IsKbdKeyPressed(KEY_SPACEBAR)) MDT_ENTITY_Jump(&mario);
 	
-		//if (MDT_GetMs() % 2000 == 0) MDT_ENTITY_Jump(&mario);
- 
 		MDT_ENTITY_ProcessControl(&mario, 0, 0, left, right);
 		MDT_ENTITY_ProcessPhysics(&mario, time_inc);
 
 		//Draw frame:
-		MDT_GRAPHICS_GetBitmapFromContext(&main_bmp, &main_ctx);
 		MDT_Clear(bgcolor);
 
 		REPORT_F("%d", (int) mario.y, 5, 15, 0x00);
 		REPORT_F("%d", (int) mario.z, 5, 25, 0x00);
 		REPORT_LF("Tick: %lu ms", MDT_GetMs(), 5, 5, 0x00);
 		REPORT_LF("FPS: %hu", MDT_GetFPS(), 5, 35, 0x00);
 
-		DrawMario(&main_bmp, (int)mario.x, (int)(mario.y - mario.z), mario.spr);
-		//MDT_ENTITY_Draw(&mario);
+		MDT_ENTITY_Draw(&mario);
 		for (uint8_t i = 0; i < 18; i++)
 			for (uint8_t j = 0; j < 4; j++)
-				DrawSuelo(&main_bmp, i * 17, 133 + j * 17);
+				MDT_DrawBitmap(&mario_ground_spr, i * 17, 133 + j * 17);
 
-		DrawTuberia(&main_bmp, 110, 92, 30);
-		DrawTuberia(&main_bmp, 210, 102, 20);
-		DrawLogo(267, 0);
+		DrawPipe(110, 92, 30);
+		DrawPipe(210, 102, 20);
+		MDT_DrawBitmap(&logo_spr, 267, 0);
 		
 		MDT_WaitForVSync();
 		MDT_SwapBuffers();
 
 	}
 
 }
-
-
-/*
-
-Old implementation reminders:
- 
-int frameid = AddFrame(150, 150, 150, 150, "super mario");
-MDT_BITMAP* mario_window = &(frames[frameid].canvas);
-strcat(console_text, "\niniciando demo super \nmario.");
-strcat(console_text, "\ntomando control del \npuerto serie.");
-strcat(console_text, "\npulsa intro para \ndevolver el control");
-
-if (data == 'i') frames[frameid].y -= 3;
-if (data == 'k') frames[frameid].y += 3;
-if (data == 'j') frames[frameid].x -= 3;
-if (data == 'l') frames[frameid].x += 3;
-if (data == 0x0D) { data = 0; usart_captured = 0; strcat(console_text, "\ncontrol devuelto\n"); }
-
-*/
diff --git a/examples/example_retro.c b/examples/example_retro.c
@@ -119,8 +119,9 @@ void MDT_EXAMPLE_retro(void) {
 		const uint16_t m_tick = tick % 500;
 		
 		//if (m_tick >= 465 && m_tick < 469 || m_tick >= 474 && m_tick < 494 || m_tick >= 498 && m_tick < 500) {
-		if (m_tick >= 466 && (tick % 2 == 0 || m_tick >= 482 && m_tick < 492)) {
-			DrawCreature(110, 50);
+		if (m_tick >= 466 && (tick % 2 == 0 || (m_tick >= 482 && m_tick < 492))) {
+			//DrawCreature(110, 50);
+			MDT_DrawBitmap(&creature_spr, 110, 50);
 		}
 		
 
diff --git a/examples/include/mdt/examples/assets/sprites.h b/examples/include/mdt/examples/assets/sprites.h
@@ -3,10 +3,31 @@
 
 #include "mdt/graphics.h"
 
-void DrawMario(MDT_BITMAP* bmp, int x, int y, int spr);
-void DrawSuelo(MDT_BITMAP* bmp, int x, int y);
-void DrawTuberia(MDT_BITMAP* bmp, int x, int y, int height);
-void DrawLogo(int x, int y);
-void DrawCreature(int x, int y);
+/**
+ * ARCHIVO: "sprites.h"
+ * NOMBRE:  Sprites
+ * AUTOR:   José Carlos Hurtado
+ *
+ * 		Este archivo exporta los sprites que se utilizan en los ejemplos.
+ *
+ */
+
+#include "mdt/graphics.h"
+
+
+extern const MDT_BITMAP mario_spr0;
+extern const MDT_BITMAP mario_spr1;
+extern const MDT_BITMAP mario_spr2;
+extern const MDT_BITMAP mario_spr3;
+
+extern const MDT_BITMAP mario_ground_spr;
+
+extern const MDT_BITMAP mario_pipe_spr0;
+extern const MDT_BITMAP mario_pipe_spr1;
+
+extern const MDT_BITMAP logo_spr;
+
+extern const MDT_BITMAP creature_spr;
+
 
 #endif
diff --git a/include/mdt/ext/entity.h b/include/mdt/ext/entity.h
@@ -1,17 +1,24 @@
 #ifndef MDT_ENTITY_H
 #define MDT_ENTITY_H
 
+#include "mdt/graphics.h"
+
 typedef struct {
 
-    //TODO: add sprite assignment
-    float speed_v, t_jump, spr_cntr;
-    uint8_t jumping, spr;
+	const MDT_BITMAP* sprites[16];
+	//uint8_t jumping_spr_index;
+	uint8_t spr;
+	float spr_cntr;
 
 	float force;
 
 	float force_angle;
 
-    float speed, max_speed, angle;
+    uint8_t jumping;
+    float speed; 
+	float angle;
+	float max_speed; 
+    float speed_v;
     float x, y, z;
 
 } MDT_ENTITY;
diff --git a/src/ext/entity.c b/src/ext/entity.c
@@ -9,7 +9,6 @@
  *
  */
 
-#include "mdt/graphics.h"
 #include "mdt/ext/entity.h"
 #include <math.h>
 #include <stdbool.h>
@@ -22,7 +21,7 @@ void MDT_ENTITY_Init(MDT_ENTITY* ent) {
 	ent->max_speed = 6;
 	ent->x = ent->y = 270;
 	//z es la coordenada vertical. lo hacemos así por que está pensado para juegos 2D
-	ent->t_jump = ent->z = ent->speed = ent->speed_v = ent->angle = 0; 
+	ent->z = ent->speed = ent->speed_v = ent->angle = 0; 
 	ent->spr = 0;
 	ent->spr_cntr = 0;
 
@@ -35,28 +34,15 @@ void MDT_ENTITY_ProcessPhysics(MDT_ENTITY* ent, float time_inc) {
 	ent->y -= ent->speed * sin(ent->angle) * time_inc * PPM;
 
 	if (ent->jumping) {
+
 		ent->speed_v -= 9.8 * time_inc * 2.9;
 		ent->z += ent->speed_v * time_inc * PPM;
-		//ent->t_jump += time_inc;
+		
 		if (ent->z < 0) {
 			ent->z = 0;
 			ent->jumping = false;
-			//ent->t_jump = 0;
-			ent->spr = 0;
-		}
-	} else {
-		//calculo del sprite:
-		if (ent->speed != 0) {
-			ent->spr_cntr += ent->speed / 5;
-			if (ent->spr_cntr > 4) {
-				ent->spr++;
-				ent->spr_cntr = 0;
-			}
-			if (ent->spr > 2)
-				ent->spr = 0;
-		} else {
-			ent->spr = 0;
 		}
+
 	}
 	
 	if (ent->speed > 0)
@@ -72,6 +58,7 @@ void MDT_ENTITY_ProcessPhysics(MDT_ENTITY* ent, float time_inc) {
 	if (ent->speed > ent->max_speed) ent->speed = ent->max_speed;
 
 	ent->angle = atan2(speed_y, speed_x);
+
 }
 
 
@@ -95,7 +82,6 @@ void MDT_ENTITY_Jump(MDT_ENTITY* ent) {
 	if (ent->jumping) {
 		return;
 	}
-	//t_jump = 0;
 	ent->speed_v = 12.8;
 	ent->jumping = true;
 	ent->spr = 3;//dibujo saltando
@@ -106,7 +92,32 @@ void MDT_ENTITY_Jump(MDT_ENTITY* ent) {
 void MDT_ENTITY_Draw(MDT_ENTITY* ent) {
 
 	//draw_filled_ellipse(x, y - 4, 30, 8, GREY);//shadow
-	//draw_filled_circle(x, y - z, 17, WHITE);
-	//draw_bitmap(ent->x, ent->y - ent->z, ent->spr);
+	//draw_filled_circle(x, y - z, 17, WHITE);//ball
+
+	const MDT_BITMAP* spr;
+
+	if (ent->jumping) {
+
+		spr = ent->sprites[3];
+
+	} else {
+
+		if (ent->speed != 0) {
+			ent->spr_cntr += ent->speed / 5;
+			if (ent->spr_cntr > 4) {
+				ent->spr++;
+				ent->spr_cntr = 0;
+			}
+			if (ent->spr > 2)
+				ent->spr = 0;
+		} else {
+			ent->spr = 0;
+		}
+
+		spr = ent->sprites[ent->spr];
+
+	}
+	
+	MDT_DrawBitmap(spr, (int) ent->x, (int) (ent->y - ent->z));
 
 }

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,9 @@ void MDT_EXAMPLE_retro(void) {`
`119`	`119`	`const uint16_t m_tick = tick % 500;`
`120`	`120`
`121`	`121`	`//if (m_tick >= 465 && m_tick < 469 \|\| m_tick >= 474 && m_tick < 494 \|\| m_tick >= 498 && m_tick < 500) {`
`122`		`- if (m_tick >= 466 && (tick % 2 == 0 \|\| m_tick >= 482 && m_tick < 492)) {`
`123`		`- DrawCreature(110, 50);`
	`122`	`+ if (m_tick >= 466 && (tick % 2 == 0 \|\| (m_tick >= 482 && m_tick < 492))) {`
	`123`	`+ //DrawCreature(110, 50);`
	`124`	`+ MDT_DrawBitmap(&creature_spr, 110, 50);`
`124`	`125`	`}`
`125`	`126`
`126`	`127`