From 672982618cb3ea63f0305785d7c499c83ece145b Mon Sep 17 00:00:00 2001 From: lonkaars Date: Fri, 24 Feb 2023 15:10:45 +0100 Subject: mv sdl2 demo to src/ppusim folder --- src/ds.mk | 5 +++++ src/makefile | 1 + src/ppusim/sim.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ test/sdl2/.gitignore | 2 -- test/sdl2/main.c | 48 ------------------------------------------------ test/sdl2/makefile | 18 ------------------ test/sdl2/readme.md | 6 ------ 7 files changed, 54 insertions(+), 74 deletions(-) create mode 100644 src/ppusim/sim.c delete mode 100644 test/sdl2/.gitignore delete mode 100644 test/sdl2/main.c delete mode 100644 test/sdl2/makefile delete mode 100644 test/sdl2/readme.md diff --git a/src/ds.mk b/src/ds.mk index 57b305f..498ed27 100644 --- a/src/ds.mk +++ b/src/ds.mk @@ -1,2 +1,7 @@ CC := gcc LD := gcc + +LFLAGS += -lSDL2 + +DESKTOP_SRCS += ppusim/main.c + diff --git a/src/makefile b/src/makefile index 6077824..f433385 100644 --- a/src/makefile +++ b/src/makefile @@ -33,6 +33,7 @@ AFLAGS += $(SHARED_FLAGS) SRCS += $(LOCAL_SRCS) SRCS += $(if $(STM), $(STM_SRCS), ) +SRCS += $(if $(DESKTOP), $(DESKTOP_SRCS), ) ifeq ($(PLATFORM),stm) OBJS := $(patsubst %.c,%-stm.o, $(patsubst %.s,%-stm.o, $(SRCS))) diff --git a/src/ppusim/sim.c b/src/ppusim/sim.c new file mode 100644 index 0000000..beddc3f --- /dev/null +++ b/src/ppusim/sim.c @@ -0,0 +1,48 @@ +#include +#include +#include +#include + +#define UPSCALE_FACTOR 3 +#define WIN_HEIGHT 240 +#define WIN_WIDTH 320 +#define FPS 60 + +static void pixel(SDL_Renderer* r, unsigned px, unsigned py, unsigned cr, unsigned cg, unsigned cb) { + SDL_SetRenderDrawColor(r, cr, cg, cb, 255); + SDL_RenderFillRect(r, &(SDL_Rect) {.x = px * UPSCALE_FACTOR, .y = py * UPSCALE_FACTOR, .w = UPSCALE_FACTOR, .h = UPSCALE_FACTOR}); +} + +int main() { + SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS); + SDL_Window *window = SDL_CreateWindow("sdl2 test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIN_WIDTH * UPSCALE_FACTOR, WIN_HEIGHT * UPSCALE_FACTOR, SDL_WINDOW_SHOWN); + SDL_Renderer *renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED); + + SDL_Event e; + unsigned long frame = 0; + while (true) { + uint32_t start = SDL_GetTicks(); + frame++; + while (SDL_PollEvent(&e)) if (e.type == SDL_QUIT) exit(0); + + SDL_RenderClear(renderer); + + for (unsigned i = 0; i < WIN_WIDTH; i++) { + for (unsigned j = 0; j < WIN_HEIGHT; j++) { + pixel(renderer, i, j, (unsigned)(sqrt(i * 20) + frame) % 255, (i * j + frame) % 255, (j * 20) % 255); + } + } + + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + SDL_RenderPresent(renderer); + + uint32_t end = SDL_GetTicks(); + int wait_for = 1000 / FPS - (end - start); + if (wait_for > 0) SDL_Delay(wait_for); + } + + SDL_DestroyRenderer(renderer); + SDL_DestroyWindow(window); + SDL_Quit(); + return 0; +} diff --git a/test/sdl2/.gitignore b/test/sdl2/.gitignore deleted file mode 100644 index f0c9b81..0000000 --- a/test/sdl2/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.o -main diff --git a/test/sdl2/main.c b/test/sdl2/main.c deleted file mode 100644 index beddc3f..0000000 --- a/test/sdl2/main.c +++ /dev/null @@ -1,48 +0,0 @@ -#include -#include -#include -#include - -#define UPSCALE_FACTOR 3 -#define WIN_HEIGHT 240 -#define WIN_WIDTH 320 -#define FPS 60 - -static void pixel(SDL_Renderer* r, unsigned px, unsigned py, unsigned cr, unsigned cg, unsigned cb) { - SDL_SetRenderDrawColor(r, cr, cg, cb, 255); - SDL_RenderFillRect(r, &(SDL_Rect) {.x = px * UPSCALE_FACTOR, .y = py * UPSCALE_FACTOR, .w = UPSCALE_FACTOR, .h = UPSCALE_FACTOR}); -} - -int main() { - SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS); - SDL_Window *window = SDL_CreateWindow("sdl2 test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIN_WIDTH * UPSCALE_FACTOR, WIN_HEIGHT * UPSCALE_FACTOR, SDL_WINDOW_SHOWN); - SDL_Renderer *renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED); - - SDL_Event e; - unsigned long frame = 0; - while (true) { - uint32_t start = SDL_GetTicks(); - frame++; - while (SDL_PollEvent(&e)) if (e.type == SDL_QUIT) exit(0); - - SDL_RenderClear(renderer); - - for (unsigned i = 0; i < WIN_WIDTH; i++) { - for (unsigned j = 0; j < WIN_HEIGHT; j++) { - pixel(renderer, i, j, (unsigned)(sqrt(i * 20) + frame) % 255, (i * j + frame) % 255, (j * 20) % 255); - } - } - - SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); - SDL_RenderPresent(renderer); - - uint32_t end = SDL_GetTicks(); - int wait_for = 1000 / FPS - (end - start); - if (wait_for > 0) SDL_Delay(wait_for); - } - - SDL_DestroyRenderer(renderer); - SDL_DestroyWindow(window); - SDL_Quit(); - return 0; -} diff --git a/test/sdl2/makefile b/test/sdl2/makefile deleted file mode 100644 index 4c26dc3..0000000 --- a/test/sdl2/makefile +++ /dev/null @@ -1,18 +0,0 @@ -CC = gcc -LD = gcc -RM = rm -f -TARGET = main -LFLAGS += -lSDL2 -lm -OBJS += main.o - -all: $(TARGET) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ - -$(TARGET): $(OBJS) - $(LD) $^ $(LFLAGS) -o $@ - -clean: - $(RM) $(TARGET) $(OBJS) - diff --git a/test/sdl2/readme.md b/test/sdl2/readme.md deleted file mode 100644 index 940e315..0000000 --- a/test/sdl2/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -# sdl2 test - -this is a simple POC that makes a window to draw PPU graphics to using SDL2. -this code will be moved to the stm32/ppu directory, and the stm32's makefile -will be edited to include a sim target for building the game for desktop -debugging. -- cgit v1.2.3