feat(packet): implement zstd compression and refactor packet decoding

Increase header length to 12 bytes, add CompressType and PacketHeader struct, and implement decode_packet_header. Update CMake to find zstd and link against it, adding Findzstd module.

.github/workflows/format-check.yml

@@ -1,3 +1,4 @@
+# .github/workflows/format-check.yml
 name: Code Format Check
 
 on: [push, pull_request]
@@ -8,22 +9,9 @@ permissions:
 jobs:
   formatting:
     runs-on: ubuntu-latest
-
+    container: silkeh/clang:latest   
     steps:
       - uses: actions/checkout@v4
-
-      - name: Install LLVM 22
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 22
-
-          sudo apt-get install -y clang-format-22
-
-          clang-format-22 --version
-
       - name: Run clang-format
         run: |
-          find src include \
-            \( -name '*.cpp' -o -name '*.hpp' \) \
-            -print0 | xargs -0 clang-format-22 --dry-run --Werror
+          find src include -name '*.cpp' -o -name '*.h' -print0 | xargs -0 clang-format --dry-run --Werror

.github/workflows/release-build.yml

@@ -1,154 +0,0 @@
-name: Release-Build
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: Version
-        required: false
-        default: dev
-
-  push:
-    tags:
-      - "v*"
-
-permissions:
-  contents: write
-
-jobs:
-
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: windows-2022
-            platform: windows
-            
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-
-      - uses: actions/checkout@v4
-
-
-      - name: Get Version
-        id: version
-        shell: bash
-        run: |
-          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
-            VERSION="${GITHUB_REF_NAME#v}"
-          else
-            VERSION="${{ github.event.inputs.version }}"
-          fi
-
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-
-      - name: Setup MSVC
-        if: matrix.platform == 'windows'
-        uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Bootstrap vcpkg
-        run: |
-          git clone https://github.com/microsoft/vcpkg.git
-          ./vcpkg/bootstrap-vcpkg.bat
-
-      - name: Configure
-        if: matrix.platform == 'windows'
-        run: >
-          cmake
-          -B build
-          -G Ninja
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
-          -DVCPKG_TARGET_TRIPLET=x64-windows-release
-          -DVCPKG_BUILD_TYPE=release
-          -DBUILD_TESTING=OFF
-          "-DCUBED_VERSION=${{ steps.version.outputs.version }}"
-
-      - name: Build
-        run: cmake --build build --config Release --target Cubed
-
-      - name: Copy assets
-        if: matrix.platform == 'windows'
-        shell: pwsh
-        run: |
-          if (Test-Path assets) {
-            Copy-Item -Path assets -Destination build/Cubed -Recurse
-          } else {
-            Write-Warning "assets folder not found, skipping copy"
-          }
-
-      - name: Create Zip
-        if: matrix.platform == 'windows'
-        shell: pwsh
-        run: |
-          Compress-Archive `
-            -Path build/Cubed/* `
-            -DestinationPath Cubed-${{ steps.version.outputs.version }}-windows-x64.zip
-      
-      ####################################################################
-      # Upload
-      ####################################################################
-
-      - name: Upload Windows Artifacts
-        if: matrix.platform == 'windows'
-        uses: actions/upload-artifact@v4
-        with:
-          name: windows
-          path: |
-            *.zip
-
-  ##########################################################################
-  # Release
-  ##########################################################################
-
-  release:
-
-    needs: build
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1   
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-
-      - name: Generate SHA256
-        run: |
-          cd artifacts
-
-          find . -type f | while read file
-          do
-            sha256sum "$file"
-          done > SHA256SUMS
-          
-      - name: Determine prerelease
-        id: prerelease
-        run: |
-          MAIN_BRANCH="${{ github.event.repository.default_branch }}"
-          git fetch origin "$MAIN_BRANCH" --depth=1 2>/dev/null || true
-
-          if git merge-base --is-ancestor "${{ github.sha }}" "origin/$MAIN_BRANCH"; then
-            echo "is_prerelease=false" >> $GITHUB_OUTPUT
-            echo "is_prerelease=false"
-          else
-            echo "is_prerelease=true" >> $GITHUB_OUTPUT
-            echo "is_prerelease=true"
-          fi
-
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: |
-            artifacts/**/*
-            artifacts/SHA256SUMS
-          generate_release_notes: true
-          draft: false
-          prerelease: ${{ steps.prerelease.outputs.is_prerelease }}

.gitignore

@@ -41,7 +41,5 @@ CMakeError.log
 *~
 .DS_Store
 assets/config.toml
-assets/server-config.toml
 .venv/
-pyout/
-vcpkg_installed/
+pyout/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.14...3.24)
 project(Cubed LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 23)
@@ -6,121 +6,194 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-if(NOT CMAKE_CONFIGURATION_TYPES
-   AND NOT CMAKE_BUILD_TYPE)
-
-    set(CMAKE_BUILD_TYPE Debug CACHE STRING "" FORCE)
-
-endif()
-
-if(NOT DEFINED CUBED_VERSION)
-    set(CUBED_VERSION "dev")
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Debug)
 endif()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
-list(APPEND CMAKE_MODULE_PATH 
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+if(MSVC)
+    add_compile_options(/utf-8)
+endif()
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+find_package(OpenGL REQUIRED)
+find_package(Protobuf REQUIRED)
+find_package(absl REQUIRED)
+find_package(zstd REQUIRED)
+
+if (UNIX AND NOT APPLE)
+    find_package(Freetype REQUIRED)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(EGL REQUIRED egl)
+    pkg_check_modules(Wayland REQUIRED wayland-client wayland-egl)
+    find_package(glfw3 REQUIRED)   
+endif()
+
+add_library(glad STATIC third_party/glad/src/glad.c)
+target_include_directories(glad PUBLIC third_party/glad/include)
+
+include(FetchContent)
+
+if (WIN32)
+    FetchContent_Declare(
+        glfw
+        GIT_REPOSITORY https://github.com/glfw/glfw.git
+        GIT_TAG 3.4  
+    )
+
+    set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+    set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)         
+    set(GLFW_VULKAN_STATIC ON CACHE BOOL "" FORCE)     
+    set(GLFW_STATIC ON CACHE BOOL "" FORCE)          
+
+    FetchContent_MakeAvailable(glfw)
+
+    FetchContent_Declare(
+        freetype
+        GIT_REPOSITORY https://gitlab.freedesktop.org/freetype/freetype.git
+        GIT_TAG VER-2-14-3
+    )
+    FetchContent_MakeAvailable(freetype)
+    if(TARGET freetype)
+    add_library(Freetype::Freetype ALIAS freetype)
+    endif()
+    set(_BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
+    set(BUILD_SHARED_LIBS ON)
+
+    FetchContent_Declare(
+    onetbb                           
+    GIT_REPOSITORY https://github.com/uxlfoundation/oneTBB.git
+    GIT_TAG v2023.0.0
+    )
+    set(BUILD_TESTING OFF CACHE BOOL "Build tests" FORCE)
+    set(TBB_TEST OFF CACHE BOOL "Build TBB tests" FORCE)
+    FetchContent_MakeAvailable(onetbb)
+
+    set(BUILD_SHARED_LIBS ${_BUILD_SHARED_LIBS_SAVED})
+    unset(_BUILD_SHARED_LIBS_SAVED)
+
+endif()
+
+FetchContent_Declare(
+    glm
+    GIT_REPOSITORY https://github.com/g-truc/glm.git
+    GIT_TAG 1.0.3 
+    
 )
-
-include(Dependencies)
-
-add_subdirectory(third_party/glad)
+FetchContent_MakeAvailable(glm)
+FetchContent_Declare(
+    soil2
+    GIT_REPOSITORY https://github.com/SpartanJ/SOIL2.git
+    GIT_TAG 1.31  
+    
+)
+FetchContent_MakeAvailable(soil2)
+FetchContent_Declare(
+    tomlplusplus
+    GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
+    GIT_TAG v3.4.0
+)
+FetchContent_MakeAvailable(tomlplusplus)
 
 add_subdirectory(third_party/imgui)
 
-add_subdirectory(third_party/dr_libs)
 
-add_executable(${PROJECT_NAME})
-
-add_subdirectory(src)
 
+add_executable(${PROJECT_NAME}
+    src/main.cpp
+    src/app.cpp
+    src/debug_collector.cpp
+    src/camera.cpp
+    src/config.cpp
+    src/dev_panel.cpp
+    src/gameplay/biome.cpp
+    src/gameplay/chunk_generator.cpp
+    src/gameplay/tree.cpp
+    src/input.cpp
+    src/map_table.cpp
+    src/renderer.cpp
+    src/shader.cpp
+    src/texture_manager.cpp
+    src/tools/cubed_random.cpp
+    src/tools/math_tools.cpp
+    src/tools/shader_tools.cpp
+    src/tools/font.cpp
+    src/tools/perlin_noise.cpp
+    src/ui/text.cpp
+    src/window.cpp
+    src/gameplay/builders/biome_builder.cpp
+    src/gameplay/builders/plain_builder.cpp
+    src/gameplay/builders/mountain_builder.cpp
+    src/gameplay/builders/river_builder.cpp
+    src/gameplay/builders/desert_builder.cpp
+    src/gameplay/builders/forest_builder.cpp
+    src/gameplay/cave_carver.cpp
+    src/gameplay/cave_path.cpp
+    src/gameplay/builders/snowy_plain_builder.cpp
+    src/gameplay/river_worm.cpp
+    src/gameplay/river_path.cpp
+    src/block.cpp
+    src/gameplay/vertex_data.cpp
+    src/gameplay/builders/ocean_builder.cpp
+    src/gameplay/network_server.cpp
+    src/gameplay/server_world.cpp
+    src/gameplay/client_world.cpp
+    src/gameplay/server_chunk.cpp
+    src/gameplay/client_chunk.cpp
+    src/gameplay/server_player.cpp
+    src/gameplay/client_player.cpp
+    src/gameplay/session.cpp
+    src/gameplay/network_client.cpp
+)
 file(GLOB_RECURSE PROTO_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/proto/*.proto
 )
-
 protobuf_generate(
     TARGET ${PROJECT_NAME}           
     LANGUAGE cpp         
     PROTOS ${PROTO_FILES}
     IMPORT_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/proto
 )
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message(STATUS "Building with AddressSanitizer enabled for target: ${PROJECT_NAME}")
 
-configure_file(
-    src/version.hpp.in
-    ${CMAKE_BINARY_DIR}/generated/version.hpp
-    @ONLY
-)
+    target_compile_options(${PROJECT_NAME} PRIVATE
+        #-fsanitize=address
+        #-fsanitize=thread
+        -fno-omit-frame-pointer   
+        -g                        
+    )
 
-target_compile_options(${PROJECT_NAME}
-    PRIVATE
-        $<$<CONFIG:Debug>:-fno-omit-frame-pointer>
-        $<$<CONFIG:Debug>:-g>
-        #$<$<CONFIG:Debug>:-fsanitize=address>
-        #$<$<CONFIG:Debug>:-fsanitize=thread>
+    target_link_options(${PROJECT_NAME} PRIVATE
+        #-fsanitize=address
+        #-fsanitize=thread
+    )
 
-        $<$<CXX_COMPILER_ID:GNU,Clang>:-Wall>
-        $<$<CXX_COMPILER_ID:GNU,Clang>:-Wextra>
-        $<$<CXX_COMPILER_ID:GNU,Clang>:-Wpedantic>
-
-        $<$<CXX_COMPILER_ID:MSVC>:/utf-8>
-        $<$<CXX_COMPILER_ID:MSVC>:/W4>
-)
-
-target_link_options(${PROJECT_NAME}
-    PRIVATE
-        #$<$<CONFIG:Debug>:-fsanitize=address>
-        #$<$<CONFIG:Debug>:-fsanitize=thread>
-)
-
-target_compile_definitions(${PROJECT_NAME}
-    PRIVATE
-        ASIO_STANDALONE
-        ASIO_NO_DEPRECATED
-        $<$<CONFIG:Debug>:DEBUG_MODE>
-        $<$<CXX_COMPILER_ID:MSVC>:
-            WIN32_LEAN_AND_MEAN
-            NOMINMAX
-            _CRT_SECURE_NO_WARNINGS
-        >
-)
-
-if(CMAKE_CONFIGURATION_TYPES)
-    # Visual Studio / Xcode multi-configuration generator
-    target_compile_definitions(${PROJECT_NAME}
-        PRIVATE
-            ASSETS_PATH="$<$<CONFIG:Debug>:${PROJECT_SOURCE_DIR}/assets/>$<$<NOT:$<CONFIG:Debug>>:./assets/>"
+    target_compile_definitions(${PROJECT_NAME} PRIVATE DEBUG_MODE)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE 
+        ASSETS_PATH="${CMAKE_SOURCE_DIR}/assets/"
     )
 else()
-    # Ninja / Makefiles single-configuration generator
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        target_compile_definitions(${PROJECT_NAME}
-            PRIVATE
-                ASSETS_PATH="${PROJECT_SOURCE_DIR}/assets/"
-        )
-    else()
-        target_compile_definitions(${PROJECT_NAME}
-            PRIVATE
-                ASSETS_PATH="./assets/"
-        )
-    endif()
+    target_compile_definitions(${PROJECT_NAME} PRIVATE 
+        ASSETS_PATH="./assets/"
+    )
 endif()
 
-
-target_include_directories(${PROJECT_NAME}
-    PRIVATE
-        ${PROJECT_SOURCE_DIR}/include
-        ${PROJECT_SOURCE_DIR}/third_party/asio/include
-        ${CMAKE_BINARY_DIR}/generated
-        ${PROJECT_BINARY_DIR}
-        ${PROJECT_BINARY_DIR}/src
-
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
+target_include_directories(${PROJECT_NAME} PRIVATE
+    ${CMAKE_SOURCE_DIR}/third_party/asio/include
 )
 
-
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_compile_definitions(${PROJECT_NAME} PRIVATE
+    ASIO_STANDALONE
+    ASIO_NO_DEPRECATED
+)
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
         glfw                                   
@@ -131,27 +204,47 @@ target_link_libraries(${PROJECT_NAME}
         Freetype::Freetype
         tomlplusplus::tomlplusplus
         imgui
-        dr_libs
         tbb
         protobuf::libprotobuf
         absl::log
         absl::check
-        absl::base
-        absl::strings
-        absl::flat_hash_map
         zstd::zstd
-        OpenAL::OpenAL
-        $<$<PLATFORM_ID:Windows>:ws2_32>
-
 )
 
-if(WIN32)
-    add_custom_command(
-        TARGET ${PROJECT_NAME}
-        POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_RUNTIME_DLLS:${PROJECT_NAME}>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}>
-        COMMAND_EXPAND_LISTS
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+#    target_link_libraries(${PROJECT_NAME} PRIVATE tbb)
+endif()
+
+if (UNIX AND NOT APPLE)
+    target_link_libraries(${PROJECT_NAME}
+        PRIVATE
+            ${EGL_LIBRARIES}
+            ${Wayland_LIBRARIES}
     )
+
+
+    target_include_directories(${PROJECT_NAME}
+        PRIVATE
+            ${EGL_INCLUDE_DIRS}
+            ${Wayland_INCLUDE_DIRS}
+    )
+
+
+    target_compile_options(${PROJECT_NAME} PRIVATE ${EGL_CFLAGS_OTHER} ${Wayland_CFLAGS_OTHER})
+endif()
+
+if (WIN32)
+    foreach(TBB_LIB IN ITEMS tbb tbbmalloc tbbmalloc_proxy)
+        if(TARGET ${TBB_LIB})
+            add_custom_command(
+                TARGET ${PROJECT_NAME} POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    $<TARGET_FILE:${TBB_LIB}>
+                    $<TARGET_FILE_DIR:${PROJECT_NAME}>
+                COMMENT "Copying ${TBB_LIB}.dll"
+            )
+        else()
+            message(STATUS "Target ${TBB_LIB} not found, skipping copy")
+        endif()
+    endforeach()
 endif()

assets/shaders/block_f_shader.glsl

@@ -29,8 +29,254 @@ uniform bool flipY;
 uniform int renderDistance;
 uniform vec3 skyColor;
 
-#include "shadow.glsl"
-#include "normal.glsl"
+const vec2 poissonDisk32[32] = vec2[](
+    vec2(-0.975402, -0.071138),
+    vec2(-0.920347, -0.411420),
+    vec2(-0.883908,  0.217872),
+    vec2(-0.815442, -0.879125),
+    vec2(-0.775043,  0.543896),
+    vec2(-0.698126, -0.227570),
+    vec2(-0.682433,  0.801894),
+    vec2(-0.563905,  0.021517),
+    vec2(-0.443233, -0.975116),
+    vec2(-0.412231,  0.361307),
+    vec2(-0.264969, -0.418930),
+    vec2(-0.241888,  0.997065),
+    vec2(-0.094184, -0.929389),
+    vec2(-0.019101,  0.680997),
+    vec2( 0.143832, -0.141008),
+    vec2( 0.199841,  0.786414),
+
+    vec2( 0.344959,  0.293878),
+    vec2( 0.443233, -0.475115),
+    vec2( 0.537430, -0.473734),
+    vec2( 0.589349,  0.569135),
+    vec2( 0.674281, -0.178897),
+    vec2( 0.791975,  0.190902),
+    vec2( 0.815442,  0.879125),
+    vec2( 0.896420, -0.613392),
+    vec2( 0.945586, -0.768907),
+    vec2( 0.974844,  0.756484),
+    vec2(-0.814100,  0.914376),
+    vec2(-0.382775,  0.276768),
+    vec2(-0.915886,  0.457714),
+    vec2( 0.537800,  0.912200),
+    vec2(-0.620000, -0.650000),
+    vec2( 0.120000, -0.780000)
+);
+
+const vec2 poissonDisk16[16] = vec2[](
+    vec2(-0.94201624, -0.39906216), vec2(0.94558609, -0.76890725),
+    vec2(-0.09418410, -0.92938870), vec2(0.34495938, 0.29387760),
+    vec2(-0.91588581, 0.45771432), vec2(-0.81544232, -0.87912464),
+    vec2(-0.38277543, 0.27676845), vec2(0.97484398, 0.75648379),
+    vec2(0.44323325, -0.97511554), vec2(0.53742981, -0.47373420),
+    vec2(-0.26496911, -0.41893023), vec2(0.79197514, 0.19090188),
+    vec2(-0.24188840, 0.99706507), vec2(-0.81409955, 0.91437590),
+    vec2(0.19984126, 0.78641367), vec2(0.14383161, -0.14100790)
+);
+const vec2 poissonDisk8[8] = vec2[](
+    vec2( 0.1440,  0.7659), vec2(-0.5761,  0.4479),
+    vec2(-0.3220, -0.6058), vec2( 0.5693, -0.4048),
+    vec2(-0.1276,  0.1657), vec2(-0.0649, -0.0165),
+    vec2( 0.2773, -0.0305), vec2(-0.1134, -0.2122)
+);
+uniform int samples;
+float random(vec3 seed) {
+    return fract(sin(dot(seed, vec3(12.9898,78.233,45.5432))) * 43758.5453);
+}
+
+float FindBlocker(vec2 uv,
+                  float zReceiver,
+                  vec2 texelSize,
+                  float bias,
+                  float lightSizeUV)
+{
+    float avgDepth = 0.0;
+    int blockers = 0;
+
+    float searchRadius = lightSizeUV * 0.5;
+
+    for(int i = 0; i < samples; i++)
+    {    
+        vec2 offset;
+        if (samples == 32) {
+            offset =
+            poissonDisk32[i]
+            * searchRadius
+            * texelSize;
+        } else if (samples == 16) {
+            offset =
+            poissonDisk16[i]
+            * searchRadius
+            * texelSize;
+        } else if (samples == 8) {
+            offset =
+            poissonDisk8[i]
+            * searchRadius
+            * texelSize;
+        } else {
+            offset =
+            poissonDisk32[i]
+            * searchRadius
+            * texelSize;
+        }
+        float depth =
+            texture(shadowMap, uv + offset).r;
+
+        if(depth < zReceiver - bias)
+        {
+            avgDepth += depth;
+            blockers++;
+        }
+    }
+
+    if(blockers == 0)
+        return -1.0;
+
+    return avgDepth / blockers;
+}
+
+float ShadowCalculation(vec4 fragPosLightSpace, vec3 norm, vec3 lightDir)
+{
+
+    vec3 projCoords = fragPosLightSpace.xyz / fragPosLightSpace.w;
+
+    projCoords = projCoords * 0.5 + 0.5;
+    if (projCoords.x < 0.0 || projCoords.x > 1.0 ||
+        projCoords.y < 0.0 || projCoords.y > 1.0 ||
+        projCoords.z < 0.0 || projCoords.z > 1.0) {
+        return 0.0;
+    }
+    float currentDepth = projCoords.z;
+    vec2 texelSize = 1.0 / vec2(textureSize(shadowMap, 0));
+    float shadow = 0.0;
+
+    float bias =
+    clamp(
+        0.001 * (1.0 - dot(norm, lightDir)),
+        0.0003,
+        0.003
+    );
+
+    if (shadowMode == 0) {
+        vec3 seed = vert_pos * 37.0 + sin(vert_pos * 91.7) * 13.0;
+        float angle = random(seed) * 6.2831853;; // 2*PI
+        float s = sin(angle), c = cos(angle);
+        mat2 rot = mat2(c, -s, s, c);
+        //float radius = 0.7;
+        float radius = mix(1.0, 4.0, currentDepth);
+        
+        for (int i = 0; i < samples; ++i) {
+            vec2 offset;
+            if (samples == 32) {
+                offset = rot * poissonDisk32[i] * radius * texelSize;
+            } else if (samples == 16) {
+                offset = rot * poissonDisk16[i] * radius * texelSize;
+            } else if (samples == 8) {
+                offset = rot * poissonDisk8[i] * radius * texelSize;
+            } else {
+               offset = rot * poissonDisk32[i] * radius * texelSize;
+            }
+            float pcfDepth = texture(shadowMap, projCoords.xy + offset).r;
+            shadow += (currentDepth - bias > pcfDepth ? 1.0 : 0.0);
+        }
+        shadow /= float(samples);
+    } else if (shadowMode == 1) {
+        for (int x = -1; x <= 1; ++x) {
+            for (int y = -1; y <= 1; ++y) {
+                vec2 offset = vec2(x, y) * texelSize;
+                float pcfDepth = texture(shadowMap, projCoords.xy + offset).r;
+                shadow += (currentDepth - bias > pcfDepth ? 1.0 : 0.0);
+            }
+        }
+        shadow /= 9.0;
+    } else if (shadowMode == 2) {
+        // pcf off
+        float pcfDepth =
+        texture(shadowMap, projCoords.xy).r;
+
+        shadow =
+        currentDepth - bias > pcfDepth
+            ? 1.0
+            : 0.0;
+    } else if (shadowMode == 3) {
+        float avgBlockerDepth =
+            FindBlocker(
+                projCoords.xy,
+                currentDepth,
+                texelSize,
+                bias,
+                lightSizeUV
+            );
+
+        if(avgBlockerDepth < 0.0)
+        {
+            return 0.0;
+        }
+
+        vec3 seed = vert_pos * 37.0 + sin(vert_pos * 91.7) * 13.0;
+        float angle = random(seed) * 6.2831853;; // 2*PI
+        float s = sin(angle), c = cos(angle);
+        mat2 rot = mat2(c, -s, s, c);
+        /*
+        float penumbraRatio = (currentDepth - avgBlockerDepth);
+        float radius = clamp(
+            penumbraRatio * lightSizeUV,
+            minRadius,
+            maxRadius
+        );
+        */
+        float radius =
+            mix(
+                minRadius,
+                maxRadius,
+                smoothstep(
+                    0.0,
+                    0.05,
+                    currentDepth - avgBlockerDepth
+                )
+            );
+        for (int i = 0; i < samples; ++i) {
+            vec2 offset;
+            if (samples == 32) {
+                offset = rot * poissonDisk32[i] * radius * texelSize;
+            } else if (samples == 16) {
+                offset = rot * poissonDisk16[i] * radius * texelSize;
+            } else if (samples == 8) {
+                offset = rot * poissonDisk8[i] * radius * texelSize;
+            } else {
+               offset = rot * poissonDisk32[i] * radius * texelSize;
+            }
+            float pcfDepth = texture(shadowMap, projCoords.xy + offset).r;
+            shadow += (currentDepth - bias > pcfDepth ? 1.0 : 0.0);
+        }
+        shadow /= float(samples);
+
+    } else {
+        float pcfDepth =
+        texture(shadowMap, projCoords.xy).r;
+
+        shadow =
+        currentDepth - bias > pcfDepth
+            ? 1.0
+            : 0.0;
+    }
+
+   
+    return shadow;
+}
+
+vec3 calcNewNormal() {
+    mat3 TBN = mat3(normalize(tangent), normalize(bitangent), normalize(normal));
+    vec3 retrievedNormal = texture(normMap, vec3(tc, tex_layer)).xyz;       
+    retrievedNormal = retrievedNormal * 2.0 - 1.0;
+    if (flipY) {
+        retrievedNormal.y = -retrievedNormal.y;
+    }
+    vec3 newNormal = TBN * retrievedNormal;
+    return normalize(newNormal);
+}
 
 void main(void) {
     vec4 objectColor = texture(samp, vec3(tc, tex_layer));

assets/shaders/depth_player_fragment_shader.glsl

@@ -1,7 +0,0 @@
-#version 460
-
-in vec2 tc;
-
-void main() {
-
-}

assets/shaders/depth_player_shader.glsl

@@ -1,15 +0,0 @@
-#version 460
-
-layout (location = 0) in vec3 pos;
-layout (location = 1) in vec2 texCoord;
-
-uniform mat4 lightSpaceMatrix;
-uniform mat4 modelMatrix;
-
-out vec2 tc;
-flat out int tex_layer;
-
-void main() {
-    tc = texCoord;
-    gl_Position = lightSpaceMatrix * modelMatrix * vec4(pos, 1.0);
-}

assets/shaders/image_f_shader.glsl

@@ -1,11 +0,0 @@
-#version 460
-
-in vec2 tc;
-
-out vec4 color;
-
-layout (binding = 0) uniform sampler2D samp;
-
-void main(void) {
-    color = texture(samp, tc);
-}

assets/shaders/image_v_shader.glsl

@@ -1,14 +0,0 @@
-#version 460
-
-layout (location = 0) in vec2 pos;
-layout (location = 1) in vec2 texCoord;
-
-out vec2 tc;
-
-uniform mat4 model_matrix;
-uniform mat4 proj_matrix;
-
-void main(void) {
-    gl_Position = proj_matrix * model_matrix * vec4(pos, 0.0, 1.0);
-    tc = texCoord;
-}

assets/shaders/normal.glsl

@@ -1,10 +0,0 @@
-vec3 calcNewNormal() {
-    mat3 TBN = mat3(normalize(tangent), normalize(bitangent), normalize(normal));
-    vec3 retrievedNormal = texture(normMap, vec3(tc, tex_layer)).xyz;       
-    retrievedNormal = retrievedNormal * 2.0 - 1.0;
-    if (flipY) {
-        retrievedNormal.y = -retrievedNormal.y;
-    }
-    vec3 newNormal = TBN * retrievedNormal;
-    return normalize(newNormal);
-}

assets/shaders/player_f_shader.glsl

@@ -1,47 +1,8 @@
 #version 460
 
-in vec2 tc;
-in vec3 normal;
-in vec3 vert_pos;
-in vec4 FragPosLightSpace;
 out vec4 color;
-
-layout (binding = 0) uniform sampler2D shadowMap;
-layout (binding = 1) uniform sampler2D samp;
-
-uniform float ambientStrength;
-uniform vec3 sunlightColor;
-uniform vec3 ambientColor;
-uniform vec3 sunlightDir;
-uniform bool shader_on;
-uniform int shadowMode;
-uniform float lightSizeUV; 
-uniform float minRadius;
-uniform float maxRadius;
-
-#include "shadow.glsl"
+in vec2 tc;
 
 void main() {
-    vec4 objectColor = texture(samp, tc);
-
-    if (!shader_on) {
-        color = objectColor;
-        return;
-    }
-   
-    vec3 lightDir = normalize(-sunlightDir);
-    
-    vec3 norm = normalize(normal);
-
-    vec3 ambient = ambientStrength * ambientColor;
-    
-    float diff = max(dot(norm, lightDir), 0.0);
-    
-    vec3 diffuse = diff * sunlightColor;
- 
-    float shadow = ShadowCalculation(FragPosLightSpace, norm, lightDir);  
-    //float shadow = 0.0;
-    //color = vec4(vec3(shadow),1);
-    //color = vec4(vec3(diff),1);
-    color = vec4((ambient + (1.0 - shadow) * (diffuse)) * objectColor.rgb, objectColor.a);
-}
+    color = vec4(0.0, 0.0, 1.0, 1.0);
+}

