From af0033caceb1462fd8aee172e3dbf9f4c173c576 Mon Sep 17 00:00:00 2001 From: tijani Date: Sat, 31 Aug 2024 13:53:51 -0500 Subject: [PATCH] fixed crash. --- .gitignore | 3 ++- src/ragar/ragar_main.c | 56 +++--------------------------------------- src/renderer/display.c | 4 ++- 3 files changed, 9 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index 81f8a1e..fcf7a37 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.pdf *.obj *.pdb -*.res \ No newline at end of file +*.res +*.rdi \ No newline at end of file diff --git a/src/ragar/ragar_main.c b/src/ragar/ragar_main.c index ccaa4b1..bb615a7 100644 --- a/src/ragar/ragar_main.c +++ b/src/ragar/ragar_main.c @@ -1,19 +1,11 @@ -#define WIN32_LEAN_AND_MEAN - #include #include #include #include "base/base_inc.h" #include "renderer/display.h" -#include "renderer/vector.h" #include "renderer/display.c" -#include "renderer/vector.c" - -#define POINTS (9 * 9 * 9) -Vec3F32 cube_points[POINTS]; -Vec2F32 projected_points[POINTS]; int is_running; @@ -21,26 +13,8 @@ void setup(void) { colour_buffer = (u32 *)malloc(sizeof(u32) * window_width * window_height); colour_buffer_texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, window_width, window_height); - - int point_count = 0; - - // Start loading an array of vectors - // from -1 to 1 (in the 9*9*9 cube) - for (f32 x = -1; x < 1; x += 0.25) { - for (f32 y = -1; y < 1; y += 0.25) { - for (f32 z = -1; z < 1; z += 0.25) { - Vec3F32 new_point = {.x = x, .y = y, .z = z}; - cube_points[point_count++] = new_point; - } - } - } } -// Orthographic projection -// Vec2F32 project(Vec3F32 point) { -// Vec2F32 projected_point = {.x = point.x, .y = point.y}; -// return projected_point; -// } void process_input(void) { SDL_Event event; @@ -60,39 +34,17 @@ void process_input(void) { } } -// Convert 3D projection -> 2D -Vec2F32 project(Vec3F32 point) { - Vec2F32 projected_point = {.x = point.x, .y = point.y}; - return projected_point; -} - void update(void) { - for (int i = 0; i < POINTS; ++i) { - Vec3F32 point = cube_points[i]; - - // Project the current point - Vec2F32 projected_point = project(point); - - // save the projected 2D vector in the array of projected_points - projected_points[i] = projected_point; - } } void render(void) { - // FrameMarkStart("render"); - draw_grid(0xFFFFFFFF); + draw_dots(0xFFFFFFFF); - // Loop all projected points and render them - for (int i = 0; i < POINTS; i++) { - Vec2F32 projected_point = projected_points[i]; - draw_rect(projected_point.x, projected_point.y, 4, 4, 0xFFFFFF00); - } - - // SDL_SetRenderDrawColor(renderer, 28, 450, 560, 255); - // SDL_RenderClear(renderer); + SDL_SetRenderDrawColor(renderer, 28, 450, 560, 255); + SDL_RenderClear(renderer); render_colour_buffer(); - // clear_colour_buffer(0xFF384893); + clear_colour_buffer(0xFF384893); clear_colour_buffer(0xFF000000); SDL_RenderPresent(renderer); diff --git a/src/renderer/display.c b/src/renderer/display.c index e6f1b70..3f77f95 100644 --- a/src/renderer/display.c +++ b/src/renderer/display.c @@ -79,4 +79,6 @@ void draw_rect(s32 x, s32 y, s32 width, s32 height, s32 colour) { } } -void draw_pixel(u32 x, u32 y, u32 colour) { colour_buffer[(window_width * y) + x] = colour; } +void draw_pixel(u32 x, u32 y, u32 colour) { + colour_buffer[(window_width * y) + x] = colour; +}