TODO(#456)

[nothing.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index e91b2a1afb32c7449672dd9972fcdec009df0c31..46181504ba9572d044ef873ab7bc38ec14c43df8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,5 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_mixer.h>
-#include <SDL2/SDL_ttf.h>
 
 #include <stdint.h>
 #include <stdio.h>
@@ -11,7 +10,7 @@
 #include "game/level/platforms.h"
 #include "game/level/player.h"
 #include "game/sound_samples.h"
-#include "math/minmax.h"
+#include "game/sprite_font.h"
 #include "math/point.h"
 #include "sdl/renderer.h"
 #include "system/error.h"
@@ -30,10 +29,10 @@ 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) {
@@ -61,12 +60,6 @@ int main(int argc, char *argv[])
         RETURN_LT(lt, -1);
     }
 
-    if (TTF_Init() < 0) {
-        print_error_msg(ERROR_TYPE_SDL2_TTF, "Could not initialize SDL_ttf");
-        RETURN_LT(lt, -1);
-    }
-    PUSH_LT(lt, 42, TTF_Quit_lt);
-
     if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
         print_error_msg(ERROR_TYPE_SDL2, "Could not initialize SDL");
         RETURN_LT(lt, -1);
@@ -141,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,
@@ -154,28 +147,14 @@ int main(int argc, char *argv[])
         RETURN_LT(lt, -1);
     }
 
-    TTF_Font *const font = PUSH_LT(lt, TTF_OpenFont("fonts/UbuntuMono-R.ttf", 24), TTF_CloseFont);
-    if (font == NULL) {
-        print_error_msg(ERROR_TYPE_SDL2_TTF, "loading fonts");
-        RETURN_LT(lt, -1);
-    }
-
     const Uint8 *const keyboard_state = SDL_GetKeyboardState(NULL);
 
+    SDL_StartTextInput();
     SDL_Event e;
-    int64_t last_time = (int64_t) SDL_GetTicks();
-    const int64_t expected_delay_ms = (int64_t) (1000.0f / (float) fps);
+    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 current_time = (int64_t) SDL_GetTicks();
-
-        if (current_time == last_time) {
-            SDL_Delay((Uint32) expected_delay_ms);
-            last_time = current_time;
-            continue;
-        }
-
-        const int64_t actual_delta_ms = current_time - last_time;
-
+        const int64_t begin_frame_time = (int64_t) SDL_GetTicks();
 
         while (!game_over_check(game) && SDL_PollEvent(&e)) {
             if (game_event(game, &e) < 0) {
@@ -189,30 +168,30 @@ int main(int argc, char *argv[])
             RETURN_LT(lt, -1);
         }
 
-        if (game_render(game) < 0) {
-            print_current_error_msg("Failed rendering the game");
+        if (game_update(game, (float) delta_time * 0.001f) < 0) {
+            print_current_error_msg("Failed handling updating");
             RETURN_LT(lt, -1);
         }
 
-        SDL_RenderPresent(renderer);
-
-        int64_t effective_delta_ms = max_int64(actual_delta_ms, expected_delay_ms);
-        while (effective_delta_ms > 0) {
-            if (game_update(game, (float) min_int64(expected_delay_ms, effective_delta_ms) * 0.001f) < 0) {
-                print_current_error_msg("Failed handling updating");
-                RETURN_LT(lt, -1);
-            }
-
-            effective_delta_ms -= expected_delay_ms;
-        }
-
         if (game_sound(game) < 0) {
             print_current_error_msg("Failed handling the sound");
             RETURN_LT(lt, -1);
         }
 
-        SDL_Delay((unsigned int) max_int64(0, expected_delay_ms - actual_delta_ms));
-        last_time = current_time;
+        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);