X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain.c;h=46181504ba9572d044ef873ab7bc38ec14c43df8;hb=cf5c164d48262e22592b902fd03293e77bacc34a;hp=40bfd880d855c481fb12892349a0adcdee323ccd;hpb=f568a71bcc1b278a321a7814966bb2df1a40c51e;p=nothing.git

diff --git a/src/main.c b/src/main.c
index 40bfd880..46181504 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,48 +1,61 @@
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_mixer.h>
+
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_mixer.h>
 
-#include "./game/level/player.h"
-#include "./platforms.h"
-#include "./error.h"
-#include "./game.h"
-#include "./lt.h"
-#include "./path.h"
-#include "./point.h"
-#include "./game/sound_medium.h"
+#include "game.h"
+#include "game/level/platforms.h"
+#include "game/level/player.h"
+#include "game/sound_samples.h"
+#include "game/sprite_font.h"
+#include "math/point.h"
+#include "sdl/renderer.h"
+#include "system/error.h"
+#include "system/lt.h"
+#include "system/lt/lt_adapters.h"
 
 #define SCREEN_WIDTH 800
 #define SCREEN_HEIGHT 600
-#define GAME_FPS 60
-
-/* LT module adapter for Mix_CloseAudio */
-static void Mix_CloseAudio_lt(void* ignored)
-{
-    (void) ignored;
-    Mix_CloseAudio();
-}
-
-/* LT module adapter for SDL_Quit */
-static void SDL_Quit_lt(void* ignored)
-{
-    (void) ignored;
-    SDL_Quit();
-}
 
 static void print_usage(FILE *stream)
 {
-    fprintf(stream, "Usage: nothing <level-file>\n");
+    fprintf(stream, "Usage: nothing [--fps <fps>] <level-file>\n");
 }
 
 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 = 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]);
+                    print_usage(stderr);
+                    RETURN_LT(lt, -1);
+                }
+                i += 2;
+            } else {
+                fprintf(stderr, "Value of FPS is not provided\n");
+                print_usage(stderr);
+                RETURN_LT(lt, -1);
+            }
+        } else {
+            level_filename = argv[i];
+            i++;
+        }
+    }
 
-    if (argc < 2) {
+    if (level_filename == NULL) {
+        fprintf(stderr, "Path to level file is not provided\n");
         print_usage(stderr);
         RETURN_LT(lt, -1);
     }
@@ -53,6 +66,8 @@ int main(int argc, char *argv[])
     }
     PUSH_LT(lt, 42, SDL_Quit_lt);
 
+    SDL_ShowCursor(SDL_DISABLE);
+
     SDL_Window *const window = PUSH_LT(
         lt,
         SDL_CreateWindow(
@@ -111,40 +126,36 @@ int main(int argc, char *argv[])
     }
     PUSH_LT(lt, 42, Mix_CloseAudio_lt);
 
-    Mix_Chunk * sound_samples[] = {
-        PUSH_LT(lt, Mix_LoadWAV("./sounds/nothing.wav"), Mix_FreeChunk),
-        PUSH_LT(lt, Mix_LoadWAV("./sounds/something.wav"), Mix_FreeChunk)
-    };
-    const size_t sound_samples_count = sizeof(sound_samples) / sizeof(Mix_Chunk*);
-
-    sound_medium_t *sound_medium =
-        PUSH_LT(
-            lt,
-            create_sound_medium(sound_samples, sound_samples_count, 0, MIX_CHANNELS - 1),
-            destroy_sound_medium);
-    if (sound_medium == NULL) {
-        print_current_error_msg("Could not create sound medium");
-        RETURN_LT(lt, -1);
-    }
-
     // ------------------------------
 
-    char *sounds_folder = PUSH_LT(lt, base_path_folder("sounds"), free);
-    if (sounds_folder == NULL) {
-        print_current_error_msg("Could not get the sounds folder");
-        RETURN_LT(lt, -1);
-    }
+    const char * sound_sample_files[] = {
+        "./sounds/nothing.wav",
+        "./sounds/something.wav"
+    };
+    const size_t sound_sample_files_count = sizeof(sound_sample_files) / sizeof(char*);
 
-    game_t *const game = PUSH_LT(lt, create_game(argv[1], sound_medium), destroy_game);
+    Game *const game = PUSH_LT(
+        lt,
+        create_game(
+            level_filename,
+            sound_sample_files,
+            sound_sample_files_count,
+            renderer),
+        destroy_game);
     if (game == NULL) {
         print_current_error_msg("Could not create the game object");
         RETURN_LT(lt, -1);
     }
 
     const Uint8 *const keyboard_state = SDL_GetKeyboardState(NULL);
-    const float delay_ms = 1.0f / GAME_FPS;
+
+    SDL_StartTextInput();
     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);
     while (!game_over_check(game)) {
+        const int64_t begin_frame_time = (int64_t) SDL_GetTicks();
+
         while (!game_over_check(game) && SDL_PollEvent(&e)) {
             if (game_event(game, &e) < 0) {
                 print_current_error_msg("Failed handling event");
@@ -157,12 +168,7 @@ int main(int argc, char *argv[])
             RETURN_LT(lt, -1);
         }
 
-        if (game_render(game, renderer) < 0) {
-            print_current_error_msg("Failed rendering the game");
-            RETURN_LT(lt, -1);
-        }
-
-        if (game_update(game, delay_ms) < 0) {
+        if (game_update(game, (float) delta_time * 0.001f) < 0) {
             print_current_error_msg("Failed handling updating");
             RETURN_LT(lt, -1);
         }
@@ -171,6 +177,21 @@ int main(int argc, char *argv[])
             print_current_error_msg("Failed handling the sound");
             RETURN_LT(lt, -1);
         }
+
+        render_timer -= delta_time;
+        if (render_timer <= 0) {
+            if (game_render(game) < 0) {
+                print_current_error_msg("Failed rendering the game");
+                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);