assets/shaders/player_v_shader.glsl

@@ -2,26 +2,14 @@
 
 layout (location = 0) in vec3 pos;
 layout (location = 1) in vec2 texCoord;
-layout (location = 2) in vec3 aNormal;
-layout (location = 3) in vec3 aTangent;
 
 uniform mat4 mv_matrix;
 uniform mat4 proj_matrix;
-uniform mat4 norm_matrix;
-uniform mat4 lightSpaceMatrix;
-uniform mat4 modelMatrix;
-out vec4 FragPosLightSpace;
-out vec3 normal;
-out vec2 tc;
-out vec3 vert_pos;
 
+out vec2 tc;
 
 void main() {
-    vec4 worldPos = modelMatrix * vec4(pos, 1.0);
-    FragPosLightSpace = lightSpaceMatrix * worldPos;
     vec4 viewPos = mv_matrix * vec4(pos, 1.0);
     tc = texCoord;
-    vert_pos = pos;
-    normal = normalize(mat3(norm_matrix) * aNormal);
     gl_Position = proj_matrix * viewPos;
 }

assets/shaders/rect_f_shader.glsl

@@ -1,9 +0,0 @@
-#version 460
-
-out vec4 color;
-
-uniform vec4 inColor;
-
-void main(void) {
-    color = inColor;
-}

assets/shaders/rect_v_shader.glsl

@@ -1,11 +0,0 @@
-#version 460
-
-layout (location = 0) in vec2 pos;
-
-
-uniform mat4 model_matrix;
-uniform mat4 proj_matrix;
-
-void main(void) {
-    gl_Position = proj_matrix * model_matrix * vec4(pos, 0.0, 1.0);
-}

assets/shaders/shadow.glsl

