raylib web game

From e9b6b597e97c37e7fb0af50a56e051b5627aa296 Mon Sep 17 00:00:00 2001 From: realtradam Date: Wed, 31 May 2023 04:34:41 -0400 Subject: bug fixed release --- CMakeLists.txt | 4 +- assets/aim.xcf | Bin 12838 -> 0 bytes assets/death_menu_art.xcf | Bin 235624 -> 235624 bytes assets/enemies.xcf | Bin 17851 -> 0 bytes assets/main_menu.png | Bin 76793 -> 76793 bytes assets/menu_art.xcf | Bin 250713 -> 250713 bytes external_assets/aim.xcf | Bin 0 -> 12838 bytes external_assets/death_menu_art.xcf | Bin 0 -> 235624 bytes external_assets/enemies.xcf | Bin 0 -> 17851 bytes external_assets/menu_art.xcf | Bin 0 -> 250713 bytes external_assets/shell.html | 82 +++++++++++++++++++++++++++++++++++++ run | 2 +- run_dbg | 2 +- src/enemies.c | 12 ------ src/main.c | 2 +- 15 files changed, 87 insertions(+), 17 deletions(-) delete mode 100644 assets/aim.xcf delete mode 100644 assets/enemies.xcf create mode 100644 external_assets/aim.xcf create mode 100644 external_assets/death_menu_art.xcf create mode 100644 external_assets/enemies.xcf create mode 100644 external_assets/menu_art.xcf create mode 100644 external_assets/shell.html diff --git a/CMakeLists.txt b/CMakeLists.txt index a6fb109..78a4102 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.25.1) -project(demo +project(index LANGUAGES C ) @@ -52,7 +52,7 @@ if(DEFINED EMSCRIPTEN) set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS - "--preload-file ${PROJECT_SOURCE_DIR}/external/RodeoKit/build_dir/shaders@shaders --preload-file ${PROJECT_SOURCE_DIR}/assets@assets --use-preload-plugins" + "--preload-file ${PROJECT_SOURCE_DIR}/external/RodeoKit/build_dir/shaders@shaders --preload-file ${PROJECT_SOURCE_DIR}/assets@assets --use-preload-plugins --shell-file ${PROJECT_SOURCE_DIR}/external_assets/shell.html" ) endif() diff --git a/assets/aim.xcf b/assets/aim.xcf deleted file mode 100644 index b852969..0000000 Binary files a/assets/aim.xcf and /dev/null differ diff --git a/assets/death_menu_art.xcf b/assets/death_menu_art.xcf index 3e485c5..4081423 100644 Binary files a/assets/death_menu_art.xcf and b/assets/death_menu_art.xcf differ diff --git a/assets/enemies.xcf b/assets/enemies.xcf deleted file mode 100644 index decc1fe..0000000 Binary files a/assets/enemies.xcf and /dev/null differ diff --git a/assets/main_menu.png b/assets/main_menu.png index d2abc52..ebb0c66 100644 Binary files a/assets/main_menu.png and b/assets/main_menu.png differ diff --git a/assets/menu_art.xcf b/assets/menu_art.xcf index 63d49b7..6a706db 100644 Binary files a/assets/menu_art.xcf and b/assets/menu_art.xcf differ diff --git a/external_assets/aim.xcf b/external_assets/aim.xcf new file mode 100644 index 0000000..b852969 Binary files /dev/null and b/external_assets/aim.xcf differ diff --git a/external_assets/death_menu_art.xcf b/external_assets/death_menu_art.xcf new file mode 100644 index 0000000..3e485c5 Binary files /dev/null and b/external_assets/death_menu_art.xcf differ diff --git a/external_assets/enemies.xcf b/external_assets/enemies.xcf new file mode 100644 index 0000000..decc1fe Binary files /dev/null and b/external_assets/enemies.xcf differ diff --git a/external_assets/menu_art.xcf b/external_assets/menu_art.xcf new file mode 100644 index 0000000..63d49b7 Binary files /dev/null and b/external_assets/menu_art.xcf differ diff --git a/external_assets/shell.html b/external_assets/shell.html new file mode 100644 index 0000000..c87a31f --- /dev/null +++ b/external_assets/shell.html @@ -0,0 +1,82 @@ + + + + + + + raylib web game + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + {{{ SCRIPT }}} + + diff --git a/run b/run index 5210c0f..27b51d8 100755 --- a/run +++ b/run @@ -1,4 +1,4 @@ #! /bin/sh #gdb ./build_dir/space_squad -(cd ./build_dir/tux/ ; ./demo) +(cd ./build_dir/tux/ ; ./index) diff --git a/run_dbg b/run_dbg index f3cd91e..01b3743 100755 --- a/run_dbg +++ b/run_dbg @@ -1,4 +1,4 @@ #! /bin/sh #gdb ./build_dir/space_squad -(cd ./build_dir/tux/ ; kdbg demo) +(cd ./build_dir/tux/ ; kdbg index) diff --git a/src/enemies.c b/src/enemies.c index da89ea0..596d6b3 100644 --- a/src/enemies.c +++ b/src/enemies.c @@ -176,18 +176,6 @@ draw_enemy(cvec_collision_2d_world_item_value *enemy) break; } - if (enemy->x > 1600 || enemy->x < 0 || enemy->y > 900 || enemy->x < 0) - { - rodeo_log( - rodeo_logLevel_error, - "Bad position, x:%f, y:%f", - enemy->x, - enemy->y - ); - return; - } - - rodeo_texture_2d_draw( &(rodeo_rectangle_t){ .x = enemy->x, diff --git a/src/main.c b/src/main.c index 6dda3dc..2df4e32 100644 --- a/src/main.c +++ b/src/main.c @@ -88,7 +88,7 @@ main(void) { inputs_register_do() { - mrodeo_window_do(window_height, window_width, cstr_lit("Rodeo Window")) + mrodeo_window_do(window_height, window_width, cstr_lit("Bubbles, Behind")) { renderer_name = rodeo_renderer_name_get(); rodeo_frame_limit_set(60); -- cgit v1.2.3