From b85b7918c320fdc0b9c3d27558e6799b8ef3df83 Mon Sep 17 00:00:00 2001 From: AnonymusRaccoon Date: Thu, 12 Mar 2020 20:43:18 +0100 Subject: [PATCH] Solving a small bug --- include/vector2.h | 5 +++++ src/sfml_renderer/sfml_events.c | 3 ++- src/utility/vector2.c | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/vector2.h b/include/vector2.h index 06f4198..421a66b 100644 --- a/include/vector2.h +++ b/include/vector2.h @@ -5,8 +5,12 @@ ** vector2 */ + + #pragma once +#include + typedef struct gc_vector2 { float x; @@ -22,4 +26,5 @@ typedef struct gc_vector2i float gcvector_magnitude(gc_vector2 vec); gc_vector2 gcvector2_normilize(gc_vector2 vec); +gc_vector2 gc_vector2_from_sf(sfVector2f sf_vector); gc_vector2 gc_vector2_add(gc_vector2 first, gc_vector2 second); \ No newline at end of file diff --git a/src/sfml_renderer/sfml_events.c b/src/sfml_renderer/sfml_events.c index a678155..1dd27af 100644 --- a/src/sfml_renderer/sfml_events.c +++ b/src/sfml_renderer/sfml_events.c @@ -22,7 +22,8 @@ void sfml_handle_events(gc_engine *engine) sfRenderWindow_close(rend->window); break; case sfEvtResized: - engine->on_resize(engine, *(gc_vector2 *)&event.size); + engine->on_resize(engine, (gc_vector2){event.size.width, \ +event.size.height}); break; case sfEvtMouseButtonReleased: if (event.mouseButton.button == sfMouseLeft) diff --git a/src/utility/vector2.c b/src/utility/vector2.c index 83676e7..1006591 100644 --- a/src/utility/vector2.c +++ b/src/utility/vector2.c @@ -5,6 +5,7 @@ ** vector2 */ +#include #include "vector2.h" #include "utility.h" #include "math.h" @@ -26,4 +27,9 @@ gc_vector2 gcvector2_normilize(gc_vector2 vec) gc_vector2 gc_vector2_add(gc_vector2 first, gc_vector2 second) { return ((gc_vector2){first.x + second.x, first.y + second.y}); +} + +gc_vector2 gc_vector2_from_sf(sfVector2f sf_vector) +{ + return (gc_vector2){sf_vector.x, sf_vector.y}; } \ No newline at end of file