refactor physics

Author: jsoulier

CMakeLists.txt

@@ -23,7 +23,6 @@ add_executable(blocks WIN32
     src/camera.c
     src/main.c
     src/map.c
-    src/physics.c
     src/player.c
     src/rand.c
     src/save.c

README.md

@@ -8,11 +8,11 @@ Tiny Minecraft clone in C and HLSL using the new SDL3 GPU API
 
 - Procedural world generation
 - Asynchronous chunk loading
-- Blocks and sprites
 - Persistent worlds
+- Physics
 - Directional shadows
 - Clustered dynamic lighting
-- Basic transparency
+- Blocks and sprites
 
 ### Building
 
@@ -51,15 +51,15 @@ To build locally, add [SDL_shadercross](https://github.com/libsdl-org/SDL_shader
 
 - `WASD` to move
 - `Space` to jump
-- `F5` to toggle first person/freecam controller
+- `F5` to toggle fly
 - `Escape` to unfocus
 - `Left Click` to break a block
 - `Middle Click` to select a block
 - `Right Click` to place a block
 - `Scroll` to change blocks
 - `F11` to toggle fullscreen
 - `LControl` to sprint
-- `E/Q` to move up/down in freecam
+- `EQ` to move up and down (fly only)
 
 ### Passes
 

src/main.c

@@ -14,8 +14,6 @@ static const int PLAYER_ID = 0;
 static const float ATLAS_WIDTH = 512.0f;
 static const int ATLAS_MIP_LEVELS = 4;
 static const float BLOCK_WIDTH = 16.0f;
-static const float PLAYER_SENSITIVITY = 0.1f;
-static const float PLAYER_REACH = 10.0f;
 static const int SHADOW_RESOLUTION = 4096.0f;
 static const float SHADOW_Y = 30.0f;
 static const float SHADOW_ORTHO = 300.0f;
@@ -52,7 +50,6 @@ static SDL_GPUSampler* linear_sampler;
 static SDL_GPUSampler* nearest_sampler;
 static camera_t shadow_camera;
 static player_t player;
-static world_query_t player_query;
 static Uint64 ticks1;
 static Uint64 ticks2;
 
@@ -69,44 +66,6 @@ static void update_shadow_camera()
     camera_update(&shadow_camera);
 }
 
-static void save_or_load_player(bool save)
-{
-    struct
-    {
-        float x;
-        float y;
-        float z;
-        float pitch;
-        float yaw;
-        block_t block;
-    }
-    data;
-    if (save)
-    {
-        data.x = player.camera.x;
-        data.y = player.camera.y;
-        data.z = player.camera.z;
-        data.pitch = player.camera.pitch;
-        data.yaw = player.camera.yaw;
-        data.block = player.block;
-        save_set_player(PLAYER_ID, &data, sizeof(data));
-    }
-    else
-    {
-        player_init(&player);
-        if (save_get_player(PLAYER_ID, &data, sizeof(data)))
-        {
-            player.block = data.block;
-            player.camera.x = data.x;
-            player.camera.y = data.y;
-            player.camera.z = data.z;
-            player.camera.pitch = data.pitch;
-            player.camera.yaw = data.yaw;
-        }
-        player_update_grounded(&player);
-    }
-}
-
 static bool create_atlas()
 {
     char path[512] = {0};
@@ -583,9 +542,8 @@ SDL_AppResult SDLCALL SDL_AppInit(void** appstate, int argc, char** argv)
     set_window_icon(BLOCK_GRASS);
     save_init(SAVE_PATH);
     world_init(device);
-    save_or_load_player(false);
+    player_save_or_load(&player, PLAYER_ID, false);
     world_update(&player.camera);
-    player_query = world_raycast(&player.camera, PLAYER_REACH);
     update_shadow_camera();
     ticks2 = SDL_GetTicks();
     ticks1 = 0;
@@ -596,7 +554,7 @@ void SDLCALL SDL_AppQuit(void* appstate, SDL_AppResult result)
 {
     SDL_HideWindow(window);
     world_free();
-    save_or_load_player(true);
+    player_save_or_load(&player, PLAYER_ID, true);
     save_free();
     SDL_ReleaseGPUSampler(device, linear_sampler);
     SDL_ReleaseGPUSampler(device, nearest_sampler);
@@ -916,14 +874,14 @@ static void render_transparent(SDL_GPUCommandBuffer* cbuf, SDL_GPURenderPass* pa
 
 static void render_raycast(SDL_GPUCommandBuffer* cbuf, SDL_GPURenderPass* pass)
 {
-    if (player_query.block == BLOCK_EMPTY)
+    if (player.query.block == BLOCK_EMPTY)
     {
         return;
     }
     SDL_PushGPUDebugGroup(cbuf, "raycast");
     SDL_BindGPUGraphicsPipeline(pass, raycast_pipeline);
     SDL_PushGPUVertexUniformData(cbuf, 0, player.camera.matrix, 64);
-    SDL_PushGPUVertexUniformData(cbuf, 1, player_query.current, 12);
+    SDL_PushGPUVertexUniformData(cbuf, 1, player.query.current, 12);
     SDL_DrawGPUPrimitives(pass, 36, 1, 0, 0);
     SDL_PopGPUDebugGroup(cbuf);
 }
@@ -1036,54 +994,15 @@ SDL_AppResult SDLCALL SDL_AppIterate(void* appstate)
     ticks1 = ticks2;
     if (SDL_GetWindowRelativeMouseMode(window))
     {
-        player_move(&player, dt, SDL_GetKeyboardState(NULL));
-        player_query = world_raycast(&player.camera, PLAYER_REACH);
-        save_or_load_player(true);
+        player_move(&player, dt);
+        player_save_or_load(&player, PLAYER_ID, true);
     }
     update_shadow_camera();
     world_update(&player.camera);
     render();
     return SDL_APP_CONTINUE;
 }
 
-static void rotate_player(float pitch, float yaw)
-{
-    player_rotate(&player, pitch, yaw, PLAYER_SENSITIVITY);
-    player_query = world_raycast(&player.camera, PLAYER_REACH);
-}
-
-static void break_block()
-{
-    if (player_query.block != BLOCK_EMPTY)
-    {
-        world_set_block(player_query.current, BLOCK_EMPTY);
-    }
-}
-
-static void select_block()
-{
-    if (player_query.block != BLOCK_EMPTY)
-    {
-        player.block = player_query.block;
-    }
-}
-
-static void place_block()
-{
-    if (player_query.block != BLOCK_EMPTY && !player_overlaps_block(&player, player_query.previous))
-    {
-        world_set_block(player_query.previous, player.block);
-    }
-}
-
-static void change_block(int dy)
-{
-    static const int COUNT = BLOCK_COUNT - BLOCK_EMPTY - 1;
-    int block = player.block - (BLOCK_EMPTY + 1) + dy;
-    block = (block + COUNT) % COUNT;
-    player.block = block + BLOCK_EMPTY + 1;
-}
-
 SDL_AppResult SDLCALL SDL_AppEvent(void* appstate, SDL_Event* event)
 {
     switch (event->type)
@@ -1093,7 +1012,7 @@ SDL_AppResult SDLCALL SDL_AppEvent(void* appstate, SDL_Event* event)
     case SDL_EVENT_MOUSE_MOTION:
         if (SDL_GetWindowRelativeMouseMode(window))
         {
-            rotate_player(event->motion.yrel, event->motion.xrel);
+            player_rotate(&player, event->motion.yrel, event->motion.xrel);
         }
         break;
     case SDL_EVENT_KEY_DOWN:
@@ -1105,7 +1024,6 @@ SDL_AppResult SDLCALL SDL_AppEvent(void* appstate, SDL_Event* event)
         else if (event->key.scancode == SDL_SCANCODE_F5)
         {
             player_toggle_controller(&player);
-            SDL_Log("Controller mode: %s", player_controller_name(player.controller));
         }
         else if (event->key.scancode == SDL_SCANCODE_F11)
         {
@@ -1130,20 +1048,20 @@ SDL_AppResult SDLCALL SDL_AppEvent(void* appstate, SDL_Event* event)
         {
             if (event->button.button == SDL_BUTTON_LEFT)
             {
-                break_block();
+                player_break_block(&player);
             }
             else if (event->button.button == SDL_BUTTON_MIDDLE)
             {
-                select_block();
+                player_select_block(&player);
             }
             else if (event->button.button == SDL_BUTTON_RIGHT)
             {
-                place_block();
+                player_place_block(&player);
             }
         }
         break;
     case SDL_EVENT_MOUSE_WHEEL:
-        change_block(event->wheel.y);
+        player_change_block(&player, event->wheel.y);
         break;
     }
     return SDL_APP_CONTINUE;