merge `dev` into `ppu`

1 files changed, 38 insertions, 7 deletions

diff --git a/src/ppusim/sim.c b/src/ppusim/sim.c
index 2816b31..a5fec45 100644
--- a/src/ppusim/sim.c
+++ b/src/ppusim/sim.c
@@ -1,26 +1,56 @@
-#include <stdlib.h>
-#include <stdbool.h>
 #include <SDL2/SDL.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include "main.h"
 #include "ppu/ppu.h"
+#include "ppu/consts.h"
+#include "ppu/internals.h"
 #include "ppusim/mem.h"
 #include "ppusim/sim.h"
 #include "ppusim/work.h"
 
-SDL_Window *g_hh_window = NULL;
+SDL_Window *g_hh_window		= NULL;
 SDL_Renderer *g_hh_renderer = NULL;
 
 void hh_ppu_init() {
 	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS);
-	g_hh_window = SDL_CreateWindow("ppusim", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, HH_PPU_SCREEN_WIDTH * HH_PPUSIM_UPSCALE_FACTOR, HH_PPU_SCREEN_HEIGHT * HH_PPUSIM_UPSCALE_FACTOR, SDL_WINDOW_SHOWN);
+	g_hh_window	  = SDL_CreateWindow("ppusim", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, HH_PPU_SCREEN_WIDTH * HH_PPUSIM_UPSCALE_FACTOR,
+									 HH_PPU_SCREEN_HEIGHT * HH_PPUSIM_UPSCALE_FACTOR, SDL_WINDOW_SHOWN);
 	g_hh_renderer = SDL_CreateRenderer(g_hh_window, -1, SDL_RENDERER_ACCELERATED);
 
 	g_hh_ppusim_core_count = SDL_GetCPUCount();
-	g_hh_ppusim_threads = malloc(sizeof(pthread_t) * g_hh_ppusim_core_count);
+	g_hh_ppusim_threads	   = malloc(sizeof(pthread_t) * g_hh_ppusim_core_count);
 
 	g_hh_ppusim_vram = malloc(sizeof(hh_ppu_data_t) * 0xffff);
 	memset(g_hh_ppusim_vram, 0x0000, 0xffff);
+	hh_ppu_load_tilemap();
+}
+
+void hh_ppu_load_tilemap() {
+	char* filename = "../test/bin/tiles.bin";
+	FILE* fp = fopen(filename,"rb");
+	if (!fp){
+		fprintf(stderr,"Error: Failed to load tiles.");
+		return;//error
+	}
+	int sprite_size = (HH_PPU_SPRITE_WIDTH * HH_PPU_SPRITE_HEIGHT);
+	fseek(fp, 0, SEEK_END);//goto EOF
+	int _size = ftell(fp)/sprite_size;
+	fseek(fp, 0, 0);//goto start of file
+
+	for (int i = 0; i < _size; i++) {
+		uint8_t data[sprite_size];
+
+		fread(data,sizeof(uint8_t),sprite_size,fp);
+		
+		hh_s_ppu_vram_data sprite = hh_ppu_2nat_sprite(data);
+		sprite.offset = i*HH_PPU_VRAM_TMM_SPRITE_SIZE;
+		hh_ppu_vram_write(sprite);
+		free(sprite.data);
+	}
+	fclose(fp);
 }
 
 void hh_ppu_deinit() {
@@ -36,8 +66,9 @@ void hh_loop() {
 	SDL_Event e;
 	while (g_hh_run) {
 		uint32_t start = SDL_GetTicks();
-		while (SDL_PollEvent(&e)) if (e.type == SDL_QUIT) exit(0);
-		
+		while (SDL_PollEvent(&e))
+			if (e.type == SDL_QUIT) exit(0);
+
 		hh_ppu_vblank_interrupt();
 
 		SDL_RenderClear(g_hh_renderer);