Sara
/
basic-game-framework
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'main' into ui

pull/3/head
Sara 2023-05-08 10:19:15 +00:00
parent bb6dec40b6 b72d4ef88a
commit 8fd411bc84
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debug
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Debug && cmake --build build && lldb bin/sim-game -o r -b cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1 && cmake --build build && lldb bin/sim-game -o r -b

2
release
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build && bin/sim-game cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1 && cmake --build build && bin/sim-game

3
src/game.c
View File

@ -1,7 +1,6 @@
#include "engine.h" #include "engine.h"
#include "world.h" #include "world.h"
#include "player.h" #include "player.h"
#include "ui.h"
#include "corelib/input.h" #include "corelib/input.h"
#include "corelib/render.h" #include "corelib/render.h"
#include "corelib/assets.h" #include "corelib/assets.h"
@ -56,8 +55,6 @@ void on_scroll_zoom(float delta) {
} }
void load_game() { void load_game() {
ui_style.button.button = ui_style.button.active = make_nineslice("button.png", 126, 0.01);
ui_style.text = make_text_style("ui_font.otf", (SDL_Color){255, 255, 255, 255}, 50, 0.02f);
world_sheet = make_spritesheet("tileset.png", 189, 189); world_sheet = make_spritesheet("tileset.png", 189, 189);
input_init(); input_init();

5
src/player.c
View File

@ -1,6 +1,5 @@
#include "player.h" #include "player.h"
#include "layers.h" #include "layers.h"
#include "ui.h"
#include "world.h" #include "world.h"
#include "input.h" #include "input.h"
#include "engine.h" #include "engine.h"
@ -27,8 +26,8 @@ object_t* create_player() {
player_instance->evt_update = &player_update; player_instance->evt_update = &player_update;
player_instance->sprite = make_sprite("player.png", 0, 0); player_instance->sprite = make_sprite("player.png", 0, 0);
add_key_listener(SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, &player_axis_horizontal); add_key_listener(SDL_SCANCODE_A, SDL_SCANCODE_D, &player_axis_horizontal);
add_key_listener(SDL_SCANCODE_DOWN, SDL_SCANCODE_UP, &player_axis_vertical); add_key_listener(SDL_SCANCODE_S, SDL_SCANCODE_W, &player_axis_vertical);
return player_instance; return player_instance;
} }