Merge pull request #48 from heavydemon21/dev

gameloop/bullet/levels

7 files changed, 211 insertions, 106 deletions

diff --git a/src/engine/bullet.c b/src/engine/bullet.c
index 5aa9e51..e6ca6df 100644
--- a/src/engine/bullet.c
+++ b/src/engine/bullet.c
@@ -1,44 +1,35 @@
 #include "bullet.h"
-#include "engine/sprite_controller.h"
 
 
-void shootBullet(vec2 playerPos, Bullet* bullet){
-	// Set bullet's x and y coordinates to player's coordinates
-    bullet->x = playerPos.x;
-    bullet->y = playerPos.y;
-    // Set bullet's velocity to a fixed value
-    bullet->velocity = 1;
-    // Set bullet's status to active
-    bullet->isActive = true;
-}
-void updateBullet(Bullet* bullet, int deltaTime){
-    // Only update bullet if it is active   
-	 static int latestLocationBullet = 0;
-    if (bullet->isActive) {
-        // Move bullet based on velocity and deltaTime
-        bullet->x += bullet->velocity * deltaTime;
-		drawBullet(bullet);
-        // Check if bullet has moved 16 pixels
-        if (bullet->x - latestLocationBullet > 32) {
-            // Set bullet's status to inactive
-            bullet->isActive = false;
-            drawBullet(&(Bullet){.x = -16,.y = -16.    });
-        }
-    }
-	 else{
-		latestLocationBullet = bullet->x;
-	 }
+
+// TODO: use hh_entity as bullet struct
+void hh_shoot_bullet(vec2 player, vec_cor cam_pos, hh_entity* bullet){
+	vec2 temp;
+	if(g_hh_controller_p1.button_secondary){
+		if(bullet->is_grounded){
+			bullet->is_grounded=false;
+			bullet->pos = player;
+		}
+	}
+	else{
+		if(!bullet->is_grounded){
+			hh_update_bullet(bullet , cam_pos);
+			hh_draw_bullet(*bullet);
+		}
+	}
+	
+
 }
-void drawBullet(Bullet* bullet){
 
+void hh_update_bullet(hh_entity* bullet, vec_cor cam_pos){
+	bullet->pos.x += 1;
 
-	hh_ppu_update_foreground(10, (hh_s_ppu_loc_fam_entry)
-			{
-                .position_x = bullet->x,
-                .position_y = bullet->y,
-				.horizontal_flip = false,
-				.vertical_flip = false,
-				.palette_index = 7,
-				.tilemap_index = 84, // change tilemap to the correct foreground index;
-			});
+	// update bullet sprite on ppu
+	bullet->render.fam.position_x = (bullet->pos.x-cam_pos.x);
+	bullet->render.fam.position_y = (bullet->pos.y-cam_pos.y);
+
+}
+void hh_draw_bullet(hh_entity bullet){
+	hh_s_ppu_loc_fam_entry temp = bullet.render.fam;
+	hh_ppu_update_foreground(10,temp);
 }
diff --git a/src/engine/bullet.h b/src/engine/bullet.h
index ad67d84..5f07b2e 100644
--- a/src/engine/bullet.h
+++ b/src/engine/bullet.h
@@ -1,16 +1,11 @@
 #pragma once
 #include "player_controller.h"
+#include "engine/sprite_controller.h"
+#include "input.h"
 
-typedef struct {
-    int x;
-    int y;
-    int velocity;
-    int isActive;
-    int hit;
-} Bullet;
 
+void hh_shoot_bullet(vec2 playerPos, vec_cor cam_pos, hh_entity*);
 
-//Bullet* createBullet(float x, float y, float velocity, float direction);
-void shootBullet(vec2 playerPos, Bullet* bullet);
-void updateBullet(Bullet* bullet, int deltaTime);
-void drawBullet(Bullet* bullet);
+void hh_update_bullet(hh_entity* , vec_cor );
+
+void hh_draw_bullet(hh_entity);
diff --git a/src/engine/camera.c b/src/engine/camera.c
index 2c3e517..6898430 100644
--- a/src/engine/camera.c
+++ b/src/engine/camera.c
@@ -4,12 +4,13 @@
 
 
 vec_cor hh_update_camera(vec_cen new, vec2 min, vec2 max){
-
 	//TODO: change floating point math to fix point math
 	//TODO: remove magic number at y camera offset
 
 	// new = vec_cen2cor(new,(vec2){.x=max.x/2,.y=max.y/2});
-	new = vec_cen2cor((vec2){.x=new.x+(HH_PPU_SPRITE_WIDTH),.y=new.y+(HH_PPU_SPRITE_HEIGHT*8)},(vec2){.x=max.x/2,.y=max.y/2});
+	new = vec_cen2cor((vec2){.x=new.x+(HH_PPU_SPRITE_WIDTH),.y=new.y+(HH_PPU_SPRITE_HEIGHT*8)},(vec2){.x=(max.x	- min.x)/2,.y=(max.y	- min.y)/2});
+	// new = vec_cen2cor((vec2){.x=new.x+(HH_PPU_SPRITE_WIDTH),.y=new.y+(HH_PPU_SPRITE_HEIGHT*8)},(vec2){.x=max.x/2,.y=max.y/2});
+
 	// new.x = new.x << HH_MATH_FIXED_POINT;
 	// new.y = new.y << HH_MATH_FIXED_POINT;
 	static vec_cor old;
@@ -30,6 +31,8 @@ vec_cor hh_update_camera(vec_cen new, vec2 min, vec2 max){
 	old.x = CLAMP(new.x,min.x,max.x);
 	old.y = CLAMP(new.y,min.y,max.y);
 
+	//printf("camera new %d min %d max %d\n",new.y,min.y,max.y);
 	return old;
 }
 
+
diff --git a/src/engine/draw_screen.c b/src/engine/draw_screen.c
index 0c31bf6..d1d7a04 100644
--- a/src/engine/draw_screen.c
+++ b/src/engine/draw_screen.c
@@ -1,66 +1,106 @@
 #include "engine/draw_screen.h"
-#include "engine/sprite_controller.h"
 
+hh_level_entity level;
+uint64_t offsetY=0;
+uint64_t offsetX=0;
 uint8_t hh_world_to_tile(vec2 pos){
-	//TODO: remove magic file name here
-    FILE* level = fopen("static/level1_test.bin", "rb"); /* open binary file */
-    if (!level) { /* check if file opened successfully */
-        fprintf(stderr, "Error: Failed to open file.\n");
-        return 0;
-    }
-	int index = ((pos.y/16)*40 + pos.x/16);//TODO: remove magic number(s)
-	fseek(level, (index * sizeof(int)) + sizeof(int), SEEK_SET);
-	int tile;// = (int*)malloc(sizeof(int));
-   fread(&tile, sizeof(int), 1, level); // read 1 tile from binary
-
-	fclose(level);
-	// int val = tile;
-	// free(tile);
+	
+	int index = (((pos.y/HH_PPU_SPRITE_HEIGHT)*level.size.x) + (pos.x/HH_PPU_SPRITE_WIDTH));//TODO: remove magic number(s)
+	int tile= level.place[index];
 	return tile;
 }
 
+void hh_update_screen(vec2 view, vec2 player){
+	int current_tile_y = view.y / HH_PPU_SPRITE_HEIGHT;
+	int current_tile_x = view.x / HH_PPU_SPRITE_WIDTH;
+	int offset_py = view.y - (offsetY / 40 * HH_PPU_SPRITE_HEIGHT);
+	int offset_px = view.x - offsetX * HH_PPU_SPRITE_WIDTH;
+	static int prev_ofsset = 0;
 
-// remeber old value to know which part to update.
-vec2 previousViewport = { .x = 0, .y = 0 };
-void hh_draw_screen(vec_cor viewport){
-	if (viewport.x == previousViewport.x && viewport.y == previousViewport.y) return;
-	
-	hh_ppu_update_aux((hh_s_ppu_loc_aux){
-		.bg_shift_x = viewport.x,
-		.bg_shift_y = viewport.y,
-		.fg_fetch	= 0,
-		.sysreset	= 0,
-	});
-
-	// update previous viewport values
-	previousViewport = viewport;
-}
+	int size = MIN(HH_PPU_BG_CANVAS_TILES_H,level.size.x) * MIN(HH_PPU_BG_CANVAS_TILES_V,level.size.y);
+	if( (offset_py == 0 || offset_py > 230) && level.size.y > level.size.x && prev_ofsset != offset_py){
+		if(offset_py==0){
+			offsetY = (current_tile_y-14) * level.size.x;
+		}
+		else{
+			offsetY = current_tile_y * level.size.x;
+		}
 
-void hh_setup_screen(){
-	//(HH_map_size_X*HH_map_size_Y)
-	int size = 2400; // max X = 40 en max Y = 80
-	//TODO: remove magic file name here
-	FILE* level = fopen("static/level1_test.bin", "rb"); /* open binary file */
-	if (!level) { /* check if file opened successfully */
-		fprintf(stderr, "Error: Failed to open level file.\n");
-		return;
+		// Update the background screen
+		for (int BAM_index = 0; BAM_index < size; BAM_index++) {
+			hh_ppu_update_background(BAM_index, (hh_s_ppu_loc_bam_entry){
+				.horizontal_flip = false,
+				.vertical_flip = false,
+				.palette_index = hh_get_palette(level.place[offsetY + BAM_index]),
+				.tilemap_index = level.place[offsetY + BAM_index],
+			});
+		}
+		prev_ofsset = offset_py;
+	}
+	else if ((offset_px == 0 || offset_px > 310) && level.size.x > level.size.y && prev_ofsset != offset_px)
+	{
+		if(offset_px==0){
+			offsetX = current_tile_x - 14;
+		}
+		else{
+			offsetX = current_tile_x;
+		}
+		// Update the background screen
+		for (int BAM_index = 0; BAM_index < size; BAM_index++) {
+			int var = (BAM_index / HH_PPU_BG_CANVAS_TILES_H) * level.size.x + MIN((BAM_index % HH_PPU_BG_CANVAS_TILES_H + offsetX),level.size.x);
+			hh_ppu_update_background(BAM_index, (hh_s_ppu_loc_bam_entry){
+				.horizontal_flip = false,
+				.vertical_flip = false,
+				.palette_index = hh_get_palette(level.place[var]),
+				.tilemap_index = level.place[var],
+			});
+		}
 	}
-	fseek(level, (0* sizeof(int)) + sizeof(int), SEEK_SET);
-	int* tile = (int*)malloc(size*sizeof(int));
-   fread(tile, sizeof(int), size, level); // read 1 tile from binary
-
-	fclose(level);
 
-	for(int BAM_index = 0; BAM_index < size; BAM_index++){
+	prev_ofsset = offset_px;
+	
+}
+void hh_setup_screen(hh_level_entity currentlevel){
+	hh_clear_screen();
+	hh_clear_sprite();
+	level = currentlevel;
+	offsetY=0;
+	offsetX=0;
+	int size = MIN(HH_PPU_BG_CANVAS_TILES_H, level.size.x) * MIN(HH_PPU_BG_CANVAS_TILES_V, level.size.y);
+	for (int BAM_index = 0; BAM_index < size; BAM_index++) {
+		int var = (BAM_index / HH_PPU_BG_CANVAS_TILES_H) * level.size.x + BAM_index % HH_PPU_BG_CANVAS_TILES_H;
 		hh_ppu_update_background(BAM_index, (hh_s_ppu_loc_bam_entry){
 			.horizontal_flip = false,
 			.vertical_flip   = false,
-			.palette_index   = hh_get_palette(tile[BAM_index]),
-			.tilemap_index   = tile[BAM_index],
+			.palette_index   = hh_get_palette(currentlevel.place[var]),
+			.tilemap_index   = currentlevel.place[var],
+		});
+	}
+}
+vec_cor hh_draw_screen(vec2 player) {
+   static vec_cor previousViewport = {0, 0};
+	int offset_py = offsetY / 40 * HH_PPU_SPRITE_HEIGHT;
+	
+	int offset_px = (offsetX * HH_PPU_SPRITE_WIDTH) ;
+	vec_cor viewport = hh_update_camera(player,(vec2){.x = offset_px, .y = offset_py},(vec2){.x = HH_PPU_SCREEN_WIDTH + offset_px, .y = 480 + offset_py});//TODO: remove magic number(s)
+	viewport.x = CLAMP(viewport.x, 0, level.size.x * HH_PPU_SPRITE_WIDTH - HH_PPU_SCREEN_WIDTH);
+	viewport.y = CLAMP(viewport.y, 0, level.size.y * HH_PPU_SPRITE_HEIGHT - HH_PPU_SCREEN_HEIGHT);
+	
+	hh_update_screen((vec2){.y=viewport.y,.x=viewport.x},player);
+   if (viewport.x == previousViewport.x && viewport.y == previousViewport.y){}
+	else{
+		hh_ppu_update_aux((hh_s_ppu_loc_aux){
+			.bg_shift_x = viewport.x - offset_px,
+			.bg_shift_y = viewport.y - offset_py,
+			.fg_fetch	= 0,
+			.sysreset	= 0,
 		});
+		previousViewport = viewport;
 	}
-	free(tile);
+
+	return viewport;
 }
+
 void hh_clear_screen(){
 	// (HH_PPU_SCREEN_HEIGHT*HH_PPU_SCREEN_WIDTH)/(HH_PPU_SPRITE_HEIGHT*HH_PPU_SPRITE_WIDTH)
 	for (int i = 0; i < HH_PPU_BG_CANVAS_TILES_H*HH_PPU_BG_CANVAS_TILES_V; i++) {
@@ -82,8 +122,8 @@ void hh_clear_screen(){
 void hh_clear_sprite(){
 	for (int i = 0; i < HH_PPU_FG_SPRITE_COUNT; i++) {
 		hh_ppu_update_foreground(i,(hh_s_ppu_loc_fam_entry){
-			.position_x = -16,
-			.position_y = -16,
+			.position_x = -HH_PPU_SPRITE_WIDTH,
+			.position_y = -HH_PPU_SPRITE_HEIGHT,
 		});
 	}
 }
diff --git a/src/engine/draw_screen.h b/src/engine/draw_screen.h
index 95765e5..9130842 100644
--- a/src/engine/draw_screen.h
+++ b/src/engine/draw_screen.h
@@ -3,24 +3,32 @@
 
 // every function call for drawing the screen goes here.
 #include "engine/maths.h"
-#include "ppu/consts.h"
 #include "ppu/ppu.h"
-
+#include "engine/level_const.h"
+#include "engine/sprite_controller.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include "engine/camera.h"
 
-
-#define HH_map_size_X 80
-#define HH_map_size_Y 60
+#define hh_max_x_size 40 
+#define hh_max_y_size 30
 
 /** @brief return a single tile from world binary */
 uint8_t hh_world_to_tile(vec2 pos);
+
 /** @brief shift to level if viewport changed position */
-void hh_draw_screen(vec2 viewport);
+vec_cor hh_draw_screen(vec2 player);
+
 /** @brief send data to BAM memory from binary level */
-void hh_setup_screen();
+void hh_setup_screen(hh_level_entity currentlevel);
+/** @brief updates screen based on view and maybe player position if it needs to turn back*/
+void hh_update_screen(vec2 view, vec2 );
+
 /** @brief send black screen to background memory */
 void hh_clear_screen();
+
 /** @brief clears all sprite data */
 void hh_clear_sprite();
+/** @brief send data to BAM memory from binary from shop */
+void hh_setup_Shop();
diff --git a/src/engine/level_const.c b/src/engine/level_const.c
new file mode 100644
index 0000000..5ba0187
--- /dev/null
+++ b/src/engine/level_const.c
@@ -0,0 +1,37 @@
+#include "engine/level_const.h"
+
+
+hh_g_all_levels hh_init_game_levels(){
+	hh_g_all_levels levels;
+	levels.current_level=0;
+	
+	levels.level[0].size.x=40;
+	levels.level[0].size.y=100;
+	levels.level[0].hh_level_completed=false;
+
+	levels.level[1].size.x=100;
+	levels.level[1].size.y=28;
+	levels.level[1].hh_level_completed=false;
+
+	FILE *fp = fopen("../test/bin/level1_test.bin", "rb");
+	fseek(fp, 0, SEEK_END);
+	int size = ftell(fp) / sizeof(int);
+	fseek(fp, (0 * sizeof(int)) + sizeof(int), SEEK_SET);
+	int* hh_game_level1 = malloc(size * sizeof(int));
+	fread(hh_game_level1, sizeof(int), size, fp);
+	fclose(fp);
+
+	FILE *lvl2 = fopen("../test/bin/level2_test.bin", "rb");
+	fseek(lvl2, 0, SEEK_END);
+	size = ftell(lvl2) / sizeof(int);
+	fseek(lvl2, (0 * sizeof(int)) + sizeof(int), SEEK_SET);
+	int* hh_game_level2 = malloc(size * sizeof(int));
+	fread(hh_game_level2, sizeof(int), size, lvl2);
+	fclose(lvl2);
+
+	levels.level[0].place = hh_game_level1;
+	levels.level[1].place = hh_game_level2;
+
+	return levels;
+}
+
diff --git a/src/engine/level_const.h b/src/engine/level_const.h
new file mode 100644
index 0000000..b86ae7b
--- /dev/null
+++ b/src/engine/level_const.h
@@ -0,0 +1,31 @@
+#pragma once
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include "engine/maths.h"
+#include "engine/entity.h"
+
+typedef enum {
+	hh_e_state_starting_screen,
+	hh_e_state_shop,
+	hh_e_state_gameplay,
+	hh_e_state_game_over,
+	hh_e_state_high_score
+} hh_e_game_state;
+//entity array met enemeies
+typedef struct  {
+	vec2 size;
+	int hh_total_enemies;
+	int* place;
+	bool hh_level_completed;
+}hh_level_entity;
+
+typedef struct  {
+	hh_level_entity level[2];
+	int current_level;
+
+
+}hh_g_all_levels;
+
+hh_g_all_levels hh_init_game_levels();