diff options
| author | realtradam <[email protected]> | 2023-05-31 04:34:41 -0400 |
|---|---|---|
| committer | realtradam <[email protected]> | 2023-05-31 04:34:41 -0400 |
| commit | e9b6b597e97c37e7fb0af50a56e051b5627aa296 (patch) | |
| tree | e16d6ff482125042df5d70e684b79af2028491fa | |
| parent | f31ad1e6123a3a5b4b9dceddbf1b296b64626322 (diff) | |
| download | TOJam2023-e9b6b597e97c37e7fb0af50a56e051b5627aa296.tar.gz TOJam2023-e9b6b597e97c37e7fb0af50a56e051b5627aa296.zip | |
bug fixed release
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | assets/death_menu_art.xcf | bin | 235624 -> 235624 bytes | |||
| -rw-r--r-- | assets/main_menu.png | bin | 76793 -> 76793 bytes | |||
| -rw-r--r-- | assets/menu_art.xcf | bin | 250713 -> 250713 bytes | |||
| -rw-r--r-- | external_assets/aim.xcf (renamed from assets/aim.xcf) | bin | 12838 -> 12838 bytes | |||
| -rw-r--r-- | external_assets/death_menu_art.xcf | bin | 0 -> 235624 bytes | |||
| -rw-r--r-- | external_assets/enemies.xcf (renamed from assets/enemies.xcf) | bin | 17851 -> 17851 bytes | |||
| -rw-r--r-- | external_assets/menu_art.xcf | bin | 0 -> 250713 bytes | |||
| -rw-r--r-- | external_assets/shell.html | 82 | ||||
| -rwxr-xr-x | run | 2 | ||||
| -rwxr-xr-x | run_dbg | 2 | ||||
| -rw-r--r-- | src/enemies.c | 12 | ||||
| -rw-r--r-- | src/main.c | 2 |
13 files changed, 87 insertions, 17 deletions
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/death_menu_art.xcf b/assets/death_menu_art.xcf Binary files differindex 3e485c5..4081423 100644 --- a/assets/death_menu_art.xcf +++ b/assets/death_menu_art.xcf diff --git a/assets/main_menu.png b/assets/main_menu.png Binary files differindex d2abc52..ebb0c66 100644 --- a/assets/main_menu.png +++ b/assets/main_menu.png diff --git a/assets/menu_art.xcf b/assets/menu_art.xcf Binary files differindex 63d49b7..6a706db 100644 --- a/assets/menu_art.xcf +++ b/assets/menu_art.xcf diff --git a/assets/aim.xcf b/external_assets/aim.xcf Binary files differindex b852969..b852969 100644 --- a/assets/aim.xcf +++ b/external_assets/aim.xcf diff --git a/external_assets/death_menu_art.xcf b/external_assets/death_menu_art.xcf Binary files differnew file mode 100644 index 0000000..3e485c5 --- /dev/null +++ b/external_assets/death_menu_art.xcf diff --git a/assets/enemies.xcf b/external_assets/enemies.xcf Binary files differindex decc1fe..decc1fe 100644 --- a/assets/enemies.xcf +++ b/external_assets/enemies.xcf diff --git a/external_assets/menu_art.xcf b/external_assets/menu_art.xcf Binary files differnew file mode 100644 index 0000000..63d49b7 --- /dev/null +++ b/external_assets/menu_art.xcf 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 @@ +<!doctype html> +<html lang="EN-us"> + <head> + <meta charset="utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + + <title>raylib web game</title> + + <meta name="title" content="Bubbles, Behind"> + <meta name="description" content="A new gamejam game from _Tradam and Arnold"> + <meta name="keywords" content="rodeo kit, games, html5, programming, C, library, videogames"> + <meta name="viewport" content="width=device-width"> + + <!-- Open Graph metatags for sharing --> + <meta property="og:title" content="Bubbles, Behind"> + <meta property="og:image:type" content="image/png"> + <meta property="og:image" content="https://dev.catgirls.rodeo/assets/catgirlsrodeologo.png"> + <meta property="og:site_name" content="dev.catgirls.rodeo"> + <meta property="og:url" content="https://dev.catgirls.rodeo"> + <meta property="og:description" content=":3"> + + <!-- Twitter metatags for sharing --> + <meta name="twitter:card" content="summary"> + <meta name="twitter:title" content="Bubbles, Behind"> + <meta name="twitter:image" content="https://dev.catgirls.rodeo/assets/catgirlsrodeologo.png"> + <meta name="twitter:url" content="https://dev.catgirls.rodeo"> + <meta name="twitter:description" content="A new gamejam game from _Tradam and Arnold"> + + <!-- Favicon --> + <link rel="shortcut icon" href="https://dev.catgirls.rodeo/assets/favicon-32x32.png"> + + <style> + body { margin: 0px; background-color: black; } + canvas.emscripten { border: 0px none; background-color: black; } + </style> + <script type='text/javascript' src="https://cdn.jsdelivr.net/gh/eligrey/FileSaver.js/dist/FileSaver.min.js"> </script> + <script type='text/javascript'> + function saveFileFromMEMFSToDisk(memoryFSname, localFSname) // This can be called by C/C++ code + { + var isSafari = false; // Not supported, navigator.userAgent access is being restricted + //var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent); + var data = FS.readFile(memoryFSname); + var blob; + + if (isSafari) blob = new Blob([data.buffer], { type: "application/octet-stream" }); + else blob = new Blob([data.buffer], { type: "application/octet-binary" }); + + // NOTE: SaveAsDialog is a browser setting. For example, in Google Chrome, + // in Settings/Advanced/Downloads section you have a setting: + // 'Ask where to save each file before downloading' - which you can set true/false. + // If you enable this setting it would always ask you and bring the SaveAsDialog + saveAs(blob, localFSname); + } + </script> + </head> + <body> + <!--<canvas class=emscripten id=canvas oncontextmenu=event.preventDefault() tabindex=-1 style="border:0px; outline:0px; aspect-ratio: attr(width)/attr(height); max-width:100vw; max-height:100vh;"></canvas>--> + <canvas class=emscripten id=canvas oncontextmenu=event.preventDefault() tabindex=-1></canvas> + <p id="output" /> + <script> + var Module = { + print: (function() { + var element = document.getElementById('output'); + if (element) element.value = ''; // clear browser cache + return function(text) { + if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' '); + console.log(text); + if (element) { + element.value += text + "\n"; + element.scrollTop = element.scrollHeight; // focus on bottom + } + }; + })(), + canvas: (function() { + var canvas = document.getElementById('canvas'); + return canvas; + })() + }; + </script> + {{{ SCRIPT }}} + </body> +</html> @@ -1,4 +1,4 @@ #! /bin/sh #gdb ./build_dir/space_squad -(cd ./build_dir/tux/ ; ./demo) +(cd ./build_dir/tux/ ; ./index) @@ -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, @@ -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); |