@@ -1,238 +0,0 @@
-const vec2 poissonDisk32[32] = vec2[](
-    vec2(-0.975402, -0.071138),
-    vec2(-0.920347, -0.411420),
-    vec2(-0.883908,  0.217872),
-    vec2(-0.815442, -0.879125),
-    vec2(-0.775043,  0.543896),
-    vec2(-0.698126, -0.227570),
-    vec2(-0.682433,  0.801894),
-    vec2(-0.563905,  0.021517),
-    vec2(-0.443233, -0.975116),
-    vec2(-0.412231,  0.361307),
-    vec2(-0.264969, -0.418930),
-    vec2(-0.241888,  0.997065),
-    vec2(-0.094184, -0.929389),
-    vec2(-0.019101,  0.680997),
-    vec2( 0.143832, -0.141008),
-    vec2( 0.199841,  0.786414),
-
-    vec2( 0.344959,  0.293878),
-    vec2( 0.443233, -0.475115),
-    vec2( 0.537430, -0.473734),
-    vec2( 0.589349,  0.569135),
-    vec2( 0.674281, -0.178897),
-    vec2( 0.791975,  0.190902),
-    vec2( 0.815442,  0.879125),
-    vec2( 0.896420, -0.613392),
-    vec2( 0.945586, -0.768907),
-    vec2( 0.974844,  0.756484),
-    vec2(-0.814100,  0.914376),
-    vec2(-0.382775,  0.276768),
-    vec2(-0.915886,  0.457714),
-    vec2( 0.537800,  0.912200),
-    vec2(-0.620000, -0.650000),
-    vec2( 0.120000, -0.780000)
-);
-
-const vec2 poissonDisk16[16] = vec2[](
-    vec2(-0.94201624, -0.39906216), vec2(0.94558609, -0.76890725),
-    vec2(-0.09418410, -0.92938870), vec2(0.34495938, 0.29387760),
-    vec2(-0.91588581, 0.45771432), vec2(-0.81544232, -0.87912464),
-    vec2(-0.38277543, 0.27676845), vec2(0.97484398, 0.75648379),
-    vec2(0.44323325, -0.97511554), vec2(0.53742981, -0.47373420),
-    vec2(-0.26496911, -0.41893023), vec2(0.79197514, 0.19090188),
-    vec2(-0.24188840, 0.99706507), vec2(-0.81409955, 0.91437590),
-    vec2(0.19984126, 0.78641367), vec2(0.14383161, -0.14100790)
-);
-const vec2 poissonDisk8[8] = vec2[](
-    vec2( 0.1440,  0.7659), vec2(-0.5761,  0.4479),
-    vec2(-0.3220, -0.6058), vec2( 0.5693, -0.4048),
-    vec2(-0.1276,  0.1657), vec2(-0.0649, -0.0165),
-    vec2( 0.2773, -0.0305), vec2(-0.1134, -0.2122)
-);
-uniform int samples;
-float random(vec3 seed) {
-    return fract(sin(dot(seed, vec3(12.9898,78.233,45.5432))) * 43758.5453);
-}
-
-float FindBlocker(vec2 uv,
-                  float zReceiver,
-                  vec2 texelSize,
-                  float bias,
-                  float lightSizeUV)
-{
-    float avgDepth = 0.0;
-    int blockers = 0;
-
-    float searchRadius = lightSizeUV * 0.5;
-
-    for(int i = 0; i < samples; i++)
-    {    
-        vec2 offset;
-        if (samples == 32) {
-            offset =
-            poissonDisk32[i]
-            * searchRadius
-            * texelSize;
-        } else if (samples == 16) {
-            offset =
-            poissonDisk16[i]
-            * searchRadius
-            * texelSize;
-        } else if (samples == 8) {
-            offset =
-            poissonDisk8[i]
-            * searchRadius
-            * texelSize;
-        } else {
-            offset =
-            poissonDisk32[i]
-            * searchRadius
-            * texelSize;
-        }
-        float depth =
-            texture(shadowMap, uv + offset).r;
-
-        if(depth < zReceiver - bias)
-        {
-            avgDepth += depth;
-            blockers++;
-        }
-    }
-
-    if(blockers == 0)
-        return -1.0;
-
-    return avgDepth / blockers;
-}
-
-float ShadowCalculation(vec4 fragPosLightSpace, vec3 norm, vec3 lightDir)
-{
-
-    vec3 projCoords = fragPosLightSpace.xyz / fragPosLightSpace.w;
-
-    projCoords = projCoords * 0.5 + 0.5;
-    if (projCoords.x < 0.0 || projCoords.x > 1.0 ||
-        projCoords.y < 0.0 || projCoords.y > 1.0 ||
-        projCoords.z < 0.0 || projCoords.z > 1.0) {
-        return 0.0;
-    }
-    float currentDepth = projCoords.z;
-    vec2 texelSize = 1.0 / vec2(textureSize(shadowMap, 0));
-    float shadow = 0.0;
-
-    float bias =
-    clamp(
-        0.001 * (1.0 - dot(norm, lightDir)),
-        0.0003,
-        0.003
-    );
-
-    if (shadowMode == 0) {
-        vec3 seed = vert_pos * 37.0 + sin(vert_pos * 91.7) * 13.0;
-        float angle = random(seed) * 6.2831853;; // 2*PI
-        float s = sin(angle), c = cos(angle);
-        mat2 rot = mat2(c, -s, s, c);
-        //float radius = 0.7;
-        float radius = mix(1.0, 4.0, currentDepth);
-        
-        for (int i = 0; i < samples; ++i) {
-            vec2 offset;
-            if (samples == 32) {
-                offset = rot * poissonDisk32[i] * radius * texelSize;
-            } else if (samples == 16) {
-                offset = rot * poissonDisk16[i] * radius * texelSize;
-            } else if (samples == 8) {
-                offset = rot * poissonDisk8[i] * radius * texelSize;
-            } else {
-               offset = rot * poissonDisk32[i] * radius * texelSize;
-            }
-            float pcfDepth = texture(shadowMap, projCoords.xy + offset).r;
-            shadow += (currentDepth - bias > pcfDepth ? 1.0 : 0.0);
-        }
-        shadow /= float(samples);
-    } else if (shadowMode == 1) {
-        for (int x = -1; x <= 1; ++x) {
-            for (int y = -1; y <= 1; ++y) {
-                vec2 offset = vec2(x, y) * texelSize;
-                float pcfDepth = texture(shadowMap, projCoords.xy + offset).r;
-                shadow += (currentDepth - bias > pcfDepth ? 1.0 : 0.0);
-            }
-        }
-        shadow /= 9.0;
-    } else if (shadowMode == 2) {
-        // pcf off
-        float pcfDepth =
-        texture(shadowMap, projCoords.xy).r;
-
-        shadow =
-        currentDepth - bias > pcfDepth
-            ? 1.0
-            : 0.0;
-    } else if (shadowMode == 3) {
-        float avgBlockerDepth =
-            FindBlocker(
-                projCoords.xy,
-                currentDepth,
-                texelSize,
-                bias,
-                lightSizeUV
-            );
-
-        if(avgBlockerDepth < 0.0)
-        {
-            return 0.0;
-        }
-
-        vec3 seed = vert_pos * 37.0 + sin(vert_pos * 91.7) * 13.0;
-        float angle = random(seed) * 6.2831853;; // 2*PI
-        float s = sin(angle), c = cos(angle);
-        mat2 rot = mat2(c, -s, s, c);
-        /*
-        float penumbraRatio = (currentDepth - avgBlockerDepth);
-        float radius = clamp(
-            penumbraRatio * lightSizeUV,
-            minRadius,
-            maxRadius
-        );
-        */
-        float radius =
-            mix(
-                minRadius,
-                maxRadius,
-                smoothstep(
-                    0.0,
-                    0.05,
-                    currentDepth - avgBlockerDepth
-                )
-            );
-        for (int i = 0; i < samples; ++i) {
-            vec2 offset;
-            if (samples == 32) {
-                offset = rot * poissonDisk32[i] * radius * texelSize;
-            } else if (samples == 16) {
-                offset = rot * poissonDisk16[i] * radius * texelSize;
-            } else if (samples == 8) {
-                offset = rot * poissonDisk8[i] * radius * texelSize;
-            } else {
-               offset = rot * poissonDisk32[i] * radius * texelSize;
-            }
-            float pcfDepth = texture(shadowMap, projCoords.xy + offset).r;
-            shadow += (currentDepth - bias > pcfDepth ? 1.0 : 0.0);
-        }
-        shadow /= float(samples);
-
-    } else {
-        float pcfDepth =
-        texture(shadowMap, projCoords.xy).r;
-
-        shadow =
-        currentDepth - bias > pcfDepth
-            ? 1.0
-            : 0.0;
-    }
-
-   
-    return shadow;
-}
-

assets/shaders/ui_f_shader.glsl

@@ -0,0 +1,12 @@
+#version 460
+
+in vec2 tc;
+flat in int tex_layer;
+
+out vec4 color;
+
+layout (binding = 0) uniform sampler2DArray samp;
+
+void main(void) {
+    color = texture(samp, vec3(tc, tex_layer));
+}

assets/shaders/ui_v_shader.glsl

@@ -0,0 +1,18 @@
+#version 460
+
+layout (location = 0) in vec2 pos;
+layout (location = 1) in vec2 texCoord;
+layout (location = 2) in float layer;
+
+out vec2 tc;
+
+flat out int tex_layer;
+
+uniform mat4 m_matrix;
+uniform mat4 proj_matrix;
+
+void main(void) {
+    gl_Position = proj_matrix * m_matrix * vec4(pos, 0.0, 1.0);
+    tc = texCoord;
+    tex_layer = int(layer);
+}

cmake/Dependencies.cmake

