From 50d4ca3c7df7ca7d67a4435ea726a6c68375a814 Mon Sep 17 00:00:00 2001 From: realtradam Date: Wed, 11 Jan 2023 22:10:23 -0500 Subject: bump rodeo version --- CMakeLists.txt | 2 ++ external/RodeoEngine | 2 +- run | 1 + src/main.c | 24 +++++++++++------------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c8e18d..c885377 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.25.1) +set(CMAKE_BUILD_TYPE Debug) + project(space_squad) file(GLOB SOURCES diff --git a/external/RodeoEngine b/external/RodeoEngine index b4bc894..b172c2a 160000 --- a/external/RodeoEngine +++ b/external/RodeoEngine @@ -1 +1 @@ -Subproject commit b4bc89485ab18ccdc2e381e3e3f2c3bb5e346e1e +Subproject commit b172c2a6b22796dc16c059979d2ec6108b0402e4 diff --git a/run b/run index 95c0220..c6fe24f 100755 --- a/run +++ b/run @@ -1,3 +1,4 @@ #! /bin/sh +#gdb ./build_dir/space_squad ./build_dir/space_squad diff --git a/src/main.c b/src/main.c index 4d2afb7..f578bfd 100644 --- a/src/main.c +++ b/src/main.c @@ -3,46 +3,45 @@ #include "rodeo.h" -Rodeo__data_t _state = {0}; -Rodeo__data_t *state = &_state; +Rodeo__data_p state; -const struct Rodeo__color_rgba_t red = +const Rodeo__color_rgba_t red = { 1.0f, 0.0f, 0.0f, 1.0f }; -const struct Rodeo__color_rgba_t green = +const Rodeo__color_rgba_t green = { 0.0f, 1.0f, 0.0f, 1.0f }; -const struct Rodeo__color_rgba_t blue = +const Rodeo__color_rgba_t blue = { 0.0f, 0.0f, 1.0f, 1.0f }; -const struct Rodeo__color_rgba_t pink = +const Rodeo__color_rgba_t pink = { 1.0f, 0.0f, 1.0f, 1.0f }; -const struct Rodeo__color_rgba_t red_clear = +const Rodeo__color_rgba_t red_clear = { 1.0f, 0.0f, 0.0f, 0.5f }; -const struct Rodeo__color_rgba_t green_clear = +const Rodeo__color_rgba_t green_clear = { 0.0f, 1.0f, 0.0f, 0.5f }; -const struct Rodeo__color_rgba_t blue_clear = +const Rodeo__color_rgba_t blue_clear = { 0.0f, 0.0f, 1.0f, 0.5f }; -const struct Rodeo__color_rgba_t pink_clear = +const Rodeo__color_rgba_t pink_clear = { 1.0f, 0.0f, 1.0f, 0.5f @@ -51,10 +50,9 @@ const struct Rodeo__color_rgba_t pink_clear = int main() { - Rodeo__init_window(state, 480, 640, "Rodeo Window"); + Rodeo__init_window(&state, 480, 640, "Rodeo Window"); - - while(!state->quit) + while(!Rodeo__should_quit(state)) { Rodeo__begin(state); -- cgit v1.2.3