From b8bbc54c5c920aff1ff1b45a693f50d6d96d61c8 Mon Sep 17 00:00:00 2001 From: untodesu Date: Thu, 11 Sep 2025 15:45:26 +0500 Subject: Revise style: split include groups --- game/client/entity/camera.cc | 4 ++++ game/client/entity/factory.cc | 1 + game/client/entity/interpolation.cc | 1 + game/client/entity/listener.cc | 3 +++ game/client/entity/player_look.cc | 5 +++++ game/client/entity/player_move.cc | 7 +++++++ game/client/entity/sound_emitter.cc | 3 +++ game/client/experiments.cc | 2 ++ game/client/game.cc | 12 ++++++++++++ game/client/gui/background.cc | 1 + game/client/gui/chat.cc | 7 +++++++ game/client/gui/crosshair.cc | 1 + game/client/gui/direct_connection.cc | 2 ++ game/client/gui/hotbar.cc | 4 ++++ game/client/gui/imdraw_ext.hh | 4 ++-- game/client/gui/language.cc | 1 + game/client/gui/main_menu.cc | 3 +++ game/client/gui/metrics.cc | 6 ++++-- game/client/gui/play_menu.cc | 4 ++++ game/client/gui/scoreboard.cc | 1 + game/client/gui/settings.cc | 4 ++++ game/client/gui/splash.cc | 5 +++++ game/client/io/gamepad.cc | 15 +++++++++------ game/client/main.cc | 8 ++++++-- game/client/receive.cc | 3 +++ game/client/resource/sound_effect.cc | 1 + game/client/screenshot.cc | 3 +++ game/client/session.cc | 4 ++++ game/client/sound/sound.cc | 5 +++++ game/client/toggles.cc | 1 + game/client/world/chunk_mesher.cc | 12 ++++++------ game/client/world/chunk_renderer.cc | 3 +++ game/client/world/chunk_visibility.cc | 1 + game/client/world/voxel_anims.cc | 6 ++++-- game/client/world/voxel_atlas.cc | 5 +++-- game/server/game.cc | 4 ++++ game/server/main.cc | 4 ++++ game/server/receive.cc | 1 + game/server/sessions.cc | 4 ++++ game/server/whitelist.cc | 3 +++ game/server/world/overworld.hh | 1 + game/server/world/universe.cc | 6 ++++-- game/server/world/unloader.cc | 1 + game/shared/entity/collision.cc | 1 + game/shared/entity/factory.cc | 1 + game/shared/entity/gravity.cc | 1 + game/shared/entity/stasis.cc | 1 + game/shared/entity/velocity.cc | 1 + game/shared/protocol.cc | 1 + game/shared/world/chunk.hh | 3 ++- 50 files changed, 156 insertions(+), 25 deletions(-) (limited to 'game') diff --git a/game/client/entity/camera.cc b/game/client/entity/camera.cc index e0b4cb5..c17291f 100644 --- a/game/client/entity/camera.cc +++ b/game/client/entity/camera.cc @@ -3,15 +3,19 @@ #include "client/entity/camera.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/angles.hh" #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "client/entity/player_move.hh" + #include "client/gui/settings.hh" #include "client/const.hh" diff --git a/game/client/entity/factory.cc b/game/client/entity/factory.cc index 708dc65..f6f6079 100644 --- a/game/client/entity/factory.cc +++ b/game/client/entity/factory.cc @@ -5,6 +5,7 @@ #include "shared/entity/factory.hh" #include "shared/entity/head.hh" #include "shared/entity/transform.hh" + #include "shared/world/dimension.hh" #include "client/entity/sound_emitter.hh" diff --git a/game/client/entity/interpolation.cc b/game/client/entity/interpolation.cc index 6eb9e65..9eca735 100644 --- a/game/client/entity/interpolation.cc +++ b/game/client/entity/interpolation.cc @@ -6,6 +6,7 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" + #include "shared/world/dimension.hh" #include "shared/coord.hh" diff --git a/game/client/entity/listener.cc b/game/client/entity/listener.cc index 2156571..3b1a35b 100644 --- a/game/client/entity/listener.cc +++ b/game/client/entity/listener.cc @@ -3,12 +3,15 @@ #include "client/entity/listener.hh" #include "core/config/number.hh" + #include "core/math/constexpr.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "client/entity/camera.hh" + #include "client/sound/sound.hh" #include "client/const.hh" diff --git a/game/client/entity/player_look.cc b/game/client/entity/player_look.cc index c633922..715475b 100644 --- a/game/client/entity/player_look.cc +++ b/game/client/entity/player_look.cc @@ -4,16 +4,21 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/angles.hh" #include "shared/entity/head.hh" + #include "shared/world/dimension.hh" #include "client/config/gamepad_axis.hh" #include "client/config/gamepad_button.hh" #include "client/config/keybind.hh" + #include "client/gui/settings.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" diff --git a/game/client/entity/player_move.cc b/game/client/entity/player_move.cc index 4b40efb..fb49754 100644 --- a/game/client/entity/player_move.cc +++ b/game/client/entity/player_move.cc @@ -4,7 +4,9 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/angles.hh" #include "core/math/constexpr.hh" @@ -12,16 +14,21 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "client/config/gamepad_axis.hh" #include "client/config/gamepad_button.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/settings.hh" #include "client/gui/status_lines.hh" + #include "client/io/gamepad.hh" + #include "client/sound/sound.hh" + #include "client/world/voxel_sounds.hh" #include "client/const.hh" diff --git a/game/client/entity/sound_emitter.cc b/game/client/entity/sound_emitter.cc index 7ee5cc1..eeb7294 100644 --- a/game/client/entity/sound_emitter.cc +++ b/game/client/entity/sound_emitter.cc @@ -3,15 +3,18 @@ #include "client/entity/sound_emitter.hh" #include "core/config/number.hh" + #include "core/math/constexpr.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/coord.hh" #include "client/entity/camera.hh" + #include "client/sound/sound.hh" #include "client/globals.hh" diff --git a/game/client/experiments.cc b/game/client/experiments.cc index c9b5e0c..247bce9 100644 --- a/game/client/experiments.cc +++ b/game/client/experiments.cc @@ -11,7 +11,9 @@ #include "client/gui/chat.hh" #include "client/gui/hotbar.hh" #include "client/gui/status_lines.hh" + #include "client/io/glfw.hh" + #include "client/world/player_target.hh" #include "client/globals.hh" diff --git a/game/client/game.cc b/game/client/game.cc index 428e6a3..118ac66 100644 --- a/game/client/game.cc +++ b/game/client/game.cc @@ -5,9 +5,13 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/math/angles.hh" + #include "core/resource/resource.hh" + #include "core/utils/physfs.hh" #include "shared/entity/collision.hh" @@ -17,8 +21,10 @@ #include "shared/entity/stasis.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/game_items.hh" #include "shared/game_voxels.hh" + #include "shared/world/dimension.hh" #include "shared/world/item_registry.hh" #include "shared/world/ray_dda.hh" @@ -28,12 +34,14 @@ #include "shared/protocol.hh" #include "client/config/keybind.hh" + #include "client/entity/camera.hh" #include "client/entity/interpolation.hh" #include "client/entity/listener.hh" #include "client/entity/player_look.hh" #include "client/entity/player_move.hh" #include "client/entity/sound_emitter.hh" + #include "client/gui/background.hh" #include "client/gui/bother.hh" #include "client/gui/chat.hh" @@ -52,10 +60,14 @@ #include "client/gui/splash.hh" #include "client/gui/status_lines.hh" #include "client/gui/window_title.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" + #include "client/sound/sound.hh" + #include "client/world/chunk_mesher.hh" #include "client/world/chunk_renderer.hh" #include "client/world/chunk_visibility.hh" diff --git a/game/client/gui/background.cc b/game/client/gui/background.cc index 0c38283..50fef01 100644 --- a/game/client/gui/background.cc +++ b/game/client/gui/background.cc @@ -3,6 +3,7 @@ #include "client/gui/background.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "client/resource/texture_gui.hh" diff --git a/game/client/gui/chat.cc b/game/client/gui/chat.cc index 855c892..6e4498b 100644 --- a/game/client/gui/chat.cc +++ b/game/client/gui/chat.cc @@ -4,19 +4,26 @@ #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/resource/resource.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/imdraw_ext.hh" #include "client/gui/language.hh" #include "client/gui/settings.hh" + #include "client/io/glfw.hh" + #include "client/resource/sound_effect.hh" + #include "client/sound/sound.hh" #include "client/game.hh" diff --git a/game/client/gui/crosshair.cc b/game/client/gui/crosshair.cc index 729ede9..29b5fe5 100644 --- a/game/client/gui/crosshair.cc +++ b/game/client/gui/crosshair.cc @@ -3,6 +3,7 @@ #include "client/gui/crosshair.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "client/resource/texture_gui.hh" diff --git a/game/client/gui/direct_connection.cc b/game/client/gui/direct_connection.cc index 0290bd3..37372e2 100644 --- a/game/client/gui/direct_connection.cc +++ b/game/client/gui/direct_connection.cc @@ -3,12 +3,14 @@ #include "client/gui/direct_connection.hh" #include "core/config/boolean.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" #include "client/game.hh" diff --git a/game/client/gui/hotbar.cc b/game/client/gui/hotbar.cc index a7c3c62..ca058a3 100644 --- a/game/client/gui/hotbar.cc +++ b/game/client/gui/hotbar.cc @@ -3,14 +3,18 @@ #include "client/gui/hotbar.hh" #include "core/io/config_map.hh" + #include "core/resource/resource.hh" #include "shared/world/item_registry.hh" #include "client/config/keybind.hh" + #include "client/gui/settings.hh" #include "client/gui/status_lines.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" diff --git a/game/client/gui/imdraw_ext.hh b/game/client/gui/imdraw_ext.hh index 35ee37e..664b702 100644 --- a/game/client/gui/imdraw_ext.hh +++ b/game/client/gui/imdraw_ext.hh @@ -4,8 +4,8 @@ namespace gui::imdraw_ext { -void text_shadow( - const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list); +void text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, + ImDrawList* draw_list); void text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list, float font_size); } // namespace gui::imdraw_ext diff --git a/game/client/gui/language.cc b/game/client/gui/language.cc index 3c700a2..f63dd99 100644 --- a/game/client/gui/language.cc +++ b/game/client/gui/language.cc @@ -3,6 +3,7 @@ #include "client/gui/language.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" #include "client/gui/settings.hh" diff --git a/game/client/gui/main_menu.cc b/game/client/gui/main_menu.cc index 5395335..3c68612 100644 --- a/game/client/gui/main_menu.cc +++ b/game/client/gui/main_menu.cc @@ -3,6 +3,7 @@ #include "client/gui/main_menu.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "core/version.hh" @@ -10,7 +11,9 @@ #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" #include "client/gui/window_title.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" diff --git a/game/client/gui/metrics.cc b/game/client/gui/metrics.cc index 234d3b5..57a6319 100644 --- a/game/client/gui/metrics.cc +++ b/game/client/gui/metrics.cc @@ -8,19 +8,21 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/coord.hh" #include "client/entity/camera.hh" + #include "client/gui/imdraw_ext.hh" #include "client/game.hh" #include "client/globals.hh" #include "client/session.hh" -constexpr static ImGuiWindowFlags WINDOW_FLAGS = - ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoNav; +constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs + | ImGuiWindowFlags_NoNav; static std::basic_string r_version; static std::basic_string r_renderer; diff --git a/game/client/gui/play_menu.cc b/game/client/gui/play_menu.cc index dc4ffed..2951bf2 100644 --- a/game/client/gui/play_menu.cc +++ b/game/client/gui/play_menu.cc @@ -3,8 +3,11 @@ #include "client/gui/play_menu.hh" #include "core/config/boolean.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" @@ -12,6 +15,7 @@ #include "client/gui/bother.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" #include "client/game.hh" diff --git a/game/client/gui/scoreboard.cc b/game/client/gui/scoreboard.cc index ad49a69..fabd753 100644 --- a/game/client/gui/scoreboard.cc +++ b/game/client/gui/scoreboard.cc @@ -7,6 +7,7 @@ #include "shared/protocol.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/settings.hh" diff --git a/game/client/gui/settings.cc b/game/client/gui/settings.cc index e8f9bca..693f0d6 100644 --- a/game/client/gui/settings.cc +++ b/game/client/gui/settings.cc @@ -5,14 +5,18 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "client/config/gamepad_axis.hh" #include "client/config/gamepad_button.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" diff --git a/game/client/gui/splash.cc b/game/client/gui/splash.cc index 887e209..440df49 100644 --- a/game/client/gui/splash.cc +++ b/game/client/gui/splash.cc @@ -3,13 +3,18 @@ #include "client/gui/splash.hh" #include "core/io/cmdline.hh" + #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" + #include "core/utils/epoch.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" diff --git a/game/client/io/gamepad.cc b/game/client/io/gamepad.cc index d07ee86..3a71920 100644 --- a/game/client/io/gamepad.cc +++ b/game/client/io/gamepad.cc @@ -68,10 +68,13 @@ static void on_glfw_joystick_event(const io::GlfwJoystickEvent& event) active_gamepad_id = INVALID_GAMEPAD_ID; - for(int i = 0; i < NUM_AXES; io::gamepad::last_state.axes[i++] = 0.0f) - ; - for(int i = 0; i < NUM_BUTTONS; io::gamepad::last_state.buttons[i++] = GLFW_RELEASE) - ; + for(int i = 0; i < NUM_AXES; io::gamepad::last_state.axes[i++] = 0.0f) { + // empty + } + + for(int i = 0; i < NUM_BUTTONS; io::gamepad::last_state.buttons[i++] = GLFW_RELEASE) { + // empty + } spdlog::warn("gamepad: disconnected"); @@ -145,7 +148,7 @@ void io::gamepad::update_late(void) if(glfwGetGamepadState(active_gamepad_id, &io::gamepad::state)) { for(int i = 0; i < NUM_AXES; ++i) { if((math::abs(io::gamepad::state.axes[i]) > GAMEPAD_AXIS_EVENT_THRESHOLD) - && (math::abs(io::gamepad::last_state.axes[i]) <= GAMEPAD_AXIS_EVENT_THRESHOLD)) { + && (math::abs(io::gamepad::last_state.axes[i]) <= GAMEPAD_AXIS_EVENT_THRESHOLD)) { GamepadAxisEvent event; event.action = GLFW_PRESS; event.axis = i; @@ -154,7 +157,7 @@ void io::gamepad::update_late(void) } if((math::abs(io::gamepad::state.axes[i]) <= GAMEPAD_AXIS_EVENT_THRESHOLD) - && (math::abs(io::gamepad::last_state.axes[i]) > GAMEPAD_AXIS_EVENT_THRESHOLD)) { + && (math::abs(io::gamepad::last_state.axes[i]) > GAMEPAD_AXIS_EVENT_THRESHOLD)) { GamepadAxisEvent event; event.action = GLFW_RELEASE; event.axis = i; diff --git a/game/client/main.cc b/game/client/main.cc index d7fcb1e..a1185e2 100644 --- a/game/client/main.cc +++ b/game/client/main.cc @@ -2,8 +2,10 @@ #include "core/io/cmdline.hh" #include "core/io/config_map.hh" + #include "core/resource/image.hh" #include "core/resource/resource.hh" + #include "core/utils/epoch.hh" #include "core/threading.hh" @@ -13,7 +15,9 @@ #include "shared/splash.hh" #include "client/gui/window_title.hh" + #include "client/io/glfw.hh" + #include "client/resource/sound_effect.hh" #include "client/resource/texture_gui.hh" @@ -122,8 +126,8 @@ static void on_glfw_window_focus(GLFWwindow* window, int focused) ImGui_ImplGlfw_WindowFocusCallback(window, focused); } -static void GLAD_API_PTR on_opengl_message( - GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* param) +static void GLAD_API_PTR on_opengl_message(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, + const void* param) { spdlog::info("opengl: {}", reinterpret_cast(message)); } diff --git a/game/client/receive.cc b/game/client/receive.cc index ce7b6ab..a253911 100644 --- a/game/client/receive.cc +++ b/game/client/receive.cc @@ -6,15 +6,18 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/protocol.hh" #include "client/entity/factory.hh" + #include "client/gui/chat.hh" #include "client/gui/gui_screen.hh" #include "client/gui/message_box.hh" #include "client/gui/window_title.hh" + #include "client/sound/sound.hh" #include "client/globals.hh" diff --git a/game/client/resource/sound_effect.cc b/game/client/resource/sound_effect.cc index fad5b18..4fb3e82 100644 --- a/game/client/resource/sound_effect.cc +++ b/game/client/resource/sound_effect.cc @@ -3,6 +3,7 @@ #include "client/resource/sound_effect.hh" #include "core/resource/resource.hh" + #include "core/utils/physfs.hh" #include "client/globals.hh" diff --git a/game/client/screenshot.cc b/game/client/screenshot.cc index 08d8521..9b573ef 100644 --- a/game/client/screenshot.cc +++ b/game/client/screenshot.cc @@ -3,12 +3,15 @@ #include "client/screenshot.hh" #include "core/io/config_map.hh" + #include "core/utils/epoch.hh" #include "client/config/keybind.hh" + #include "client/gui/chat.hh" #include "client/gui/language.hh" #include "client/gui/settings.hh" + #include "client/io/glfw.hh" #include "client/globals.hh" diff --git a/game/client/session.cc b/game/client/session.cc index 5826b02..96bd28a 100644 --- a/game/client/session.cc +++ b/game/client/session.cc @@ -3,12 +3,14 @@ #include "client/session.hh" #include "core/config/string.hh" + #include "core/math/crc64.hh" #include "shared/entity/head.hh" #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/world/item_registry.hh" #include "shared/world/voxel_registry.hh" @@ -17,11 +19,13 @@ #include "shared/protocol.hh" #include "client/entity/camera.hh" + #include "client/gui/chat.hh" #include "client/gui/gui_screen.hh" #include "client/gui/message_box.hh" #include "client/gui/progress_bar.hh" #include "client/gui/window_title.hh" + #include "client/world/chunk_visibility.hh" #include "client/game.hh" diff --git a/game/client/sound/sound.cc b/game/client/sound/sound.cc index c77f968..e77289c 100644 --- a/game/client/sound/sound.cc +++ b/game/client/sound/sound.cc @@ -3,8 +3,11 @@ #include "client/sound/sound.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "shared/world/dimension.hh" @@ -14,7 +17,9 @@ #include "client/entity/camera.hh" #include "client/entity/sound_emitter.hh" + #include "client/gui/settings.hh" + #include "client/resource/sound_effect.hh" #include "client/const.hh" diff --git a/game/client/toggles.cc b/game/client/toggles.cc index e6ffc26..833e099 100644 --- a/game/client/toggles.cc +++ b/game/client/toggles.cc @@ -6,6 +6,7 @@ #include "client/gui/chat.hh" #include "client/gui/language.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" diff --git a/game/client/world/chunk_mesher.cc b/game/client/world/chunk_mesher.cc index 53c4882..e2f1e10 100644 --- a/game/client/world/chunk_mesher.cc +++ b/game/client/world/chunk_mesher.cc @@ -97,8 +97,8 @@ public: private: bool vis_test(voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos) const; void push_quad_a(const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face); - void push_quad_v( - const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face, std::size_t entropy); + void push_quad_v(const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face, + std::size_t entropy); void make_cube(voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos, world::voxel_vis vis, std::size_t entropy); void cache_chunk(const chunk_pos& cpos); @@ -304,8 +304,8 @@ void GL_MeshingTask::push_quad_a(const world::VoxelInfo* info, const glm::fvec3& } } -void GL_MeshingTask::push_quad_v( - const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face, std::size_t entropy) +void GL_MeshingTask::push_quad_v(const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face, + std::size_t entropy) { const world::voxel_facing facing = get_facing(face, info->type); const world::VoxelTexture& vtex = info->textures[static_cast(face)]; @@ -319,8 +319,8 @@ void GL_MeshingTask::push_quad_v( } } -void GL_MeshingTask::make_cube( - voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos, world::voxel_vis vis, std::size_t entropy) +void GL_MeshingTask::make_cube(voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos, world::voxel_vis vis, + std::size_t entropy) { const glm::fvec3 fpos = glm::fvec3(lpos); const glm::fvec2 fsize = glm::fvec2(1.0f, 1.0f); diff --git a/game/client/world/chunk_renderer.cc b/game/client/world/chunk_renderer.cc index fe3a42e..23ce4ec 100644 --- a/game/client/world/chunk_renderer.cc +++ b/game/client/world/chunk_renderer.cc @@ -4,6 +4,7 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" #include "shared/world/chunk.hh" @@ -12,7 +13,9 @@ #include "shared/coord.hh" #include "client/entity/camera.hh" + #include "client/gui/settings.hh" + #include "client/world/chunk_mesher.hh" #include "client/world/chunk_quad.hh" #include "client/world/outline.hh" diff --git a/game/client/world/chunk_visibility.cc b/game/client/world/chunk_visibility.cc index 8f76755..871c04b 100644 --- a/game/client/world/chunk_visibility.cc +++ b/game/client/world/chunk_visibility.cc @@ -3,6 +3,7 @@ #include "client/world/chunk_visibility.hh" #include "core/config/number.hh" + #include "core/math/vectors.hh" #include "shared/world/chunk.hh" diff --git a/game/client/world/voxel_anims.cc b/game/client/world/voxel_anims.cc index 9e5e035..e4d9cf6 100644 --- a/game/client/world/voxel_anims.cc +++ b/game/client/world/voxel_anims.cc @@ -3,7 +3,9 @@ #include "client/world/voxel_anims.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "client/globals.hh" @@ -24,8 +26,8 @@ void world::voxel_anims::init(void) void world::voxel_anims::update(void) { if(globals::curtime >= world::voxel_anims::nextframe) { - world::voxel_anims::nextframe = - globals::curtime + static_cast(1000000.0 / static_cast(base_framerate.get_value())); + world::voxel_anims::nextframe = globals::curtime + + static_cast(1000000.0 / static_cast(base_framerate.get_value())); world::voxel_anims::frame += 1U; } } diff --git a/game/client/world/voxel_atlas.cc b/game/client/world/voxel_atlas.cc index 1018747..512a06a 100644 --- a/game/client/world/voxel_atlas.cc +++ b/game/client/world/voxel_atlas.cc @@ -4,6 +4,7 @@ #include "core/math/constexpr.hh" #include "core/math/crc64.hh" + #include "core/resource/image.hh" #include "core/resource/resource.hh" @@ -71,8 +72,8 @@ static world::AtlasStrip* plane_new_strip(AtlasPlane& plane, const std::vectorsize.x, image->size.y, 1, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); + glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, offset, image->size.x, image->size.y, 1, GL_RGBA, GL_UNSIGNED_BYTE, + image->pixels); } } diff --git a/game/server/game.cc b/game/server/game.cc index de9af9c..441a2cb 100644 --- a/game/server/game.cc +++ b/game/server/game.cc @@ -4,10 +4,13 @@ #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/cmdline.hh" #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "core/math/crc64.hh" + #include "core/utils/epoch.hh" #include "shared/entity/collision.hh" @@ -17,6 +20,7 @@ #include "shared/entity/stasis.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/game_items.hh" diff --git a/game/server/main.cc b/game/server/main.cc index b3caf36..9d7026f 100644 --- a/game/server/main.cc +++ b/game/server/main.cc @@ -1,11 +1,15 @@ #include "server/pch.hh" #include "core/config/number.hh" + #include "core/io/cmdline.hh" #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" + #include "core/resource/image.hh" #include "core/resource/resource.hh" + #include "core/utils/epoch.hh" #include "core/threading.hh" diff --git a/game/server/receive.cc b/game/server/receive.cc index 296d664..5c56872 100644 --- a/game/server/receive.cc +++ b/game/server/receive.cc @@ -7,6 +7,7 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/chunk_aabb.hh" #include "shared/world/dimension.hh" diff --git a/game/server/sessions.cc b/game/server/sessions.cc index df74e01..0bddcfe 100644 --- a/game/server/sessions.cc +++ b/game/server/sessions.cc @@ -4,9 +4,12 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "core/math/crc64.hh" + #include "core/utils/string.hh" #include "shared/entity/factory.hh" @@ -14,6 +17,7 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/chunk.hh" #include "shared/world/dimension.hh" #include "shared/world/item_registry.hh" diff --git a/game/server/whitelist.cc b/game/server/whitelist.cc index 4e53ee8..0807c19 100644 --- a/game/server/whitelist.cc +++ b/game/server/whitelist.cc @@ -4,8 +4,11 @@ #include "core/config/boolean.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/math/crc64.hh" + #include "core/utils/string.hh" #include "server/game.hh" diff --git a/game/server/world/overworld.hh b/game/server/world/overworld.hh index 3da0401..cc6be91 100644 --- a/game/server/world/overworld.hh +++ b/game/server/world/overworld.hh @@ -3,6 +3,7 @@ #pragma once #include "core/config/number.hh" + #include "core/io/config_map.hh" #include "shared/world/dimension.hh" diff --git a/game/server/world/universe.cc b/game/server/world/universe.cc index fe840da..278d0a9 100644 --- a/game/server/world/universe.cc +++ b/game/server/world/universe.cc @@ -4,8 +4,10 @@ #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/buffer.hh" #include "core/io/config_map.hh" + #include "core/utils/epoch.hh" #include "shared/world/chunk.hh" @@ -73,8 +75,8 @@ static void add_new_dimension(world::Dimension* dimension) dimension->init_late(universe_config_seed.get_value()); } -static void internal_save_chunk( - const DimensionMetadata* metadata, const world::Dimension* dimension, const chunk_pos& cpos, const world::Chunk* chunk) +static void internal_save_chunk(const DimensionMetadata* metadata, const world::Dimension* dimension, const chunk_pos& cpos, + const world::Chunk* chunk) { auto path = make_chunk_filename(metadata, cpos); diff --git a/game/server/world/unloader.cc b/game/server/world/unloader.cc index 3600ea2..4a3f4e1 100644 --- a/game/server/world/unloader.cc +++ b/game/server/world/unloader.cc @@ -6,6 +6,7 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" + #include "shared/world/chunk.hh" #include "shared/world/chunk_aabb.hh" #include "shared/world/dimension.hh" diff --git a/game/shared/entity/collision.cc b/game/shared/entity/collision.cc index 454e96a..4346b68 100644 --- a/game/shared/entity/collision.cc +++ b/game/shared/entity/collision.cc @@ -8,6 +8,7 @@ #include "shared/entity/grounded.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/world/voxel_registry.hh" diff --git a/game/shared/entity/factory.cc b/game/shared/entity/factory.cc index c98306a..619a418 100644 --- a/game/shared/entity/factory.cc +++ b/game/shared/entity/factory.cc @@ -8,6 +8,7 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/globals.hh" diff --git a/game/shared/entity/gravity.cc b/game/shared/entity/gravity.cc index f5dd145..f1708aa 100644 --- a/game/shared/entity/gravity.cc +++ b/game/shared/entity/gravity.cc @@ -4,6 +4,7 @@ #include "shared/entity/stasis.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/globals.hh" diff --git a/game/shared/entity/stasis.cc b/game/shared/entity/stasis.cc index 68d8e9d..3b86294 100644 --- a/game/shared/entity/stasis.cc +++ b/game/shared/entity/stasis.cc @@ -3,6 +3,7 @@ #include "shared/entity/stasis.hh" #include "shared/entity/transform.hh" + #include "shared/world/dimension.hh" void entity::Stasis::fixed_update(world::Dimension* dimension) diff --git a/game/shared/entity/velocity.cc b/game/shared/entity/velocity.cc index 9e40688..86df445 100644 --- a/game/shared/entity/velocity.cc +++ b/game/shared/entity/velocity.cc @@ -4,6 +4,7 @@ #include "shared/entity/stasis.hh" #include "shared/entity/transform.hh" + #include "shared/world/dimension.hh" #include "shared/globals.hh" diff --git a/game/shared/protocol.cc b/game/shared/protocol.cc index 34b7034..6c18658 100644 --- a/game/shared/protocol.cc +++ b/game/shared/protocol.cc @@ -8,6 +8,7 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/chunk.hh" #include "shared/world/dimension.hh" diff --git a/game/shared/world/chunk.hh b/game/shared/world/chunk.hh index 5eacf44..4f70453 100644 --- a/game/shared/world/chunk.hh +++ b/game/shared/world/chunk.hh @@ -2,9 +2,10 @@ #define SHARED_CHUNK_HH 1 #pragma once -#include "shared/types.hh" #include "shared/world/voxel_storage.hh" +#include "shared/types.hh" + constexpr static unsigned int BIOME_VOID = 0U; namespace world -- cgit