@@ -1,80 +0,0 @@
-include(FetchContent)
-
-# System packages
-find_package(OpenGL REQUIRED)
-find_package(Protobuf REQUIRED)
-find_package(absl REQUIRED)
-find_package(zstd REQUIRED)
-find_package(OpenAL REQUIRED)
-if (UNIX AND NOT APPLE)
-    find_package(Freetype REQUIRED)
-    find_package(glfw3 REQUIRED)   
-endif()
-
-
-# Third-party libraries
-FetchContent_Declare(
-    glm
-    GIT_REPOSITORY https://github.com/g-truc/glm.git
-    GIT_TAG 1.0.3 
-    
-)
-FetchContent_MakeAvailable(glm)
-FetchContent_Declare(
-    soil2
-    GIT_REPOSITORY https://github.com/SpartanJ/SOIL2.git
-    GIT_TAG 1.31  
-    
-)
-FetchContent_MakeAvailable(soil2)
-FetchContent_Declare(
-    tomlplusplus
-    GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
-    GIT_TAG v3.4.0
-)
-FetchContent_MakeAvailable(tomlplusplus)
-
-
-if (WIN32)
-    FetchContent_Declare(
-        glfw
-        GIT_REPOSITORY https://github.com/glfw/glfw.git
-        GIT_TAG 3.4  
-    )
-
-    set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
-    set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-    set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)         
-    set(GLFW_VULKAN_STATIC ON CACHE BOOL "" FORCE)             
-    set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
-
-    FetchContent_MakeAvailable(glfw)
-
-    FetchContent_Declare(
-        freetype
-        GIT_REPOSITORY https://gitlab.freedesktop.org/freetype/freetype.git
-        GIT_TAG VER-2-14-3
-    )
-    FetchContent_MakeAvailable(freetype)
-    if(TARGET freetype)
-    add_library(Freetype::Freetype ALIAS freetype)
-    endif()
-    set(_BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
-    set(BUILD_SHARED_LIBS ON)
-
-    FetchContent_Declare(
-    onetbb                           
-    GIT_REPOSITORY https://github.com/uxlfoundation/oneTBB.git
-    GIT_TAG v2023.0.0
-    )
-    
-    set(BUILD_TESTING OFF CACHE BOOL "Build tests" FORCE)
-    set(TBB_TEST OFF CACHE BOOL "Build TBB tests" FORCE)
-    FetchContent_MakeAvailable(onetbb)
-
-    set(BUILD_SHARED_LIBS ${_BUILD_SHARED_LIBS_SAVED})
-    unset(_BUILD_SHARED_LIBS_SAVED)
-
-endif()
-

include/Cubed/app.hpp

@@ -1,17 +1,23 @@
 #pragma once
-#include "Cubed/audio/audio_engine.hpp"
+#include "Cubed/gameplay/client_world.hpp"
+#include "Cubed/gameplay/network_server.hpp"
+#include "Cubed/gameplay/server_world.hpp"
 #define GLFW_INCLUDE_NONE
-#include "Cubed/argument.hpp"
-#include "Cubed/config.hpp"
+#include "Cubed/camera.hpp"
 #include "Cubed/dev_panel.hpp"
-#include "Cubed/render/renderer.hpp"
-#include "Cubed/scene/scene_manager.hpp"
+#include "Cubed/renderer.hpp"
 #include "Cubed/texture_manager.hpp"
 #include "Cubed/window.hpp"
 namespace Cubed {
 
 class App {
 public:
+    struct Argument {
+        bool is_client = false;
+        int port = 25530;
+        std::string ip{"127.0.0.1"};
+    };
+
     App();
     ~App();
     static void cursor_position_callback(GLFWwindow* window, double xpos,
@@ -23,8 +29,6 @@ public:
     static void window_focus_callback(GLFWwindow* window, int focused);
     static void window_reshape_callback(GLFWwindow* window, int new_width,
                                         int new_height);
-    static void framebuffer_size_callback(GLFWwindow* window, int new_width,
-                                          int new_height);
     static void mouse_scroll_callback(GLFWwindow* window, double xoffset,
                                       double yoffset);
     static void cursor_enter_callback(GLFWwindow* window, int entered);
@@ -32,43 +36,39 @@ public:
     static int start_cubed_application(int argc, char** argv);
 
     static unsigned int seed();
-    static float delta_time();
+    static float delte_time();
     static float get_fps();
 
+    Camera& camera();
+    DevPanel& dev_panel();
     Renderer& renderer();
     TextureManager& texture_manager();
     Window& window();
-
-    Config& config();
-    const Argument& argument() const;
-    AudioEngine& audio();
-
-    const char* get_clipboard_text();
+    ClientWorld& client_world();
+    ServerWorld& server_world();
 
 private:
-    Config m_game_config;
-
+    Camera m_camera;
     TextureManager m_texture_manager;
+    NetworkServer m_server;
+    std::shared_ptr<NetworkClient> m_client;
+    ClientWorld m_client_world;
 
-    AudioEngine m_audio;
+    DevPanel m_dev_panel{*this};
+    Renderer m_renderer{m_camera, m_client_world, m_texture_manager,
+                        m_dev_panel};
 
-    Renderer m_renderer;
-
-    Window m_window;
-
-    SceneManager m_scene_manager;
+    Window m_window{m_renderer};
 
     inline static double last_time = glfwGetTime();
     inline static double current_time = glfwGetTime();
-    inline static double dt = 0.0f;
+    inline static double delta_time = 0.0f;
     inline static double fps_time_count = 0.0f;
     inline static int frame_count = 0;
     inline static int fps = 0;
     Argument m_argument;
-
     void init(int argc, char** argv);
     void handle_argument(int argc, char** argv);
-    void handle_toml();
     auto init_camera();
     auto init_texture();
     auto init_world();
@@ -76,8 +76,6 @@ private:
     void render();
     void run();
     void update();
-
-    void dispatch_event(const Event& e);
 };
 
 } // namespace Cubed

include/Cubed/argument.hpp

@@ -1,11 +0,0 @@
-#pragma once
-#include <string>
-namespace Cubed {
-struct Argument {
-    bool is_client = false;
-    int port = 25530;
-    std::string ip{"127.0.0.1"};
-    std::string player{"Unknown"};
-    bool debug_on = true;
-};
-} // namespace Cubed

include/Cubed/audio/audio_buffer.hpp

@@ -1,24 +0,0 @@
-#pragma once
-#include "Cubed/audio/audio_data.hpp"
-
-#include <AL/al.h>
-namespace Cubed {
-class AudioBuffer {
-public:
-    AudioBuffer(const AudioData& data);
-    AudioBuffer(const AudioBuffer&) = delete;
-    AudioBuffer(AudioBuffer&&) = delete;
-    AudioBuffer& operator=(const AudioBuffer&) = delete;
-    AudioBuffer& operator=(AudioBuffer&&) = delete;
-    ~AudioBuffer();
-    ALuint buffer() const;
-    float duration() const;
-    uint32_t channels() const;
-
-private:
-    ALuint m_buffer = 0;
-    float m_duration = 0.0f;
-    uint32_t m_channels = 0;
-    void set_data(const AudioData& data);
-};
-} // namespace Cubed

include/Cubed/audio/audio_data.hpp

@@ -1,10 +0,0 @@
-#pragma once
-#include <cstdint>
-#include <vector>
-namespace Cubed {
-struct AudioData {
-    std::vector<int16_t> pcm;
-    uint32_t channels;
-    uint32_t sample_rate;
-};
-} // namespace Cubed

include/Cubed/audio/audio_effect.hpp

@@ -1,19 +0,0 @@
-#pragma once
-#include <AL/al.h>
-namespace Cubed {
-class AudioEffect {
-public:
-    AudioEffect();
-    AudioEffect(const AudioEffect&) = delete;
-    AudioEffect(AudioEffect&&) = delete;
-    AudioEffect& operator=(const AudioEffect&) = default;
-    AudioEffect& operator=(AudioEffect&&) = delete;
-    ~AudioEffect();
-    void set_reverb(float decay_time, float reverb_gain, float gain_hf,
-                    float density = 1.0f, float diffusion = 1.0f);
-    ALuint effect() const;
-
-private:
-    ALuint m_effect = 0;
-};
-} // namespace Cubed

include/Cubed/audio/audio_effect_slot.hpp

@@ -1,18 +0,0 @@
-#pragma once
-#include "Cubed/audio/audio_effect.hpp"
-namespace Cubed {
-class AudioEffectSlot {
-public:
-    AudioEffectSlot();
-    AudioEffectSlot(const AudioEffectSlot&) = delete;
-    AudioEffectSlot(AudioEffectSlot&&) = delete;
-    AudioEffectSlot& operator=(const AudioEffectSlot&) = delete;
-    AudioEffectSlot& operator=(AudioEffectSlot&&) = delete;
-    ~AudioEffectSlot();
-    void set_effect(const AudioEffect& effect);
-    ALuint slot() const;
-
-private:
-    ALuint m_slot = 0;
-};
-} // namespace Cubed

include/Cubed/audio/audio_engine.hpp

@@ -1,63 +0,0 @@
-#pragma once
-
-#include "Cubed/audio/audio_fade.hpp"
-#include "Cubed/audio/audio_source.hpp"
-#include "Cubed/audio/sound_manager.hpp"
-#include "Cubed/audio/source_pool.hpp"
-#include "Cubed/config.hpp"
-
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <glm/glm.hpp>
-#include <memory>
-#include <string>
-#include <unordered_map>
-namespace Cubed {
-
-class ClientWorld;
-
-class AudioEngine {
-public:
-    AudioEngine(Config& config);
-    AudioEngine(const AudioEngine&) = delete;
-    AudioEngine(AudioEngine&&) = delete;
-    AudioEngine& operator=(const AudioEngine&) = delete;
-    AudioEngine& operator=(AudioEngine&&) = delete;
-    ~AudioEngine();
-
-    void init();
-    void play_bgm();
-    void stop_bgm();
-    void change_bgm(const std::string& sound);
-    void play_3d(const std::string& sound, const glm::vec3& pos,
-                 bool check = false);
-    void play_2d(const std::string& sound, bool check = false);
-    void update_listener(const glm::vec3& pos, const glm::vec3& forward,
-                         const glm::vec3& up);
-    void update();
-    void reload_config();
-
-    void underwater_change(bool underwater);
-
-    float& bgm_target_volume();
-
-private:
-    using FadeMap = std::unordered_map<std::string, AudioFade>;
-    bool m_init{false};
-    ALCdevice* device{nullptr};
-    ALCcontext* context{nullptr};
-    glm::vec3 listener_pos;
-    std::unique_ptr<AudioSource> m_bgm;
-    FadeMap m_fade_map;
-    SoundManager m_sounds;
-    Config& m_config;
-    std::shared_ptr<SourcePool> m_pool;
-    bool m_efx_supported = false;
-    bool m_underwater = false;
-    float m_music_volume = 1.0f;
-    float m_sfx_volume = 1.0f;
-    std::unique_ptr<AudioFilter> m_low_pass_filter;
-    std::unique_ptr<AudioEffect> m_underwater_effect;
-    std::unique_ptr<AudioEffectSlot> m_underwater_slot;
-};
-} // namespace Cubed

include/Cubed/audio/audio_error.hpp

@@ -1,15 +0,0 @@
-#pragma once
-#include "Cubed/tools/log.hpp"
-
-#include <AL/al.h>
-namespace Cubed {
-inline void check_al_error(
-    std::source_location loaction = std::source_location::current()) {
-    ALenum error = alGetError();
-    if (error != AL_NO_ERROR) {
-        Logger::error("File {} Line {} Function {} OpenAL Error {} ",
-                      loaction.file_name(), loaction.line(),
-                      loaction.function_name(), alGetString(error));
-    }
-}
-} // namespace Cubed

include/Cubed/audio/audio_fade.hpp

@@ -1,19 +0,0 @@
-#pragma once
-#include "Cubed/audio/audio_source.hpp"
-namespace Cubed {
-class AudioFade {
-public:
-    AudioFade(AudioSource* source, float fade_in = 0.0f, float fade_out = 0.0f);
-    ~AudioFade();
-    void update();
-    void reset();
-
-private:
-    AudioSource* m_source = nullptr;
-    float m_in_duration = 0.0f;
-    float m_out_duration = 0.0f;
-    float m_start_gain = 0.0f;
-    bool m_fade_in = true;
-    bool m_active = true;
-};
-} // namespace Cubed

include/Cubed/audio/audio_filter.hpp

@@ -1,19 +0,0 @@
-#pragma once
-#include <AL/al.h>
-namespace Cubed {
-class AudioFilter {
-public:
-    AudioFilter();
-    AudioFilter(const AudioFilter&) = delete;
-    AudioFilter(AudioFilter&&) = delete;
-    AudioFilter& operator=(const AudioFilter&) = delete;
-    AudioFilter& operator=(AudioFilter&&) = delete;
-    ~AudioFilter();
-
-    void set_lowpass(float gain, float gain_hf);
-    ALuint filter() const;
-
-private:
-    ALuint m_filter = 0;
-};
-} // namespace Cubed

include/Cubed/audio/audio_loader.hpp

@@ -1,17 +0,0 @@
-#pragma once
-#include "Cubed/audio/audio_data.hpp"
-
-#include <filesystem>
-namespace Cubed {
-
-class AudioLoader {
-public:
-    static AudioData load(const std::filesystem::path& path);
-
-private:
-    static AudioData load_wav(const std::filesystem::path& path);
-    static AudioData load_mp3(const std::filesystem::path& path);
-    static AudioData load_flac(const std::filesystem::path& path);
-    static AudioData load_ogg(const std::filesystem::path& path);
-};
-} // namespace Cubed

include/Cubed/audio/audio_source.hpp

@@ -1,50 +0,0 @@
-#pragma once
-#include "Cubed/audio/audio_buffer.hpp"
-#include "Cubed/audio/audio_effect_slot.hpp"
-#include "Cubed/audio/audio_filter.hpp"
-
-#include <AL/al.h>
-#include <glm/glm.hpp>
-namespace Cubed {
-
-enum class AudioState { INITIAL, PLAYING, PAUSED, STOPPED };
-
-class AudioSource {
-public:
-    AudioSource(float volume = 1.0f);
-    ~AudioSource();
-
-    void set_buffer_2d(const AudioBuffer& buffer);
-    void set_buffer_3d(const AudioBuffer& buffer, const glm::vec3& vec3);
-    void set_loop(bool on = true);
-    void set_volume(float volume);
-    void set_pitch(float pitch);
-    void play();
-    void play_2d(const AudioBuffer& buffer);
-    void play_3d(const AudioBuffer& buffer, const glm::vec3& pos);
-
-    void stop();
-    void pause();
-    float duration() const;
-    float current_time() const;
-    float target_volume() const;
-    float& target_volume();
-    void set_target_volume(float volume);
-    AudioState state() const;
-
-    void mark_in_use();
-    bool in_use() const;
-    void reset();
-
-    void set_filter(const AudioFilter& filter);
-    void clear_filter();
-    void set_effect_slot(const AudioEffectSlot& slot);
-    void clear_effect_slot();
-
-private:
-    ALuint m_source = 0;
-    float m_target_volume = 1.0f;
-    float m_duration = 0.0f;
-    bool m_using;
-};
-} // namespace Cubed

include/Cubed/audio/sound_manager.hpp

@@ -1,19 +0,0 @@
-#pragma once
-#include "Cubed/audio/audio_buffer.hpp"
-
-#include <string>
-#include <unordered_map>
-namespace Cubed {
-class SoundManager {
-public:
-    SoundManager();
-    ~SoundManager();
-    const AudioBuffer& load(const std::string& name);
-    const AudioBuffer& get_buffer(const std::string& name);
-    void init();
-    void clear();
-
-private:
-    std::unordered_map<std::string, AudioBuffer> m_buffers;
-};
-} // namespace Cubed

include/Cubed/audio/source_pool.hpp

@@ -1,23 +0,0 @@
-#pragma once
-#include "Cubed/audio/audio_source.hpp"
-
-namespace Cubed {
-class SourcePool {
-private:
-    std::vector<AudioSource> m_sources;
-
-public:
-    explicit SourcePool(size_t size);
-    ~SourcePool();
-    SourcePool(const SourcePool&) = delete;
-    SourcePool(SourcePool&&) = delete;
-    SourcePool& operator=(const SourcePool&) = delete;
-    SourcePool& operator=(SourcePool&&) = delete;
-
-    void update();
-    AudioSource* acquire();
-
-    std::vector<AudioSource>& sources();
-};
-
-} // namespace Cubed

include/Cubed/camera.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Cubed/input/event.hpp"
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 #include <glm/glm.hpp>
@@ -13,24 +12,11 @@ class ClientPlayer;
 
 class Camera {
 private:
-    enum class Perspective {
-        FIRST_PERSON,
-        THIRD_PERSON_BACK,
-        THIRD_PERSON_FRONT,
-    };
-
     bool m_firse_mouse = true;
     ClientPlayer* m_player;
     float m_last_mouse_x, m_last_mouse_y;
     glm::vec3 m_camera_pos;
     bool m_under_water = false;
-    Perspective m_perspective = Perspective::FIRST_PERSON;
-    glm::vec3 m_front;
-    glm::vec3 camera_collision(glm::vec3 start, glm::vec3 end,
-                               float radius = 0.2f);
-
-    bool handle_key_event(const KeyEvent& e);
-    bool handle_mouse_move_event(const MouseMoveEvent& e);
 
 public:
     Camera();
@@ -47,9 +33,6 @@ public:
 
     bool is_under_water() const;
     glm::vec3 get_camera_front() const;
-    void change_perspective();
-    bool is_first_person() const;
-    bool handle_event(const Event& e);
 };
 
 } // namespace Cubed

include/Cubed/config.hpp

@@ -1,74 +1,107 @@
 #pragma once
-#include "Cubed/tools/toml.utils.hpp"
+#include "Cubed/tools/cubed_assert.hpp"
+
+#include <toml++/toml.hpp>
 
 namespace Cubed {
 
+template <typename T>
+concept TomlValueType =
+    std::same_as<T, int> || std::same_as<T, bool> || std::same_as<T, double> ||
+    std::same_as<T, const char*> || std::same_as<T, toml::date> ||
+    std::same_as<T, toml::time> || std::same_as<T, toml::date_time> ||
+    std::same_as<T, std::string>;
+
 class Config {
 public:
-    explicit Config(std::string_view path);
-    Config(const Config&) = delete;
-    Config(Config&&) = delete;
-    Config& operator=(const Config&) = delete;
-    Config& operator=(Config&&) = delete;
+    Config();
     ~Config();
 
+    static Config& get();
+
     toml::table& table();
 
-    void load_config();
+    void load_or_create_config();
     void save_to_file();
 
-    template <TOML::TomlValueType T>
-    T get(std::string_view key, T default_value) {
-        if (auto* node = find_node(m_tbl, key)) {
-            if (auto value = node->value<T>())
-                return *value;
+    template <TomlValueType T> T get(std::string_view key) const {
+        size_t cur = 0;
+        auto pos = key.find('.');
+        const toml::table* table = &m_tbl;
+        while (pos != std::string_view::npos) {
+            std::string_view s = key.substr(cur, pos - cur);
+            if (s.empty()) {
+                Logger::error("Empty key/table name in path '{}'", key);
+                ASSERT(false);
+                std::abort();
+            }
+            cur = pos + 1;
+            pos = key.find('.', cur);
+            if (auto* next = (*table)[s].as_table()) {
+                table = next;
+            } else {
+                Logger::error("Can't find table {}", s);
+                ASSERT(false);
+                std::abort();
+            }
         }
-
-        set(key, default_value);
-
-        return default_value;
-    }
-
-    template <TOML::TomlValueType T> void set(std::string_view key, T&& value) {
-        auto pos = key.rfind('.');
-
-        toml::table* table;
-        std::string_view name;
-
-        if (pos == std::string_view::npos) {
-            table = &m_tbl;
-            name = key;
+        std::string_view n_key = key.substr(cur);
+        if (n_key.empty()) {
+            Logger::error("Trailing dot in path '{}'", key);
+            ASSERT(false);
+            std::abort();
+        }
+        auto opt = (*table)[n_key].value<T>();
+        if (opt) {
+            return *opt;
         } else {
-            table = find_or_create_table(key.substr(0, pos));
-            name = key.substr(pos + 1);
+            Logger::error("Can't find key {}", n_key);
+            ASSERT(false);
+            std::abort();
         }
-        // Insert node at the last level's table
-        table->insert_or_assign(name, std::forward<T>(value));
     }
-
+    template <typename T> void set(std::string_view key, T&& val) {
+        if constexpr (!TomlValueType<std::decay_t<T>>) {
+            static_assert(false, "Type Not Support");
+        }
+        size_t cur = 0;
+        auto pos = key.find('.');
+        toml::table* table = &m_tbl;
+        while (pos != std::string_view::npos) {
+            std::string_view s = key.substr(cur, pos - cur);
+            if (s.empty()) {
+                Logger::error("Empty key/table name in path '{}'", key);
+                ASSERT(false);
+                std::abort();
+            }
+            cur = pos + 1;
+            pos = key.find('.', cur);
+            if (auto* next = (*table)[s].as_table()) {
+                table = next;
+            } else {
+                auto [it, inserted] = table->insert_or_assign(s, toml::table{});
+                table = it->second.as_table();
+            }
+        }
+        std::string_view n_key = key.substr(cur);
+        if (n_key.empty()) {
+            Logger::error("Trailing dot in path '{}'", key);
+            ASSERT(false);
+            std::abort();
+        }
+        table->insert_or_assign(n_key, std::forward<T>(val));
+    }
     template <typename T> void set_and_save(std::string_view key, T&& val) {
         set(key, std::forward(val));
         save_to_file();
     }
+    toml::node_view<toml::node> val_view(std::string_view key);
 
 private:
     toml::table m_tbl;
-    const std::string CONGIF_PATH;
-    const toml::node* find_node(const toml::table& root,
-                                std::string_view path) const;
-    // Follow the path to find the last-level toml::table, creating it if it
-    // does not exist
-    toml::table* find_or_create_table(std::string_view path);
+    constexpr static inline std::string_view CONGIF_PATH =
+        ASSETS_PATH "config.toml";
+    void create_config();
 };
 
-template <>
-inline float Config::get(std::string_view key, float default_value) {
-    return static_cast<float>(
-        Config::get<double>(key, static_cast<double>(default_value)));
-}
-
-template <> inline void Config::set(std::string_view key, float&& value) {
-    Config::set<double>(key, static_cast<double>(value));
-}
-
 } // namespace Cubed

include/Cubed/debug_collector.hpp

@@ -1,8 +1,6 @@
 #pragma once
 
-#include "Cubed/ui/column_layout.hpp"
-#include "Cubed/ui/label.hpp"
-#include "Cubed/ui/widget.hpp"
+#include "Cubed/ui/text.hpp"
 
 #include <unordered_map>
 
@@ -13,14 +11,14 @@ public:
     static DebugCollector& get();
     DebugCollector();
 
-    void report(const std::string& name, std::string_view content);
-    void init(int width, int height);
-    Widget& get_widget();
-    bool handle_event(const Event& e);
+    std::unordered_map<std::size_t, Text>& all_texts();
+
+    Text& text(std::string_view name);
+    void report(std::string_view name, std::string_view content);
+    void init_text();
 
 private:
-    ColumnLayout m_widget;
-    std::unordered_map<std::string, Label*> m_component;
+    std::unordered_map<std::size_t, Text> m_texts;
 };
 
 } // namespace Cubed

include/Cubed/dev_panel.hpp

@@ -1,14 +1,11 @@
 #pragma once
 
-#include "Cubed/config.hpp"
-
 #include <toml++/toml.hpp>
 
 namespace Cubed {
 
-class WorldScene;
-class ClientPlayer;
 class App;
+class ClientPlayer;
 class DevPanel {
     struct ConfigView {
         float fov = 70.0f;
@@ -23,27 +20,27 @@ class DevPanel {
         bool is_enable_aniso = false;
         bool is_support_aniso = true;
         bool is_reload = true;
-        float volume_music = 1.0f;
-        float volume_sfx = 1.0f;
     };
     struct PlayerProfile {
         int game_mode = 0;
         int gait = 0;
         float pos[3] = {0.0f, 0.0f, 0.0f};
     };
+    struct TextEditing {
+        bool perlin_seed = false;
+    };
 
 public:
-    DevPanel(WorldScene& app);
+    DevPanel(App& app);
     void init();
     void render();
 
 private:
     App& m_app;
-    WorldScene& m_world_scene;
-    Config& m_config;
-    ConfigView m_config_view;
+    ConfigView m_config;
     ClientPlayer* m_player;
     PlayerProfile m_player_profile;
+    TextEditing m_text_editing;
     bool m_need_save_config = false;
     bool m_gen_thread_running = true;
     int m_theme = 0;
@@ -53,6 +50,7 @@ private:
     int m_samples_idx = 1;
     int m_threads = 1;
     int m_chunk_style = 0;
+    void show_about_table_bar();
     void show_biome_table_bar();
     void show_time_table_bar();
     void show_cave_table_bar();
@@ -60,8 +58,6 @@ private:
     void show_chunk_table_bar();
     void show_settings_tab_item();
     void show_world_tab_item();
-    void show_server_world_table_bar();
-    void show_client_world_table_bar();
     void show_player_tab_item();
     void show_items_tab_item();
     void show_shader_tab_item();

include/Cubed/gameplay/chunk_generator.hpp

@@ -18,7 +18,6 @@ public:
     ChunkGenerator(ServerChunk& chunk);
 
     static void init();
-    static void init(unsigned seed);
     static void reload();
     static const unsigned& seed();
     static void seed(unsigned s);

include/Cubed/gameplay/client_chunk.hpp

@@ -51,7 +51,6 @@ public:
     const std::vector<BlockType>& get_chunk_blocks() const;
     void receive_chunk(const ChunkDataRsp& data);
     void gen_vertex_data(const OptionalBlockVectorArray& neighbor_block);
-    // Can only be called on the render thread
     void upload_to_gpu();
 
     GLuint get_normal_vao() const;
@@ -76,7 +75,6 @@ public:
     void need_upload();
 
     void set_chunk_block(int index, unsigned id);
-    BlockType get_chunk_block(int index);
     bool is_temp_chunk() const;
     ChunkPos chunk_pos() const;
     BiomeType biome() const;
@@ -84,7 +82,6 @@ public:
     std::vector<BlockType>& blocks();
     ClientWorld& world();
     unsigned seed() const;
-    const ChunkRenderSnapshot* get_render_snapshot() const;
 
 private:
     struct FaceKey {
@@ -120,9 +117,6 @@ private:
     4 - water
     */
     std::vector<VertexData> m_vertex_data;
-
-    ChunkRenderSnapshot m_render_snapshot;
-
     unsigned m_seed = 0;
     void clear_dirty();
     void gen_vertices(const OptionalBlockVectorArray& neighbor_block);

include/Cubed/gameplay/client_player.hpp

@@ -4,51 +4,34 @@
 #include "Cubed/gameplay/block.hpp"
 #include "Cubed/gameplay/chunk_pos.hpp"
 #include "Cubed/gameplay/game_mode.hpp"
-#include "Cubed/gameplay/game_time.hpp"
-#include "Cubed/gameplay/player.hpp"
-#include "Cubed/input/event.hpp"
-#include "Cubed/input/input.hpp"
+#include "Cubed/input.hpp"
 
-#include <absl/container/flat_hash_set.h>
 #include <glm/glm.hpp>
 #include <optional>
 #include <shared_mutex>
 namespace Cubed {
-
+enum class Gait { WALK = 0, RUN };
 class ClientWorld;
 class ClientPlayer {
 public:
-    static constexpr float WALK_SOUND_INTERVAL = 0.45f;
-    static constexpr float RUN_SOUND_INTERVAL = 0.3f;
-    using ChunkPosSet = absl::flat_hash_set<ChunkPos, ChunkPos::Hash>;
     ClientPlayer(ClientWorld& world);
     ~ClientPlayer();
-
-    bool handle_mouse_button_event(const MouseButtonEvent& e);
-    bool handle_key_event(const KeyEvent& e);
-    bool handle_mouse_wheel_event(const MouseWheelEvent& e);
-
-    void update_front_vec(float offset_x, float offset_y);
-    bool update_player_move_state(Key key, KeyAction action);
-    bool update_scroll(float yoffset);
-
-    void update_chunk_set(const ChunkPosSet& set);
-    const ChunkPosSet& get_chunk_pos_set() const;
-    ChunkPosSet get_chunk_pos_set();
-
-    static AABB get_aabb(const glm::vec3& pos);
+    AABB get_aabb(const glm::vec3& pos) const;
     const glm::vec3& get_front() const;
-    Gait get_gait() const;
+    const Gait& get_gait() const;
     const std::optional<LookBlock>& get_look_block_pos() const;
     // thread safe
     glm::vec3 get_player_pos() const;
     const MoveState& get_move_state() const;
 
     void change_mode(GameMode mode);
-    void reload_config();
+    void hot_reload();
     void set_player_pos(const glm::vec3& pos);
     void set_place_block(unsigned id);
     void update(float delta_time);
+    void update_front_vec(float offset_x, float offset_y);
+    void update_player_move_state(int key, int action);
+    void update_scroll(double yoffset);
 
     float& max_walk_speed();
     float& max_run_speed();
@@ -58,29 +41,18 @@ public:
     float& g();
     float& fly_y_speed();
 
-    unsigned get_current_block() const;
+    unsigned place_block() const;
 
-    void set_gait(Gait gait);
+    Gait& gait();
     GameMode& game_mode();
 
-    ClientWorld& get_world();
+    const ClientWorld& get_world() const;
 
     void set_uuid(std::string_view uuid);
-    std::string get_uuid() const;
+    const std::string& get_uuid() const;
     const std::string& get_name() const;
-    void reset_key_status();
-    void init(std::string_view name);
 
-    float yaw() const;
-    float pitch() const;
-    float& angle();
-    float& walk_time();
-    bool ray_cast(const glm::vec3& start, const glm::vec3& dir,
-                  glm::ivec3& block_pos, glm::vec3& normal,
-                  float distance = 4.0f);
-    bool is_underwater() const;
-    void set_underwater(bool u);
-    void place_block(float dt);
+    void init(std::string_view name);
 
 private:
     using enum GameMode;
@@ -90,10 +62,9 @@ private:
     float m_deceleration = DEFAULT_DECELERATION;
     float m_g = DEFAULT_G;
     constexpr static float MAX_SPACE_ON_TIME = 0.3f;
-    constexpr static float PLACE_BLOCK_INTERVAL = 0.2f;
-    float m_place_time = PLACE_BLOCK_INTERVAL;
-    std::atomic<float> m_yaw = 0.0f;
-    std::atomic<float> m_pitch = 0.0f;
+
+    float m_yaw = 0.0f;
+    float m_pitch = 0.0f;
 
     float m_sensitivity = 0.15f;
 
@@ -110,10 +81,6 @@ private:
 
     unsigned m_place_block = 1;
 
-    bool m_moving = false;
-    bool m_sprinting = false;
-    bool m_underwater = false;
-
     glm::vec3 direction = glm::vec3(0.0f, 0.0f, 0.0f);
     glm::vec3 move_distance{0.0f, 0.0f, 0.0f};
     // player is tow block tall, the pos is the lower pos
@@ -123,39 +90,28 @@ private:
 
     glm::vec3 m_front{0, 0, -1};
     glm::vec3 m_right{0, 0, 0};
-    static constexpr glm::vec3 M_SIZE{0.6f, 1.8f, 0.6f};
+    glm::vec3 m_size{0.6f, 1.8f, 0.6f};
 
-    std::atomic<Gait> m_gait = Gait::STOP;
+    Gait m_gait = Gait::WALK;
     MoveState m_move_state{};
-    MouseState m_mouse_state{};
     GameMode m_game_mode = CREATIVE;
     std::optional<LookBlock> m_look_block = std::nullopt;
     std::string m_name{};
-    mutable std::shared_mutex m_uuid_mutex;
     std::string m_uuid;
     ClientWorld& m_world;
 
-    float m_angle{0.0f};
-    float m_walk_time{0.0f};
-
-    std::unordered_map<std::string, Timer> m_timers;
-
     mutable std::shared_mutex m_player_pos_mutex;
-    mutable std::shared_mutex m_chunk_pos_mutex;
-    ChunkPosSet m_player_chunk_pos_set;
+
+    bool ray_cast(const glm::vec3& start, const glm::vec3& dir,
+                  glm::ivec3& block_pos, glm::vec3& normal,
+                  float distance = 4.0f);
 
     void update_direction();
     void update_lookup_block();
-
     void update_move(float delta_time);
-
     void update_x_move(glm::vec3& player_pos);
     void update_y_move(glm::vec3& player_pos);
     void update_z_move(glm::vec3& player_pos);
-
     void update_player_chunk();
-
-    void play_walk_sound(float dt);
-    Gait compute_gait() const;
 };
 } // namespace Cubed

include/Cubed/gameplay/client_world.hpp

@@ -1,68 +1,43 @@
 #pragma once
-#include "Cubed/audio/audio_engine.hpp"
-#include "Cubed/config.hpp"
 #include "Cubed/gameplay/block.hpp"
 #include "Cubed/gameplay/chunk_pos.hpp"
 #include "Cubed/gameplay/client_chunk.hpp"
 #include "Cubed/gameplay/client_player.hpp"
 #include "Cubed/gameplay/game_time.hpp"
 #include "Cubed/gameplay/network_client.hpp"
-#include "Cubed/input/event.hpp"
-#include "Cubed/tools/cubed_random.hpp"
-#include "Cubed/tools/priority_thread_pool.hpp"
+#include "Cubed/tools/thread_pool.hpp"
 
-#include <absl/container/flat_hash_set.h>
 #include <deque>
-#include <tbb/concurrent_hash_map.h>
-#include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 namespace Cubed {
 
-struct PlayerInfo {
+struct OtherPlayerInfo {
     std::string name;
-    std::string uuid;
-    glm::vec3 render_pos;
-    glm::vec3 target_pos;
-    float render_yaw;
-    float yaw;
-    float render_pitch;
-    float pitch;
-    Gait gait;
-    float angle = 0.0f;
-    float walk_time = 0.0f;
-    float moving_time = 0.0f;
+    glm::vec3 pos;
 };
 
-struct PlayerRenderData {
+struct RenderPlayerData {
     std::string name;
-    std::string uuid;
-    glm::vec3 render_pos;
-    float yaw;
-    float pitch;
-    Gait gait;
-    float angle;
+    glm::vec3 pos;
 };
-class WorldScene;
+
 class ClientWorld {
 public:
-    ClientWorld(AudioEngine& auido, Config& config, WorldScene& scene);
+    ClientWorld();
     ~ClientWorld();
     void init(std::string_view player_name,
               std::shared_ptr<NetworkClient> client);
     void update(float delta_time);
-    bool handle_event(const Event& e);
-    const std::optional<LookBlock>& get_look_block_pos() const;
+    const std::optional<LookBlock>&
+    get_look_block_pos(const std::string& name) const;
     ClientPlayer& get_player();
-    const ClientPlayer& get_player() const;
     int get_block(const glm::ivec3& block_pos) const;
     bool is_solid(const glm::ivec3& block_pos) const;
     bool can_pass_block(const glm::ivec3& block_pos) const;
     BlockType get_block_tpye(const glm::ivec3& block_pos) const;
 
-    void rebuild_world();
-
-    void push_delete_vbo(std::unique_ptr<VertexBuffer>& vbo);
-    void push_delete_vao(std::unique_ptr<VertexArray>& vao);
+    void push_delete_vbo(GLuint vbo);
+    void push_delete_vao(GLuint vao);
     // void hot_reload();
 
     // void rebuild_world();
@@ -70,111 +45,75 @@ public:
     void receive_block_change(const BlockChangeRsp& rsp);
     void receive_time(const UpdateTime& rsp);
 
-    void receive_remote_player(const PlayerInfoRsp& rsp);
+    void receive_other_player(const PlayerInfoRsp& rsp);
     void receive_player_logout(const LogoutRsp& rsp);
-    void receive_player_water_sound(const PlayerWaterSound& rsp);
-    void send_player_water_sound(bool underwater, const glm::vec3& pos);
     int rendering_distance() const;
     void rendering_distance(int rendering_distance);
-    int get_chunk_task_id() const;
     void start_client_thread(std::string_view uuid);
     void stop_client_thread();
 
     void start_thread_pool();
     void stop_thread_pool();
     void change_pool_threads(int threads);
-    void reload_config(bool chunk_build = true);
+    void hot_reload();
     void request_chunk();
-    void reset_key_status();
     std::vector<glm::vec4>& planes();
-    const std::vector<const ChunkRenderSnapshot*>& render_snapshots() const;
-    const std::vector<PlayerRenderData>& render_player_data() const;
-    std::vector<PlayerRenderData>& render_player_data();
-
+    const std::vector<ChunkRenderSnapshot>& render_snapshots() const;
+    const std::vector<RenderPlayerData>& render_player_data() const;
     glm::vec3 sunlight_dir() const;
-    bool sphere_collide_world(glm::vec3 center, float radius) const;
-    void receive_chunk(std::vector<uint8_t> data, PacketHeader header);
-    void request_exit();
-    bool is_receive_exit();
-    int chunk_size() const;
-    static AABB get_block_aabb(const glm::ivec3& pos);
-    AudioEngine& get_audio();
-    Config& get_config();
-    WorldScene& world_scene();
+    void receive_chunk(const ChunkDataRsp& data);
+    void exit();
     template <typename Fn>
-    void register_ticktimer(std::string_view id, TickType threshold, Fn&& f) {
-        m_ticktimers.emplace(
-            std::piecewise_construct, std::forward_as_tuple(std::string(id)),
-            std::forward_as_tuple(threshold, std::forward<Fn>(f)));
+    void register_timer(std::string_view id, TickType threshold, Fn&& f) {
+        m_timers.emplace(std::piecewise_construct,
+                         std::forward_as_tuple(std::string(id)),
+                         std::forward_as_tuple(threshold, std::forward<Fn>(f)));
     }
 
 private:
-    std::atomic<bool> m_is_pending_delete_queue_free{false};
-    std::mutex m_delete_vbo_mutex;
-    std::mutex m_delete_vao_mutex;
-    std::vector<std::unique_ptr<VertexBuffer>> m_pending_delete_vbo;
-    std::vector<std::unique_ptr<VertexArray>> m_pending_delete_vao;
-
     enum class ChunkLoadStyle { RANDOM, CENTER };
     using ChunkHashMap =
-        tbb::concurrent_hash_map<ChunkPos, std::shared_ptr<ClientChunk>,
-                                 ChunkPos::TBBHash>;
-    using ChunkPosSet = absl::flat_hash_set<ChunkPos, ChunkPos::Hash>;
+        tbb::concurrent_unordered_map<ChunkPos, ClientChunk, ChunkPos::Hash>;
+    using ChunkPosSet = std::unordered_set<ChunkPos, ChunkPos::Hash>;
     using ChunkPosVector = std::vector<ChunkPos>;
-    using OtherPlayerHashMap = std::unordered_map<std::string, PlayerInfo>;
-    using chunk_acc = ChunkHashMap::accessor;
-    using chunk_cacc = ChunkHashMap::const_accessor;
-
-    struct PendingSound {
-        std::string sound;
-        glm::vec3 sound_pos;
-    };
-
-    static constexpr int WORLD_EXIT_TIMEOUT = 200;
-    static constexpr int MAX_UPLOAD_CHUNK_SUM = 16;
+    using OtherPlayerHashMap = std::unordered_map<std::string, OtherPlayerInfo>;
     ClientPlayer m_player;
-    OtherPlayerHashMap m_player_info;
+    OtherPlayerHashMap m_other_players;
     ChunkHashMap m_chunks;
-    AudioEngine& m_audio;
-    Config& m_config;
-    WorldScene& m_world_scene;
     std::vector<glm::vec4> m_planes;
     std::jthread m_client_thread;
 
-    mutable std::shared_mutex m_player_info_mutex;
+    mutable std::shared_mutex m_chunks_mutex;
+    std::mutex m_delete_vbo_mutex;
+    std::mutex m_delete_vao_mutex;
+    std::mutex m_pending_upload_queue_mutex;
+    std::mutex m_other_players_mutex;
 
-    tbb::concurrent_queue<std::unique_ptr<ClientChunk>> m_pending_upload_queue;
-    tbb::concurrent_queue<ChunkPos> m_dirty_chunk_queue;
-    tbb::concurrent_queue<PendingSound> m_pending_sound;
+    std::deque<ClientChunk> m_pending_upload_queue;
+
+    std::vector<GLuint> m_pending_delete_vbo;
+    std::vector<GLuint> m_pending_delete_vao;
 
     std::deque<ChunkPos> m_dirty_queue;
-    std::vector<const ChunkRenderSnapshot*> m_render_snapshots;
-    std::vector<PlayerRenderData> m_render_player_data;
-
-    tbb::concurrent_unordered_map<std::string, TickTimer> m_ticktimers;
-    std::unordered_map<std::string, Timer> m_timers;
-
+    std::vector<ChunkRenderSnapshot> m_render_snapshots;
+    std::vector<RenderPlayerData> m_render_player_data;
+    tbb::concurrent_unordered_map<std::string, Timer> m_timers;
     std::atomic<bool> m_game_running{false};
-    std::atomic<bool> m_receive_exit{false};
     std::atomic<int> m_rendering_distance{24};
     std::atomic<TickType> m_game_ticks{0};
     std::atomic<TickType> m_day_tick{6000};
     std::atomic<bool> m_requesting_chunk{false};
-    std::atomic<bool> m_is_rebuilding{false};
-    std::atomic<int> m_chunk_task_id{0};
     std::shared_ptr<NetworkClient> m_client;
     ChunkLoadStyle m_chunk_load_style{ChunkLoadStyle::CENTER};
 
-    std::atomic<std::shared_ptr<PriorityThreadPool>> m_thread_pool;
-
-    Random m_random;
+    std::atomic<std::shared_ptr<ThreadPool>> m_thread_pool;
 
     void client_run(std::stop_token token);
 
-    void report_player_info();
+    void set_player_pos();
+
+    void report_player_pos();
 
     void set_block(const glm::ivec3& pos, unsigned id);
-
-    void update_chunk(const ChunkPosSet& old, const ChunkPosSet& now);
 };
 } // namespace Cubed

include/Cubed/gameplay/game_time.hpp

@@ -6,9 +6,7 @@
 #include <functional>
 #include <utility>
 namespace Cubed {
-
 using TickType = long long;
-using TimeType = float;
 
 constexpr int DEFAULT_PER_TICK_TIME = 50;
 
@@ -16,10 +14,10 @@ constexpr TickType DAY_TIME = 24000;
 
 constexpr TickType PER_HOUR = 1000;
 
-class TickTimer {
+class Timer {
 public:
     template <typename Fn>
-    TickTimer(TickType threshold, Fn&& f)
+    Timer(TickType threshold, Fn&& f)
         : m_fn(std::forward<Fn>(f)), m_threshold(threshold) {
         ASSERT_MSG(threshold > 0, "Threshold Must Rreater Than 0");
     }
@@ -39,37 +37,4 @@ private:
     TickType m_current = 0;
 };
 
-class Timer {
-public:
-    template <typename Fn>
-    Timer(TimeType threshold, Fn&& f)
-        : m_fn(std::forward<Fn>(f)), m_threshold(threshold) {
-        ASSERT_MSG(threshold > 0, "Threshold Must Rreater Than 0");
-    }
-    bool update(TimeType dt) {
-        m_current += dt;
-
-        bool triggered = false;
-
-        while (m_current >= m_threshold) {
-            m_current -= m_threshold;
-            m_fn();
-            triggered = true;
-        }
-
-        return triggered;
-    }
-    void reset() { m_current = 0.0f; }
-    void set_threshold(TimeType threshold) {
-
-        ASSERT_MSG(threshold > 0, "Threshold must be greater than 0");
-        m_threshold = threshold;
-    }
-
-private:
-    std::function<void()> m_fn;
-    TimeType m_threshold;
-    TimeType m_current = 0;
-};
-
 } // namespace Cubed

include/Cubed/gameplay/network_client.hpp

@@ -3,7 +3,6 @@
 #include "Cubed/gameplay/packet.hpp"
 
 #include <asio.hpp>
-#include <queue>
 #include <string>
 #include <thread>
 namespace Cubed {
@@ -15,56 +14,29 @@ public:
     ~NetworkClient();
     void close();
     void stop();
-    void send(Packet packet, int priority = 10);
+    void send(Packet packet);
     void start(std::string ip, int port = 25530);
     bool is_connected() const;
     bool is_connect_error() const;
-    std::string get_error_string() const;
-    void clear_error();
 
 private:
-    struct Task {
-        int priority = 10;
-        std::uint64_t sequence = 0;
-        Packet packet;
-        Task(int p, std::uint64_t seq, Packet pac)
-            : priority(p), sequence(seq), packet(std::move(pac)) {}
-    };
-
-    struct TaskCompare {
-        bool operator()(const Task& a, const Task& b) const {
-
-            if (a.priority != b.priority) {
-                return a.priority > b.priority;
-            }
-
-            return a.sequence > b.sequence;
-        }
-    };
-
     asio::io_context m_io;
 
     std::thread m_net_thread;
     static constexpr uint32_t MAX_PACKET_SIZE = 4 * 1024 * 1024;
     tcp::socket m_socket;
     std::vector<char> m_read_buffer;
-
-    std::priority_queue<Task, std::vector<Task>, TaskCompare> m_write_queue;
-
+    std::deque<Packet> m_write_queue;
     asio::strand<asio::io_context::executor_type> m_strand;
-    std::atomic<bool> m_closed{false};
-    std::atomic<bool> m_connected{false};
-    std::atomic<bool> m_connect_error{false};
-    mutable std::mutex m_error_string_mutex;
-    std::string m_error_string;
-    // ClientWorld is managed by App
-    ClientWorld& m_world;
-    std::atomic_uint64_t m_sequence{0};
-
     asio::awaitable<void> connect(std::string ip, int port);
     asio::awaitable<void> read_loop();
 
+    std::atomic<bool> m_closed{false};
+    std::atomic<bool> m_connected{false};
+    std::atomic<bool> m_connect_error{false};
+    // ClientWorld is managed by App
+    ClientWorld& m_world;
+
     void do_write();
-    void set_error(std::string_view error);
 };
 } // namespace Cubed

include/Cubed/gameplay/network_server.hpp

@@ -1,5 +1,4 @@
 #pragma once
-#include "Cubed/config.hpp"
 #include "Cubed/gameplay/server_world.hpp"
 #include "Cubed/gameplay/session.hpp"
 
@@ -9,19 +8,17 @@ namespace Cubed {
 
 class NetworkServer {
 public:
-    explicit NetworkServer();
+    NetworkServer(int port = 25530);
     ~NetworkServer();
     void stop();
 
     // Run in another thread after initialization is complete
-    void start_server(int port);
-    void start_server();
+    void start_server(int port = 25530);
+
     int port() const;
     ServerWorld& server_world();
 
 private:
-    Config m_config;
-
     asio::io_context m_io;
     std::thread m_net_thread;
     int m_port = 25530;

include/Cubed/gameplay/packet.hpp

@@ -6,14 +6,7 @@
 #include <cstdint>
 #include <cstring>
 #include <memory>
-#ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <winsock2.h>
-#else
 #include <netinet/in.h>
-#endif
 #include <span>
 #include <stdexcept>
 #include <type_traits>
@@ -30,10 +23,11 @@ enum class CompressType : uint16_t {
 
 inline CompressType get_compress_type(uint16_t id) {
     using enum CompressType;
+    constexpr auto& to = std::to_underlying<CompressType>;
     switch (id) {
-    case std::to_underlying(NONE):
+    case to(NONE):
         return NONE;
-    case std::to_underlying(ZSTD):
+    case to(ZSTD):
         return ZSTD;
     }
     throw std::runtime_error(std::format("Unknown CompressType {}", id));
@@ -52,74 +46,56 @@ enum class PacketEnum : uint16_t {
     LOGOUT_REQ = 1003,
     LOGOUT_RSP = 1004,
     PLAYER_INFO = 2001,
-    C2S_PLAYER_INFO = 2002,
+    PLAYER_POS = 2002,
     PLAYER_INFO_RSP = 2003,
-    PLAYER_WATER_SOUND = 2004,
     CHUNK_DATA_REQ = 3001,
     CHUNK_DATA_RSP = 3002,
     BLOCK_CHANGE_REQ = 3003,
     BLOCK_CHANGE_RSP = 3004,
-    S2C_CLEAR_ALL_CHUNKS = 3005,
-    UPDATE_TIME = 3006,
+    UPDATE_TIME = 3005,
     PING = 9001,
     PONG = 9002
 
 };
 
 template <typename> struct always_false : std::false_type {}; // NOLINT
-
 template <typename T> constexpr uint16_t get_packet_id() {
-    static_assert(always_false<T>::value, "Unknown Type");
-    return 0;
-}
+    using enum PacketEnum;
+    using std::is_same_v;
 
-template <> constexpr uint16_t get_packet_id<LoginReq>() {
-    return std::to_underlying(PacketEnum::LOGIN_REQ);
-}
-template <> constexpr uint16_t get_packet_id<LoginRsp>() {
-    return std::to_underlying(PacketEnum::LOGIN_RSP);
-}
-template <> constexpr uint16_t get_packet_id<LogoutReq>() {
-    return std::to_underlying(PacketEnum::LOGOUT_REQ);
-}
-template <> constexpr uint16_t get_packet_id<LogoutRsp>() {
-    return std::to_underlying(PacketEnum::LOGOUT_RSP);
-}
-template <> constexpr uint16_t get_packet_id<PlayerInfo>() {
-    return std::to_underlying(PacketEnum::PLAYER_INFO);
-}
-template <> constexpr uint16_t get_packet_id<C2S_PlayerInfo>() {
-    return std::to_underlying(PacketEnum::C2S_PLAYER_INFO);
-}
-template <> constexpr uint16_t get_packet_id<PlayerInfoRsp>() {
-    return std::to_underlying(PacketEnum::PLAYER_INFO_RSP);
-}
-template <> constexpr uint16_t get_packet_id<ChunkDataReq>() {
-    return std::to_underlying(PacketEnum::CHUNK_DATA_REQ);
-}
-template <> constexpr uint16_t get_packet_id<ChunkDataRsp>() {
-    return std::to_underlying(PacketEnum::CHUNK_DATA_RSP);
-}
-template <> constexpr uint16_t get_packet_id<BlockChangeReq>() {
-    return std::to_underlying(PacketEnum::BLOCK_CHANGE_REQ);
-}
-template <> constexpr uint16_t get_packet_id<BlockChangeRsp>() {
-    return std::to_underlying(PacketEnum::BLOCK_CHANGE_RSP);
-}
-template <> constexpr uint16_t get_packet_id<S2C_ClearAllChunks>() {
-    return std::to_underlying(PacketEnum::S2C_CLEAR_ALL_CHUNKS);
-}
-template <> constexpr uint16_t get_packet_id<UpdateTime>() {
-    return std::to_underlying(PacketEnum::UPDATE_TIME);
-}
-template <> constexpr uint16_t get_packet_id<Ping>() {
-    return std::to_underlying(PacketEnum::PING);
-}
-template <> constexpr uint16_t get_packet_id<Pong>() {
-    return std::to_underlying(PacketEnum::PONG);
-}
-template <> constexpr uint16_t get_packet_id<PlayerWaterSound>() {
-    return std::to_underlying(PacketEnum::PLAYER_WATER_SOUND);
+    using U = std::decay_t<T>;
+    constexpr auto& to_num = std::to_underlying<PacketEnum>;
+    if constexpr (is_same_v<U, LoginReq>) {
+        return to_num(LOGIN_REQ);
+    } else if constexpr (is_same_v<U, LoginRsp>) {
+        return to_num(LOGIN_RSP);
+    } else if constexpr (is_same_v<U, LogoutReq>) {
+        return to_num(LOGOUT_REQ);
+    } else if constexpr (is_same_v<U, LogoutRsp>) {
+        return to_num(LOGOUT_RSP);
+    } else if constexpr (is_same_v<U, PlayerInfo>) {
+        return to_num(PLAYER_INFO);
+    } else if constexpr (is_same_v<U, PlayerPos>) {
+        return to_num(PLAYER_POS);
+    } else if constexpr (is_same_v<U, PlayerInfoRsp>) {
+        return to_num(PLAYER_INFO_RSP);
+    } else if constexpr (is_same_v<U, ChunkDataReq>) {
+        return to_num(CHUNK_DATA_REQ);
+    } else if constexpr (is_same_v<U, ChunkDataRsp>) {
+        return to_num(CHUNK_DATA_RSP);
+    } else if constexpr (is_same_v<U, BlockChangeReq>) {
+        return to_num(BLOCK_CHANGE_REQ);
+    } else if constexpr (is_same_v<U, BlockChangeRsp>) {
+        return to_num(BLOCK_CHANGE_RSP);
+    } else if constexpr (is_same_v<U, UpdateTime>) {
+        return to_num(UPDATE_TIME);
+    } else if constexpr (is_same_v<U, Ping>) {
+        return to_num(PING);
+    } else if constexpr (is_same_v<U, Pong>) {
+        return to_num(PONG);
+    } else {
+        static_assert(always_false<U>::value, "Unknown Type");
+    }
 }
 
 template <typename T>

include/Cubed/gameplay/player.hpp

@@ -1,21 +0,0 @@
-#pragma once
-#include <stdexcept>
-#include <utility>
-namespace Cubed {
-enum class Gait { STOP = 0, WALK = 1, RUN = 2 };
-constexpr int get_gait_id(Gait gait) { return std::to_underlying(gait); }
-
-inline Gait get_gait_from_id(int id) {
-    switch (id) {
-    case std::to_underlying(Gait::STOP):
-        return Gait::STOP;
-    case std::to_underlying(Gait::WALK):
-        return Gait::WALK;
-    case std::to_underlying(Gait::RUN):
-        return Gait::RUN;
-    default:
-        throw std::runtime_error("Unknown Gait");
-    }
-}
-
-} // namespace Cubed

include/Cubed/gameplay/pre_remove_chunk.hpp

@@ -0,0 +1,171 @@
+#pragma once
+
+#include "Cubed/gameplay/biome.hpp"
+#include "Cubed/gameplay/block.hpp"
+#include "Cubed/gameplay/chunk_generator.hpp"
+#include "Cubed/gameplay/chunk_pos.hpp"
+#include "Cubed/gameplay/vertex_data.hpp"
+
+#include <atomic>
+#include <mutex>
+namespace Cubed {
+
+struct ChunkInfo {
+    ChunkPos pos{0, 0};
+    unsigned seed{0};
+    BiomeType biome{BiomeType::NONE};
+    unsigned first_random{0};
+    bool has_cave_start{false};
+    bool has_cave{false};
+};
+
+class World;
+// if want to use, do init_chunk(), gen_vertex_data() and
+class Chunk {
+private:
+    using OptionalBlockVectorArray =
+        std::array<std::optional<std::vector<BlockType>>, 4>;
+
+    struct FaceKey {
+        BlockType block_id = 0;
+        int face = -1; // 0-5, used to index NORMALS/TANGENTS/TEX_COORDS
+
+        bool valid() const { return block_id != 0; }
+        bool operator==(const FaceKey& o) const {
+            return block_id == o.block_id && face == o.face;
+        }
+        bool operator!=(const FaceKey& o) const { return !(*this == o); }
+    };
+
+    static constexpr int SIZE_X = CHUNK_SIZE;
+    static constexpr int SIZE_Y = WORLD_SIZE_Y;
+    static constexpr int SIZE_Z = CHUNK_SIZE;
+    static constexpr int VERTEX_DATA_SUM = 5;
+    std::atomic<bool> m_dirty{false};
+    std::atomic<bool> m_need_upload{true};
+    std::atomic<bool> m_is_on_gen_vertex_data{false};
+    std::atomic<bool> m_gening{false};
+    std::atomic<bool> m_temp_chunk{false};
+
+    bool m_has_cave{false};
+
+    std::atomic<BiomeType> m_biome = BiomeType::PLAIN;
+    std::mutex m_vertexs_data_mutex;
+
+    std::unique_ptr<ChunkGenerator> m_generator;
+
+    ChunkPos m_chunk_pos;
+    World& m_world;
+    HeightMapArray m_heightmap;
+    // the index is a array of block id
+    std::vector<BlockType> m_blocks;
+
+    /*
+    0 - normal
+    1 - cross_plane
+    2 - normal_discard
+    3 - transparent and blend
+    4 - water
+    */
+    std::vector<VertexData> m_vertex_data;
+    float frequency = 0.01f;
+    float height = 80;
+    unsigned m_seed = 0;
+
+    BiomeConditions m_conditions;
+    ChunkInfo m_info;
+    void clear_dirty();
+    void gen_vertices(const OptionalBlockVectorArray& neighbor_block);
+    void gen_cross_plane_vertices(int world_x, int world_y, int world_z,
+                                  BlockType id);
+    void emit_quad(int axis, int face_dir, int layer, int i, int j, int w,
+                   int h, int u_axis, int v_axis, FaceKey key);
+
+public:
+    Chunk(World& world, ChunkPos chunk_pos, bool temp_chunk = false);
+    ~Chunk();
+    Chunk(const Chunk&) = delete;
+    Chunk& operator=(const Chunk&) = delete;
+    Chunk(Chunk&&) noexcept;
+    Chunk& operator=(Chunk&&) noexcept;
+
+    static std::tuple<int, int, int> world_to_block(int world_x, int world_y,
+                                                    int world_z, int chunk_x,
+                                                    int chunk_z);
+    static std::tuple<int, int, int> world_to_block(const glm::ivec3& block_pos,
+                                                    ChunkPos chunk_pos);
+    static std::tuple<int, int, int> block_to_world(int x, int y, int z,
+                                                    int chunk_x, int chunk_z);
+    static std::tuple<int, int, int> block_to_world(const glm::ivec3& block_pos,
+                                                    ChunkPos chunk_pos);
+    BiomeType get_biome() const;
+    ChunkPos get_chunk_pos() const;
+    const std::vector<BlockType>& get_chunk_blocks() const;
+    HeightMapArray get_heightmap() const;
+    static int index(int x, int y, int z);
+    static int index(const glm::vec3& pos);
+    // Init Chunk
+    // Determine biome from temperature and humidity noise
+    void gen_phase_one();
+    // Resolve biome adjacency conflicts with neighbor chunks
+    void gen_phase_two(const std::array<const Chunk*, 8>& adj_chunks);
+    // Generate heightmap using biome-specific noise
+    void gen_phase_three();
+    // Blend heightmap with neighbors for smooth transitions
+    void gen_phase_four(
+        const std::array<std::optional<HeightMapArray>, 8>& neighbor_heightmap,
+        const std::array<BiomeType, 8>& neighbor_biome);
+    // Generate terrain blocks from heightmap and biome
+    void gen_phase_five();
+    // Blend surface blocks at chunk borders with neighbors
+    void gen_phase_six(const std::array<std::optional<std::vector<BlockType>>,
+                                        4>& neighbor_block);
+    // Generate biome-specific vegetation/structures
+    void gen_phase_seven();
+    // void gen_vertex_data();
+    //  0 : (1, 0)
+    //  1 : (-1, 0)
+    //  2 : (0, 1)
+    //  3 : (0, -1)
+    void gen_vertex_data(const OptionalBlockVectorArray& neighbor_block);
+    void upload_to_gpu();
+
+    GLuint get_normal_vao() const;
+    size_t get_normal_vertices_sum() const;
+
+    GLuint get_cross_vao() const;
+    size_t get_cross_vertices_sum() const;
+
+    GLuint get_normal_discard_vao() const;
+    size_t get_normal_discard_vertices_sum() const;
+
+    GLuint get_normal_blend_vao() const;
+    size_t get_normal_blend_vertices_sum() const;
+
+    GLuint get_water_vao() const;
+    size_t get_water_vertices_sum() const;
+
+    bool is_dirty() const;
+    void mark_dirty();
+
+    bool is_need_upload() const;
+    void need_upload();
+
+    void set_chunk_block(int index, unsigned id);
+    // ensure thread safe!
+    void gen_chunk();
+
+    bool is_temp_chunk() const;
+    ChunkPos chunk_pos() const;
+    BiomeType biome() const;
+    void biome(BiomeType b);
+    HeightMapArray& heightmap();
+    std::vector<BlockType>& blocks();
+    World& world();
+    unsigned seed() const;
+    BiomeConditions& conditions();
+    ChunkInfo get_info() const;
+    bool& has_cave();
+};
+
+} // namespace Cubed

include/Cubed/gameplay/pre_remove_player.hpp

@@ -0,0 +1,112 @@
+#pragma once
+#include "Cubed/AABB.hpp"
+#include "Cubed/constants.hpp"
+#include "Cubed/gameplay/block.hpp"
+#include "Cubed/gameplay/chunk_pos.hpp"
+#include "Cubed/gameplay/game_mode.hpp"
+#include "Cubed/input.hpp"
+
+#include <glm/glm.hpp>
+#include <optional>
+#include <string>
+
+namespace Cubed {
+
+enum class Gait { WALK = 0, RUN };
+
+class World;
+
+class Player {
+private:
+    using enum GameMode;
+    float m_max_walk_speed = DEFAULT_MAX_WALK_SPEED;
+    float m_max_run_speed = DEFAULT_MAX_RUN_SPEED;
+    float m_acceleration = DEFAULT_ACCELERATION;
+    float m_deceleration = DEFAULT_DECELERATION;
+    float m_g = DEFAULT_G;
+
+    constexpr static float MAX_SPACE_ON_TIME = 0.3f;
+
+    float m_yaw = 0.0f;
+    float m_pitch = 0.0f;
+
+    float m_sensitivity = 0.15f;
+
+    float m_max_speed = m_max_walk_speed;
+    float m_y_speed = 0.0f;
+    float m_fly_y_speed = 7.5f;
+    bool can_up = true;
+
+    float space_on_time = 0.0f;
+    bool space_on = false;
+    bool is_fly = false;
+
+    float m_xz_speed = 0.0f;
+
+    unsigned m_place_block = 1;
+
+    glm::vec3 direction = glm::vec3(0.0f, 0.0f, 0.0f);
+    glm::vec3 move_distance{0.0f, 0.0f, 0.0f};
+    // player is tow block tall, the pos is the lower pos
+
+    glm::vec3 m_player_pos{0.0f, 255.0f, 0.0f};
+    ChunkPos m_player_chunk_pos{0, 0};
+
+    glm::vec3 m_front{0, 0, -1};
+    glm::vec3 m_right{0, 0, 0};
+    glm::vec3 m_size{0.6f, 1.8f, 0.6f};
+
+    Gait m_gait = Gait::WALK;
+    MoveState m_move_state{};
+    GameMode m_game_mode = CREATIVE;
+    std::optional<LookBlock> m_look_block = std::nullopt;
+    std::string m_name{};
+    World& m_world;
+
+    bool ray_cast(const glm::vec3& start, const glm::vec3& dir,
+                  glm::ivec3& block_pos, glm::vec3& normal,
+                  float distance = 4.0f);
+
+    void check_player_chunk_transition();
+    void update_direction();
+    void update_lookup_block();
+    void update_move(float delta_time);
+    void update_x_move();
+    void update_y_move();
+    void update_z_move();
+
+public:
+    Player(World& world, const std::string& name);
+    ~Player();
+    AABB get_aabb() const;
+    const glm::vec3& get_front() const;
+    const Gait& get_gait() const;
+    const std::optional<LookBlock>& get_look_block_pos() const;
+    const glm::vec3& get_player_pos() const;
+    const MoveState& get_move_state() const;
+
+    void change_mode(GameMode mode);
+    void hot_reload();
+    void set_player_pos(const glm::vec3& pos);
+    void set_place_block(unsigned id);
+    void update(float delta_time);
+    void update_front_vec(float offset_x, float offset_y);
+    void update_player_move_state(int key, int action);
+    void update_scroll(double yoffset);
+
+    float& max_walk_speed();
+    float& max_run_speed();
+    float& max_speed();
+    float& acceleration();
+    float& deceleration();
+    float& g();
+    float& fly_y_speed();
+
+    unsigned place_block() const;
+
+    Gait& gait();
+    GameMode& game_mode();
+    const World& get_world() const;
+};
+
+} // namespace Cubed

include/Cubed/gameplay/pre_remove_world.hpp

@@ -0,0 +1,173 @@
+#pragma once
+#include "Cubed/AABB.hpp"
+#include "Cubed/gameplay/cave_carver.hpp"
+#include "Cubed/gameplay/chunk.hpp"
+#include "Cubed/gameplay/game_time.hpp"
+#include "Cubed/gameplay/river_worm.hpp"
+#include "Cubed/tools/thread_pool.hpp"
+
+#include <atomic>
+#include <condition_variable>
+#include <mutex>
+#include <optional>
+#include <shared_mutex>
+#include <thread>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace Cubed {
+
+struct ChunkRenderSnapshot {
+    GLuint normal_vao;
+    size_t normal_vertices_count;
+    GLuint cross_vao;
+    size_t cross_vertices_count;
+    GLuint normal_discard_vao;
+    size_t normal_discard_vertices_count;
+    GLuint normal_blend_vao;
+    size_t normal_blend_vertices_count;
+    GLuint water_vao;
+    size_t water_vertices_count;
+    glm::vec3 center;
+    glm::vec3 half_extents;
+};
+
+class Player;
+class TextureManager;
+class World {
+private:
+    enum class ChunkLoadStyle { RANDOM, CENTER };
+
+    struct PendingChunk {
+        Chunk chunk;
+        std::future<void> future;
+    };
+
+    using OptionalBlockVectorArray =
+        std::array<std::optional<std::vector<BlockType>>, 4>;
+    using ChunkPtrUpdateList = std::vector<std::pair<ChunkPos, Chunk*>>;
+    using ChunkPairVector = std::vector<std::pair<ChunkPos, Chunk>>;
+    using ChunkPairQueue = std::queue<std::pair<ChunkPos, Chunk>>;
+    using ConstChunkMap =
+        std::unordered_map<ChunkPos, const Chunk*, ChunkPos::Hash>;
+    using ChunkPosSet = std::unordered_set<ChunkPos, ChunkPos::Hash>;
+    using ChunkHashMap = std::unordered_map<ChunkPos, Chunk, ChunkPos::Hash>;
+    using PendingChunkHashMap =
+        std::unordered_map<ChunkPos, PendingChunk, ChunkPos::Hash>;
+    glm::vec3 m_gen_player_pos{0.0f, 0.0f, 0.0f};
+    ChunkHashMap m_chunks;
+    std::unordered_map<std::size_t, Player> m_players;
+    std::vector<glm::vec4> m_planes;
+
+    std::thread m_gen_thread;
+    std::thread m_server_thread;
+    std::atomic<std::shared_ptr<ThreadPool>> m_gen_thread_pool;
+    std::stop_source m_server_stop_source;
+
+    std::atomic<int> m_per_tick_time = DEFAULT_PER_TICK_TIME; // ms
+
+    std::atomic<TickType> m_day_tick = 6000;
+
+    mutable std::shared_mutex m_chunks_mutex;
+    std::mutex m_gen_signal_mutex;
+    std::mutex m_new_chunk_mutex;
+    std::mutex m_delete_vbo_mutex;
+    std::mutex m_delete_vao_mutex;
+    std::mutex m_gen_player_pos_mutex;
+    std::vector<GLuint> m_pending_delete_vbo;
+    std::vector<GLuint> m_pending_delete_vao;
+    std::condition_variable m_gen_cv;
+    std::atomic<bool> m_gen_running{false};
+    std::atomic<bool> m_need_gen_chunk{false};
+    std::atomic<bool> m_is_rebuilding{false};
+    std::atomic<bool> m_chunk_gen_finished{false};
+    std::atomic<bool> m_could_gen{true};
+    std::atomic<bool> m_tick_running{true};
+    std::atomic<int> m_rendering_distance{24};
+    std::atomic<int> m_pool_threads{0};
+    std::atomic<int> m_max_threads{1};
+    std::atomic<TickType> m_game_ticks{0};
+    std::atomic<ChunkLoadStyle> m_chunk_load_style{ChunkLoadStyle::RANDOM};
+    std::vector<ChunkPos> m_dirty_queue;
+    std::vector<ChunkRenderSnapshot> m_render_snapshots;
+    std::vector<std::pair<ChunkPos, Chunk>> m_new_finished_chunk;
+    // Can only be used in the gen thread
+    PendingChunkHashMap new_chunks;
+
+    CaveCarver m_cave_carcer;
+    RiverWorm m_river_worm;
+    void init_chunks();
+
+    void gen_chunks_internal();
+    void sync_player_pos(glm::vec3& player_pos);
+    void compute_required_chunks(ChunkPosSet& required_chunks);
+    void sync_and_collect_missing_chunks(std::vector<ChunkPos>&,
+                                         const ChunkPosSet&);
+
+    void submit_new_chunks();
+    void poll_finished_chunks();
+    void wait_all_chunk_tasks();
+
+public:
+    World();
+    ~World();
+
+    bool can_move(const AABB& player_box) const;
+    // const BlockRenderData& get_block_render_data(int x, int y ,int z);
+
+    const std::optional<LookBlock>&
+    get_look_block_pos(const std::string& name) const;
+    // const Chunk* get_chunk(const ChunkPos& pos) const;
+
+    Player& get_player(const std::string& name);
+    void init_world();
+    int get_block(const glm::ivec3& block_pos) const;
+    bool is_solid(const glm::ivec3& block_pos) const;
+    bool can_pass_block(const glm::ivec3& block_pos) const;
+    BlockType get_block_tpye(const glm::ivec3& block_pos) const;
+    static ChunkPos get_chunk_pos(int world_x, int world_z);
+
+    void need_gen();
+
+    void set_block(const glm::ivec3& pos, unsigned id);
+    void update(float delta_time);
+
+    void push_delete_vbo(GLuint vbo);
+    void push_delete_vao(GLuint vao);
+    void hot_reload();
+
+    void rebuild_world();
+
+    int rendering_distance() const;
+    void rendering_distance(int rendering_distance);
+    void start_gen_thread();
+    void start_server_thread();
+    void stop_gen_thread();
+    void stop_server_thread();
+    void stop_thread_pool();
+    void start_thread_pool();
+    void serever_run(std::stop_token stoken);
+
+    CaveCarver& cave_carcer();
+    RiverWorm& river_worm();
+    std::vector<glm::vec4>& planes();
+    std::vector<ChunkRenderSnapshot>& render_snapshots();
+
+    glm::vec3 sunlight_dir() const;
+    TickType game_tick() const;
+    TickType day_tick() const;
+    void day_tick(TickType tick);
+    int per_tick_time() const;
+    void per_tick_time(int ms);
+
+    bool is_tick_running() const;
+    void tick_running(bool run);
+    int pool_threads() const;
+    int max_threads() const;
+    void change_pool_threads(int threads);
+    int chunk_load_style() const;
+    void set_chunk_load_style(int id);
+    ChunkInfo get_chunk_info(const glm::vec3& world_pos) const;
+};
+
+} // namespace Cubed

include/Cubed/gameplay/server_chunk.hpp

@@ -93,5 +93,4 @@ private:
     // Generate biome-specific vegetation/structures
     void gen_phase_five();
 };
-
 } // namespace Cubed

include/Cubed/gameplay/server_player.hpp

@@ -1,30 +1,20 @@
 #pragma once
 #include "Cubed/gameplay/chunk_pos.hpp"
 #include "Cubed/gameplay/game_time.hpp"
-#include "Cubed/gameplay/player.hpp"
 
-#include <absl/container/flat_hash_set.h>
 #include <atomic>
 #include <glm/glm.hpp>
 #include <memory>
-#include <shared_mutex>
 #include <string>
 #include <string_view>
 namespace Cubed {
 class ServerWorld;
 class Session;
 class ServerPlayer {
-
 public:
-    using ChunkPosSet = absl::flat_hash_set<ChunkPos, ChunkPos::Hash>;
-    ServerPlayer(const ServerPlayer&) = delete;
-    ServerPlayer(ServerPlayer&&) = delete;
-    ServerPlayer& operator=(const ServerPlayer&) = delete;
-    ServerPlayer& operator=(ServerPlayer&&) = delete;
     ServerPlayer(std::string_view name, std::string_view uuid,
                  ServerWorld& m_world, std::shared_ptr<Session> session,
                  TickType gametick);
-
     const glm::vec3& get_pos() const;
     const std::string& get_name() const;
     const std::string& get_uuid() const;
@@ -32,20 +22,6 @@ public:
     void update_pos(float x, float y, float z);
     void update_sync_gametick(TickType gametick);
     bool is_disconnect(TickType current_gametick) const;
-    int task_id() const;
-    void task_id(int id);
-    bool has_player(ChunkPos pos) const;
-    void update_chunk_set(const ChunkPosSet& set);
-    const ChunkPosSet& get_chunk_pos_set() const;
-    ChunkPosSet& get_chunk_pos_set();
-
-    void set_yaw(float yaw);
-    void set_pitch(float pitch);
-    float yaw() const;
-    float pitch() const;
-
-    Gait gait() const;
-    void set_gait(Gait gait);
 
 private:
     static constexpr TickType TIMEOUT = 200;
@@ -54,13 +30,7 @@ private:
     glm::vec3 m_pos{0.0f};
     ServerWorld& m_world;
     ChunkPos m_last_chunk_pos{0, 0};
-    std::atomic<std::shared_ptr<Session>> m_session;
+    std::shared_ptr<Session> m_session;
     std::atomic<TickType> m_last_gametick{0};
-    std::atomic<int> m_chunk_task_id{0};
-    std::atomic<float> m_yaw{0.0f};
-    std::atomic<float> m_pitch{0.0f};
-    std::atomic<Gait> m_gait;
-    mutable std::shared_mutex m_chunk_pos_mutex;
-    ChunkPosSet m_player_chunk_pos_set;
 };
 } // namespace Cubed

include/Cubed/gameplay/server_world.hpp

@@ -1,40 +1,36 @@
 #pragma once
 
-#include "Cubed/config.hpp"
 #include "Cubed/gameplay/cave_carver.hpp"
 #include "Cubed/gameplay/chunk_pos.hpp"
 #include "Cubed/gameplay/game_time.hpp"
-#include "Cubed/gameplay/packet.hpp" // IWYU pragma: keep
 #include "Cubed/gameplay/river_worm.hpp"
 #include "Cubed/gameplay/server_chunk.hpp"
 #include "Cubed/gameplay/server_player.hpp"
-#include "Cubed/tools/priority_thread_pool.hpp"
-#include "Cubed/tools/recent_queue.hpp"
 #include "Cubed/tools/thread_pool.hpp"
 #include "world/block_change.pb.h"
 
-#include <absl/container/flat_hash_set.h>
+#include <future>
 #include <shared_mutex>
 #include <tbb/concurrent_hash_map.h>
-#include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <unordered_map>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 namespace Cubed {
 class Session;
 class ServerWorld {
 public:
-    enum class ThreadPoolKind { NET, GEN };
-    ServerWorld(Config& config);
+    ServerWorld();
     ~ServerWorld();
-    void stop();
+    void player_join(std::string_view name, std::string_view uuid);
     void handle_player_exit(const std::string& uuid);
     void init_world();
-    void need_gen(std::string uuid);
+    void need_gen(std::optional<std::string> uuid);
     void update();
     void hot_reload();
 
+    void rebuild_world();
     int rendering_distance() const;
     void rendering_distance(int rendering_distance);
     void start_gen_thread();
@@ -61,26 +57,22 @@ public:
     bool is_tick_running() const;
     void tick_running(bool run);
 
-    int gen_pool_threads() const;
+    int pool_threads() const;
     int max_threads() const;
-
-    void change_pool_threads(ThreadPoolKind kind, int threads);
+    void change_pool_threads(int threads);
 
     int chunk_load_style() const;
     void set_chunk_load_style(int id);
 
     bool set_block(const glm::ivec3& block_pos, unsigned id);
 
-    void sync_player_pos(const C2S_PlayerInfo& rsp);
-    void sync_player_water_sound(const PlayerWaterSound& rsp);
+    void sync_player_pos(const std::string& uuid, float x, float y, float z);
     void handle_player_login(const std::string& player_name,
                              std::shared_ptr<Session> session);
     glm::vec3 get_player_pos(const std::string& uuid) const;
 
-    void handle_chunk_req(int task_id, const std::string& uuid, ChunkPos pos);
+    void handle_chunk_req(const std::string& uuid, ChunkPos pos);
     void handle_block_change(const BlockChangeReq& req);
-
-    int chunk_size() const;
     template <typename Fn>
     void register_timer(std::string_view id, TickType threshold, Fn&& f) {
         m_timers.emplace(std::piecewise_construct,
@@ -89,42 +81,25 @@ public:
     }
 
 private:
-    enum class ChunkState { NONE, GENERATING, READY, PENDING_DELETE };
-    struct ChunkEntity {
-        ChunkState state;
-        std::shared_ptr<ServerChunk> chunk;
-        uint32_t ref_count = 0;
-    };
-
     enum class ChunkLoadStyle { RANDOM, CENTER };
-    struct PendingRequest {
-        std::string uuid;
-        int task_id;
-        ChunkPos pos;
-    };
     struct PendingChunk {
-        ChunkPos pos;
-        std::unique_ptr<ServerChunk> chunk;
+        ServerChunk chunk;
+        std::future<void> future;
     };
-
     using ChunkHashMap =
-        tbb::concurrent_hash_map<ChunkPos, ChunkEntity, ChunkPos::TBBHash>;
+        tbb::concurrent_unordered_map<ChunkPos, ServerChunk, ChunkPos::Hash>;
     using PlayerHashMap = std::unordered_map<std::string, ServerPlayer>;
-    using NewChunkVector = std::vector<PendingChunk>;
-    using ChunkPosSet = absl::flat_hash_set<ChunkPos, ChunkPos::Hash>;
+    using PendingChunkHashMap =
+        std::unordered_map<ChunkPos, PendingChunk, ChunkPos::Hash>;
+    using ChunkPosSet = std::unordered_set<ChunkPos, ChunkPos::Hash>;
     using PlayerUUIDMap = tbb::concurrent_hash_map<std::string, std::string>;
-
-    using chunk_acc = ChunkHashMap::accessor;
-    using chunk_caac = ChunkHashMap::const_accessor;
-
     using uuid_acc = PlayerUUIDMap::accessor;
     using uuid_cacc = PlayerUUIDMap::const_accessor;
-
-    Config& m_config;
-
     // key = uuid
     PlayerHashMap m_players;
     ChunkHashMap m_chunks;
+    PendingChunkHashMap m_new_chunks;
+    std::vector<std::pair<ChunkPos, ServerChunk>> m_new_finished_chunk;
 
     CaveCarver m_cave_carcer;
     RiverWorm m_river_worm;
@@ -136,58 +111,43 @@ private:
     std::atomic<bool> m_could_gen{true};
     std::atomic<bool> m_gen_running{false};
     std::atomic<bool> m_need_gen_chunk{false};
+    std::atomic<bool> m_is_rebuilding{false};
     std::atomic<bool> m_init{false};
-    std::atomic<bool> m_stopped{false};
     std::atomic<int> m_rendering_distance{24};
-    std::atomic<int> m_gen_pool_threads{0};
-    std::atomic<int> m_net_pool_threads{0};
+    std::atomic<int> m_pool_threads{0};
     std::atomic<int> m_max_threads{1};
-    std::atomic<size_t> m_player_sum{0};
+
     std::atomic<TickType> m_game_ticks{0};
     std::atomic<TickType> m_day_tick{6000};
     std::atomic<bool> m_tick_running{true};
     std::atomic<int> m_per_tick_time = DEFAULT_PER_TICK_TIME; // ms
 
+    mutable std::shared_mutex m_chunks_mutex;
+    std::shared_mutex m_new_chunk_mutex;
     mutable std::shared_mutex m_player_mutex;
     std::mutex m_need_gen_queue_mutex;
     std::condition_variable_any m_gen_cv;
 
-    RecentQueue<std::string> m_need_gen_queue;
+    std::deque<std::string> m_need_gen_queue;
 
-    std::atomic<std::shared_ptr<PriorityThreadPool>> m_gen_thread_pool;
-    std::atomic<std::shared_ptr<ThreadPool>> m_net_thread_pool;
+    std::atomic<std::shared_ptr<ThreadPool>> m_gen_thread_pool;
 
     std::atomic<ChunkLoadStyle> m_chunk_load_style{ChunkLoadStyle::CENTER};
 
     PlayerUUIDMap m_uuid_to_name;
-
-    tbb::concurrent_unordered_map<std::string, TickTimer> m_timers;
-    tbb::concurrent_queue<PendingRequest> m_waiting_chunk_requests;
-    tbb::concurrent_queue<std::unique_ptr<ServerChunk>> m_finished_queue;
-
+    tbb::concurrent_unordered_map<std::string, Timer> m_timers;
     void init_chunks();
 
-    void gen_chunks_internal(const std::string& uuid);
+    void gen_chunks_internal(std::optional<std::string> uuid);
 
     void compute_required_chunks(ChunkPosSet& required_chunks,
                                  const std::optional<std::string>& uuid);
     void sync_and_collect_missing_chunks(std::vector<ChunkPos>&,
                                          const ChunkPosSet&);
-    void submit_new_chunks(const std::string& uuid, NewChunkVector& new_chunks);
-    // void wait_all_chunk_tasks();
-
-    void update_ref_count(const ChunkPosSet& old, const ChunkPosSet& now);
+    void submit_new_chunks(const std::optional<std::string>& uuid);
+    void poll_finished_chunks();
+    void wait_all_chunk_tasks();
 
     void send_time();
-
-    void send_chunk(int task_id, const std::string& uuid, ChunkPos pos);
-
-    int
-    change_pool_threads(std::atomic<std::shared_ptr<ThreadPool>>& thread_pool,
-                        int threads);
-    int change_pool_threads(
-        std::atomic<std::shared_ptr<PriorityThreadPool>>& thread_pool,
-        int threads);
-    void send_server_stop();
 };
 } // namespace Cubed

include/Cubed/gameplay/session.hpp

@@ -3,8 +3,8 @@
 #include "Cubed/gameplay/packet.hpp"
 
 #include <asio.hpp>
+#include <deque>
 #include <memory>
-#include <queue>
 #include <string>
 namespace Cubed {
 
@@ -17,44 +17,20 @@ public:
             asio::io_context& io);
     ~Session();
     void start();
-    void send(Packet packet, int priority = 10);
-
+    void send(Packet packet);
     void close();
     const std::string& uuid() const;
 
 private:
-    struct Task {
-        int priority = 10;
-        std::uint64_t sequence = 0;
-        Packet packet;
-        Task(int p, std::uint64_t seq, Packet pac)
-            : priority(p), sequence(seq), packet(std::move(pac)) {}
-    };
-
-    struct TaskCompare {
-        bool operator()(const Task& a, const Task& b) const {
-
-            if (a.priority != b.priority) {
-                return a.priority > b.priority;
-            }
-
-            return a.sequence > b.sequence;
-        }
-    };
-
     static constexpr uint32_t MAX_PACKET_SIZE = 4 * 1024 * 1024;
     tcp::socket m_socket;
     std::vector<char> m_read_buffer;
-    std::priority_queue<Task, std::vector<Task>, TaskCompare> m_write_queue;
+    std::deque<Packet> m_write_queue;
     asio::strand<asio::io_context::executor_type> m_strand;
     std::string m_uuid;
     ServerWorld& m_server_world;
-    std::atomic<bool> m_closed{false};
-
-    std::atomic_uint64_t m_sequence{0};
-
     asio::awaitable<void> read_loop();
-
+    std::atomic<bool> m_closed{false};
     void do_write();
 };
 } // namespace Cubed

include/Cubed/gameplay/vertex_data.hpp

@@ -1,18 +1,15 @@
 #pragma once
 #include "Cubed/primitive_data.hpp"
-#include "Cubed/render/vertex_array.hpp"
-#include "Cubed/render/vertex_buffer.hpp"
 
 #include <atomic>
 #include <glad/glad.h>
-#include <memory>
 #include <vector>
 namespace Cubed {
 class ClientWorld;
 struct VertexData {
     std::vector<Vertex3D> m_vertices;
-    std::unique_ptr<VertexBuffer> m_vbo;
-    std::unique_ptr<VertexArray> m_vao;
+    GLuint m_vbo = 0;
+    GLuint m_vao = 0;
     std::atomic<std::size_t> m_sum{0};
     ClientWorld& m_world;
     VertexData(ClientWorld& world);

include/Cubed/input.hpp

@@ -18,4 +18,19 @@ struct MouseState {
     bool right = false;
 };
 
+struct KeyState {
+    bool r = false;
+};
+
+struct InputState {
+    MoveState move_state;
+    MouseState mouse_state;
+    KeyState key_state;
+};
+
+namespace Input {
+InputState& get_input_state();
+
+}
+
 } // namespace Cubed

include/Cubed/input/event.hpp

@@ -1,61 +0,0 @@
-#pragma once
-
-#include "Cubed/input/key.hpp"
-#include "Cubed/input/mouse.hpp"
-
-#include <string>
-#include <variant>
-
-namespace Cubed {
-
-struct MouseMoveEvent {
-    float xpos;
-    float ypos;
-
-    MouseMoveEvent(float x, float y) : xpos(x), ypos(y) {}
-};
-
-struct MouseButtonEvent {
-    MouseKey key;
-    KeyAction action;
-
-    MouseButtonEvent(MouseKey k, KeyAction a) : key(k), action(a) {}
-};
-
-struct MouseWheelEvent {
-    float offset;
-
-    MouseWheelEvent(float o) : offset(o) {}
-};
-
-struct KeyEvent {
-    Key key;
-    KeyAction action;
-
-    KeyEvent(Key k, KeyAction a) : key(k), action(a) {}
-};
-
-struct TextInputEvent {
-    std::string text;
-
-    TextInputEvent(std::string t) : text(std::move(t)) {}
-};
-
-struct WindowResizeEvent {
-    int width;
-    int height;
-};
-struct FrameBufferResizeEvent {
-    int width;
-    int height;
-};
-using Event =
-    std::variant<MouseMoveEvent, MouseButtonEvent, MouseWheelEvent, KeyEvent,
-                 TextInputEvent, WindowResizeEvent, FrameBufferResizeEvent>;
-
-template <class... T> struct Overloaded : T... {
-    using T::operator()...;
-};
-template <class... T> Overloaded(T...) -> Overloaded<T...>;
-
-} // namespace Cubed

include/Cubed/input/key.hpp

@@ -1,129 +0,0 @@
-#pragma once
-#ifdef DELETE
-#undef DELETE
-#endif
-namespace Cubed {
-enum class Key {
-    // Letter keys
-    A,
-    B,
-    C,
-    D,
-    E,
-    F,
-    G,
-    H,
-    I,
-    J,
-    K,
-    L,
-    M,
-    N,
-    O,
-    P,
-    Q,
-    R,
-    S,
-    T,
-    U,
-    V,
-    W,
-    X,
-    Y,
-    Z,
-
-    // Digit keys (main keyboard area)
-    DIGIT_0,
-    DIGIT_1,
-    DIGIT_2,
-    DIGIT_3,
-    DIGIT_4,
-    DIGIT_5,
-    DIGIT_6,
-    DIGIT_7,
-    DIGIT_8,
-    DIGIT_9,
-
-    // Function keys
-    F1,
-    F2,
-    F3,
-    F4,
-    F5,
-    F6,
-    F7,
-    F8,
-    F9,
-    F10,
-    F11,
-    F12,
-
-    // Control keys
-    BACKSPACE,
-    TAB,
-    ENTER,
-    ESCAPE,
-    SPACE,
-    CAPS_LOCK,
-    NUM_LOCK,
-    SCROLL_LOCK,
-
-    // Modifier keys
-    LEFT_SHIFT,
-    RIGHT_SHIFT,
-    LEFT_CTRL,
-    RIGHT_CTRL,
-    LEFT_ALT,
-    RIGHT_ALT,
-    LEFT_SUPER,
-    RIGHT_SUPER, // Windows / Command 键
-
-    // Navigation keys
-    INSERT,
-    DELETE,
-    HOME,
-    END,
-    PAGE_UP,
-    PAGE_DOWN,
-    LEFT,
-    RIGHT,
-    UP,
-    DOWN,
-
-    // Lock and system keys
-    PRINT_SCREEN,
-    PAUSE,
-
-    // Main keyboard area symbol keys
-    GRAVE_ACCENT,  // `
-    MINUS,         // -
-    EQUALS,        // =
-    LEFT_BRACKET,  // [
-    RIGHT_BRACKET, // ]
-    BACKSLASH,     // \ /
-    SEMICOLON,     // ;
-    APOSTROPHE,    // '
-    COMMA,         // ,
-    PERIOD,        // .
-    SLASH,         // /
-
-    // Numpad area
-    NUMPAD_0,
-    NUMPAD_1,
-    NUMPAD_2,
-    NUMPAD_3,
-    NUMPAD_4,
-    NUMPAD_5,
-    NUMPAD_6,
-    NUMPAD_7,
-    NUMPAD_8,
-    NUMPAD_9,
-    NUMPAD_ADD,      // +
-    NUMPAD_SUBTRACT, // -
-    NUMPAD_MULTIPLY, // *
-    NUMPAD_DIVIDE,   // /
-    NUMPAD_DECIMAL,  // .
-    NUMPAD_ENTER
-};
-enum class KeyAction { PRESS, RELEASE, REPEAT };
-} // namespace Cubed

include/Cubed/input/mouse.hpp

@@ -1,25 +0,0 @@
-#pragma once
-
-namespace Cubed {
-
-enum class MouseKey {
-    LEFT_BUTTON,
-    RIGHT_BUTTON,
-    MIDDLE_BUTTON,
-
-    BACK_BUTTON,    // Side button back
-    FORWARD_BUTTON, // Side button forward
-
-    WHEEL_UP,
-    WHEEL_DOWN,
-    WHEEL_LEFT,
-    WHEEL_RIGHT,
-
-    EXTRA_BUTTON_1, // Additional programmable buttons
-    EXTRA_BUTTON_2,
-    EXTRA_BUTTON_3,
-    EXTRA_BUTTON_4,
-    EXTRA_BUTTON_5
-};
-
-}

include/Cubed/map_table.hpp

@@ -0,0 +1,26 @@
+#pragma once
+// #include <string>
+// #include <unordered_map>
+// #include <vector>
+namespace Cubed {
+
+class MapTable {
+private:
+    /*
+        static inline std::unordered_map<unsigned, std::string> id_to_name_map;
+        static inline std::unordered_map<size_t, unsigned> name_to_id_map;
+        static inline std::vector<std::string> item_id_to_name;
+    */
+public:
+    // please using reference
+    /*
+    static std::string_view get_name_from_id(unsigned id);
+    static unsigned get_id_from_name(const std::string& name);
+
+    static std::string_view item_name(unsigned id);
+    static const std::vector<std::string>& item_map();
+    */
+    static void init_map();
+};
+
+} // namespace Cubed

include/Cubed/primitive_data.hpp

@@ -188,14 +188,13 @@ constexpr float CUBE_VER[24] = {0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0,
 constexpr int OUTLINE_CUBE_INDICES[24] = {0, 1, 1, 2, 2, 3, 3, 0, 4, 5, 5, 6,
                                           6, 7, 7, 4, 0, 4, 1, 5, 2, 6, 3, 7};
 
-constexpr float SQUARE_VERTICES_TOP_LEFT[6][2] = {
-    {0.0f, 0.0f}, // top left
-    {0.0f, 1.0f}, // bottom left
-    {1.0f, 1.0f}, // bottom right
-
-    {1.0f, 1.0f}, // bottom right
-    {1.0f, 0.0f}, // top right
-    {0.0f, 0.0f}  // top left
+constexpr float SQUARE_VERTICES[6][2] = {
+    {-0.5f, -0.5f}, // bottom left
+    {-0.5f, 0.5f},  // top left
+    {0.5f, 0.5f},   // top right
+    {0.5f, 0.5f},   // top right
+    {0.5f, -0.5f},  // bottom right
+    {-0.5f, -0.5f}  // bottom left
 };
 
 constexpr float SQUARE_TEXTURE_POS[6][2] = {

include/Cubed/render/frame_buffer.hpp

@@ -1,46 +0,0 @@
-#pragma once
-#include "Cubed/render/texture.hpp"
-
-#include <glad/glad.h>
-#include <span>
-
-enum class Attachment : GLenum {
-    COLOR_ATTACHMENT0 = GL_COLOR_ATTACHMENT0,
-    COLOR_ATTACHMENT1 = GL_COLOR_ATTACHMENT1,
-    DEPTH_ATTACHMENT = GL_DEPTH_ATTACHMENT
-};
-
-enum class FrameBufferType : GLenum {
-    FRAMEBUFFER = GL_FRAMEBUFFER,
-    READ_FRAMEBUFFER = GL_READ_FRAMEBUFFER,
-    DRAW_FRAMEBUFFER = GL_DRAW_FRAMEBUFFER
-};
-
-namespace Cubed {
-class FrameBuffer {
-public:
-    FrameBuffer();
-    ~FrameBuffer();
-    FrameBuffer(const FrameBuffer&) = delete;
-    FrameBuffer(FrameBuffer&&) noexcept;
-    FrameBuffer& operator=(const FrameBuffer&) = delete;
-    FrameBuffer& operator=(FrameBuffer&&) noexcept;
-
-    void bind(FrameBufferType type = FrameBufferType::FRAMEBUFFER) const;
-    GLuint id() const;
-
-    void attach(Attachment attachment, const Texture& texture,
-                GLint level = 0) const;
-    static void unbind();
-
-    bool check_status() const;
-
-    void draw_buffer(GLenum buf) const;
-    void read_buffer(GLenum src) const;
-    void draw_buffer(GLsizei n, const GLenum* bufs) const;
-    void draw_buffer(std::span<const GLenum> bufs) const;
-
-private:
-    GLuint m_fbo = 0;
-};
-} // namespace Cubed

include/Cubed/render/player_renderer.hpp

@@ -1,34 +0,0 @@
-#pragma once
-#include "Cubed/shader.hpp"
-
-#include <array>
-#include <glad/glad.h>
-
-namespace Cubed {
-class ClientWorld;
-class Renderer;
-class PlayerRenderer {
-public:
-    static constexpr int BODY_PART_NUM = 6;
-    PlayerRenderer(Renderer& renderer);
-    ~PlayerRenderer();
-    void init();
-    void render(const Shader& shader, ClientWorld& world);
-    void shadow_render(const Shader& shader, glm::mat4& light_matrix,
-                       ClientWorld& world);
-
-private:
-    struct PlayerVertex {
-
-        float x = 0.0f, y = 0.0f, z = 0.0f;
-        float s = 0.0f, t = 0.0f;
-        float nx = 0.0f, ny = 0.0f, nz = 0.0f;
-        float tx = 0.0f, ty = 0.0f, tz = 0.0f;
-    };
-    Renderer& m_renderer;
-    std::array<GLuint, BODY_PART_NUM> m_vao;
-    std::array<GLuint, BODY_PART_NUM> m_vbo;
-    bool m_inited{false};
-    std::array<std::vector<PlayerVertex>, BODY_PART_NUM> m_vertices;
-};
-} // namespace Cubed