Merge pull request #1230 from tsoding/optimization

[nothing.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index a369a61b5f565a780ccb61157f1616cfa63a8c61..e4e851e69e3ac72dab600ffd2a47716d20c218fa 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
 #include <SDL.h>
 
+#include <locale.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,7 +12,7 @@
 #include "game/sound_samples.h"
 #include "game/sprite_font.h"
 #include "math/extrema.h"
-#include "math/point.h"
+#include "math/vec.h"
 #include "sdl/renderer.h"
 #include "system/log.h"
 #include "system/lt.h"
@@ -24,13 +25,65 @@ static void print_usage(FILE *stream)
     fprintf(stream, "Usage: nothing [--fps <fps>]\n");
 }
 
+static float current_display_scale = 1.0f;
+
+
+// export this for other parts of the code to use.
+float get_display_scale(void)
+{
+    return current_display_scale;
+}
+
+static
+void recalculate_display_scale(SDL_Window* win, SDL_Renderer* rend)
+{
+    int w0 = 0;
+    SDL_GetWindowSize(win, &w0, NULL);
+
+    int w1 = 0;
+    SDL_GetRendererOutputSize(rend, &w1, NULL);
+
+    current_display_scale = (float) w1 / (float) w0;
+}
+
+static
+void maybe_fixup_input_for_display_scale(SDL_Window* win, SDL_Renderer* rend, SDL_Event* e)
+{
+    // note: we check for window move as well, because you may move the window to
+    // another monitor with a different display scale.
+    switch (e->type) {
+    case SDL_WINDOWEVENT: {
+        switch (e->window.event) {
+        case SDL_WINDOWEVENT_MOVED:
+        case SDL_WINDOWEVENT_SIZE_CHANGED:
+            recalculate_display_scale(win, rend);
+            break;
+        }
+    } break;
+
+    // this is the fixup.
+    case SDL_MOUSEMOTION: {
+        // note: do it this way *just in case* there are non-integer display scales out there.
+        e->motion.x = (int) ((float) e->motion.x * current_display_scale);
+        e->motion.y = (int) ((float) e->motion.y * current_display_scale);
+    } break;
+
+    case SDL_MOUSEBUTTONUP:
+    case SDL_MOUSEBUTTONDOWN: {
+        e->button.x = (int) ((float) e->button.x * current_display_scale);
+        e->button.y = (int) ((float) e->button.y * current_display_scale);
+    } break;
+    }
+}
+
+
 int main(int argc, char *argv[])
 {
     srand((unsigned int) time(NULL));
 
     Lt *lt = create_lt();
 
-    int fps = 30;
+    int fps = 60;
 
     for (int i = 1; i < argc;) {
         if (strcmp(argv[i], "--fps") == 0) {
@@ -53,12 +106,14 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
+    if (SDL_Init(SDL_INIT_EVERYTHING & ~SDL_INIT_HAPTIC) < 0) {
         log_fail("Could not initialize SDL: %s\n", SDL_GetError());
         RETURN_LT(lt, -1);
     }
     PUSH_LT(lt, 42, SDL_Quit);
 
+    setlocale(LC_NUMERIC, "C");
+
     SDL_ShowCursor(SDL_DISABLE);
 
     SDL_Window *const window = PUSH_LT(
@@ -67,7 +122,7 @@ int main(int argc, char *argv[])
             "Nothing",
             100, 100,
             SCREEN_WIDTH, SCREEN_HEIGHT,
-            SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE),
+            SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI),
         SDL_DestroyWindow);
 
     if (window == NULL) {
@@ -77,12 +132,17 @@ int main(int argc, char *argv[])
 
     SDL_Renderer *const renderer = PUSH_LT(
         lt,
-        SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC),
+        SDL_CreateRenderer(window, -1, RENDERER_CONFIG),
         SDL_DestroyRenderer);
     if (renderer == NULL) {
         log_fail("Could not create SDL renderer: %s\n", SDL_GetError());
         RETURN_LT(lt, -1);
     }
+
+    SDL_RendererInfo info;
+    SDL_GetRendererInfo(renderer, &info);
+    log_info("Using SDL Renderer: %s\n", info.name);
+
     if (SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND) < 0) {
         log_fail("Could not set up blending mode for the renderer: %s\n", SDL_GetError());
         RETURN_LT(lt, -1);
@@ -112,15 +172,18 @@ int main(int argc, char *argv[])
     // ------------------------------
 
     const char * sound_sample_files[] = {
-        "./sounds/nothing.wav",
-        "./sounds/something.wav"
+        "./assets/sounds/nothing.wav",
+        "./assets/sounds/something.wav",
+        "./assets/sounds/dev/ding.wav",
+        "./assets/sounds/dev/click.wav",
+        "./assets/sounds/dev/save.wav"
     };
     const size_t sound_sample_files_count = sizeof(sound_sample_files) / sizeof(char*);
 
     Game *const game = PUSH_LT(
         lt,
         create_game(
-            "./levels/",
+            "./assets/levels/",
             sound_sample_files,
             sound_sample_files_count,
             renderer),
@@ -129,6 +192,9 @@ int main(int argc, char *argv[])
         RETURN_LT(lt, -1);
     }
 
+    // calculate the display scale for the first time.
+    recalculate_display_scale(window, renderer);
+
     const Uint8 *const keyboard_state = SDL_GetKeyboardState(NULL);
 
     SDL_StopTextInput();
@@ -139,6 +205,12 @@ int main(int argc, char *argv[])
         const int64_t begin_frame_time = (int64_t) SDL_GetTicks();
 
         while (!game_over_check(game) && SDL_PollEvent(&e)) {
+
+            // this function potentially fixes mouse events by scaling them according
+            // to the window DPI scale. (eg. *2 on retina displays). it also updates
+            // the cached DPI scale on window scale/move events.
+            maybe_fixup_input_for_display_scale(window, renderer, &e);
+
             if (game_event(game, &e) < 0) {
                 RETURN_LT(lt, -1);
             }
@@ -166,7 +238,7 @@ int main(int argc, char *argv[])
         }
 
         const int64_t end_frame_time = (int64_t) SDL_GetTicks();
-        SDL_Delay((unsigned int) max_int64(10, delta_time - (end_frame_time - begin_frame_time)));
+        SDL_Delay((unsigned int) MAX(int64_t, 10, delta_time - (end_frame_time - begin_frame_time)));
     }
 
     RETURN_LT(lt, 0);