X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain.c;h=ba2b9488e76941aaac4004eea97c24f41f8f5892;hb=97c77dddf78108a2affeb84c98df61b04627629e;hp=7ed089702e39bf5879ddc21264f6c3af6c3c89c9;hpb=fc801c7e9a6ec6c9b88f5c22045db07fe1748a25;p=nothing.git diff --git a/src/main.c b/src/main.c index 7ed08970..ba2b9488 100644 --- a/src/main.c +++ b/src/main.c @@ -11,10 +11,9 @@ #include "game/level/player.h" #include "game/sound_samples.h" #include "game/sprite_font.h" -#include "math/minmax.h" #include "math/point.h" #include "sdl/renderer.h" -#include "system/error.h" +#include "system/log.h" #include "system/lt.h" #include "system/lt/lt_adapters.h" @@ -30,22 +29,22 @@ int main(int argc, char *argv[]) { srand((unsigned int) time(NULL)); - lt_t *const lt = create_lt(); + Lt *const lt = create_lt(); char *level_filename = NULL; - int fps = 60; + int fps = 30; for (int i = 1; i < argc;) { if (strcmp(argv[i], "--fps") == 0) { if (i + 1 < argc) { if (sscanf(argv[i + 1], "%d", &fps) == 0) { - fprintf(stderr, "Cannot parse FPS: %s is not a number\n", argv[i + 1]); + log_fail("Cannot parse FPS: %s is not a number\n", argv[i + 1]); print_usage(stderr); RETURN_LT(lt, -1); } i += 2; } else { - fprintf(stderr, "Value of FPS is not provided\n"); + log_fail("Value of FPS is not provided\n"); print_usage(stderr); RETURN_LT(lt, -1); } @@ -56,13 +55,13 @@ int main(int argc, char *argv[]) } if (level_filename == NULL) { - fprintf(stderr, "Path to level file is not provided\n"); + log_fail("Path to level file is not provided\n"); print_usage(stderr); RETURN_LT(lt, -1); } if (SDL_Init(SDL_INIT_EVERYTHING) < 0) { - print_error_msg(ERROR_TYPE_SDL2, "Could not initialize SDL"); + log_fail("Could not initialize SDL: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } PUSH_LT(lt, 42, SDL_Quit_lt); @@ -79,7 +78,7 @@ int main(int argc, char *argv[]) SDL_DestroyWindow); if (window == NULL) { - print_error_msg(ERROR_TYPE_SDL2, "Could not create SDL window"); + log_fail("Could not create SDL window: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } @@ -88,11 +87,11 @@ int main(int argc, char *argv[]) SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC), SDL_DestroyRenderer); if (renderer == NULL) { - print_error_msg(ERROR_TYPE_SDL2, "Could not create SDL renderer"); + log_fail("Could not create SDL renderer: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } if (SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND) < 0) { - print_error_msg(ERROR_TYPE_SDL2, "Could not set up blending mode for the renderer"); + log_fail("Could not set up blending mode for the renderer: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } @@ -102,19 +101,19 @@ int main(int argc, char *argv[]) the_stick_of_joy = PUSH_LT(lt, SDL_JoystickOpen(0), SDL_JoystickClose); if (the_stick_of_joy == NULL) { - print_error_msg(ERROR_TYPE_SDL2, "Could not open 0th Stick of the Joy: %s\n"); + log_fail("Could not open 0th Stick of the Joy: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } - printf("Opened Joystick 0\n"); - printf("Name: %s\n", SDL_JoystickNameForIndex(0)); - printf("Number of Axes: %d\n", SDL_JoystickNumAxes(the_stick_of_joy)); - printf("Number of Buttons: %d\n", SDL_JoystickNumButtons(the_stick_of_joy)); - printf("Number of Balls: %d\n", SDL_JoystickNumBalls(the_stick_of_joy)); + log_info("Opened Joystick 0\n"); + log_info("Name: %s\n", SDL_JoystickNameForIndex(0)); + log_info("Number of Axes: %d\n", SDL_JoystickNumAxes(the_stick_of_joy)); + log_info("Number of Buttons: %d\n", SDL_JoystickNumButtons(the_stick_of_joy)); + log_info("Number of Balls: %d\n", SDL_JoystickNumBalls(the_stick_of_joy)); SDL_JoystickEventState(SDL_ENABLE); } else { - fprintf(stderr, "[WARNING] Could not find any Sticks of the Joy\n"); + log_warn("Could not find any Sticks of the Joy\n"); } if (Mix_OpenAudio( @@ -122,7 +121,7 @@ int main(int argc, char *argv[]) MIX_DEFAULT_FORMAT, 2, 1024) < 0) { - print_error_msg(ERROR_TYPE_SDL2_MIXER, "Could not initialize the audio\n"); + log_fail("Could not initialize the audio: %s\n", Mix_GetError()); RETURN_LT(lt, -1); } PUSH_LT(lt, 42, Mix_CloseAudio_lt); @@ -135,7 +134,7 @@ int main(int argc, char *argv[]) }; const size_t sound_sample_files_count = sizeof(sound_sample_files) / sizeof(char*); - game_t *const game = PUSH_LT( + Game *const game = PUSH_LT( lt, create_game( level_filename, @@ -144,21 +143,12 @@ int main(int argc, char *argv[]) renderer), destroy_game); if (game == NULL) { - print_current_error_msg("Could not create the game object"); - RETURN_LT(lt, -1); - } - - sprite_font_t * const sprite_font = - PUSH_LT(lt, - create_sprite_font_from_file("fonts/charmap-oldschool_white.bmp", renderer), - destroy_sprite_font); - if (sprite_font == NULL) { - print_current_error_msg("Loading up sprite font"); RETURN_LT(lt, -1); } const Uint8 *const keyboard_state = SDL_GetKeyboardState(NULL); + SDL_StopTextInput(); SDL_Event e; const int64_t delta_time = (int64_t) roundf(1000.0f / 60.0f); int64_t render_timer = (int64_t) roundf(1000.0f / (float) fps); @@ -167,49 +157,35 @@ int main(int argc, char *argv[]) while (!game_over_check(game) && SDL_PollEvent(&e)) { if (game_event(game, &e) < 0) { - print_current_error_msg("Failed handling event"); RETURN_LT(lt, -1); } } if (game_input(game, keyboard_state, the_stick_of_joy) < 0) { - print_current_error_msg("Failed handling input"); RETURN_LT(lt, -1); } if (game_update(game, (float) delta_time * 0.001f) < 0) { - print_current_error_msg("Failed handling updating"); RETURN_LT(lt, -1); } if (game_sound(game) < 0) { - print_current_error_msg("Failed handling the sound"); - RETURN_LT(lt, -1); - } - - if (game_render(game) < 0) { - print_current_error_msg("Failed rendering the game"); - RETURN_LT(lt, -1); - } - - if (sprite_font_render_text(sprite_font, - renderer, - vec(0.0f, 0.0f), - 4, - "HELLO, WORLD!!!") < 0) { - print_current_error_msg("Failed rendering debug info"); RETURN_LT(lt, -1); } - const int64_t end_frame_time = (int64_t) SDL_GetTicks(); - render_timer -= delta_time; if (render_timer <= 0) { + if (game_render(game) < 0) { + RETURN_LT(lt, -1); + } SDL_RenderPresent(renderer); render_timer = (int64_t) roundf(1000.0f / (float) fps); } + const int64_t end_frame_time = (int64_t) SDL_GetTicks(); +#define max_int64(a, b) (a > b ? a : b) SDL_Delay((unsigned int) max_int64(10, delta_time - (end_frame_time - begin_frame_time))); +#undef max_int64 } RETURN_LT(lt, 0);