diff options
Diffstat (limited to 'game/client')
105 files changed, 10048 insertions, 10048 deletions
diff --git a/game/client/config/gamepad_axis.cc b/game/client/config/gamepad_axis.cc index 8ae74be..c782c19 100644 --- a/game/client/config/gamepad_axis.cc +++ b/game/client/config/gamepad_axis.cc @@ -1,115 +1,115 @@ -#include "client/pch.hh" - -#include "client/config/gamepad_axis.hh" - -#include "core/math/constexpr.hh" - -#include "client/io/gamepad.hh" - -constexpr static std::string_view UNKNOWN_AXIS_NAME = "UNKNOWN"; - -static const std::pair<int, std::string_view> axis_names[] = { - { GLFW_GAMEPAD_AXIS_LEFT_X, "LEFT_X" }, - { GLFW_GAMEPAD_AXIS_LEFT_Y, "LEFT_Y" }, - { GLFW_GAMEPAD_AXIS_RIGHT_X, "RIGHT_X" }, - { GLFW_GAMEPAD_AXIS_RIGHT_Y, "RIGHT_Y" }, - { GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, "LEFT_TRIG" }, - { GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, "RIGHT_TRIG" }, -}; - -static std::string_view get_axis_name(int axis) -{ - for(const auto& it : axis_names) { - if(it.first != axis) { - continue; - } - - return it.second; - } - - return UNKNOWN_AXIS_NAME; -} - -config::GamepadAxis::GamepadAxis(void) : GamepadAxis(io::INVALID_GAMEPAD_AXIS, false) -{ -} - -config::GamepadAxis::GamepadAxis(int axis, bool inverted) -{ - m_inverted = inverted; - m_gamepad_axis = axis; - m_name = get_axis_name(axis); - m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U); -} - -std::string_view config::GamepadAxis::get(void) const -{ - return m_full_string; -} - -void config::GamepadAxis::set(std::string_view value) -{ - char new_name[64]; - unsigned int new_invert; - std::string value_str(value); - - if(2 == std::sscanf(value_str.c_str(), "%63[^:]:%u", new_name, &new_invert)) { - for(const auto& it : axis_names) { - if(0 == it.second.compare(new_name)) { - m_inverted = new_invert; - m_gamepad_axis = it.first; - m_name = get_axis_name(m_gamepad_axis); - m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U); - return; - } - } - } - - m_inverted = false; - m_gamepad_axis = io::INVALID_GAMEPAD_AXIS; - m_name = UNKNOWN_AXIS_NAME; - m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U); -} - -int config::GamepadAxis::get_axis(void) const -{ - return m_gamepad_axis; -} - -void config::GamepadAxis::set_axis(int axis) -{ - m_gamepad_axis = axis; - m_name = get_axis_name(axis); - m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U); -} - -bool config::GamepadAxis::is_inverted(void) const -{ - return m_inverted; -} - -void config::GamepadAxis::set_inverted(bool inverted) -{ - m_inverted = inverted; - m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U); -} - -float config::GamepadAxis::get_value(const GLFWgamepadstate& state, float deadzone) const -{ - if(m_gamepad_axis <= math::array_size(state.axes)) { - auto value = state.axes[m_gamepad_axis]; - - if(math::abs(value) > deadzone) { - return m_inverted ? -value : value; - } - - return 0.0f; - } - - return 0.0f; -} - -std::string_view config::GamepadAxis::get_name(void) const -{ - return m_name; -} +#include "client/pch.hh"
+
+#include "client/config/gamepad_axis.hh"
+
+#include "core/math/constexpr.hh"
+
+#include "client/io/gamepad.hh"
+
+constexpr static std::string_view UNKNOWN_AXIS_NAME = "UNKNOWN";
+
+static const std::pair<int, std::string_view> axis_names[] = {
+ { GLFW_GAMEPAD_AXIS_LEFT_X, "LEFT_X" },
+ { GLFW_GAMEPAD_AXIS_LEFT_Y, "LEFT_Y" },
+ { GLFW_GAMEPAD_AXIS_RIGHT_X, "RIGHT_X" },
+ { GLFW_GAMEPAD_AXIS_RIGHT_Y, "RIGHT_Y" },
+ { GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, "LEFT_TRIG" },
+ { GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, "RIGHT_TRIG" },
+};
+
+static std::string_view get_axis_name(int axis)
+{
+ for(const auto& it : axis_names) {
+ if(it.first != axis) {
+ continue;
+ }
+
+ return it.second;
+ }
+
+ return UNKNOWN_AXIS_NAME;
+}
+
+config::GamepadAxis::GamepadAxis(void) : GamepadAxis(io::INVALID_GAMEPAD_AXIS, false)
+{
+}
+
+config::GamepadAxis::GamepadAxis(int axis, bool inverted)
+{
+ m_inverted = inverted;
+ m_gamepad_axis = axis;
+ m_name = get_axis_name(axis);
+ m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U);
+}
+
+std::string_view config::GamepadAxis::get(void) const
+{
+ return m_full_string;
+}
+
+void config::GamepadAxis::set(std::string_view value)
+{
+ char new_name[64];
+ unsigned int new_invert;
+ std::string value_str(value);
+
+ if(2 == std::sscanf(value_str.c_str(), "%63[^:]:%u", new_name, &new_invert)) {
+ for(const auto& it : axis_names) {
+ if(0 == it.second.compare(new_name)) {
+ m_inverted = new_invert;
+ m_gamepad_axis = it.first;
+ m_name = get_axis_name(m_gamepad_axis);
+ m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U);
+ return;
+ }
+ }
+ }
+
+ m_inverted = false;
+ m_gamepad_axis = io::INVALID_GAMEPAD_AXIS;
+ m_name = UNKNOWN_AXIS_NAME;
+ m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U);
+}
+
+int config::GamepadAxis::get_axis(void) const
+{
+ return m_gamepad_axis;
+}
+
+void config::GamepadAxis::set_axis(int axis)
+{
+ m_gamepad_axis = axis;
+ m_name = get_axis_name(axis);
+ m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U);
+}
+
+bool config::GamepadAxis::is_inverted(void) const
+{
+ return m_inverted;
+}
+
+void config::GamepadAxis::set_inverted(bool inverted)
+{
+ m_inverted = inverted;
+ m_full_string = std::format("{}:{}", m_name, m_inverted ? 1U : 0U);
+}
+
+float config::GamepadAxis::get_value(const GLFWgamepadstate& state, float deadzone) const
+{
+ if(m_gamepad_axis <= math::array_size(state.axes)) {
+ auto value = state.axes[m_gamepad_axis];
+
+ if(math::abs(value) > deadzone) {
+ return m_inverted ? -value : value;
+ }
+
+ return 0.0f;
+ }
+
+ return 0.0f;
+}
+
+std::string_view config::GamepadAxis::get_name(void) const
+{
+ return m_name;
+}
diff --git a/game/client/config/gamepad_axis.hh b/game/client/config/gamepad_axis.hh index 9392a35..80c323f 100644 --- a/game/client/config/gamepad_axis.hh +++ b/game/client/config/gamepad_axis.hh @@ -1,38 +1,38 @@ -#pragma once - -#include "core/config/ivalue.hh" - -struct GLFWgamepadstate; - -namespace config -{ -class GamepadAxis final : public IValue { -public: - explicit GamepadAxis(void); - explicit GamepadAxis(int axis, bool inverted); - virtual ~GamepadAxis(void) = default; - - virtual std::string_view get(void) const override; - virtual void set(std::string_view value) override; - - int get_axis(void) const; - void set_axis(int axis); - - bool is_inverted(void) const; - void set_inverted(bool inverted); - - float get_value(const GLFWgamepadstate& state, float deadzone = 0.0f) const; - - // Conventional get/set methods implemented by - // this configuration value actually contain the - // inversion flag. Since we're updating that flag - // in the UI by means of a separate checkbox, we only need the name here - std::string_view get_name(void) const; - -private: - bool m_inverted; - int m_gamepad_axis; - std::string m_full_string; - std::string_view m_name; -}; -} // namespace config +#pragma once
+
+#include "core/config/ivalue.hh"
+
+struct GLFWgamepadstate;
+
+namespace config
+{
+class GamepadAxis final : public IValue {
+public:
+ explicit GamepadAxis(void);
+ explicit GamepadAxis(int axis, bool inverted);
+ virtual ~GamepadAxis(void) = default;
+
+ virtual std::string_view get(void) const override;
+ virtual void set(std::string_view value) override;
+
+ int get_axis(void) const;
+ void set_axis(int axis);
+
+ bool is_inverted(void) const;
+ void set_inverted(bool inverted);
+
+ float get_value(const GLFWgamepadstate& state, float deadzone = 0.0f) const;
+
+ // Conventional get/set methods implemented by
+ // this configuration value actually contain the
+ // inversion flag. Since we're updating that flag
+ // in the UI by means of a separate checkbox, we only need the name here
+ std::string_view get_name(void) const;
+
+private:
+ bool m_inverted;
+ int m_gamepad_axis;
+ std::string m_full_string;
+ std::string_view m_name;
+};
+} // namespace config
diff --git a/game/client/config/gamepad_button.cc b/game/client/config/gamepad_button.cc index 07e4457..5141de3 100644 --- a/game/client/config/gamepad_button.cc +++ b/game/client/config/gamepad_button.cc @@ -1,90 +1,90 @@ -#include "client/pch.hh" - -#include "client/config/gamepad_button.hh" - -#include "core/math/constexpr.hh" - -#include "client/io/gamepad.hh" - -constexpr static std::string_view UNKNOWN_BUTTON_NAME = "UNKNOWN"; - -static const std::pair<int, std::string_view> button_names[] = { - { GLFW_GAMEPAD_BUTTON_A, "A" }, - { GLFW_GAMEPAD_BUTTON_B, "B" }, - { GLFW_GAMEPAD_BUTTON_X, "X" }, - { GLFW_GAMEPAD_BUTTON_Y, "Y" }, - { GLFW_GAMEPAD_BUTTON_LEFT_BUMPER, "L_BUMP" }, - { GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER, "R_BUMP" }, - { GLFW_GAMEPAD_BUTTON_BACK, "BACK" }, - { GLFW_GAMEPAD_BUTTON_START, "START" }, - { GLFW_GAMEPAD_BUTTON_GUIDE, "GUIDE" }, - { GLFW_GAMEPAD_BUTTON_LEFT_THUMB, "L_THUMB" }, - { GLFW_GAMEPAD_BUTTON_RIGHT_THUMB, "R_THUMB" }, - { GLFW_GAMEPAD_BUTTON_DPAD_UP, "DPAD_UP" }, - { GLFW_GAMEPAD_BUTTON_DPAD_RIGHT, "DPAD_RIGHT" }, - { GLFW_GAMEPAD_BUTTON_DPAD_DOWN, "DPAD_DOWN" }, - { GLFW_GAMEPAD_BUTTON_DPAD_LEFT, "DPAD_LEFT" }, -}; - -static std::string_view get_button_name(int button) -{ - for(const auto& it : button_names) { - if(it.first == button) { - return it.second; - } - } - - return UNKNOWN_BUTTON_NAME; -} - -config::GamepadButton::GamepadButton(void) -{ - m_gamepad_button = io::INVALID_GAMEPAD_BUTTON; - m_name = UNKNOWN_BUTTON_NAME; -} - -config::GamepadButton::GamepadButton(int button) -{ - m_gamepad_button = button; - m_name = get_button_name(button); -} - -std::string_view config::GamepadButton::get(void) const -{ - return m_name; -} - -void config::GamepadButton::set(std::string_view value) -{ - for(const auto& it : button_names) { - if(0 == it.second.compare(value)) { - m_gamepad_button = it.first; - m_name = it.second; - return; - } - } - - m_gamepad_button = io::INVALID_GAMEPAD_BUTTON; - m_name = UNKNOWN_BUTTON_NAME; -} - -int config::GamepadButton::get_button(void) const -{ - return m_gamepad_button; -} - -void config::GamepadButton::set_button(int button) -{ - m_gamepad_button = button; - m_name = get_button_name(button); -} - -bool config::GamepadButton::equals(int button) const -{ - return m_gamepad_button == button; -} - -bool config::GamepadButton::is_pressed(const GLFWgamepadstate& state) const -{ - return m_gamepad_button < math::array_size(state.buttons) && state.buttons[m_gamepad_button] == GLFW_PRESS; -} +#include "client/pch.hh"
+
+#include "client/config/gamepad_button.hh"
+
+#include "core/math/constexpr.hh"
+
+#include "client/io/gamepad.hh"
+
+constexpr static std::string_view UNKNOWN_BUTTON_NAME = "UNKNOWN";
+
+static const std::pair<int, std::string_view> button_names[] = {
+ { GLFW_GAMEPAD_BUTTON_A, "A" },
+ { GLFW_GAMEPAD_BUTTON_B, "B" },
+ { GLFW_GAMEPAD_BUTTON_X, "X" },
+ { GLFW_GAMEPAD_BUTTON_Y, "Y" },
+ { GLFW_GAMEPAD_BUTTON_LEFT_BUMPER, "L_BUMP" },
+ { GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER, "R_BUMP" },
+ { GLFW_GAMEPAD_BUTTON_BACK, "BACK" },
+ { GLFW_GAMEPAD_BUTTON_START, "START" },
+ { GLFW_GAMEPAD_BUTTON_GUIDE, "GUIDE" },
+ { GLFW_GAMEPAD_BUTTON_LEFT_THUMB, "L_THUMB" },
+ { GLFW_GAMEPAD_BUTTON_RIGHT_THUMB, "R_THUMB" },
+ { GLFW_GAMEPAD_BUTTON_DPAD_UP, "DPAD_UP" },
+ { GLFW_GAMEPAD_BUTTON_DPAD_RIGHT, "DPAD_RIGHT" },
+ { GLFW_GAMEPAD_BUTTON_DPAD_DOWN, "DPAD_DOWN" },
+ { GLFW_GAMEPAD_BUTTON_DPAD_LEFT, "DPAD_LEFT" },
+};
+
+static std::string_view get_button_name(int button)
+{
+ for(const auto& it : button_names) {
+ if(it.first == button) {
+ return it.second;
+ }
+ }
+
+ return UNKNOWN_BUTTON_NAME;
+}
+
+config::GamepadButton::GamepadButton(void)
+{
+ m_gamepad_button = io::INVALID_GAMEPAD_BUTTON;
+ m_name = UNKNOWN_BUTTON_NAME;
+}
+
+config::GamepadButton::GamepadButton(int button)
+{
+ m_gamepad_button = button;
+ m_name = get_button_name(button);
+}
+
+std::string_view config::GamepadButton::get(void) const
+{
+ return m_name;
+}
+
+void config::GamepadButton::set(std::string_view value)
+{
+ for(const auto& it : button_names) {
+ if(0 == it.second.compare(value)) {
+ m_gamepad_button = it.first;
+ m_name = it.second;
+ return;
+ }
+ }
+
+ m_gamepad_button = io::INVALID_GAMEPAD_BUTTON;
+ m_name = UNKNOWN_BUTTON_NAME;
+}
+
+int config::GamepadButton::get_button(void) const
+{
+ return m_gamepad_button;
+}
+
+void config::GamepadButton::set_button(int button)
+{
+ m_gamepad_button = button;
+ m_name = get_button_name(button);
+}
+
+bool config::GamepadButton::equals(int button) const
+{
+ return m_gamepad_button == button;
+}
+
+bool config::GamepadButton::is_pressed(const GLFWgamepadstate& state) const
+{
+ return m_gamepad_button < math::array_size(state.buttons) && state.buttons[m_gamepad_button] == GLFW_PRESS;
+}
diff --git a/game/client/config/gamepad_button.hh b/game/client/config/gamepad_button.hh index 584c353..f11fe4f 100644 --- a/game/client/config/gamepad_button.hh +++ b/game/client/config/gamepad_button.hh @@ -1,28 +1,28 @@ -#pragma once - -#include "core/config/ivalue.hh" - -struct GLFWgamepadstate; - -namespace config -{ -class GamepadButton final : public IValue { -public: - explicit GamepadButton(void); - explicit GamepadButton(int button); - virtual ~GamepadButton(void) = default; - - virtual std::string_view get(void) const override; - virtual void set(std::string_view value) override; - - int get_button(void) const; - void set_button(int button); - - bool equals(int button) const; - bool is_pressed(const GLFWgamepadstate& state) const; - -private: - int m_gamepad_button; - std::string_view m_name; -}; -} // namespace config +#pragma once
+
+#include "core/config/ivalue.hh"
+
+struct GLFWgamepadstate;
+
+namespace config
+{
+class GamepadButton final : public IValue {
+public:
+ explicit GamepadButton(void);
+ explicit GamepadButton(int button);
+ virtual ~GamepadButton(void) = default;
+
+ virtual std::string_view get(void) const override;
+ virtual void set(std::string_view value) override;
+
+ int get_button(void) const;
+ void set_button(int button);
+
+ bool equals(int button) const;
+ bool is_pressed(const GLFWgamepadstate& state) const;
+
+private:
+ int m_gamepad_button;
+ std::string_view m_name;
+};
+} // namespace config
diff --git a/game/client/config/keybind.cc b/game/client/config/keybind.cc index e254f7b..befdca2 100644 --- a/game/client/config/keybind.cc +++ b/game/client/config/keybind.cc @@ -1,202 +1,202 @@ -#include "client/pch.hh" - -#include "client/config/keybind.hh" - -#include "core/math/constexpr.hh" - -#include "client/const.hh" - -constexpr static std::string_view UNKNOWN_KEY_NAME = "UNKNOWN"; - -static const std::pair<int, std::string_view> key_names[] = { - { GLFW_KEY_SPACE, "SPACE" }, - { GLFW_KEY_APOSTROPHE, "'" }, - { GLFW_KEY_COMMA, "," }, - { GLFW_KEY_MINUS, "-" }, - { GLFW_KEY_PERIOD, "." }, - { GLFW_KEY_SLASH, "/" }, - { GLFW_KEY_0, "0" }, - { GLFW_KEY_1, "1" }, - { GLFW_KEY_2, "2" }, - { GLFW_KEY_3, "3" }, - { GLFW_KEY_4, "4" }, - { GLFW_KEY_5, "5" }, - { GLFW_KEY_6, "6" }, - { GLFW_KEY_7, "7" }, - { GLFW_KEY_8, "8" }, - { GLFW_KEY_9, "9" }, - { GLFW_KEY_SEMICOLON, ";" }, - { GLFW_KEY_EQUAL, "=" }, - { GLFW_KEY_A, "A" }, - { GLFW_KEY_B, "B" }, - { GLFW_KEY_C, "C" }, - { GLFW_KEY_D, "D" }, - { GLFW_KEY_E, "E" }, - { GLFW_KEY_F, "F" }, - { GLFW_KEY_G, "G" }, - { GLFW_KEY_H, "H" }, - { GLFW_KEY_I, "I" }, - { GLFW_KEY_J, "J" }, - { GLFW_KEY_K, "K" }, - { GLFW_KEY_L, "L" }, - { GLFW_KEY_M, "M" }, - { GLFW_KEY_N, "N" }, - { GLFW_KEY_O, "O" }, - { GLFW_KEY_P, "P" }, - { GLFW_KEY_Q, "Q" }, - { GLFW_KEY_R, "R" }, - { GLFW_KEY_S, "S" }, - { GLFW_KEY_T, "T" }, - { GLFW_KEY_U, "U" }, - { GLFW_KEY_V, "V" }, - { GLFW_KEY_W, "W" }, - { GLFW_KEY_X, "X" }, - { GLFW_KEY_Y, "Y" }, - { GLFW_KEY_Z, "Z" }, - { GLFW_KEY_LEFT_BRACKET, "[" }, - { GLFW_KEY_BACKSLASH, "\\" }, - { GLFW_KEY_RIGHT_BRACKET, "]" }, - { GLFW_KEY_GRAVE_ACCENT, "`" }, - { GLFW_KEY_WORLD_1, "WORLD_1" }, - { GLFW_KEY_WORLD_2, "WORLD_2" }, - { GLFW_KEY_ESCAPE, "ESCAPE" }, - { GLFW_KEY_ENTER, "ENTER" }, - { GLFW_KEY_TAB, "TAB" }, - { GLFW_KEY_BACKSPACE, "BACKSPACE" }, - { GLFW_KEY_INSERT, "INSERT" }, - { GLFW_KEY_DELETE, "DELETE" }, - { GLFW_KEY_RIGHT, "RIGHT" }, - { GLFW_KEY_LEFT, "LEFT" }, - { GLFW_KEY_DOWN, "DOWN" }, - { GLFW_KEY_UP, "UP" }, - { GLFW_KEY_PAGE_UP, "PAGE_UP" }, - { GLFW_KEY_PAGE_DOWN, "PAGE_DOWN" }, - { GLFW_KEY_HOME, "HOME" }, - { GLFW_KEY_END, "END" }, - { GLFW_KEY_CAPS_LOCK, "CAPS_LOCK" }, - { GLFW_KEY_SCROLL_LOCK, "SCROLL_LOCK" }, - { GLFW_KEY_NUM_LOCK, "NUM_LOCK" }, - { GLFW_KEY_PRINT_SCREEN, "PRINT_SCREEN" }, - { GLFW_KEY_PAUSE, "PAUSE" }, - { GLFW_KEY_F1, "F1" }, - { GLFW_KEY_F2, "F2" }, - { GLFW_KEY_F3, "F3" }, - { GLFW_KEY_F4, "F4" }, - { GLFW_KEY_F5, "F5" }, - { GLFW_KEY_F6, "F6" }, - { GLFW_KEY_F7, "F7" }, - { GLFW_KEY_F8, "F8" }, - { GLFW_KEY_F9, "F9" }, - { GLFW_KEY_F10, "F10" }, - { GLFW_KEY_F11, "F11" }, - { GLFW_KEY_F12, "F12" }, - { GLFW_KEY_F13, "F13" }, - { GLFW_KEY_F14, "F14" }, - { GLFW_KEY_F15, "F15" }, - { GLFW_KEY_F16, "F16" }, - { GLFW_KEY_F17, "F17" }, - { GLFW_KEY_F18, "F18" }, - { GLFW_KEY_F19, "F19" }, - { GLFW_KEY_F20, "F20" }, - { GLFW_KEY_F21, "F21" }, - { GLFW_KEY_F22, "F22" }, - { GLFW_KEY_F23, "F23" }, - { GLFW_KEY_F24, "F24" }, - { GLFW_KEY_F25, "F25" }, - { GLFW_KEY_KP_0, "KEYPAD_0" }, - { GLFW_KEY_KP_1, "KEYPAD_1" }, - { GLFW_KEY_KP_2, "KEYPAD_2" }, - { GLFW_KEY_KP_3, "KEYPAD_3" }, - { GLFW_KEY_KP_4, "KEYPAD_4" }, - { GLFW_KEY_KP_5, "KEYPAD_5" }, - { GLFW_KEY_KP_6, "KEYPAD_6" }, - { GLFW_KEY_KP_7, "KEYPAD_7" }, - { GLFW_KEY_KP_8, "KEYPAD_8" }, - { GLFW_KEY_KP_9, "KEYPAD_9" }, - { GLFW_KEY_KP_DECIMAL, "KEYPAD_POINT" }, - { GLFW_KEY_KP_DIVIDE, "KEYPAD_DIV" }, - { GLFW_KEY_KP_MULTIPLY, "KEYPAD_MUL" }, - { GLFW_KEY_KP_SUBTRACT, "KEYPAD_MINUS" }, - { GLFW_KEY_KP_ADD, "KEYPAD_PLUS" }, - { GLFW_KEY_KP_ENTER, "KEYPAD_ENTER" }, - { GLFW_KEY_KP_EQUAL, "KEYPAD_EQUAL" }, - { GLFW_KEY_LEFT_SHIFT, "LEFT_SHIFT" }, - { GLFW_KEY_LEFT_CONTROL, "LEFT_CTRL" }, - { GLFW_KEY_LEFT_ALT, "LEFT_ALT" }, - { GLFW_KEY_LEFT_SUPER, "LEFT_SUPER" }, - { GLFW_KEY_RIGHT_SHIFT, "RIGHT_SHIFT" }, - { GLFW_KEY_RIGHT_CONTROL, "RIGHT_CTRL" }, - { GLFW_KEY_RIGHT_ALT, "RIGHT_ALT" }, - { GLFW_KEY_RIGHT_SUPER, "RIGHT_SUPER" }, - { GLFW_KEY_MENU, "MENU" }, -}; - -static std::string_view get_key_name(int keycode) -{ - for(const auto& it : key_names) { - if(it.first == keycode) { - return it.second; - } - } - - return UNKNOWN_KEY_NAME; -} - -config::KeyBind::KeyBind(void) -{ - m_glfw_keycode = GLFW_KEY_UNKNOWN; - m_name = UNKNOWN_KEY_NAME; -} - -config::KeyBind::KeyBind(int default_value) -{ - if(default_value == DEBUG_KEY) { - m_glfw_keycode = GLFW_KEY_UNKNOWN; - m_name = UNKNOWN_KEY_NAME; - } - else { - m_glfw_keycode = default_value; - m_name = get_key_name(default_value); - } -} - -void config::KeyBind::set(std::string_view value) -{ - for(const auto& it : key_names) { - if((it.first != DEBUG_KEY) && 0 == it.second.compare(value)) { - m_glfw_keycode = it.first; - m_name = it.second; - return; - } - } - - m_glfw_keycode = GLFW_KEY_UNKNOWN; - m_name = UNKNOWN_KEY_NAME; -} - -std::string_view config::KeyBind::get(void) const -{ - return m_name; -} - -void config::KeyBind::set_key(int keycode) -{ - if(keycode == DEBUG_KEY) { - m_glfw_keycode = GLFW_KEY_UNKNOWN; - m_name = UNKNOWN_KEY_NAME; - } - else { - m_glfw_keycode = keycode; - m_name = get_key_name(keycode); - } -} - -int config::KeyBind::get_key(void) const -{ - return m_glfw_keycode; -} - -bool config::KeyBind::equals(int keycode) const -{ - return m_glfw_keycode == keycode; -} +#include "client/pch.hh"
+
+#include "client/config/keybind.hh"
+
+#include "core/math/constexpr.hh"
+
+#include "client/const.hh"
+
+constexpr static std::string_view UNKNOWN_KEY_NAME = "UNKNOWN";
+
+static const std::pair<int, std::string_view> key_names[] = {
+ { GLFW_KEY_SPACE, "SPACE" },
+ { GLFW_KEY_APOSTROPHE, "'" },
+ { GLFW_KEY_COMMA, "," },
+ { GLFW_KEY_MINUS, "-" },
+ { GLFW_KEY_PERIOD, "." },
+ { GLFW_KEY_SLASH, "/" },
+ { GLFW_KEY_0, "0" },
+ { GLFW_KEY_1, "1" },
+ { GLFW_KEY_2, "2" },
+ { GLFW_KEY_3, "3" },
+ { GLFW_KEY_4, "4" },
+ { GLFW_KEY_5, "5" },
+ { GLFW_KEY_6, "6" },
+ { GLFW_KEY_7, "7" },
+ { GLFW_KEY_8, "8" },
+ { GLFW_KEY_9, "9" },
+ { GLFW_KEY_SEMICOLON, ";" },
+ { GLFW_KEY_EQUAL, "=" },
+ { GLFW_KEY_A, "A" },
+ { GLFW_KEY_B, "B" },
+ { GLFW_KEY_C, "C" },
+ { GLFW_KEY_D, "D" },
+ { GLFW_KEY_E, "E" },
+ { GLFW_KEY_F, "F" },
+ { GLFW_KEY_G, "G" },
+ { GLFW_KEY_H, "H" },
+ { GLFW_KEY_I, "I" },
+ { GLFW_KEY_J, "J" },
+ { GLFW_KEY_K, "K" },
+ { GLFW_KEY_L, "L" },
+ { GLFW_KEY_M, "M" },
+ { GLFW_KEY_N, "N" },
+ { GLFW_KEY_O, "O" },
+ { GLFW_KEY_P, "P" },
+ { GLFW_KEY_Q, "Q" },
+ { GLFW_KEY_R, "R" },
+ { GLFW_KEY_S, "S" },
+ { GLFW_KEY_T, "T" },
+ { GLFW_KEY_U, "U" },
+ { GLFW_KEY_V, "V" },
+ { GLFW_KEY_W, "W" },
+ { GLFW_KEY_X, "X" },
+ { GLFW_KEY_Y, "Y" },
+ { GLFW_KEY_Z, "Z" },
+ { GLFW_KEY_LEFT_BRACKET, "[" },
+ { GLFW_KEY_BACKSLASH, "\\" },
+ { GLFW_KEY_RIGHT_BRACKET, "]" },
+ { GLFW_KEY_GRAVE_ACCENT, "`" },
+ { GLFW_KEY_WORLD_1, "WORLD_1" },
+ { GLFW_KEY_WORLD_2, "WORLD_2" },
+ { GLFW_KEY_ESCAPE, "ESCAPE" },
+ { GLFW_KEY_ENTER, "ENTER" },
+ { GLFW_KEY_TAB, "TAB" },
+ { GLFW_KEY_BACKSPACE, "BACKSPACE" },
+ { GLFW_KEY_INSERT, "INSERT" },
+ { GLFW_KEY_DELETE, "DELETE" },
+ { GLFW_KEY_RIGHT, "RIGHT" },
+ { GLFW_KEY_LEFT, "LEFT" },
+ { GLFW_KEY_DOWN, "DOWN" },
+ { GLFW_KEY_UP, "UP" },
+ { GLFW_KEY_PAGE_UP, "PAGE_UP" },
+ { GLFW_KEY_PAGE_DOWN, "PAGE_DOWN" },
+ { GLFW_KEY_HOME, "HOME" },
+ { GLFW_KEY_END, "END" },
+ { GLFW_KEY_CAPS_LOCK, "CAPS_LOCK" },
+ { GLFW_KEY_SCROLL_LOCK, "SCROLL_LOCK" },
+ { GLFW_KEY_NUM_LOCK, "NUM_LOCK" },
+ { GLFW_KEY_PRINT_SCREEN, "PRINT_SCREEN" },
+ { GLFW_KEY_PAUSE, "PAUSE" },
+ { GLFW_KEY_F1, "F1" },
+ { GLFW_KEY_F2, "F2" },
+ { GLFW_KEY_F3, "F3" },
+ { GLFW_KEY_F4, "F4" },
+ { GLFW_KEY_F5, "F5" },
+ { GLFW_KEY_F6, "F6" },
+ { GLFW_KEY_F7, "F7" },
+ { GLFW_KEY_F8, "F8" },
+ { GLFW_KEY_F9, "F9" },
+ { GLFW_KEY_F10, "F10" },
+ { GLFW_KEY_F11, "F11" },
+ { GLFW_KEY_F12, "F12" },
+ { GLFW_KEY_F13, "F13" },
+ { GLFW_KEY_F14, "F14" },
+ { GLFW_KEY_F15, "F15" },
+ { GLFW_KEY_F16, "F16" },
+ { GLFW_KEY_F17, "F17" },
+ { GLFW_KEY_F18, "F18" },
+ { GLFW_KEY_F19, "F19" },
+ { GLFW_KEY_F20, "F20" },
+ { GLFW_KEY_F21, "F21" },
+ { GLFW_KEY_F22, "F22" },
+ { GLFW_KEY_F23, "F23" },
+ { GLFW_KEY_F24, "F24" },
+ { GLFW_KEY_F25, "F25" },
+ { GLFW_KEY_KP_0, "KEYPAD_0" },
+ { GLFW_KEY_KP_1, "KEYPAD_1" },
+ { GLFW_KEY_KP_2, "KEYPAD_2" },
+ { GLFW_KEY_KP_3, "KEYPAD_3" },
+ { GLFW_KEY_KP_4, "KEYPAD_4" },
+ { GLFW_KEY_KP_5, "KEYPAD_5" },
+ { GLFW_KEY_KP_6, "KEYPAD_6" },
+ { GLFW_KEY_KP_7, "KEYPAD_7" },
+ { GLFW_KEY_KP_8, "KEYPAD_8" },
+ { GLFW_KEY_KP_9, "KEYPAD_9" },
+ { GLFW_KEY_KP_DECIMAL, "KEYPAD_POINT" },
+ { GLFW_KEY_KP_DIVIDE, "KEYPAD_DIV" },
+ { GLFW_KEY_KP_MULTIPLY, "KEYPAD_MUL" },
+ { GLFW_KEY_KP_SUBTRACT, "KEYPAD_MINUS" },
+ { GLFW_KEY_KP_ADD, "KEYPAD_PLUS" },
+ { GLFW_KEY_KP_ENTER, "KEYPAD_ENTER" },
+ { GLFW_KEY_KP_EQUAL, "KEYPAD_EQUAL" },
+ { GLFW_KEY_LEFT_SHIFT, "LEFT_SHIFT" },
+ { GLFW_KEY_LEFT_CONTROL, "LEFT_CTRL" },
+ { GLFW_KEY_LEFT_ALT, "LEFT_ALT" },
+ { GLFW_KEY_LEFT_SUPER, "LEFT_SUPER" },
+ { GLFW_KEY_RIGHT_SHIFT, "RIGHT_SHIFT" },
+ { GLFW_KEY_RIGHT_CONTROL, "RIGHT_CTRL" },
+ { GLFW_KEY_RIGHT_ALT, "RIGHT_ALT" },
+ { GLFW_KEY_RIGHT_SUPER, "RIGHT_SUPER" },
+ { GLFW_KEY_MENU, "MENU" },
+};
+
+static std::string_view get_key_name(int keycode)
+{
+ for(const auto& it : key_names) {
+ if(it.first == keycode) {
+ return it.second;
+ }
+ }
+
+ return UNKNOWN_KEY_NAME;
+}
+
+config::KeyBind::KeyBind(void)
+{
+ m_glfw_keycode = GLFW_KEY_UNKNOWN;
+ m_name = UNKNOWN_KEY_NAME;
+}
+
+config::KeyBind::KeyBind(int default_value)
+{
+ if(default_value == DEBUG_KEY) {
+ m_glfw_keycode = GLFW_KEY_UNKNOWN;
+ m_name = UNKNOWN_KEY_NAME;
+ }
+ else {
+ m_glfw_keycode = default_value;
+ m_name = get_key_name(default_value);
+ }
+}
+
+void config::KeyBind::set(std::string_view value)
+{
+ for(const auto& it : key_names) {
+ if((it.first != DEBUG_KEY) && 0 == it.second.compare(value)) {
+ m_glfw_keycode = it.first;
+ m_name = it.second;
+ return;
+ }
+ }
+
+ m_glfw_keycode = GLFW_KEY_UNKNOWN;
+ m_name = UNKNOWN_KEY_NAME;
+}
+
+std::string_view config::KeyBind::get(void) const
+{
+ return m_name;
+}
+
+void config::KeyBind::set_key(int keycode)
+{
+ if(keycode == DEBUG_KEY) {
+ m_glfw_keycode = GLFW_KEY_UNKNOWN;
+ m_name = UNKNOWN_KEY_NAME;
+ }
+ else {
+ m_glfw_keycode = keycode;
+ m_name = get_key_name(keycode);
+ }
+}
+
+int config::KeyBind::get_key(void) const
+{
+ return m_glfw_keycode;
+}
+
+bool config::KeyBind::equals(int keycode) const
+{
+ return m_glfw_keycode == keycode;
+}
diff --git a/game/client/config/keybind.hh b/game/client/config/keybind.hh index dff6c18..51a67d6 100644 --- a/game/client/config/keybind.hh +++ b/game/client/config/keybind.hh @@ -1,25 +1,25 @@ -#pragma once - -#include "core/config/ivalue.hh" - -namespace config -{ -class KeyBind final : public IValue { -public: - explicit KeyBind(void); - explicit KeyBind(int default_value); - virtual ~KeyBind(void) = default; - - virtual void set(std::string_view value) override; - virtual std::string_view get(void) const override; - - void set_key(int keycode); - int get_key(void) const; - - bool equals(int keycode) const; - -private: - std::string_view m_name; - int m_glfw_keycode; -}; -} // namespace config +#pragma once
+
+#include "core/config/ivalue.hh"
+
+namespace config
+{
+class KeyBind final : public IValue {
+public:
+ explicit KeyBind(void);
+ explicit KeyBind(int default_value);
+ virtual ~KeyBind(void) = default;
+
+ virtual void set(std::string_view value) override;
+ virtual std::string_view get(void) const override;
+
+ void set_key(int keycode);
+ int get_key(void) const;
+
+ bool equals(int keycode) const;
+
+private:
+ std::string_view m_name;
+ int m_glfw_keycode;
+};
+} // namespace config
diff --git a/game/client/const.hh b/game/client/const.hh index 461b500..b1e458f 100644 --- a/game/client/const.hh +++ b/game/client/const.hh @@ -1,23 +1,23 @@ -#pragma once - -#include "shared/const.hh" - -// This key is then going to be reserved for only -// the debug toggles and users won't be able to -// use this key for conventional gameplay things -constexpr static int DEBUG_KEY = GLFW_KEY_F3; - -constexpr static int BASE_WIDTH = 320; -constexpr static int BASE_HEIGHT = 240; - -constexpr static int MIN_WIDTH = 2 * BASE_WIDTH; -constexpr static int MIN_HEIGHT = 2 * BASE_HEIGHT; - -constexpr static int DEFAULT_WIDTH = 720; -constexpr static int DEFAULT_HEIGHT = 480; - -static_assert(DEFAULT_WIDTH >= MIN_WIDTH); -static_assert(DEFAULT_HEIGHT >= MIN_HEIGHT); - -constexpr static float MIN_PITCH = 0.0625f; -constexpr static float MAX_PITCH = 10.0f; +#pragma once
+
+#include "shared/const.hh"
+
+// This key is then going to be reserved for only
+// the debug toggles and users won't be able to
+// use this key for conventional gameplay things
+constexpr static int DEBUG_KEY = GLFW_KEY_F3;
+
+constexpr static int BASE_WIDTH = 320;
+constexpr static int BASE_HEIGHT = 240;
+
+constexpr static int MIN_WIDTH = 2 * BASE_WIDTH;
+constexpr static int MIN_HEIGHT = 2 * BASE_HEIGHT;
+
+constexpr static int DEFAULT_WIDTH = 720;
+constexpr static int DEFAULT_HEIGHT = 480;
+
+static_assert(DEFAULT_WIDTH >= MIN_WIDTH);
+static_assert(DEFAULT_HEIGHT >= MIN_HEIGHT);
+
+constexpr static float MIN_PITCH = 0.0625f;
+constexpr static float MAX_PITCH = 10.0f;
diff --git a/game/client/entity/camera.cc b/game/client/entity/camera.cc index c17291f..471f2b6 100644 --- a/game/client/entity/camera.cc +++ b/game/client/entity/camera.cc @@ -1,114 +1,114 @@ -#include "client/pch.hh" - -#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" -#include "client/globals.hh" -#include "client/session.hh" -#include "client/toggles.hh" - -config::Float entity::camera::roll_angle(2.0f, 0.0f, 4.0f); -config::Float entity::camera::vertical_fov(90.0f, 45.0f, 110.0f); -config::Unsigned entity::camera::view_distance(16U, 4U, 32U); - -glm::fvec3 entity::camera::angles; -glm::fvec3 entity::camera::direction; -glm::fmat4x4 entity::camera::matrix; -chunk_pos entity::camera::position_chunk; -glm::fvec3 entity::camera::position_local; - -static void reset_camera(void) -{ - entity::camera::angles = glm::fvec3(0.0f, 0.0f, 0.0f); - entity::camera::direction = DIR_FORWARD<float>; - entity::camera::matrix = glm::identity<glm::fmat4x4>(); - entity::camera::position_chunk = chunk_pos(0, 0, 0); - entity::camera::position_local = glm::fvec3(0.0f, 0.0f, 0.0f); -} - -// Gracefully contributed by PQCraft himself in 2024 -// making PlatinumSrc and Voxelius kind of related to each other -static glm::fmat4x4 platinumsrc_viewmatrix(const glm::fvec3& position, const glm::fvec3& angles) -{ - glm::fvec3 forward, up; - math::vectors(angles, &forward, nullptr, &up); - - auto result = glm::identity<glm::fmat4x4>(); - result[0][0] = forward.y * up.z - forward.z * up.y; - result[1][0] = forward.z * up.x - forward.x * up.z; - result[2][0] = forward.x * up.y - forward.y * up.x; - result[3][0] = -result[0][0] * position.x - result[1][0] * position.y - result[2][0] * position.z; - result[0][1] = up.x; - result[1][1] = up.y; - result[2][1] = up.z; - result[3][1] = -up.x * position.x - up.y * position.y - up.z * position.z; - result[0][2] = -forward.x; - result[1][2] = -forward.y; - result[2][2] = -forward.z; - result[3][2] = forward.x * position.x + forward.y * position.y + forward.z * position.z; - return result; -} - -void entity::camera::init(void) -{ - globals::client_config.add_value("camera.roll_angle", entity::camera::roll_angle); - globals::client_config.add_value("camera.vertical_fov", entity::camera::vertical_fov); - globals::client_config.add_value("camera.view_distance", entity::camera::view_distance); - - settings::add_slider(1, entity::camera::vertical_fov, settings_location::GENERAL, "camera.vertical_fov", true, "%.0f"); - settings::add_slider(0, entity::camera::view_distance, settings_location::VIDEO, "camera.view_distance", false); - settings::add_slider(10, entity::camera::roll_angle, settings_location::VIDEO, "camera.roll_angle", true, "%.01f"); - - reset_camera(); -} - -void entity::camera::update(void) -{ - if(!session::is_ingame()) { - reset_camera(); - return; - } - - const auto& head = globals::dimension->entities.get<entity::client::HeadIntr>(globals::player); - const auto& transform = globals::dimension->entities.get<entity::client::TransformIntr>(globals::player); - const auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player); - - entity::camera::angles = transform.angles + head.angles; - entity::camera::position_chunk = transform.chunk; - entity::camera::position_local = transform.local + head.offset; - - glm::fvec3 right_vector, up_vector; - math::vectors(entity::camera::angles, &entity::camera::direction, &right_vector, &up_vector); - - auto client_angles = entity::camera::angles; - - if(!toggles::get(TOGGLE_PM_FLIGHT)) { - // Apply the quake-like view rolling - client_angles[2] = math::radians( - -entity::camera::roll_angle.get_value() * glm::dot(velocity.value / PMOVE_MAX_SPEED_GROUND, right_vector)); - } - - const auto z_near = 0.01f; - const auto z_far = 1.25f * static_cast<float>(CHUNK_SIZE * entity::camera::view_distance.get_value()); - - auto proj = glm::perspective(math::radians(entity::camera::vertical_fov.get_value()), globals::aspect, z_near, z_far); - auto view = platinumsrc_viewmatrix(entity::camera::position_local, client_angles); - - entity::camera::matrix = proj * view; -} +#include "client/pch.hh"
+
+#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"
+#include "client/globals.hh"
+#include "client/session.hh"
+#include "client/toggles.hh"
+
+config::Float entity::camera::roll_angle(2.0f, 0.0f, 4.0f);
+config::Float entity::camera::vertical_fov(90.0f, 45.0f, 110.0f);
+config::Unsigned entity::camera::view_distance(16U, 4U, 32U);
+
+glm::fvec3 entity::camera::angles;
+glm::fvec3 entity::camera::direction;
+glm::fmat4x4 entity::camera::matrix;
+chunk_pos entity::camera::position_chunk;
+glm::fvec3 entity::camera::position_local;
+
+static void reset_camera(void)
+{
+ entity::camera::angles = glm::fvec3(0.0f, 0.0f, 0.0f);
+ entity::camera::direction = DIR_FORWARD<float>;
+ entity::camera::matrix = glm::identity<glm::fmat4x4>();
+ entity::camera::position_chunk = chunk_pos(0, 0, 0);
+ entity::camera::position_local = glm::fvec3(0.0f, 0.0f, 0.0f);
+}
+
+// Gracefully contributed by PQCraft himself in 2024
+// making PlatinumSrc and Voxelius kind of related to each other
+static glm::fmat4x4 platinumsrc_viewmatrix(const glm::fvec3& position, const glm::fvec3& angles)
+{
+ glm::fvec3 forward, up;
+ math::vectors(angles, &forward, nullptr, &up);
+
+ auto result = glm::identity<glm::fmat4x4>();
+ result[0][0] = forward.y * up.z - forward.z * up.y;
+ result[1][0] = forward.z * up.x - forward.x * up.z;
+ result[2][0] = forward.x * up.y - forward.y * up.x;
+ result[3][0] = -result[0][0] * position.x - result[1][0] * position.y - result[2][0] * position.z;
+ result[0][1] = up.x;
+ result[1][1] = up.y;
+ result[2][1] = up.z;
+ result[3][1] = -up.x * position.x - up.y * position.y - up.z * position.z;
+ result[0][2] = -forward.x;
+ result[1][2] = -forward.y;
+ result[2][2] = -forward.z;
+ result[3][2] = forward.x * position.x + forward.y * position.y + forward.z * position.z;
+ return result;
+}
+
+void entity::camera::init(void)
+{
+ globals::client_config.add_value("camera.roll_angle", entity::camera::roll_angle);
+ globals::client_config.add_value("camera.vertical_fov", entity::camera::vertical_fov);
+ globals::client_config.add_value("camera.view_distance", entity::camera::view_distance);
+
+ settings::add_slider(1, entity::camera::vertical_fov, settings_location::GENERAL, "camera.vertical_fov", true, "%.0f");
+ settings::add_slider(0, entity::camera::view_distance, settings_location::VIDEO, "camera.view_distance", false);
+ settings::add_slider(10, entity::camera::roll_angle, settings_location::VIDEO, "camera.roll_angle", true, "%.01f");
+
+ reset_camera();
+}
+
+void entity::camera::update(void)
+{
+ if(!session::is_ingame()) {
+ reset_camera();
+ return;
+ }
+
+ const auto& head = globals::dimension->entities.get<entity::client::HeadIntr>(globals::player);
+ const auto& transform = globals::dimension->entities.get<entity::client::TransformIntr>(globals::player);
+ const auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player);
+
+ entity::camera::angles = transform.angles + head.angles;
+ entity::camera::position_chunk = transform.chunk;
+ entity::camera::position_local = transform.local + head.offset;
+
+ glm::fvec3 right_vector, up_vector;
+ math::vectors(entity::camera::angles, &entity::camera::direction, &right_vector, &up_vector);
+
+ auto client_angles = entity::camera::angles;
+
+ if(!toggles::get(TOGGLE_PM_FLIGHT)) {
+ // Apply the quake-like view rolling
+ client_angles[2] = math::radians(-entity::camera::roll_angle.get_value()
+ * glm::dot(velocity.value / PMOVE_MAX_SPEED_GROUND, right_vector));
+ }
+
+ const auto z_near = 0.01f;
+ const auto z_far = 1.25f * static_cast<float>(CHUNK_SIZE * entity::camera::view_distance.get_value());
+
+ auto proj = glm::perspective(math::radians(entity::camera::vertical_fov.get_value()), globals::aspect, z_near, z_far);
+ auto view = platinumsrc_viewmatrix(entity::camera::position_local, client_angles);
+
+ entity::camera::matrix = proj * view;
+}
diff --git a/game/client/entity/camera.hh b/game/client/entity/camera.hh index 67baf72..faefe78 100644 --- a/game/client/entity/camera.hh +++ b/game/client/entity/camera.hh @@ -1,31 +1,31 @@ -#pragma once - -#include "shared/types.hh" - -namespace config -{ -class Float; -class Unsigned; -} // namespace config - -namespace entity::camera -{ -extern config::Float roll_angle; -extern config::Float vertical_fov; -extern config::Unsigned view_distance; -} // namespace entity::camera - -namespace entity::camera -{ -extern glm::fvec3 angles; -extern glm::fvec3 direction; -extern glm::fmat4x4 matrix; -extern chunk_pos position_chunk; -extern glm::fvec3 position_local; -} // namespace entity::camera - -namespace entity::camera -{ -void init(void); -void update(void); -} // namespace entity::camera +#pragma once
+
+#include "shared/types.hh"
+
+namespace config
+{
+class Float;
+class Unsigned;
+} // namespace config
+
+namespace entity::camera
+{
+extern config::Float roll_angle;
+extern config::Float vertical_fov;
+extern config::Unsigned view_distance;
+} // namespace entity::camera
+
+namespace entity::camera
+{
+extern glm::fvec3 angles;
+extern glm::fvec3 direction;
+extern glm::fmat4x4 matrix;
+extern chunk_pos position_chunk;
+extern glm::fvec3 position_local;
+} // namespace entity::camera
+
+namespace entity::camera
+{
+void init(void);
+void update(void);
+} // namespace entity::camera
diff --git a/game/client/entity/factory.cc b/game/client/entity/factory.cc index f6f6079..5a1785a 100644 --- a/game/client/entity/factory.cc +++ b/game/client/entity/factory.cc @@ -1,30 +1,30 @@ -#include "client/pch.hh" - -#include "client/entity/factory.hh" - -#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" - -#include "client/globals.hh" - -void entity::client::create_player(world::Dimension* dimension, entt::entity entity) -{ - entity::shared::create_player(dimension, entity); - - const auto& head = dimension->entities.get<entity::Head>(entity); - dimension->entities.emplace_or_replace<entity::client::HeadIntr>(entity, head); - dimension->entities.emplace_or_replace<entity::client::HeadPrev>(entity, head); - - const auto& transform = dimension->entities.get<entity::Transform>(entity); - dimension->entities.emplace_or_replace<entity::client::TransformIntr>(entity, transform); - dimension->entities.emplace_or_replace<entity::client::TransformPrev>(entity, transform); - - if(globals::sound_ctx) { - dimension->entities.emplace_or_replace<entity::SoundEmitter>(entity); - } -} +#include "client/pch.hh"
+
+#include "client/entity/factory.hh"
+
+#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"
+
+#include "client/globals.hh"
+
+void entity::client::create_player(world::Dimension* dimension, entt::entity entity)
+{
+ entity::shared::create_player(dimension, entity);
+
+ const auto& head = dimension->entities.get<entity::Head>(entity);
+ dimension->entities.emplace_or_replace<entity::client::HeadIntr>(entity, head);
+ dimension->entities.emplace_or_replace<entity::client::HeadPrev>(entity, head);
+
+ const auto& transform = dimension->entities.get<entity::Transform>(entity);
+ dimension->entities.emplace_or_replace<entity::client::TransformIntr>(entity, transform);
+ dimension->entities.emplace_or_replace<entity::client::TransformPrev>(entity, transform);
+
+ if(globals::sound_ctx) {
+ dimension->entities.emplace_or_replace<entity::SoundEmitter>(entity);
+ }
+}
diff --git a/game/client/entity/factory.hh b/game/client/entity/factory.hh index 63e6e44..8cc8208 100644 --- a/game/client/entity/factory.hh +++ b/game/client/entity/factory.hh @@ -1,11 +1,11 @@ -#pragma once - -namespace world -{ -class Dimension; -} // namespace world - -namespace entity::client -{ -void create_player(world::Dimension* dimension, entt::entity entity); -} // namespace entity::client +#pragma once
+
+namespace world
+{
+class Dimension;
+} // namespace world
+
+namespace entity::client
+{
+void create_player(world::Dimension* dimension, entt::entity entity);
+} // namespace entity::client
diff --git a/game/client/entity/interpolation.cc b/game/client/entity/interpolation.cc index 9eca735..ef23a4c 100644 --- a/game/client/entity/interpolation.cc +++ b/game/client/entity/interpolation.cc @@ -1,64 +1,64 @@ -#include "client/pch.hh" - -#include "client/entity/interpolation.hh" - -#include "core/math/constexpr.hh" - -#include "shared/entity/head.hh" -#include "shared/entity/transform.hh" - -#include "shared/world/dimension.hh" - -#include "shared/coord.hh" - -#include "client/globals.hh" - -static void transform_interpolate(float alpha) -{ - auto group = globals::dimension->entities.group<entity::client::TransformIntr>( - entt::get<entity::Transform, entity::client::TransformPrev>); - - for(auto [entity, interp, current, previous] : group.each()) { - interp.angles[0] = math::lerp(previous.angles[0], current.angles[0], alpha); - interp.angles[1] = math::lerp(previous.angles[1], current.angles[1], alpha); - interp.angles[2] = math::lerp(previous.angles[2], current.angles[2], alpha); - - // Figure out previous chunk-local floating-point coordinates transformed - // to the current WorldCoord's chunk domain coordinates; we're interpolating - // against these instead of using previous.position.local to prevent jittering - auto previous_shift = coord::to_relative(current.chunk, current.local, previous.chunk, previous.local); - auto previous_local = current.local + previous_shift; - - interp.chunk.x = current.chunk.x; - interp.chunk.y = current.chunk.y; - interp.chunk.z = current.chunk.z; - - interp.local.x = math::lerp(previous_local.x, current.local.x, alpha); - interp.local.y = math::lerp(previous_local.y, current.local.y, alpha); - interp.local.z = math::lerp(previous_local.z, current.local.z, alpha); - } -} - -static void head_interpolate(float alpha) -{ - auto group = globals::dimension->entities.group<entity::client::HeadIntr>(entt::get<entity::Head, entity::client::HeadPrev>); - - for(auto [entity, interp, current, previous] : group.each()) { - interp.angles[0] = math::lerp(previous.angles[0], current.angles[0], alpha); - interp.angles[1] = math::lerp(previous.angles[1], current.angles[1], alpha); - interp.angles[2] = math::lerp(previous.angles[2], current.angles[2], alpha); - - interp.offset.x = math::lerp(previous.offset.x, current.offset.x, alpha); - interp.offset.y = math::lerp(previous.offset.y, current.offset.y, alpha); - interp.offset.z = math::lerp(previous.offset.z, current.offset.z, alpha); - } -} - -void entity::interpolation::update(void) -{ - if(globals::dimension) { - auto alpha = static_cast<float>(globals::fixed_accumulator) / static_cast<float>(globals::fixed_frametime_us); - transform_interpolate(alpha); - head_interpolate(alpha); - } +#include "client/pch.hh"
+
+#include "client/entity/interpolation.hh"
+
+#include "core/math/constexpr.hh"
+
+#include "shared/entity/head.hh"
+#include "shared/entity/transform.hh"
+
+#include "shared/world/dimension.hh"
+
+#include "shared/coord.hh"
+
+#include "client/globals.hh"
+
+static void transform_interpolate(float alpha)
+{
+ auto group = globals::dimension->entities.group<entity::client::TransformIntr>(
+ entt::get<entity::Transform, entity::client::TransformPrev>);
+
+ for(auto [entity, interp, current, previous] : group.each()) {
+ interp.angles[0] = math::lerp(previous.angles[0], current.angles[0], alpha);
+ interp.angles[1] = math::lerp(previous.angles[1], current.angles[1], alpha);
+ interp.angles[2] = math::lerp(previous.angles[2], current.angles[2], alpha);
+
+ // Figure out previous chunk-local floating-point coordinates transformed
+ // to the current WorldCoord's chunk domain coordinates; we're interpolating
+ // against these instead of using previous.position.local to prevent jittering
+ auto previous_shift = coord::to_relative(current.chunk, current.local, previous.chunk, previous.local);
+ auto previous_local = current.local + previous_shift;
+
+ interp.chunk.x = current.chunk.x;
+ interp.chunk.y = current.chunk.y;
+ interp.chunk.z = current.chunk.z;
+
+ interp.local.x = math::lerp(previous_local.x, current.local.x, alpha);
+ interp.local.y = math::lerp(previous_local.y, current.local.y, alpha);
+ interp.local.z = math::lerp(previous_local.z, current.local.z, alpha);
+ }
+}
+
+static void head_interpolate(float alpha)
+{
+ auto group = globals::dimension->entities.group<entity::client::HeadIntr>(entt::get<entity::Head, entity::client::HeadPrev>);
+
+ for(auto [entity, interp, current, previous] : group.each()) {
+ interp.angles[0] = math::lerp(previous.angles[0], current.angles[0], alpha);
+ interp.angles[1] = math::lerp(previous.angles[1], current.angles[1], alpha);
+ interp.angles[2] = math::lerp(previous.angles[2], current.angles[2], alpha);
+
+ interp.offset.x = math::lerp(previous.offset.x, current.offset.x, alpha);
+ interp.offset.y = math::lerp(previous.offset.y, current.offset.y, alpha);
+ interp.offset.z = math::lerp(previous.offset.z, current.offset.z, alpha);
+ }
+}
+
+void entity::interpolation::update(void)
+{
+ if(globals::dimension) {
+ auto alpha = static_cast<float>(globals::fixed_accumulator) / static_cast<float>(globals::fixed_frametime_us);
+ transform_interpolate(alpha);
+ head_interpolate(alpha);
+ }
}
\ No newline at end of file diff --git a/game/client/entity/interpolation.hh b/game/client/entity/interpolation.hh index 6935fe8..a7c4dac 100644 --- a/game/client/entity/interpolation.hh +++ b/game/client/entity/interpolation.hh @@ -1,6 +1,6 @@ -#pragma once - -namespace entity::interpolation -{ -void update(void); -} // namespace entity::interpolation +#pragma once
+
+namespace entity::interpolation
+{
+void update(void);
+} // namespace entity::interpolation
diff --git a/game/client/entity/listener.cc b/game/client/entity/listener.cc index 3b1a35b..3d732ae 100644 --- a/game/client/entity/listener.cc +++ b/game/client/entity/listener.cc @@ -1,42 +1,42 @@ -#include "client/pch.hh" - -#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" -#include "client/globals.hh" -#include "client/session.hh" - -void entity::listener::update(void) -{ - if(session::is_ingame()) { - const auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player).value; - const auto& position = entity::camera::position_local; - - alListener3f(AL_POSITION, position.x, position.y, position.z); - alListener3f(AL_VELOCITY, velocity.x, velocity.y, velocity.z); - - float orientation[6]; - orientation[0] = entity::camera::direction.x; - orientation[1] = entity::camera::direction.y; - orientation[2] = entity::camera::direction.z; - orientation[3] = DIR_UP<float>.x; - orientation[4] = DIR_UP<float>.y; - orientation[5] = DIR_UP<float>.z; - - alListenerfv(AL_ORIENTATION, orientation); - } - - alListenerf(AL_GAIN, math::clamp(sound::volume_master.get_value() * 0.01f, 0.0f, 1.0f)); -} +#include "client/pch.hh"
+
+#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"
+#include "client/globals.hh"
+#include "client/session.hh"
+
+void entity::listener::update(void)
+{
+ if(session::is_ingame()) {
+ const auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player).value;
+ const auto& position = entity::camera::position_local;
+
+ alListener3f(AL_POSITION, position.x, position.y, position.z);
+ alListener3f(AL_VELOCITY, velocity.x, velocity.y, velocity.z);
+
+ float orientation[6];
+ orientation[0] = entity::camera::direction.x;
+ orientation[1] = entity::camera::direction.y;
+ orientation[2] = entity::camera::direction.z;
+ orientation[3] = DIR_UP<float>.x;
+ orientation[4] = DIR_UP<float>.y;
+ orientation[5] = DIR_UP<float>.z;
+
+ alListenerfv(AL_ORIENTATION, orientation);
+ }
+
+ alListenerf(AL_GAIN, math::clamp(sound::volume_master.get_value() * 0.01f, 0.0f, 1.0f));
+}
diff --git a/game/client/entity/listener.hh b/game/client/entity/listener.hh index 594cde1..817e2fd 100644 --- a/game/client/entity/listener.hh +++ b/game/client/entity/listener.hh @@ -1,6 +1,6 @@ -#pragma once - -namespace entity::listener -{ -void update(void); -} // namespace entity::listener +#pragma once
+
+namespace entity::listener
+{
+void update(void);
+} // namespace entity::listener
diff --git a/game/client/entity/player_look.cc b/game/client/entity/player_look.cc index 715475b..caa367e 100644 --- a/game/client/entity/player_look.cc +++ b/game/client/entity/player_look.cc @@ -1,155 +1,155 @@ -#include "client/pch.hh" - -#include "client/entity/player_look.hh" - -#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" - -#include "client/const.hh" -#include "client/globals.hh" -#include "client/session.hh" - -constexpr static float PITCH_MIN = -1.0f * math::radians(90.0f); -constexpr static float PITCH_MAX = +1.0f * math::radians(90.0f); - -// Mouse options -static config::Boolean mouse_raw_input(true); -static config::Unsigned mouse_sensitivity(25U, 1U, 100U); - -// Gamepad options -static config::Float gamepad_fastlook_factor(1.5f, 1.0f, 5.0f); -static config::Unsigned gamepad_accel_pitch(15U, 1U, 100U); -static config::Unsigned gamepad_accel_yaw(25U, 1U, 100U); - -// Gamepad axes -static config::GamepadAxis axis_pitch(GLFW_GAMEPAD_AXIS_LEFT_Y, false); -static config::GamepadAxis axis_yaw(GLFW_GAMEPAD_AXIS_LEFT_X, false); - -// Gamepad buttons -static config::GamepadButton button_fastlook(GLFW_GAMEPAD_BUTTON_LEFT_THUMB); - -static bool fastlook_enabled; -static glm::fvec2 last_cursor; - -static void add_angles(float pitch, float yaw) -{ - if(session::is_ingame()) { - auto& head = globals::dimension->entities.get<entity::Head>(globals::player); - - head.angles[0] += pitch; - head.angles[1] += yaw; - head.angles[0] = math::clamp(head.angles[0], PITCH_MIN, PITCH_MAX); - head.angles = math::wrap_180(head.angles); - - // Client-side head angles are not interpolated; - // Re-assigning the previous state after the current - // state has been already modified is certainly a way - // to circumvent the interpolation applied to anything with a head - globals::dimension->entities.emplace_or_replace<entity::client::HeadPrev>(globals::player, head); - } -} - -static void on_glfw_cursor_pos(const io::GlfwCursorPosEvent& event) -{ - if(io::gamepad::available && io::gamepad::active.get_value()) { - // The player is assumed to be using - // a gamepad instead of mouse and keyboard - last_cursor = event.pos; - return; - } - - if(globals::gui_screen || !session::is_ingame()) { - // UI is visible or we're not in-game - last_cursor = event.pos; - return; - } - - auto dx = -0.01f * static_cast<float>(mouse_sensitivity.get_value()) * math::radians(event.pos.x - last_cursor.x); - auto dy = -0.01f * static_cast<float>(mouse_sensitivity.get_value()) * math::radians(event.pos.y - last_cursor.y); - add_angles(dy, dx); - - last_cursor = event.pos; -} - -static void on_gamepad_button(const io::GamepadButtonEvent& event) -{ - if(button_fastlook.equals(event.button)) { - fastlook_enabled = event.action == GLFW_PRESS; - } -} - -void entity::player_look::init(void) -{ - globals::client_config.add_value("player_look.mouse.raw_input", mouse_raw_input); - globals::client_config.add_value("player_look.mouse.sensitivity", mouse_sensitivity); - globals::client_config.add_value("player_look.gamepad.fastlook_factor", gamepad_fastlook_factor); - globals::client_config.add_value("player_look.gamepad.accel_pitch", gamepad_accel_pitch); - globals::client_config.add_value("player_look.gamepad.accel_yaw", gamepad_accel_yaw); - globals::client_config.add_value("player_look.gp_axis.pitch", axis_pitch); - globals::client_config.add_value("player_look.gp_axis.yaw", axis_yaw); - globals::client_config.add_value("player_look.gp_button.fastlook", button_fastlook); - - settings::add_slider(0, mouse_sensitivity, settings_location::MOUSE, "player_look.mouse.sensitivity", true); - settings::add_checkbox(1, mouse_raw_input, settings_location::MOUSE, "player_look.mouse.raw_input", true); - - settings::add_slider(0, gamepad_accel_pitch, settings_location::GAMEPAD_GAMEPLAY, "player_look.gamepad.accel_pitch", false); - settings::add_slider(1, gamepad_accel_yaw, settings_location::GAMEPAD_GAMEPLAY, "player_look.gamepad.accel_yaw", false); - settings::add_gamepad_axis(2, axis_pitch, settings_location::GAMEPAD_GAMEPLAY, "player_look.gp_axis.pitch"); - settings::add_gamepad_axis(3, axis_yaw, settings_location::GAMEPAD_GAMEPLAY, "player_look.gp_axis.yaw"); - settings::add_slider( - 4, gamepad_fastlook_factor, settings_location::GAMEPAD_GAMEPLAY, "player_look.gamepad.fastlook_factor", true, "%.02f"); - settings::add_gamepad_button(5, button_fastlook, settings_location::GAMEPAD_GAMEPLAY, "player_look.gp_button.fastlook"); - - fastlook_enabled = false; - last_cursor.x = 0.5f * static_cast<float>(globals::width); - last_cursor.y = 0.5f * static_cast<float>(globals::height); - - globals::dispatcher.sink<io::GlfwCursorPosEvent>().connect<&on_glfw_cursor_pos>(); - globals::dispatcher.sink<io::GamepadButtonEvent>().connect<&on_gamepad_button>(); -} - -void entity::player_look::update_late(void) -{ - if(io::gamepad::available && io::gamepad::active.get_value() && !globals::gui_screen) { - auto pitch_value = axis_pitch.get_value(io::gamepad::state, io::gamepad::deadzone.get_value()); - auto yaw_value = axis_yaw.get_value(io::gamepad::state, io::gamepad::deadzone.get_value()); - - if(fastlook_enabled) { - // Fastlook allows the camera to - // rotate quicker when a button is held down - pitch_value *= gamepad_fastlook_factor.get_value(); - yaw_value *= gamepad_fastlook_factor.get_value(); - } - - pitch_value *= 0.001f * static_cast<float>(gamepad_accel_pitch.get_value()); - yaw_value *= 0.001f * static_cast<float>(gamepad_accel_yaw.get_value()); - - add_angles(pitch_value, yaw_value); - } - - if(!globals::gui_screen && session::is_ingame()) { - glfwSetInputMode(globals::window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); - glfwSetInputMode(globals::window, GLFW_RAW_MOUSE_MOTION, mouse_raw_input.get_value()); - } - else { - glfwSetInputMode(globals::window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); - glfwSetInputMode(globals::window, GLFW_RAW_MOUSE_MOTION, false); - } -} +#include "client/pch.hh"
+
+#include "client/entity/player_look.hh"
+
+#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"
+
+#include "client/const.hh"
+#include "client/globals.hh"
+#include "client/session.hh"
+
+constexpr static float PITCH_MIN = -1.0f * math::radians(90.0f);
+constexpr static float PITCH_MAX = +1.0f * math::radians(90.0f);
+
+// Mouse options
+static config::Boolean mouse_raw_input(true);
+static config::Unsigned mouse_sensitivity(25U, 1U, 100U);
+
+// Gamepad options
+static config::Float gamepad_fastlook_factor(1.5f, 1.0f, 5.0f);
+static config::Unsigned gamepad_accel_pitch(15U, 1U, 100U);
+static config::Unsigned gamepad_accel_yaw(25U, 1U, 100U);
+
+// Gamepad axes
+static config::GamepadAxis axis_pitch(GLFW_GAMEPAD_AXIS_LEFT_Y, false);
+static config::GamepadAxis axis_yaw(GLFW_GAMEPAD_AXIS_LEFT_X, false);
+
+// Gamepad buttons
+static config::GamepadButton button_fastlook(GLFW_GAMEPAD_BUTTON_LEFT_THUMB);
+
+static bool fastlook_enabled;
+static glm::fvec2 last_cursor;
+
+static void add_angles(float pitch, float yaw)
+{
+ if(session::is_ingame()) {
+ auto& head = globals::dimension->entities.get<entity::Head>(globals::player);
+
+ head.angles[0] += pitch;
+ head.angles[1] += yaw;
+ head.angles[0] = math::clamp(head.angles[0], PITCH_MIN, PITCH_MAX);
+ head.angles = math::wrap_180(head.angles);
+
+ // Client-side head angles are not interpolated;
+ // Re-assigning the previous state after the current
+ // state has been already modified is certainly a way
+ // to circumvent the interpolation applied to anything with a head
+ globals::dimension->entities.emplace_or_replace<entity::client::HeadPrev>(globals::player, head);
+ }
+}
+
+static void on_glfw_cursor_pos(const io::GlfwCursorPosEvent& event)
+{
+ if(io::gamepad::available && io::gamepad::active.get_value()) {
+ // The player is assumed to be using
+ // a gamepad instead of mouse and keyboard
+ last_cursor = event.pos;
+ return;
+ }
+
+ if(globals::gui_screen || !session::is_ingame()) {
+ // UI is visible or we're not in-game
+ last_cursor = event.pos;
+ return;
+ }
+
+ auto dx = -0.01f * static_cast<float>(mouse_sensitivity.get_value()) * math::radians(event.pos.x - last_cursor.x);
+ auto dy = -0.01f * static_cast<float>(mouse_sensitivity.get_value()) * math::radians(event.pos.y - last_cursor.y);
+ add_angles(dy, dx);
+
+ last_cursor = event.pos;
+}
+
+static void on_gamepad_button(const io::GamepadButtonEvent& event)
+{
+ if(button_fastlook.equals(event.button)) {
+ fastlook_enabled = event.action == GLFW_PRESS;
+ }
+}
+
+void entity::player_look::init(void)
+{
+ globals::client_config.add_value("player_look.mouse.raw_input", mouse_raw_input);
+ globals::client_config.add_value("player_look.mouse.sensitivity", mouse_sensitivity);
+ globals::client_config.add_value("player_look.gamepad.fastlook_factor", gamepad_fastlook_factor);
+ globals::client_config.add_value("player_look.gamepad.accel_pitch", gamepad_accel_pitch);
+ globals::client_config.add_value("player_look.gamepad.accel_yaw", gamepad_accel_yaw);
+ globals::client_config.add_value("player_look.gp_axis.pitch", axis_pitch);
+ globals::client_config.add_value("player_look.gp_axis.yaw", axis_yaw);
+ globals::client_config.add_value("player_look.gp_button.fastlook", button_fastlook);
+
+ settings::add_slider(0, mouse_sensitivity, settings_location::MOUSE, "player_look.mouse.sensitivity", true);
+ settings::add_checkbox(1, mouse_raw_input, settings_location::MOUSE, "player_look.mouse.raw_input", true);
+
+ settings::add_slider(0, gamepad_accel_pitch, settings_location::GAMEPAD_GAMEPLAY, "player_look.gamepad.accel_pitch", false);
+ settings::add_slider(1, gamepad_accel_yaw, settings_location::GAMEPAD_GAMEPLAY, "player_look.gamepad.accel_yaw", false);
+ settings::add_gamepad_axis(2, axis_pitch, settings_location::GAMEPAD_GAMEPLAY, "player_look.gp_axis.pitch");
+ settings::add_gamepad_axis(3, axis_yaw, settings_location::GAMEPAD_GAMEPLAY, "player_look.gp_axis.yaw");
+ settings::add_slider(4, gamepad_fastlook_factor, settings_location::GAMEPAD_GAMEPLAY, "player_look.gamepad.fastlook_factor", true,
+ "%.02f");
+ settings::add_gamepad_button(5, button_fastlook, settings_location::GAMEPAD_GAMEPLAY, "player_look.gp_button.fastlook");
+
+ fastlook_enabled = false;
+ last_cursor.x = 0.5f * static_cast<float>(globals::width);
+ last_cursor.y = 0.5f * static_cast<float>(globals::height);
+
+ globals::dispatcher.sink<io::GlfwCursorPosEvent>().connect<&on_glfw_cursor_pos>();
+ globals::dispatcher.sink<io::GamepadButtonEvent>().connect<&on_gamepad_button>();
+}
+
+void entity::player_look::update_late(void)
+{
+ if(io::gamepad::available && io::gamepad::active.get_value() && !globals::gui_screen) {
+ auto pitch_value = axis_pitch.get_value(io::gamepad::state, io::gamepad::deadzone.get_value());
+ auto yaw_value = axis_yaw.get_value(io::gamepad::state, io::gamepad::deadzone.get_value());
+
+ if(fastlook_enabled) {
+ // Fastlook allows the camera to
+ // rotate quicker when a button is held down
+ pitch_value *= gamepad_fastlook_factor.get_value();
+ yaw_value *= gamepad_fastlook_factor.get_value();
+ }
+
+ pitch_value *= 0.001f * static_cast<float>(gamepad_accel_pitch.get_value());
+ yaw_value *= 0.001f * static_cast<float>(gamepad_accel_yaw.get_value());
+
+ add_angles(pitch_value, yaw_value);
+ }
+
+ if(!globals::gui_screen && session::is_ingame()) {
+ glfwSetInputMode(globals::window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
+ glfwSetInputMode(globals::window, GLFW_RAW_MOUSE_MOTION, mouse_raw_input.get_value());
+ }
+ else {
+ glfwSetInputMode(globals::window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
+ glfwSetInputMode(globals::window, GLFW_RAW_MOUSE_MOTION, false);
+ }
+}
diff --git a/game/client/entity/player_look.hh b/game/client/entity/player_look.hh index 0ae18db..b347031 100644 --- a/game/client/entity/player_look.hh +++ b/game/client/entity/player_look.hh @@ -1,7 +1,7 @@ -#pragma once - -namespace entity::player_look -{ -void init(void); -void update_late(void); -} // namespace entity::player_look +#pragma once
+
+namespace entity::player_look
+{
+void init(void);
+void update_late(void);
+} // namespace entity::player_look
diff --git a/game/client/entity/player_move.cc b/game/client/entity/player_move.cc index fb49754..2570780 100644 --- a/game/client/entity/player_move.cc +++ b/game/client/entity/player_move.cc @@ -1,298 +1,298 @@ -#include "client/pch.hh" - -#include "client/entity/player_move.hh" - -#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" - -#include "shared/entity/grounded.hh" -#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" -#include "client/globals.hh" -#include "client/session.hh" -#include "client/toggles.hh" - -constexpr static std::uint64_t PMOVE_JUMP_COOLDOWN = 500000; // 0.5 seconds - -constexpr static float PMOVE_FOOTSTEP_SIZE = 2.0f; - -// Movement keys -static config::KeyBind key_move_forward(GLFW_KEY_W); -static config::KeyBind key_move_back(GLFW_KEY_S); -static config::KeyBind key_move_left(GLFW_KEY_A); -static config::KeyBind key_move_right(GLFW_KEY_D); -static config::KeyBind key_move_down(GLFW_KEY_LEFT_SHIFT); -static config::KeyBind key_move_up(GLFW_KEY_SPACE); - -// Movement gamepad axes -static config::GamepadAxis axis_move_forward(GLFW_GAMEPAD_AXIS_RIGHT_X, false); -static config::GamepadAxis axis_move_sideways(GLFW_GAMEPAD_AXIS_RIGHT_Y, false); - -// Movement gamepad buttons -static config::GamepadButton button_move_down(GLFW_GAMEPAD_BUTTON_DPAD_DOWN); -static config::GamepadButton button_move_up(GLFW_GAMEPAD_BUTTON_DPAD_UP); - -// General movement options -static config::Boolean enable_speedometer(true); - -static glm::fvec3 movement_direction; - -static std::uint64_t next_jump_us; -static float speedometer_value; -static float footsteps_distance; - -static std::mt19937_64 pitch_random; -static std::uniform_real_distribution<float> pitch_distrib; - -// Quake III's PM_Accelerate-ish function used for -// conventional (gravity-affected non-flight) movement -static glm::fvec3 pm_accelerate(const glm::fvec3& wishdir, const glm::fvec3& velocity, float wishspeed, float accel) -{ - auto current_speed = glm::dot(velocity, wishdir); - auto add_speed = wishspeed - current_speed; - - if(add_speed <= 0.0f) { - // Not accelerating - return velocity; - } - - auto accel_speed = math::min(add_speed, accel * globals::fixed_frametime * wishspeed); - - auto result = glm::fvec3(velocity); - result.x += accel_speed * wishdir.x; - result.z += accel_speed * wishdir.z; - return result; -} - -// Conventional movement - velocity update when not on the ground -static glm::fvec3 pm_air_move(const glm::fvec3& wishdir, const glm::fvec3& velocity) -{ - return pm_accelerate(wishdir, velocity, PMOVE_ACCELERATION_AIR, PMOVE_MAX_SPEED_AIR); -} - -// Conventional movement - velocity uodate when on the ground -static glm::fvec3 pm_ground_move(const glm::fvec3& wishdir, const glm::fvec3& velocity) -{ - if(auto speed = glm::length(velocity)) { - auto speed_drop = speed * PMOVE_FRICTION_GROUND * globals::fixed_frametime; - auto speed_factor = math::max(speed - speed_drop, 0.0f) / speed; - return pm_accelerate(wishdir, velocity * speed_factor, PMOVE_ACCELERATION_GROUND, PMOVE_MAX_SPEED_GROUND); - } - - return pm_accelerate(wishdir, velocity, PMOVE_ACCELERATION_GROUND, PMOVE_MAX_SPEED_GROUND); -} - -// A simpler minecraft-like acceleration model -// used whenever the TOGGLE_PM_FLIGHT is enabled -static glm::fvec3 pm_flight_move(const glm::fvec3& wishdir) -{ - // FIXME: make it smoother - return wishdir * PMOVE_MAX_SPEED_AIR; -} - -void entity::player_move::init(void) -{ - movement_direction = ZERO_VEC3<float>; - - next_jump_us = 0x0000000000000000U; - speedometer_value = 0.0f; - footsteps_distance = 0.0f; - - // UNDONE: make this a separate subsystem - pitch_random.seed(std::random_device()()); - pitch_distrib = std::uniform_real_distribution<float>(0.9f, 1.1f); - - globals::client_config.add_value("player_move.key.forward", key_move_forward); - globals::client_config.add_value("player_move.key.back", key_move_back); - globals::client_config.add_value("player_move.key.left", key_move_left); - globals::client_config.add_value("player_move.key.right", key_move_right); - globals::client_config.add_value("player_move.key.down", key_move_down); - globals::client_config.add_value("player_move.key.up", key_move_up); - globals::client_config.add_value("player_move.gp_axis.move_forward", axis_move_forward); - globals::client_config.add_value("player_move.gp_axis.move_sideways", axis_move_sideways); - globals::client_config.add_value("player_move.gp_button.move_down", button_move_down); - globals::client_config.add_value("player_move.gp_button.move_up", button_move_up); - globals::client_config.add_value("player_move.enable_speedometer", enable_speedometer); - - settings::add_keybind(1, key_move_forward, settings_location::KEYBOARD_MOVEMENT, "player_move.key.forward"); - settings::add_keybind(2, key_move_back, settings_location::KEYBOARD_MOVEMENT, "player_move.key.back"); - settings::add_keybind(3, key_move_left, settings_location::KEYBOARD_MOVEMENT, "player_move.key.left"); - settings::add_keybind(4, key_move_right, settings_location::KEYBOARD_MOVEMENT, "player_move.key.right"); - settings::add_keybind(5, key_move_down, settings_location::KEYBOARD_MOVEMENT, "player_move.key.down"); - settings::add_keybind(6, key_move_up, settings_location::KEYBOARD_MOVEMENT, "player_move.key.up"); - - settings::add_gamepad_axis(0, axis_move_forward, settings_location::GAMEPAD_MOVEMENT, "player_move.gp_axis.move_forward"); - settings::add_gamepad_axis(1, axis_move_sideways, settings_location::GAMEPAD_MOVEMENT, "player_move.gp_axis.move_sideways"); - settings::add_gamepad_button(2, button_move_down, settings_location::GAMEPAD_MOVEMENT, "player_move.gp_button.move_down"); - settings::add_gamepad_button(3, button_move_up, settings_location::GAMEPAD_MOVEMENT, "player_move.gp_button.move_up"); - - settings::add_checkbox(2, enable_speedometer, settings_location::VIDEO_GUI, "player_move.enable_speedometer", true); -} - -void entity::player_move::fixed_update(void) -{ - const auto& head = globals::dimension->entities.get<entity::Head>(globals::player); - auto& transform = globals::dimension->entities.get<entity::Transform>(globals::player); - auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player); - - // Interpolation - preserve current component states - globals::dimension->entities.emplace_or_replace<entity::client::TransformPrev>(globals::player, transform); - - glm::fvec3 forward, right; - math::vectors(glm::fvec3(0.0f, head.angles[1], 0.0f), &forward, &right, nullptr); - - glm::fvec3 wishdir = ZERO_VEC3<float>; - glm::fvec3 movevars = glm::fvec3(movement_direction.x, 0.0f, movement_direction.z); - wishdir.x = glm::dot(movevars, right); - wishdir.z = glm::dot(movevars, forward); - - if(toggles::get(TOGGLE_PM_FLIGHT)) { - velocity.value = pm_flight_move(glm::fvec3(wishdir.x, movement_direction.y, wishdir.z)); - return; - } - - auto grounded = globals::dimension->entities.try_get<entity::Grounded>(globals::player); - auto velocity_horizontal = glm::fvec3(velocity.value.x, 0.0f, velocity.value.z); - - if(grounded) { - auto new_velocity = pm_ground_move(wishdir, velocity_horizontal); - velocity.value.x = new_velocity.x; - velocity.value.z = new_velocity.z; - - auto new_speed = glm::length(new_velocity); - - if(new_speed > 0.01f) { - footsteps_distance += globals::fixed_frametime * new_speed; - } - else { - footsteps_distance = 0.0f; - } - - if(footsteps_distance >= PMOVE_FOOTSTEP_SIZE) { - if(auto effect = world::voxel_sounds::get_footsteps(grounded->surface)) { - sound::play_player(effect, false, pitch_distrib(pitch_random)); - } - - footsteps_distance = 0.0f; - } - } - else { - auto new_velocity = pm_air_move(wishdir, velocity_horizontal); - velocity.value.x = new_velocity.x; - velocity.value.z = new_velocity.z; - } - - if(movement_direction.y == 0.0f) { - // Allow players to queue bunny-jumps by quickly - // releasing and pressing the jump key again without a cooldown - next_jump_us = 0x0000000000000000U; - return; - } - - if(grounded && (movement_direction.y > 0.0f) && (globals::curtime >= next_jump_us)) { - velocity.value.y = -PMOVE_JUMP_FORCE * globals::dimension->get_gravity(); - - auto new_speed = glm::length(glm::fvec2(velocity.value.x, velocity.value.z)); - auto new_speed_text = std::format("{:.02f} M/S", new_speed); - auto speed_change = new_speed - speedometer_value; - - speedometer_value = new_speed; - - next_jump_us = globals::curtime + PMOVE_JUMP_COOLDOWN; - - if(enable_speedometer.get_value()) { - if(math::abs(speed_change) < 0.01f) { - // No considerable speed increase within - // the precision we use to draw the speedometer - gui::status_lines::set(gui::STATUS_DEBUG, new_speed_text, ImVec4(0.7f, 0.7f, 0.7f, 1.0f), 1.0f); - } - else if(speed_change < 0.0f) { - // Speed change is negative, we are actively - // slowing down; use the red color for the status line - gui::status_lines::set(gui::STATUS_DEBUG, new_speed_text, ImVec4(1.0f, 0.0f, 0.0f, 1.0f), 1.0f); - } - else { - // Speed change is positive, we are actively - // speeding up; use the green color for the status line - gui::status_lines::set(gui::STATUS_DEBUG, new_speed_text, ImVec4(0.0f, 1.0f, 0.0f, 1.0f), 1.0f); - } - } - - if(auto effect = world::voxel_sounds::get_footsteps(grounded->surface)) { - sound::play_player(effect, false, 1.0f); - } - } -} - -void entity::player_move::update_late(void) -{ - movement_direction = ZERO_VEC3<float>; - - if(globals::gui_screen || !session::is_ingame()) { - // We're either disconnected or have the - // UI opened up; anyways we shouldn't move - return; - } - - if(io::gamepad::available && io::gamepad::active.get_value()) { - if(button_move_down.is_pressed(io::gamepad::state)) { - movement_direction += DIR_DOWN<float>; - } - - if(button_move_up.is_pressed(io::gamepad::state)) { - movement_direction += DIR_UP<float>; - } - - movement_direction.x += axis_move_sideways.get_value(io::gamepad::state, io::gamepad::deadzone.get_value()); - movement_direction.z -= axis_move_forward.get_value(io::gamepad::state, io::gamepad::deadzone.get_value()); - } - else { - if(GLFW_PRESS == glfwGetKey(globals::window, key_move_forward.get_key())) { - movement_direction += DIR_FORWARD<float>; - } - - if(GLFW_PRESS == glfwGetKey(globals::window, key_move_back.get_key())) { - movement_direction += DIR_BACK<float>; - } - - if(GLFW_PRESS == glfwGetKey(globals::window, key_move_left.get_key())) { - movement_direction += DIR_LEFT<float>; - } - - if(GLFW_PRESS == glfwGetKey(globals::window, key_move_right.get_key())) { - movement_direction += DIR_RIGHT<float>; - } - - if(GLFW_PRESS == glfwGetKey(globals::window, key_move_down.get_key())) { - movement_direction += DIR_DOWN<float>; - } - - if(GLFW_PRESS == glfwGetKey(globals::window, key_move_up.get_key())) { - movement_direction += DIR_UP<float>; - } - } -} +#include "client/pch.hh"
+
+#include "client/entity/player_move.hh"
+
+#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"
+
+#include "shared/entity/grounded.hh"
+#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"
+#include "client/globals.hh"
+#include "client/session.hh"
+#include "client/toggles.hh"
+
+constexpr static std::uint64_t PMOVE_JUMP_COOLDOWN = 500000; // 0.5 seconds
+
+constexpr static float PMOVE_FOOTSTEP_SIZE = 2.0f;
+
+// Movement keys
+static config::KeyBind key_move_forward(GLFW_KEY_W);
+static config::KeyBind key_move_back(GLFW_KEY_S);
+static config::KeyBind key_move_left(GLFW_KEY_A);
+static config::KeyBind key_move_right(GLFW_KEY_D);
+static config::KeyBind key_move_down(GLFW_KEY_LEFT_SHIFT);
+static config::KeyBind key_move_up(GLFW_KEY_SPACE);
+
+// Movement gamepad axes
+static config::GamepadAxis axis_move_forward(GLFW_GAMEPAD_AXIS_RIGHT_X, false);
+static config::GamepadAxis axis_move_sideways(GLFW_GAMEPAD_AXIS_RIGHT_Y, false);
+
+// Movement gamepad buttons
+static config::GamepadButton button_move_down(GLFW_GAMEPAD_BUTTON_DPAD_DOWN);
+static config::GamepadButton button_move_up(GLFW_GAMEPAD_BUTTON_DPAD_UP);
+
+// General movement options
+static config::Boolean enable_speedometer(true);
+
+static glm::fvec3 movement_direction;
+
+static std::uint64_t next_jump_us;
+static float speedometer_value;
+static float footsteps_distance;
+
+static std::mt19937_64 pitch_random;
+static std::uniform_real_distribution<float> pitch_distrib;
+
+// Quake III's PM_Accelerate-ish function used for
+// conventional (gravity-affected non-flight) movement
+static glm::fvec3 pm_accelerate(const glm::fvec3& wishdir, const glm::fvec3& velocity, float wishspeed, float accel)
+{
+ auto current_speed = glm::dot(velocity, wishdir);
+ auto add_speed = wishspeed - current_speed;
+
+ if(add_speed <= 0.0f) {
+ // Not accelerating
+ return velocity;
+ }
+
+ auto accel_speed = math::min(add_speed, accel * globals::fixed_frametime * wishspeed);
+
+ auto result = glm::fvec3(velocity);
+ result.x += accel_speed * wishdir.x;
+ result.z += accel_speed * wishdir.z;
+ return result;
+}
+
+// Conventional movement - velocity update when not on the ground
+static glm::fvec3 pm_air_move(const glm::fvec3& wishdir, const glm::fvec3& velocity)
+{
+ return pm_accelerate(wishdir, velocity, PMOVE_ACCELERATION_AIR, PMOVE_MAX_SPEED_AIR);
+}
+
+// Conventional movement - velocity uodate when on the ground
+static glm::fvec3 pm_ground_move(const glm::fvec3& wishdir, const glm::fvec3& velocity)
+{
+ if(auto speed = glm::length(velocity)) {
+ auto speed_drop = speed * PMOVE_FRICTION_GROUND * globals::fixed_frametime;
+ auto speed_factor = math::max(speed - speed_drop, 0.0f) / speed;
+ return pm_accelerate(wishdir, velocity * speed_factor, PMOVE_ACCELERATION_GROUND, PMOVE_MAX_SPEED_GROUND);
+ }
+
+ return pm_accelerate(wishdir, velocity, PMOVE_ACCELERATION_GROUND, PMOVE_MAX_SPEED_GROUND);
+}
+
+// A simpler minecraft-like acceleration model
+// used whenever the TOGGLE_PM_FLIGHT is enabled
+static glm::fvec3 pm_flight_move(const glm::fvec3& wishdir)
+{
+ // FIXME: make it smoother
+ return wishdir * PMOVE_MAX_SPEED_AIR;
+}
+
+void entity::player_move::init(void)
+{
+ movement_direction = ZERO_VEC3<float>;
+
+ next_jump_us = 0x0000000000000000U;
+ speedometer_value = 0.0f;
+ footsteps_distance = 0.0f;
+
+ // UNDONE: make this a separate subsystem
+ pitch_random.seed(std::random_device()());
+ pitch_distrib = std::uniform_real_distribution<float>(0.9f, 1.1f);
+
+ globals::client_config.add_value("player_move.key.forward", key_move_forward);
+ globals::client_config.add_value("player_move.key.back", key_move_back);
+ globals::client_config.add_value("player_move.key.left", key_move_left);
+ globals::client_config.add_value("player_move.key.right", key_move_right);
+ globals::client_config.add_value("player_move.key.down", key_move_down);
+ globals::client_config.add_value("player_move.key.up", key_move_up);
+ globals::client_config.add_value("player_move.gp_axis.move_forward", axis_move_forward);
+ globals::client_config.add_value("player_move.gp_axis.move_sideways", axis_move_sideways);
+ globals::client_config.add_value("player_move.gp_button.move_down", button_move_down);
+ globals::client_config.add_value("player_move.gp_button.move_up", button_move_up);
+ globals::client_config.add_value("player_move.enable_speedometer", enable_speedometer);
+
+ settings::add_keybind(1, key_move_forward, settings_location::KEYBOARD_MOVEMENT, "player_move.key.forward");
+ settings::add_keybind(2, key_move_back, settings_location::KEYBOARD_MOVEMENT, "player_move.key.back");
+ settings::add_keybind(3, key_move_left, settings_location::KEYBOARD_MOVEMENT, "player_move.key.left");
+ settings::add_keybind(4, key_move_right, settings_location::KEYBOARD_MOVEMENT, "player_move.key.right");
+ settings::add_keybind(5, key_move_down, settings_location::KEYBOARD_MOVEMENT, "player_move.key.down");
+ settings::add_keybind(6, key_move_up, settings_location::KEYBOARD_MOVEMENT, "player_move.key.up");
+
+ settings::add_gamepad_axis(0, axis_move_forward, settings_location::GAMEPAD_MOVEMENT, "player_move.gp_axis.move_forward");
+ settings::add_gamepad_axis(1, axis_move_sideways, settings_location::GAMEPAD_MOVEMENT, "player_move.gp_axis.move_sideways");
+ settings::add_gamepad_button(2, button_move_down, settings_location::GAMEPAD_MOVEMENT, "player_move.gp_button.move_down");
+ settings::add_gamepad_button(3, button_move_up, settings_location::GAMEPAD_MOVEMENT, "player_move.gp_button.move_up");
+
+ settings::add_checkbox(2, enable_speedometer, settings_location::VIDEO_GUI, "player_move.enable_speedometer", true);
+}
+
+void entity::player_move::fixed_update(void)
+{
+ const auto& head = globals::dimension->entities.get<entity::Head>(globals::player);
+ auto& transform = globals::dimension->entities.get<entity::Transform>(globals::player);
+ auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player);
+
+ // Interpolation - preserve current component states
+ globals::dimension->entities.emplace_or_replace<entity::client::TransformPrev>(globals::player, transform);
+
+ glm::fvec3 forward, right;
+ math::vectors(glm::fvec3(0.0f, head.angles[1], 0.0f), &forward, &right, nullptr);
+
+ glm::fvec3 wishdir = ZERO_VEC3<float>;
+ glm::fvec3 movevars = glm::fvec3(movement_direction.x, 0.0f, movement_direction.z);
+ wishdir.x = glm::dot(movevars, right);
+ wishdir.z = glm::dot(movevars, forward);
+
+ if(toggles::get(TOGGLE_PM_FLIGHT)) {
+ velocity.value = pm_flight_move(glm::fvec3(wishdir.x, movement_direction.y, wishdir.z));
+ return;
+ }
+
+ auto grounded = globals::dimension->entities.try_get<entity::Grounded>(globals::player);
+ auto velocity_horizontal = glm::fvec3(velocity.value.x, 0.0f, velocity.value.z);
+
+ if(grounded) {
+ auto new_velocity = pm_ground_move(wishdir, velocity_horizontal);
+ velocity.value.x = new_velocity.x;
+ velocity.value.z = new_velocity.z;
+
+ auto new_speed = glm::length(new_velocity);
+
+ if(new_speed > 0.01f) {
+ footsteps_distance += globals::fixed_frametime * new_speed;
+ }
+ else {
+ footsteps_distance = 0.0f;
+ }
+
+ if(footsteps_distance >= PMOVE_FOOTSTEP_SIZE) {
+ if(auto effect = world::voxel_sounds::get_footsteps(grounded->surface)) {
+ sound::play_player(effect, false, pitch_distrib(pitch_random));
+ }
+
+ footsteps_distance = 0.0f;
+ }
+ }
+ else {
+ auto new_velocity = pm_air_move(wishdir, velocity_horizontal);
+ velocity.value.x = new_velocity.x;
+ velocity.value.z = new_velocity.z;
+ }
+
+ if(movement_direction.y == 0.0f) {
+ // Allow players to queue bunny-jumps by quickly
+ // releasing and pressing the jump key again without a cooldown
+ next_jump_us = 0x0000000000000000U;
+ return;
+ }
+
+ if(grounded && (movement_direction.y > 0.0f) && (globals::curtime >= next_jump_us)) {
+ velocity.value.y = -PMOVE_JUMP_FORCE * globals::dimension->get_gravity();
+
+ auto new_speed = glm::length(glm::fvec2(velocity.value.x, velocity.value.z));
+ auto new_speed_text = std::format("{:.02f} M/S", new_speed);
+ auto speed_change = new_speed - speedometer_value;
+
+ speedometer_value = new_speed;
+
+ next_jump_us = globals::curtime + PMOVE_JUMP_COOLDOWN;
+
+ if(enable_speedometer.get_value()) {
+ if(math::abs(speed_change) < 0.01f) {
+ // No considerable speed increase within
+ // the precision we use to draw the speedometer
+ gui::status_lines::set(gui::STATUS_DEBUG, new_speed_text, ImVec4(0.7f, 0.7f, 0.7f, 1.0f), 1.0f);
+ }
+ else if(speed_change < 0.0f) {
+ // Speed change is negative, we are actively
+ // slowing down; use the red color for the status line
+ gui::status_lines::set(gui::STATUS_DEBUG, new_speed_text, ImVec4(1.0f, 0.0f, 0.0f, 1.0f), 1.0f);
+ }
+ else {
+ // Speed change is positive, we are actively
+ // speeding up; use the green color for the status line
+ gui::status_lines::set(gui::STATUS_DEBUG, new_speed_text, ImVec4(0.0f, 1.0f, 0.0f, 1.0f), 1.0f);
+ }
+ }
+
+ if(auto effect = world::voxel_sounds::get_footsteps(grounded->surface)) {
+ sound::play_player(effect, false, 1.0f);
+ }
+ }
+}
+
+void entity::player_move::update_late(void)
+{
+ movement_direction = ZERO_VEC3<float>;
+
+ if(globals::gui_screen || !session::is_ingame()) {
+ // We're either disconnected or have the
+ // UI opened up; anyways we shouldn't move
+ return;
+ }
+
+ if(io::gamepad::available && io::gamepad::active.get_value()) {
+ if(button_move_down.is_pressed(io::gamepad::state)) {
+ movement_direction += DIR_DOWN<float>;
+ }
+
+ if(button_move_up.is_pressed(io::gamepad::state)) {
+ movement_direction += DIR_UP<float>;
+ }
+
+ movement_direction.x += axis_move_sideways.get_value(io::gamepad::state, io::gamepad::deadzone.get_value());
+ movement_direction.z -= axis_move_forward.get_value(io::gamepad::state, io::gamepad::deadzone.get_value());
+ }
+ else {
+ if(GLFW_PRESS == glfwGetKey(globals::window, key_move_forward.get_key())) {
+ movement_direction += DIR_FORWARD<float>;
+ }
+
+ if(GLFW_PRESS == glfwGetKey(globals::window, key_move_back.get_key())) {
+ movement_direction += DIR_BACK<float>;
+ }
+
+ if(GLFW_PRESS == glfwGetKey(globals::window, key_move_left.get_key())) {
+ movement_direction += DIR_LEFT<float>;
+ }
+
+ if(GLFW_PRESS == glfwGetKey(globals::window, key_move_right.get_key())) {
+ movement_direction += DIR_RIGHT<float>;
+ }
+
+ if(GLFW_PRESS == glfwGetKey(globals::window, key_move_down.get_key())) {
+ movement_direction += DIR_DOWN<float>;
+ }
+
+ if(GLFW_PRESS == glfwGetKey(globals::window, key_move_up.get_key())) {
+ movement_direction += DIR_UP<float>;
+ }
+ }
+}
diff --git a/game/client/entity/player_move.hh b/game/client/entity/player_move.hh index 8c033cc..8026acf 100644 --- a/game/client/entity/player_move.hh +++ b/game/client/entity/player_move.hh @@ -1,15 +1,15 @@ -#pragma once - -constexpr static float PMOVE_MAX_SPEED_AIR = 16.0f; -constexpr static float PMOVE_MAX_SPEED_GROUND = 8.0f; -constexpr static float PMOVE_ACCELERATION_AIR = 3.0f; -constexpr static float PMOVE_ACCELERATION_GROUND = 6.0f; -constexpr static float PMOVE_FRICTION_GROUND = 10.0f; -constexpr static float PMOVE_JUMP_FORCE = 0.275f; - -namespace entity::player_move -{ -void init(void); -void fixed_update(void); -void update_late(void); -} // namespace entity::player_move +#pragma once
+
+constexpr static float PMOVE_MAX_SPEED_AIR = 16.0f;
+constexpr static float PMOVE_MAX_SPEED_GROUND = 8.0f;
+constexpr static float PMOVE_ACCELERATION_AIR = 3.0f;
+constexpr static float PMOVE_ACCELERATION_GROUND = 6.0f;
+constexpr static float PMOVE_FRICTION_GROUND = 10.0f;
+constexpr static float PMOVE_JUMP_FORCE = 0.275f;
+
+namespace entity::player_move
+{
+void init(void);
+void fixed_update(void);
+void update_late(void);
+} // namespace entity::player_move
diff --git a/game/client/entity/sound_emitter.cc b/game/client/entity/sound_emitter.cc index eeb7294..c2a93a1 100644 --- a/game/client/entity/sound_emitter.cc +++ b/game/client/entity/sound_emitter.cc @@ -1,63 +1,63 @@ -#include "client/pch.hh" - -#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" - -entity::SoundEmitter::SoundEmitter(void) -{ - alGenSources(1, &source); - sound = nullptr; -} - -entity::SoundEmitter::~SoundEmitter(void) -{ - alSourceStop(source); - alDeleteSources(1, &source); -} - -void entity::SoundEmitter::update(void) -{ - if(globals::dimension) { - const auto view = globals::dimension->entities.view<entity::SoundEmitter>(); - - const auto& pivot = entity::camera::position_chunk; - const auto gain = math::clamp(sound::volume_effects.get_value() * 0.01f, 0.0f, 1.0f); - - for(const auto [entity, emitter] : view.each()) { - alSourcef(emitter.source, AL_GAIN, gain); - - if(const auto transform = globals::dimension->entities.try_get<entity::client::TransformIntr>(entity)) { - auto position = coord::to_relative(pivot, transform->chunk, transform->local); - alSource3f(emitter.source, AL_POSITION, position.x, position.y, position.z); - } - - if(const auto velocity = globals::dimension->entities.try_get<entity::Velocity>(entity)) { - alSource3f(emitter.source, AL_VELOCITY, velocity->value.x, velocity->value.y, velocity->value.z); - } - - ALint source_state; - alGetSourcei(emitter.source, AL_SOURCE_STATE, &source_state); - - if(source_state == AL_STOPPED) { - alSourceRewind(emitter.source); - emitter.sound = nullptr; - } - } - } -} +#include "client/pch.hh"
+
+#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"
+
+entity::SoundEmitter::SoundEmitter(void)
+{
+ alGenSources(1, &source);
+ sound = nullptr;
+}
+
+entity::SoundEmitter::~SoundEmitter(void)
+{
+ alSourceStop(source);
+ alDeleteSources(1, &source);
+}
+
+void entity::SoundEmitter::update(void)
+{
+ if(globals::dimension) {
+ const auto view = globals::dimension->entities.view<entity::SoundEmitter>();
+
+ const auto& pivot = entity::camera::position_chunk;
+ const auto gain = math::clamp(sound::volume_effects.get_value() * 0.01f, 0.0f, 1.0f);
+
+ for(const auto [entity, emitter] : view.each()) {
+ alSourcef(emitter.source, AL_GAIN, gain);
+
+ if(const auto transform = globals::dimension->entities.try_get<entity::client::TransformIntr>(entity)) {
+ auto position = coord::to_relative(pivot, transform->chunk, transform->local);
+ alSource3f(emitter.source, AL_POSITION, position.x, position.y, position.z);
+ }
+
+ if(const auto velocity = globals::dimension->entities.try_get<entity::Velocity>(entity)) {
+ alSource3f(emitter.source, AL_VELOCITY, velocity->value.x, velocity->value.y, velocity->value.z);
+ }
+
+ ALint source_state;
+ alGetSourcei(emitter.source, AL_SOURCE_STATE, &source_state);
+
+ if(source_state == AL_STOPPED) {
+ alSourceRewind(emitter.source);
+ emitter.sound = nullptr;
+ }
+ }
+ }
+}
diff --git a/game/client/entity/sound_emitter.hh b/game/client/entity/sound_emitter.hh index 72a3f74..14093db 100644 --- a/game/client/entity/sound_emitter.hh +++ b/game/client/entity/sound_emitter.hh @@ -1,20 +1,20 @@ -#pragma once - -#include "core/resource/resource.hh" - -struct SoundEffect; - -namespace entity -{ -struct SoundEmitter final { - resource_ptr<SoundEffect> sound; - ALuint source; - -public: - explicit SoundEmitter(void); - virtual ~SoundEmitter(void); - -public: - static void update(void); -}; -} // namespace entity +#pragma once
+
+#include "core/resource/resource.hh"
+
+struct SoundEffect;
+
+namespace entity
+{
+struct SoundEmitter final {
+ resource_ptr<SoundEffect> sound;
+ ALuint source;
+
+public:
+ explicit SoundEmitter(void);
+ virtual ~SoundEmitter(void);
+
+public:
+ static void update(void);
+};
+} // namespace entity
diff --git a/game/client/experiments.cc b/game/client/experiments.cc index 247bce9..2b9fe89 100644 --- a/game/client/experiments.cc +++ b/game/client/experiments.cc @@ -1,81 +1,81 @@ -#include "client/pch.hh" - -#include "client/experiments.hh" - -#include "shared/world/dimension.hh" -#include "shared/world/item_registry.hh" - -#include "shared/game_items.hh" -#include "shared/game_voxels.hh" - -#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" -#include "client/session.hh" - -static void on_glfw_mouse_button(const io::GlfwMouseButtonEvent& event) -{ - if(!globals::gui_screen && session::is_ingame()) { - if((event.action == GLFW_PRESS) && (world::player_target::voxel != NULL_VOXEL_ID)) { - if(event.button == GLFW_MOUSE_BUTTON_LEFT) { - experiments::attack(); - return; - } - - if(event.button == GLFW_MOUSE_BUTTON_RIGHT) { - experiments::interact(); - return; - } - } - } -} - -void experiments::init(void) -{ - globals::dispatcher.sink<io::GlfwMouseButtonEvent>().connect<&on_glfw_mouse_button>(); -} - -void experiments::init_late(void) -{ - gui::hotbar::slots[0] = game_items::cobblestone; - gui::hotbar::slots[1] = game_items::stone; - gui::hotbar::slots[2] = game_items::dirt; - gui::hotbar::slots[3] = game_items::grass; - gui::hotbar::slots[4] = game_items::oak_leaves; - gui::hotbar::slots[5] = game_items::oak_planks; - gui::hotbar::slots[6] = game_items::oak_log; - gui::hotbar::slots[7] = game_items::glass; - gui::hotbar::slots[8] = game_items::slime; -} - -void experiments::shutdown(void) -{ -} - -void experiments::update(void) -{ -} - -void experiments::update_late(void) -{ -} - -void experiments::attack(void) -{ - globals::dimension->set_voxel(NULL_VOXEL_ID, world::player_target::coord); -} - -void experiments::interact(void) -{ - if(auto info = world::item_registry::find(gui::hotbar::slots[gui::hotbar::active_slot])) { - if(info->place_voxel != NULL_VOXEL_ID) { - globals::dimension->set_voxel(info->place_voxel, world::player_target::coord + world::player_target::normal); - } - } -} +#include "client/pch.hh"
+
+#include "client/experiments.hh"
+
+#include "shared/world/dimension.hh"
+#include "shared/world/item_registry.hh"
+
+#include "shared/game_items.hh"
+#include "shared/game_voxels.hh"
+
+#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"
+#include "client/session.hh"
+
+static void on_glfw_mouse_button(const io::GlfwMouseButtonEvent& event)
+{
+ if(!globals::gui_screen && session::is_ingame()) {
+ if((event.action == GLFW_PRESS) && (world::player_target::voxel != NULL_VOXEL_ID)) {
+ if(event.button == GLFW_MOUSE_BUTTON_LEFT) {
+ experiments::attack();
+ return;
+ }
+
+ if(event.button == GLFW_MOUSE_BUTTON_RIGHT) {
+ experiments::interact();
+ return;
+ }
+ }
+ }
+}
+
+void experiments::init(void)
+{
+ globals::dispatcher.sink<io::GlfwMouseButtonEvent>().connect<&on_glfw_mouse_button>();
+}
+
+void experiments::init_late(void)
+{
+ gui::hotbar::slots[0] = game_items::cobblestone;
+ gui::hotbar::slots[1] = game_items::stone;
+ gui::hotbar::slots[2] = game_items::dirt;
+ gui::hotbar::slots[3] = game_items::grass;
+ gui::hotbar::slots[4] = game_items::oak_leaves;
+ gui::hotbar::slots[5] = game_items::oak_planks;
+ gui::hotbar::slots[6] = game_items::oak_log;
+ gui::hotbar::slots[7] = game_items::glass;
+ gui::hotbar::slots[8] = game_items::slime;
+}
+
+void experiments::shutdown(void)
+{
+}
+
+void experiments::update(void)
+{
+}
+
+void experiments::update_late(void)
+{
+}
+
+void experiments::attack(void)
+{
+ globals::dimension->set_voxel(NULL_VOXEL_ID, world::player_target::coord);
+}
+
+void experiments::interact(void)
+{
+ if(auto info = world::item_registry::find(gui::hotbar::slots[gui::hotbar::active_slot])) {
+ if(info->place_voxel != NULL_VOXEL_ID) {
+ globals::dimension->set_voxel(info->place_voxel, world::player_target::coord + world::player_target::normal);
+ }
+ }
+}
diff --git a/game/client/experiments.hh b/game/client/experiments.hh index ff2cbad..c1b0769 100644 --- a/game/client/experiments.hh +++ b/game/client/experiments.hh @@ -1,16 +1,16 @@ -#pragma once - -namespace experiments -{ -void init(void); -void init_late(void); -void shutdown(void); -void update(void); -void update_late(void); -} // namespace experiments - -namespace experiments -{ -void attack(void); -void interact(void); -} // namespace experiments +#pragma once
+
+namespace experiments
+{
+void init(void);
+void init_late(void);
+void shutdown(void);
+void update(void);
+void update_late(void);
+} // namespace experiments
+
+namespace experiments
+{
+void attack(void);
+void interact(void);
+} // namespace experiments
diff --git a/game/client/game.cc b/game/client/game.cc index 118ac66..a59aec3 100644 --- a/game/client/game.cc +++ b/game/client/game.cc @@ -1,693 +1,693 @@ -#include "client/pch.hh" - -#include "client/game.hh" - -#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" -#include "shared/entity/gravity.hh" -#include "shared/entity/head.hh" -#include "shared/entity/player.hh" -#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" -#include "shared/world/voxel_registry.hh" - -#include "shared/coord.hh" -#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" -#include "client/gui/crosshair.hh" -#include "client/gui/direct_connection.hh" -#include "client/gui/gui_screen.hh" -#include "client/gui/hotbar.hh" -#include "client/gui/language.hh" -#include "client/gui/main_menu.hh" -#include "client/gui/message_box.hh" -#include "client/gui/metrics.hh" -#include "client/gui/play_menu.hh" -#include "client/gui/progress_bar.hh" -#include "client/gui/scoreboard.hh" -#include "client/gui/settings.hh" -#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" -#include "client/world/outline.hh" -#include "client/world/player_target.hh" -#include "client/world/skybox.hh" -#include "client/world/voxel_anims.hh" -#include "client/world/voxel_atlas.hh" -#include "client/world/voxel_sounds.hh" - -#include "client/const.hh" -#include "client/experiments.hh" -#include "client/globals.hh" -#include "client/receive.hh" -#include "client/screenshot.hh" -#include "client/session.hh" -#include "client/toggles.hh" - -config::Boolean client_game::streamer_mode(false); -config::Boolean client_game::vertical_sync(true); -config::Boolean client_game::world_curvature(true); -config::Unsigned client_game::fog_mode(1U, 0U, 2U); -config::String client_game::username("player"); - -bool client_game::hide_hud = false; - -static config::KeyBind hide_hud_toggle(GLFW_KEY_F1); - -static ImFont* load_font(std::string_view path, float size, ImFontConfig& font_config, ImVector<ImWchar>& ranges) -{ - bool font_load_success; - std::vector<std::byte> font; - - if(!utils::read_file(path, font)) { - spdlog::error("{}: utils::read_file failed", path); - std::terminate(); - } - - auto& io = ImGui::GetIO(); - auto font_ptr = io.Fonts->AddFontFromMemoryTTF(font.data(), font.size(), size, &font_config, ranges.Data); - - if(font_ptr == nullptr) { - spdlog::error("{}: AddFontFromMemoryTTF failed", path); - std::terminate(); - } - - return font_ptr; -} - -static void on_glfw_framebuffer_size(const io::GlfwFramebufferSizeEvent& event) -{ - if(globals::world_fbo) { - glDeleteRenderbuffers(1, &globals::world_fbo_depth); - glDeleteTextures(1, &globals::world_fbo_color); - glDeleteFramebuffers(1, &globals::world_fbo); - } - - glGenFramebuffers(1, &globals::world_fbo); - glGenTextures(1, &globals::world_fbo_color); - glGenRenderbuffers(1, &globals::world_fbo_depth); - - glBindTexture(GL_TEXTURE_2D, globals::world_fbo_color); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, event.size.x, event.size.y, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr); - - glBindRenderbuffer(GL_RENDERBUFFER, globals::world_fbo_depth); - glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, event.size.x, event.size.y); - - glBindFramebuffer(GL_FRAMEBUFFER, globals::world_fbo); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, globals::world_fbo_color, 0); - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, globals::world_fbo_depth); - - if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) { - spdlog::critical("opengl: world framebuffer is incomplete"); - glDeleteRenderbuffers(1, &globals::world_fbo_depth); - glDeleteTextures(1, &globals::world_fbo_color); - glDeleteFramebuffers(1, &globals::world_fbo); - std::terminate(); - } -} - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if(!globals::gui_keybind_ptr && hide_hud_toggle.equals(event.key) && (event.action == GLFW_PRESS)) { - client_game::hide_hud = !client_game::hide_hud; - } -} - -void client_game::init(void) -{ - auto& io = ImGui::GetIO(); - io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad; - io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; - io.IniFilename = nullptr; - io.Fonts->Clear(); - - ImFontConfig font_config; - font_config.FontDataOwnedByAtlas = false; - - ImFontGlyphRangesBuilder builder; - builder.AddRanges(io.Fonts->GetGlyphRangesDefault()); - builder.AddRanges(io.Fonts->GetGlyphRangesCyrillic()); - - ImVector<ImWchar> ranges; - builder.BuildRanges(&ranges); - - globals::font_unscii16 = load_font("fonts/unscii-16.ttf", 16.0f, font_config, ranges); - globals::font_unscii8 = load_font("fonts/unscii-8.ttf", 8.0f, font_config, ranges); - - gui::client_splash::init(); - gui::client_splash::render(); - - globals::client_config.add_value("game.streamer_mode", client_game::streamer_mode); - globals::client_config.add_value("game.vertical_sync", client_game::vertical_sync); - globals::client_config.add_value("game.world_curvature", client_game::world_curvature); - globals::client_config.add_value("game.fog_mode", client_game::fog_mode); - globals::client_config.add_value("game.username", client_game::username); - globals::client_config.add_value("game.key.toggle_hide_hud", hide_hud_toggle); - - settings::init(); - - settings::add_checkbox(0, client_game::streamer_mode, settings_location::VIDEO_GUI, "game.streamer_mode", true); - settings::add_checkbox(5, client_game::vertical_sync, settings_location::VIDEO, "game.vertical_sync", false); - settings::add_checkbox(4, client_game::world_curvature, settings_location::VIDEO, "game.world_curvature", true); - settings::add_stepper(3, client_game::fog_mode, settings_location::VIDEO, "game.fog_mode", false); - settings::add_input(1, client_game::username, settings_location::GENERAL, "game.username", true, false); - settings::add_keybind(4, hide_hud_toggle, settings_location::KEYBOARD_MISC, "game.key.toggle_hide_hud"); - - globals::client_host = enet_host_create(nullptr, 1, 1, 0, 0); - - if(!globals::client_host) { - spdlog::critical("game: unable to setup an ENet host"); - std::terminate(); - } - - gui::language::init(); - - session::init(); - - entity::player_look::init(); - entity::player_move::init(); - world::player_target::init(); - - io::gamepad::init(); - - entity::camera::init(); - - world::voxel_anims::init(); - - world::outline::init(); - world::chunk_mesher::init(); - world::chunk_renderer::init(); - - globals::world_fbo = 0; - globals::world_fbo_color = 0; - globals::world_fbo_depth = 0; - - world::voxel_sounds::init(); - - world::skybox::init(); - - ImGuiStyle& style = ImGui::GetStyle(); - - // Black buttons on a dark background - // may be harder to read than the text on them - style.FrameBorderSize = 1.0; - style.TabBorderSize = 1.0; - - // Rounding on elements looks cool but I am - // aiming for a more or less blocky and - // visually simple HiDPI-friendly UI style - style.TabRounding = 0.0f; - style.GrabRounding = 0.0f; - style.ChildRounding = 0.0f; - style.FrameRounding = 0.0f; - style.PopupRounding = 0.0f; - style.WindowRounding = 0.0f; - style.ScrollbarRounding = 0.0f; - - style.Colors[ImGuiCol_Text] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); - style.Colors[ImGuiCol_TextDisabled] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f); - style.Colors[ImGuiCol_WindowBg] = ImVec4(0.06f, 0.06f, 0.06f, 0.94f); - style.Colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); - style.Colors[ImGuiCol_PopupBg] = ImVec4(0.08f, 0.08f, 0.08f, 0.94f); - style.Colors[ImGuiCol_Border] = ImVec4(0.79f, 0.79f, 0.79f, 0.50f); - style.Colors[ImGuiCol_BorderShadow] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); - style.Colors[ImGuiCol_FrameBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.54f); - style.Colors[ImGuiCol_FrameBgHovered] = ImVec4(0.36f, 0.36f, 0.36f, 0.40f); - style.Colors[ImGuiCol_FrameBgActive] = ImVec4(0.63f, 0.63f, 0.63f, 0.67f); - style.Colors[ImGuiCol_TitleBg] = ImVec4(0.04f, 0.04f, 0.04f, 1.00f); - style.Colors[ImGuiCol_TitleBgActive] = ImVec4(0.00f, 0.00f, 0.00f, 1.00f); - style.Colors[ImGuiCol_TitleBgCollapsed] = ImVec4(0.00f, 0.00f, 0.00f, 0.51f); - style.Colors[ImGuiCol_MenuBarBg] = ImVec4(0.14f, 0.14f, 0.14f, 1.00f); - style.Colors[ImGuiCol_ScrollbarBg] = ImVec4(0.02f, 0.02f, 0.02f, 0.53f); - style.Colors[ImGuiCol_ScrollbarGrab] = ImVec4(0.00f, 0.00f, 0.00f, 0.75f); - style.Colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f); - style.Colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f); - style.Colors[ImGuiCol_CheckMark] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); - style.Colors[ImGuiCol_SliderGrab] = ImVec4(0.81f, 0.81f, 0.81f, 0.75f); - style.Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.00f, 0.00f, 0.00f, 1.00f); - style.Colors[ImGuiCol_Button] = ImVec4(0.00f, 0.00f, 0.00f, 1.00f); - style.Colors[ImGuiCol_ButtonHovered] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f); - style.Colors[ImGuiCol_ButtonActive] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f); - style.Colors[ImGuiCol_Header] = ImVec4(0.00f, 0.00f, 0.00f, 0.75f); - style.Colors[ImGuiCol_HeaderHovered] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f); - style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f); - style.Colors[ImGuiCol_Separator] = ImVec4(0.49f, 0.49f, 0.49f, 0.50f); - style.Colors[ImGuiCol_SeparatorHovered] = ImVec4(0.56f, 0.56f, 0.56f, 0.78f); - style.Colors[ImGuiCol_SeparatorActive] = ImVec4(0.90f, 0.90f, 0.90f, 1.00f); - style.Colors[ImGuiCol_ResizeGrip] = ImVec4(0.34f, 0.34f, 0.34f, 0.20f); - style.Colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.57f, 0.57f, 0.57f, 0.67f); - style.Colors[ImGuiCol_ResizeGripActive] = ImVec4(1.00f, 1.00f, 1.00f, 0.95f); - style.Colors[ImGuiCol_Tab] = ImVec4(0.00f, 0.00f, 0.00f, 0.75f); - style.Colors[ImGuiCol_TabHovered] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f); - style.Colors[ImGuiCol_TabActive] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f); - style.Colors[ImGuiCol_TabUnfocused] = ImVec4(0.13f, 0.13f, 0.13f, 0.97f); - style.Colors[ImGuiCol_TabUnfocusedActive] = ImVec4(0.44f, 0.44f, 0.44f, 1.00f); - style.Colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f); - style.Colors[ImGuiCol_PlotLinesHovered] = ImVec4(0.69f, 0.00f, 0.00f, 1.00f); - style.Colors[ImGuiCol_PlotHistogram] = ImVec4(0.00f, 1.00f, 0.20f, 1.00f); - style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f); - style.Colors[ImGuiCol_TableHeaderBg] = ImVec4(0.19f, 0.19f, 0.20f, 1.00f); - style.Colors[ImGuiCol_TableBorderStrong] = ImVec4(0.31f, 0.31f, 0.35f, 1.00f); - style.Colors[ImGuiCol_TableBorderLight] = ImVec4(0.23f, 0.23f, 0.25f, 1.00f); - style.Colors[ImGuiCol_TableRowBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); - style.Colors[ImGuiCol_TableRowBgAlt] = ImVec4(1.00f, 1.00f, 1.00f, 0.06f); - style.Colors[ImGuiCol_TextSelectedBg] = ImVec4(0.61f, 0.61f, 0.61f, 0.35f); - style.Colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 1.00f); - style.Colors[ImGuiCol_NavHighlight] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f); - style.Colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f); - style.Colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f); - style.Colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.35f); - - // Making my own Game UI for Source Engine - // taught me one important thing: dimensions - // of UI elements must be calculated at semi-runtime - // so there's simply no point for an INI file. - io.IniFilename = nullptr; - - toggles::init(); - - gui::background::init(); - - gui::scoreboard::init(); - - gui::client_chat::init(); - - gui::bother::init(); - - gui::main_menu::init(); - gui::play_menu::init(); - gui::progress_bar::init(); - gui::message_box::init(); - gui::direct_connection::init(); - - gui::crosshair::init(); - gui::hotbar::init(); - gui::metrics::init(); - gui::status_lines::init(); - - screenshot::init(); - - globals::gui_keybind_ptr = nullptr; - globals::gui_scale = 0U; - globals::gui_screen = GUI_MAIN_MENU; - - sound::init_config(); - - if(globals::sound_ctx) { - sound::init(); - } - - client_receive::init(); - - experiments::init(); - - globals::dispatcher.sink<io::GlfwFramebufferSizeEvent>().connect<&on_glfw_framebuffer_size>(); - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); -} - -void client_game::init_late(void) -{ - toggles::init_late(); - - if(globals::sound_ctx) { - sound::init_late(); - } - - gui::language::init_late(); - - settings::init_late(); - - gui::client_chat::init_late(); - - gui::status_lines::init_late(); - - game_voxels::populate(); - game_items::populate(); - - std::size_t max_texture_count = 0; - - // Figure out the total texture count - // NOTE: this is very debug, early and a quite - // conservative limit choice; there must be a better - // way to make this limit way smaller than it currently is - for(const std::shared_ptr<world::VoxelInfo>& info : world::voxel_registry::voxels) { - for(const world::VoxelTexture& vtex : info->textures) { - max_texture_count += vtex.paths.size(); - } - } - - // UNDONE: asset packs for non-16x16 stuff - world::voxel_atlas::create(16, 16, max_texture_count); - - for(std::shared_ptr<world::VoxelInfo>& info : world::voxel_registry::voxels) { - for(world::VoxelTexture& vtex : info->textures) { - if(auto strip = world::voxel_atlas::find_or_load(vtex.paths)) { - vtex.cached_offset = strip->offset; - vtex.cached_plane = strip->plane; - continue; - } - - spdlog::critical("client_gl: {}: failed to load atlas strips", info->name); - std::terminate(); - } - } - - world::voxel_atlas::generate_mipmaps(); - - for(std::shared_ptr<world::ItemInfo>& info : world::item_registry::items) { - info->cached_texture = resource::load<TextureGUI>(info->texture.c_str(), TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T); - } - - experiments::init_late(); - - gui::client_splash::init_late(); - - gui::window_title::update(); -} - -void client_game::shutdown(void) -{ - world::voxel_sounds::shutdown(); - - experiments::shutdown(); - - session::shutdown(); - - if(globals::sound_ctx) { - sound::shutdown(); - } - - gui::hotbar::shutdown(); - gui::main_menu::shutdown(); - gui::play_menu::shutdown(); - - gui::bother::shutdown(); - - gui::client_chat::shutdown(); - - gui::background::shutdown(); - - gui::crosshair::shutdown(); - - delete globals::dimension; - globals::player = entt::null; - globals::dimension = nullptr; - - world::item_registry::purge(); - world::voxel_registry::purge(); - - world::voxel_atlas::destroy(); - - glDeleteRenderbuffers(1, &globals::world_fbo_depth); - glDeleteTextures(1, &globals::world_fbo_color); - glDeleteFramebuffers(1, &globals::world_fbo); - - world::outline::shutdown(); - world::chunk_renderer::shutdown(); - world::chunk_mesher::shutdown(); - - enet_host_destroy(globals::client_host); -} - -void client_game::fixed_update(void) -{ - entity::player_move::fixed_update(); - - // Only update world simulation gamesystems - // if the player can actually observe all the - // changes these gamesystems cause visually - if(session::is_ingame()) { - entity::Collision::fixed_update(globals::dimension); - entity::Velocity::fixed_update(globals::dimension); - entity::Transform::fixed_update(globals::dimension); - entity::Gravity::fixed_update(globals::dimension); - entity::Stasis::fixed_update(globals::dimension); - } -} - -void client_game::fixed_update_late(void) -{ - if(session::is_ingame()) { - const auto& head = globals::dimension->entities.get<entity::Head>(globals::player); - const auto& transform = globals::dimension->entities.get<entity::Transform>(globals::player); - const auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player); - - protocol::EntityHead head_packet; - head_packet.entity = entt::null; // ignored by server - head_packet.angles = head.angles; - - protocol::EntityTransform transform_packet; - transform_packet.entity = entt::null; // ignored by server - transform_packet.angles = transform.angles; - transform_packet.chunk = transform.chunk; - transform_packet.local = transform.local; - - protocol::EntityVelocity velocity_packet; - velocity_packet.entity = entt::null; // ignored by server - velocity_packet.value = velocity.value; - - protocol::send(session::peer, protocol::encode(head_packet)); - protocol::send(session::peer, protocol::encode(transform_packet)); - protocol::send(session::peer, protocol::encode(velocity_packet)); - } -} - -void client_game::update(void) -{ - if(session::is_ingame()) { - if(toggles::get(TOGGLE_PM_FLIGHT)) { - globals::dimension->entities.remove<entity::Gravity>(globals::player); - } - else { - globals::dimension->entities.emplace_or_replace<entity::Gravity>(globals::player); - } - } - - if(globals::sound_ctx) { - sound::update(); - - entity::listener::update(); - - entity::SoundEmitter::update(); - } - - entity::interpolation::update(); - - world::player_target::update(); - - entity::camera::update(); - - world::voxel_anims::update(); - - world::chunk_mesher::update(); - - gui::client_chat::update(); - - experiments::update(); - - constexpr auto half_base_width = 0.5f * static_cast<float>(BASE_WIDTH); - constexpr auto half_base_height = 0.5f * static_cast<float>(BASE_HEIGHT); - - auto twice_scale_x = static_cast<float>(globals::width) / half_base_width; - auto twice_scale_y = static_cast<float>(globals::height) / half_base_height; - - auto scale_x = math::max(1.0f, 0.5f * glm::floor(twice_scale_x)); - auto scale_y = math::max(1.0f, 0.5f * glm::floor(twice_scale_y)); - auto scale_min = math::ceil<unsigned int>(math::min(scale_x, scale_y)); - auto scale_int = math::max(1U, (scale_min / 2U) * 2U); - - auto& io = ImGui::GetIO(); - io.FontGlobalScale = scale_int; - globals::gui_scale = scale_int; -} - -void client_game::update_late(void) -{ - ENetEvent enet_event; - - while(0 < enet_host_service(globals::client_host, &enet_event, 0)) { - switch(enet_event.type) { - case ENET_EVENT_TYPE_CONNECT: - session::send_login_request(); - break; - case ENET_EVENT_TYPE_DISCONNECT: - session::invalidate(); - break; - case ENET_EVENT_TYPE_RECEIVE: - protocol::decode(globals::dispatcher, enet_event.packet, enet_event.peer); - enet_packet_destroy(enet_event.packet); - break; - } - } - - entity::player_look::update_late(); - entity::player_move::update_late(); - - gui::play_menu::update_late(); - - gui::bother::update_late(); - - experiments::update_late(); - - io::gamepad::update_late(); - - world::chunk_visibility::update_late(); - - if(client_game::vertical_sync.get_value()) { - glfwSwapInterval(1); - } - else { - glfwSwapInterval(0); - } -} - -void client_game::render(void) -{ - glViewport(0, 0, globals::width, globals::height); - glBindFramebuffer(GL_FRAMEBUFFER, globals::world_fbo); - glClearColor(world::skybox::fog_color.r, world::skybox::fog_color.g, world::skybox::fog_color.b, 1.000f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - if(globals::dimension) { - world::chunk_renderer::render(); - } - - glEnable(GL_DEPTH_TEST); - - world::player_target::render(); - - if(globals::dimension) { - auto group = globals::dimension->entities.group( - entt::get<entity::Player, entity::Collision, entity::client::HeadIntr, entity::client::TransformIntr>); - - world::outline::prepare(); - - for(const auto [entity, collision, head, transform] : group.each()) { - if(entity == globals::player) { - // Don't render ourselves - continue; - } - - glm::fvec3 forward; - math::vectors(transform.angles + head.angles, forward); - forward *= 2.0f; - - glm::fvec3 hull_size = collision.aabb.max - collision.aabb.min; - glm::fvec3 hull_fpos = transform.local + collision.aabb.min; - glm::fvec3 look = transform.local + head.offset; - - world::outline::cube(transform.chunk, hull_fpos, hull_size, 1.0f, glm::fvec4(1.0f, 0.0f, 0.0f, 1.0f)); - world::outline::line(transform.chunk, look, forward, 1.0f, glm::fvec4(0.9f, 0.9f, 0.9f, 1.0f)); - } - } - - glEnable(GL_DEPTH_TEST); - - glViewport(0, 0, globals::width, globals::height); - glClearColor(0.000f, 0.000f, 0.000f, 1.000f); - glBindFramebuffer(GL_FRAMEBUFFER, 0); - glClear(GL_COLOR_BUFFER_BIT); - - glBindFramebuffer(GL_READ_FRAMEBUFFER, globals::world_fbo); - glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); - glBlitFramebuffer(0, 0, globals::width, globals::height, 0, 0, globals::width, globals::height, GL_COLOR_BUFFER_BIT, GL_NEAREST); -} - -void client_game::layout(void) -{ - if(!session::is_ingame()) { - gui::background::layout(); - } - - if(!globals::gui_screen || (globals::gui_screen == GUI_CHAT)) { - if(toggles::get(TOGGLE_METRICS_UI) && !client_game::hide_hud) { - // This contains Minecraft-esque debug information - // about the hardware, world state and other - // things that might be uesful - gui::metrics::layout(); - } - } - - if(session::is_ingame()) { - gui::client_chat::layout(); - gui::scoreboard::layout(); - - if(!globals::gui_screen && !client_game::hide_hud) { - gui::hotbar::layout(); - gui::status_lines::layout(); - gui::crosshair::layout(); - } - } - - if(globals::gui_screen) { - if(session::is_ingame() && (globals::gui_screen != GUI_CHAT)) { - const float width_f = static_cast<float>(globals::width); - const float height_f = static_cast<float>(globals::height); - const ImU32 darken = ImGui::GetColorU32(ImVec4(0.00f, 0.00f, 0.00f, 0.75f)); - ImGui::GetBackgroundDrawList()->AddRectFilled(ImVec2(), ImVec2(width_f, height_f), darken); - } - - switch(globals::gui_screen) { - case GUI_MAIN_MENU: - gui::main_menu::layout(); - break; - case GUI_PLAY_MENU: - gui::play_menu::layout(); - break; - case GUI_SETTINGS: - settings::layout(); - break; - case GUI_PROGRESS_BAR: - gui::progress_bar::layout(); - break; - case GUI_MESSAGE_BOX: - gui::message_box::layout(); - break; - case GUI_DIRECT_CONNECTION: - gui::direct_connection::layout(); - break; - } - } -} +#include "client/pch.hh"
+
+#include "client/game.hh"
+
+#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"
+#include "shared/entity/gravity.hh"
+#include "shared/entity/head.hh"
+#include "shared/entity/player.hh"
+#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"
+#include "shared/world/voxel_registry.hh"
+
+#include "shared/coord.hh"
+#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"
+#include "client/gui/crosshair.hh"
+#include "client/gui/direct_connection.hh"
+#include "client/gui/gui_screen.hh"
+#include "client/gui/hotbar.hh"
+#include "client/gui/language.hh"
+#include "client/gui/main_menu.hh"
+#include "client/gui/message_box.hh"
+#include "client/gui/metrics.hh"
+#include "client/gui/play_menu.hh"
+#include "client/gui/progress_bar.hh"
+#include "client/gui/scoreboard.hh"
+#include "client/gui/settings.hh"
+#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"
+#include "client/world/outline.hh"
+#include "client/world/player_target.hh"
+#include "client/world/skybox.hh"
+#include "client/world/voxel_anims.hh"
+#include "client/world/voxel_atlas.hh"
+#include "client/world/voxel_sounds.hh"
+
+#include "client/const.hh"
+#include "client/experiments.hh"
+#include "client/globals.hh"
+#include "client/receive.hh"
+#include "client/screenshot.hh"
+#include "client/session.hh"
+#include "client/toggles.hh"
+
+config::Boolean client_game::streamer_mode(false);
+config::Boolean client_game::vertical_sync(true);
+config::Boolean client_game::world_curvature(true);
+config::Unsigned client_game::fog_mode(1U, 0U, 2U);
+config::String client_game::username("player");
+
+bool client_game::hide_hud = false;
+
+static config::KeyBind hide_hud_toggle(GLFW_KEY_F1);
+
+static ImFont* load_font(std::string_view path, float size, ImFontConfig& font_config, ImVector<ImWchar>& ranges)
+{
+ bool font_load_success;
+ std::vector<std::byte> font;
+
+ if(!utils::read_file(path, font)) {
+ spdlog::error("{}: utils::read_file failed", path);
+ std::terminate();
+ }
+
+ auto& io = ImGui::GetIO();
+ auto font_ptr = io.Fonts->AddFontFromMemoryTTF(font.data(), font.size(), size, &font_config, ranges.Data);
+
+ if(font_ptr == nullptr) {
+ spdlog::error("{}: AddFontFromMemoryTTF failed", path);
+ std::terminate();
+ }
+
+ return font_ptr;
+}
+
+static void on_glfw_framebuffer_size(const io::GlfwFramebufferSizeEvent& event)
+{
+ if(globals::world_fbo) {
+ glDeleteRenderbuffers(1, &globals::world_fbo_depth);
+ glDeleteTextures(1, &globals::world_fbo_color);
+ glDeleteFramebuffers(1, &globals::world_fbo);
+ }
+
+ glGenFramebuffers(1, &globals::world_fbo);
+ glGenTextures(1, &globals::world_fbo_color);
+ glGenRenderbuffers(1, &globals::world_fbo_depth);
+
+ glBindTexture(GL_TEXTURE_2D, globals::world_fbo_color);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, event.size.x, event.size.y, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+
+ glBindRenderbuffer(GL_RENDERBUFFER, globals::world_fbo_depth);
+ glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, event.size.x, event.size.y);
+
+ glBindFramebuffer(GL_FRAMEBUFFER, globals::world_fbo);
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, globals::world_fbo_color, 0);
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, globals::world_fbo_depth);
+
+ if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
+ spdlog::critical("opengl: world framebuffer is incomplete");
+ glDeleteRenderbuffers(1, &globals::world_fbo_depth);
+ glDeleteTextures(1, &globals::world_fbo_color);
+ glDeleteFramebuffers(1, &globals::world_fbo);
+ std::terminate();
+ }
+}
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if(!globals::gui_keybind_ptr && hide_hud_toggle.equals(event.key) && (event.action == GLFW_PRESS)) {
+ client_game::hide_hud = !client_game::hide_hud;
+ }
+}
+
+void client_game::init(void)
+{
+ auto& io = ImGui::GetIO();
+ io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad;
+ io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+ io.IniFilename = nullptr;
+ io.Fonts->Clear();
+
+ ImFontConfig font_config;
+ font_config.FontDataOwnedByAtlas = false;
+
+ ImFontGlyphRangesBuilder builder;
+ builder.AddRanges(io.Fonts->GetGlyphRangesDefault());
+ builder.AddRanges(io.Fonts->GetGlyphRangesCyrillic());
+
+ ImVector<ImWchar> ranges;
+ builder.BuildRanges(&ranges);
+
+ globals::font_unscii16 = load_font("fonts/unscii-16.ttf", 16.0f, font_config, ranges);
+ globals::font_unscii8 = load_font("fonts/unscii-8.ttf", 8.0f, font_config, ranges);
+
+ gui::client_splash::init();
+ gui::client_splash::render();
+
+ globals::client_config.add_value("game.streamer_mode", client_game::streamer_mode);
+ globals::client_config.add_value("game.vertical_sync", client_game::vertical_sync);
+ globals::client_config.add_value("game.world_curvature", client_game::world_curvature);
+ globals::client_config.add_value("game.fog_mode", client_game::fog_mode);
+ globals::client_config.add_value("game.username", client_game::username);
+ globals::client_config.add_value("game.key.toggle_hide_hud", hide_hud_toggle);
+
+ settings::init();
+
+ settings::add_checkbox(0, client_game::streamer_mode, settings_location::VIDEO_GUI, "game.streamer_mode", true);
+ settings::add_checkbox(5, client_game::vertical_sync, settings_location::VIDEO, "game.vertical_sync", false);
+ settings::add_checkbox(4, client_game::world_curvature, settings_location::VIDEO, "game.world_curvature", true);
+ settings::add_stepper(3, client_game::fog_mode, settings_location::VIDEO, "game.fog_mode", false);
+ settings::add_input(1, client_game::username, settings_location::GENERAL, "game.username", true, false);
+ settings::add_keybind(4, hide_hud_toggle, settings_location::KEYBOARD_MISC, "game.key.toggle_hide_hud");
+
+ globals::client_host = enet_host_create(nullptr, 1, 1, 0, 0);
+
+ if(!globals::client_host) {
+ spdlog::critical("game: unable to setup an ENet host");
+ std::terminate();
+ }
+
+ gui::language::init();
+
+ session::init();
+
+ entity::player_look::init();
+ entity::player_move::init();
+ world::player_target::init();
+
+ io::gamepad::init();
+
+ entity::camera::init();
+
+ world::voxel_anims::init();
+
+ world::outline::init();
+ world::chunk_mesher::init();
+ world::chunk_renderer::init();
+
+ globals::world_fbo = 0;
+ globals::world_fbo_color = 0;
+ globals::world_fbo_depth = 0;
+
+ world::voxel_sounds::init();
+
+ world::skybox::init();
+
+ ImGuiStyle& style = ImGui::GetStyle();
+
+ // Black buttons on a dark background
+ // may be harder to read than the text on them
+ style.FrameBorderSize = 1.0;
+ style.TabBorderSize = 1.0;
+
+ // Rounding on elements looks cool but I am
+ // aiming for a more or less blocky and
+ // visually simple HiDPI-friendly UI style
+ style.TabRounding = 0.0f;
+ style.GrabRounding = 0.0f;
+ style.ChildRounding = 0.0f;
+ style.FrameRounding = 0.0f;
+ style.PopupRounding = 0.0f;
+ style.WindowRounding = 0.0f;
+ style.ScrollbarRounding = 0.0f;
+
+ style.Colors[ImGuiCol_Text] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);
+ style.Colors[ImGuiCol_TextDisabled] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f);
+ style.Colors[ImGuiCol_WindowBg] = ImVec4(0.06f, 0.06f, 0.06f, 0.94f);
+ style.Colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
+ style.Colors[ImGuiCol_PopupBg] = ImVec4(0.08f, 0.08f, 0.08f, 0.94f);
+ style.Colors[ImGuiCol_Border] = ImVec4(0.79f, 0.79f, 0.79f, 0.50f);
+ style.Colors[ImGuiCol_BorderShadow] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
+ style.Colors[ImGuiCol_FrameBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.54f);
+ style.Colors[ImGuiCol_FrameBgHovered] = ImVec4(0.36f, 0.36f, 0.36f, 0.40f);
+ style.Colors[ImGuiCol_FrameBgActive] = ImVec4(0.63f, 0.63f, 0.63f, 0.67f);
+ style.Colors[ImGuiCol_TitleBg] = ImVec4(0.04f, 0.04f, 0.04f, 1.00f);
+ style.Colors[ImGuiCol_TitleBgActive] = ImVec4(0.00f, 0.00f, 0.00f, 1.00f);
+ style.Colors[ImGuiCol_TitleBgCollapsed] = ImVec4(0.00f, 0.00f, 0.00f, 0.51f);
+ style.Colors[ImGuiCol_MenuBarBg] = ImVec4(0.14f, 0.14f, 0.14f, 1.00f);
+ style.Colors[ImGuiCol_ScrollbarBg] = ImVec4(0.02f, 0.02f, 0.02f, 0.53f);
+ style.Colors[ImGuiCol_ScrollbarGrab] = ImVec4(0.00f, 0.00f, 0.00f, 0.75f);
+ style.Colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f);
+ style.Colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f);
+ style.Colors[ImGuiCol_CheckMark] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);
+ style.Colors[ImGuiCol_SliderGrab] = ImVec4(0.81f, 0.81f, 0.81f, 0.75f);
+ style.Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.00f, 0.00f, 0.00f, 1.00f);
+ style.Colors[ImGuiCol_Button] = ImVec4(0.00f, 0.00f, 0.00f, 1.00f);
+ style.Colors[ImGuiCol_ButtonHovered] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f);
+ style.Colors[ImGuiCol_ButtonActive] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f);
+ style.Colors[ImGuiCol_Header] = ImVec4(0.00f, 0.00f, 0.00f, 0.75f);
+ style.Colors[ImGuiCol_HeaderHovered] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f);
+ style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f);
+ style.Colors[ImGuiCol_Separator] = ImVec4(0.49f, 0.49f, 0.49f, 0.50f);
+ style.Colors[ImGuiCol_SeparatorHovered] = ImVec4(0.56f, 0.56f, 0.56f, 0.78f);
+ style.Colors[ImGuiCol_SeparatorActive] = ImVec4(0.90f, 0.90f, 0.90f, 1.00f);
+ style.Colors[ImGuiCol_ResizeGrip] = ImVec4(0.34f, 0.34f, 0.34f, 0.20f);
+ style.Colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.57f, 0.57f, 0.57f, 0.67f);
+ style.Colors[ImGuiCol_ResizeGripActive] = ImVec4(1.00f, 1.00f, 1.00f, 0.95f);
+ style.Colors[ImGuiCol_Tab] = ImVec4(0.00f, 0.00f, 0.00f, 0.75f);
+ style.Colors[ImGuiCol_TabHovered] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f);
+ style.Colors[ImGuiCol_TabActive] = ImVec4(0.25f, 0.25f, 0.25f, 1.00f);
+ style.Colors[ImGuiCol_TabUnfocused] = ImVec4(0.13f, 0.13f, 0.13f, 0.97f);
+ style.Colors[ImGuiCol_TabUnfocusedActive] = ImVec4(0.44f, 0.44f, 0.44f, 1.00f);
+ style.Colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f);
+ style.Colors[ImGuiCol_PlotLinesHovered] = ImVec4(0.69f, 0.00f, 0.00f, 1.00f);
+ style.Colors[ImGuiCol_PlotHistogram] = ImVec4(0.00f, 1.00f, 0.20f, 1.00f);
+ style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f);
+ style.Colors[ImGuiCol_TableHeaderBg] = ImVec4(0.19f, 0.19f, 0.20f, 1.00f);
+ style.Colors[ImGuiCol_TableBorderStrong] = ImVec4(0.31f, 0.31f, 0.35f, 1.00f);
+ style.Colors[ImGuiCol_TableBorderLight] = ImVec4(0.23f, 0.23f, 0.25f, 1.00f);
+ style.Colors[ImGuiCol_TableRowBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
+ style.Colors[ImGuiCol_TableRowBgAlt] = ImVec4(1.00f, 1.00f, 1.00f, 0.06f);
+ style.Colors[ImGuiCol_TextSelectedBg] = ImVec4(0.61f, 0.61f, 0.61f, 0.35f);
+ style.Colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 1.00f);
+ style.Colors[ImGuiCol_NavHighlight] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f);
+ style.Colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f);
+ style.Colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f);
+ style.Colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.35f);
+
+ // Making my own Game UI for Source Engine
+ // taught me one important thing: dimensions
+ // of UI elements must be calculated at semi-runtime
+ // so there's simply no point for an INI file.
+ io.IniFilename = nullptr;
+
+ toggles::init();
+
+ gui::background::init();
+
+ gui::scoreboard::init();
+
+ gui::client_chat::init();
+
+ gui::bother::init();
+
+ gui::main_menu::init();
+ gui::play_menu::init();
+ gui::progress_bar::init();
+ gui::message_box::init();
+ gui::direct_connection::init();
+
+ gui::crosshair::init();
+ gui::hotbar::init();
+ gui::metrics::init();
+ gui::status_lines::init();
+
+ screenshot::init();
+
+ globals::gui_keybind_ptr = nullptr;
+ globals::gui_scale = 0U;
+ globals::gui_screen = GUI_MAIN_MENU;
+
+ sound::init_config();
+
+ if(globals::sound_ctx) {
+ sound::init();
+ }
+
+ client_receive::init();
+
+ experiments::init();
+
+ globals::dispatcher.sink<io::GlfwFramebufferSizeEvent>().connect<&on_glfw_framebuffer_size>();
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+}
+
+void client_game::init_late(void)
+{
+ toggles::init_late();
+
+ if(globals::sound_ctx) {
+ sound::init_late();
+ }
+
+ gui::language::init_late();
+
+ settings::init_late();
+
+ gui::client_chat::init_late();
+
+ gui::status_lines::init_late();
+
+ game_voxels::populate();
+ game_items::populate();
+
+ std::size_t max_texture_count = 0;
+
+ // Figure out the total texture count
+ // NOTE: this is very debug, early and a quite
+ // conservative limit choice; there must be a better
+ // way to make this limit way smaller than it currently is
+ for(const std::shared_ptr<world::VoxelInfo>& info : world::voxel_registry::voxels) {
+ for(const world::VoxelTexture& vtex : info->textures) {
+ max_texture_count += vtex.paths.size();
+ }
+ }
+
+ // UNDONE: asset packs for non-16x16 stuff
+ world::voxel_atlas::create(16, 16, max_texture_count);
+
+ for(std::shared_ptr<world::VoxelInfo>& info : world::voxel_registry::voxels) {
+ for(world::VoxelTexture& vtex : info->textures) {
+ if(auto strip = world::voxel_atlas::find_or_load(vtex.paths)) {
+ vtex.cached_offset = strip->offset;
+ vtex.cached_plane = strip->plane;
+ continue;
+ }
+
+ spdlog::critical("client_gl: {}: failed to load atlas strips", info->name);
+ std::terminate();
+ }
+ }
+
+ world::voxel_atlas::generate_mipmaps();
+
+ for(std::shared_ptr<world::ItemInfo>& info : world::item_registry::items) {
+ info->cached_texture = resource::load<TextureGUI>(info->texture.c_str(), TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T);
+ }
+
+ experiments::init_late();
+
+ gui::client_splash::init_late();
+
+ gui::window_title::update();
+}
+
+void client_game::shutdown(void)
+{
+ world::voxel_sounds::shutdown();
+
+ experiments::shutdown();
+
+ session::shutdown();
+
+ if(globals::sound_ctx) {
+ sound::shutdown();
+ }
+
+ gui::hotbar::shutdown();
+ gui::main_menu::shutdown();
+ gui::play_menu::shutdown();
+
+ gui::bother::shutdown();
+
+ gui::client_chat::shutdown();
+
+ gui::background::shutdown();
+
+ gui::crosshair::shutdown();
+
+ delete globals::dimension;
+ globals::player = entt::null;
+ globals::dimension = nullptr;
+
+ world::item_registry::purge();
+ world::voxel_registry::purge();
+
+ world::voxel_atlas::destroy();
+
+ glDeleteRenderbuffers(1, &globals::world_fbo_depth);
+ glDeleteTextures(1, &globals::world_fbo_color);
+ glDeleteFramebuffers(1, &globals::world_fbo);
+
+ world::outline::shutdown();
+ world::chunk_renderer::shutdown();
+ world::chunk_mesher::shutdown();
+
+ enet_host_destroy(globals::client_host);
+}
+
+void client_game::fixed_update(void)
+{
+ entity::player_move::fixed_update();
+
+ // Only update world simulation gamesystems
+ // if the player can actually observe all the
+ // changes these gamesystems cause visually
+ if(session::is_ingame()) {
+ entity::Collision::fixed_update(globals::dimension);
+ entity::Velocity::fixed_update(globals::dimension);
+ entity::Transform::fixed_update(globals::dimension);
+ entity::Gravity::fixed_update(globals::dimension);
+ entity::Stasis::fixed_update(globals::dimension);
+ }
+}
+
+void client_game::fixed_update_late(void)
+{
+ if(session::is_ingame()) {
+ const auto& head = globals::dimension->entities.get<entity::Head>(globals::player);
+ const auto& transform = globals::dimension->entities.get<entity::Transform>(globals::player);
+ const auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player);
+
+ protocol::EntityHead head_packet;
+ head_packet.entity = entt::null; // ignored by server
+ head_packet.angles = head.angles;
+
+ protocol::EntityTransform transform_packet;
+ transform_packet.entity = entt::null; // ignored by server
+ transform_packet.angles = transform.angles;
+ transform_packet.chunk = transform.chunk;
+ transform_packet.local = transform.local;
+
+ protocol::EntityVelocity velocity_packet;
+ velocity_packet.entity = entt::null; // ignored by server
+ velocity_packet.value = velocity.value;
+
+ protocol::send(session::peer, protocol::encode(head_packet));
+ protocol::send(session::peer, protocol::encode(transform_packet));
+ protocol::send(session::peer, protocol::encode(velocity_packet));
+ }
+}
+
+void client_game::update(void)
+{
+ if(session::is_ingame()) {
+ if(toggles::get(TOGGLE_PM_FLIGHT)) {
+ globals::dimension->entities.remove<entity::Gravity>(globals::player);
+ }
+ else {
+ globals::dimension->entities.emplace_or_replace<entity::Gravity>(globals::player);
+ }
+ }
+
+ if(globals::sound_ctx) {
+ sound::update();
+
+ entity::listener::update();
+
+ entity::SoundEmitter::update();
+ }
+
+ entity::interpolation::update();
+
+ world::player_target::update();
+
+ entity::camera::update();
+
+ world::voxel_anims::update();
+
+ world::chunk_mesher::update();
+
+ gui::client_chat::update();
+
+ experiments::update();
+
+ constexpr auto half_base_width = 0.5f * static_cast<float>(BASE_WIDTH);
+ constexpr auto half_base_height = 0.5f * static_cast<float>(BASE_HEIGHT);
+
+ auto twice_scale_x = static_cast<float>(globals::width) / half_base_width;
+ auto twice_scale_y = static_cast<float>(globals::height) / half_base_height;
+
+ auto scale_x = math::max(1.0f, 0.5f * glm::floor(twice_scale_x));
+ auto scale_y = math::max(1.0f, 0.5f * glm::floor(twice_scale_y));
+ auto scale_min = math::ceil<unsigned int>(math::min(scale_x, scale_y));
+ auto scale_int = math::max(1U, (scale_min / 2U) * 2U);
+
+ auto& io = ImGui::GetIO();
+ io.FontGlobalScale = scale_int;
+ globals::gui_scale = scale_int;
+}
+
+void client_game::update_late(void)
+{
+ ENetEvent enet_event;
+
+ while(0 < enet_host_service(globals::client_host, &enet_event, 0)) {
+ switch(enet_event.type) {
+ case ENET_EVENT_TYPE_CONNECT:
+ session::send_login_request();
+ break;
+ case ENET_EVENT_TYPE_DISCONNECT:
+ session::invalidate();
+ break;
+ case ENET_EVENT_TYPE_RECEIVE:
+ protocol::decode(globals::dispatcher, enet_event.packet, enet_event.peer);
+ enet_packet_destroy(enet_event.packet);
+ break;
+ }
+ }
+
+ entity::player_look::update_late();
+ entity::player_move::update_late();
+
+ gui::play_menu::update_late();
+
+ gui::bother::update_late();
+
+ experiments::update_late();
+
+ io::gamepad::update_late();
+
+ world::chunk_visibility::update_late();
+
+ if(client_game::vertical_sync.get_value()) {
+ glfwSwapInterval(1);
+ }
+ else {
+ glfwSwapInterval(0);
+ }
+}
+
+void client_game::render(void)
+{
+ glViewport(0, 0, globals::width, globals::height);
+ glBindFramebuffer(GL_FRAMEBUFFER, globals::world_fbo);
+ glClearColor(world::skybox::fog_color.r, world::skybox::fog_color.g, world::skybox::fog_color.b, 1.000f);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ if(globals::dimension) {
+ world::chunk_renderer::render();
+ }
+
+ glEnable(GL_DEPTH_TEST);
+
+ world::player_target::render();
+
+ if(globals::dimension) {
+ auto group = globals::dimension->entities.group(
+ entt::get<entity::Player, entity::Collision, entity::client::HeadIntr, entity::client::TransformIntr>);
+
+ world::outline::prepare();
+
+ for(const auto [entity, collision, head, transform] : group.each()) {
+ if(entity == globals::player) {
+ // Don't render ourselves
+ continue;
+ }
+
+ glm::fvec3 forward;
+ math::vectors(transform.angles + head.angles, forward);
+ forward *= 2.0f;
+
+ glm::fvec3 hull_size = collision.aabb.max - collision.aabb.min;
+ glm::fvec3 hull_fpos = transform.local + collision.aabb.min;
+ glm::fvec3 look = transform.local + head.offset;
+
+ world::outline::cube(transform.chunk, hull_fpos, hull_size, 1.0f, glm::fvec4(1.0f, 0.0f, 0.0f, 1.0f));
+ world::outline::line(transform.chunk, look, forward, 1.0f, glm::fvec4(0.9f, 0.9f, 0.9f, 1.0f));
+ }
+ }
+
+ glEnable(GL_DEPTH_TEST);
+
+ glViewport(0, 0, globals::width, globals::height);
+ glClearColor(0.000f, 0.000f, 0.000f, 1.000f);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, globals::world_fbo);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+ glBlitFramebuffer(0, 0, globals::width, globals::height, 0, 0, globals::width, globals::height, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+}
+
+void client_game::layout(void)
+{
+ if(!session::is_ingame()) {
+ gui::background::layout();
+ }
+
+ if(!globals::gui_screen || (globals::gui_screen == GUI_CHAT)) {
+ if(toggles::get(TOGGLE_METRICS_UI) && !client_game::hide_hud) {
+ // This contains Minecraft-esque debug information
+ // about the hardware, world state and other
+ // things that might be uesful
+ gui::metrics::layout();
+ }
+ }
+
+ if(session::is_ingame()) {
+ gui::client_chat::layout();
+ gui::scoreboard::layout();
+
+ if(!globals::gui_screen && !client_game::hide_hud) {
+ gui::hotbar::layout();
+ gui::status_lines::layout();
+ gui::crosshair::layout();
+ }
+ }
+
+ if(globals::gui_screen) {
+ if(session::is_ingame() && (globals::gui_screen != GUI_CHAT)) {
+ const float width_f = static_cast<float>(globals::width);
+ const float height_f = static_cast<float>(globals::height);
+ const ImU32 darken = ImGui::GetColorU32(ImVec4(0.00f, 0.00f, 0.00f, 0.75f));
+ ImGui::GetBackgroundDrawList()->AddRectFilled(ImVec2(), ImVec2(width_f, height_f), darken);
+ }
+
+ switch(globals::gui_screen) {
+ case GUI_MAIN_MENU:
+ gui::main_menu::layout();
+ break;
+ case GUI_PLAY_MENU:
+ gui::play_menu::layout();
+ break;
+ case GUI_SETTINGS:
+ settings::layout();
+ break;
+ case GUI_PROGRESS_BAR:
+ gui::progress_bar::layout();
+ break;
+ case GUI_MESSAGE_BOX:
+ gui::message_box::layout();
+ break;
+ case GUI_DIRECT_CONNECTION:
+ gui::direct_connection::layout();
+ break;
+ }
+ }
+}
diff --git a/game/client/game.hh b/game/client/game.hh index 395acc9..649700a 100644 --- a/game/client/game.hh +++ b/game/client/game.hh @@ -1,35 +1,35 @@ -#pragma once - -namespace config -{ -class Boolean; -class String; -class Unsigned; -} // namespace config - -namespace client_game -{ -extern config::Boolean streamer_mode; -extern config::Boolean vertical_sync; -extern config::Boolean world_curvature; -extern config::Unsigned fog_mode; -extern config::String username; -} // namespace client_game - -namespace client_game -{ -extern bool hide_hud; -} // namespace client_game - -namespace client_game -{ -void init(void); -void init_late(void); -void shutdown(void); -void fixed_update(void); -void fixed_update_late(void); -void update(void); -void update_late(void); -void render(void); -void layout(void); -} // namespace client_game +#pragma once
+
+namespace config
+{
+class Boolean;
+class String;
+class Unsigned;
+} // namespace config
+
+namespace client_game
+{
+extern config::Boolean streamer_mode;
+extern config::Boolean vertical_sync;
+extern config::Boolean world_curvature;
+extern config::Unsigned fog_mode;
+extern config::String username;
+} // namespace client_game
+
+namespace client_game
+{
+extern bool hide_hud;
+} // namespace client_game
+
+namespace client_game
+{
+void init(void);
+void init_late(void);
+void shutdown(void);
+void fixed_update(void);
+void fixed_update_late(void);
+void update(void);
+void update_late(void);
+void render(void);
+void layout(void);
+} // namespace client_game
diff --git a/game/client/globals.cc b/game/client/globals.cc index 1932675..1cf1aeb 100644 --- a/game/client/globals.cc +++ b/game/client/globals.cc @@ -1,47 +1,47 @@ -#include "client/pch.hh" - -#include "client/globals.hh" - -#include "core/io/config_map.hh" - -#include "client/gui/gui_screen.hh" - -io::ConfigMap globals::client_config; - -GLFWwindow* globals::window; - -float globals::window_frametime; -float globals::window_frametime_avg; -std::uint64_t globals::window_frametime_us; -std::uint64_t globals::window_framecount; - -std::uint64_t globals::fixed_accumulator; - -int globals::width; -int globals::height; -float globals::aspect; - -GLuint globals::world_fbo; -GLuint globals::world_fbo_color; -GLuint globals::world_fbo_depth; - -std::size_t globals::num_drawcalls; -std::size_t globals::num_triangles; - -ENetHost* globals::client_host; - -world::Dimension* globals::dimension = nullptr; -entt::entity globals::player; - -ImFont* globals::font_unscii16; -ImFont* globals::font_unscii8; - -config::KeyBind* globals::gui_keybind_ptr = nullptr; -config::GamepadAxis* globals::gui_gamepad_axis_ptr = nullptr; -config::GamepadButton* globals::gui_gamepad_button_ptr = nullptr; - -unsigned int globals::gui_scale = 0U; -unsigned int globals::gui_screen = GUI_SCREEN_NONE; - -ALCdevice* globals::sound_dev; -ALCcontext* globals::sound_ctx; +#include "client/pch.hh"
+
+#include "client/globals.hh"
+
+#include "core/io/config_map.hh"
+
+#include "client/gui/gui_screen.hh"
+
+io::ConfigMap globals::client_config;
+
+GLFWwindow* globals::window;
+
+float globals::window_frametime;
+float globals::window_frametime_avg;
+std::uint64_t globals::window_frametime_us;
+std::uint64_t globals::window_framecount;
+
+std::uint64_t globals::fixed_accumulator;
+
+int globals::width;
+int globals::height;
+float globals::aspect;
+
+GLuint globals::world_fbo;
+GLuint globals::world_fbo_color;
+GLuint globals::world_fbo_depth;
+
+std::size_t globals::num_drawcalls;
+std::size_t globals::num_triangles;
+
+ENetHost* globals::client_host;
+
+world::Dimension* globals::dimension = nullptr;
+entt::entity globals::player;
+
+ImFont* globals::font_unscii16;
+ImFont* globals::font_unscii8;
+
+config::KeyBind* globals::gui_keybind_ptr = nullptr;
+config::GamepadAxis* globals::gui_gamepad_axis_ptr = nullptr;
+config::GamepadButton* globals::gui_gamepad_button_ptr = nullptr;
+
+unsigned int globals::gui_scale = 0U;
+unsigned int globals::gui_screen = GUI_SCREEN_NONE;
+
+ALCdevice* globals::sound_dev;
+ALCcontext* globals::sound_ctx;
diff --git a/game/client/globals.hh b/game/client/globals.hh index ba57a9e..41531a9 100644 --- a/game/client/globals.hh +++ b/game/client/globals.hh @@ -1,71 +1,71 @@ -#pragma once - -#include "shared/globals.hh" - -namespace config -{ -class KeyBind; -class GamepadAxis; -class GamepadButton; -} // namespace config - -namespace io -{ -class ConfigMap; -} // namespace io - -struct GLFWwindow; -struct ImFont; - -namespace world -{ -class Dimension; -} // namespace world - -namespace globals -{ -extern io::ConfigMap client_config; - -extern GLFWwindow* window; - -// Some gamesystems that aren't really -// gameplay-oriented might still use client -// framerate to interpolate discrete things -// so it's still a good idea to keep these available -extern float window_frametime; -extern float window_frametime_avg; -extern std::uint64_t window_frametime_us; -extern std::uint64_t window_framecount; - -// https://gafferongames.com/post/fix_your_timestep/ -extern std::uint64_t fixed_accumulator; - -extern int width; -extern int height; -extern float aspect; - -extern GLuint world_fbo; -extern GLuint world_fbo_color; -extern GLuint world_fbo_depth; - -extern std::size_t num_drawcalls; -extern std::size_t num_triangles; - -extern ENetHost* client_host; - -extern world::Dimension* dimension; -extern entt::entity player; - -extern ImFont* font_unscii16; -extern ImFont* font_unscii8; - -extern config::KeyBind* gui_keybind_ptr; -extern config::GamepadAxis* gui_gamepad_axis_ptr; -extern config::GamepadButton* gui_gamepad_button_ptr; - -extern unsigned int gui_scale; -extern unsigned int gui_screen; - -extern ALCdevice* sound_dev; -extern ALCcontext* sound_ctx; -} // namespace globals +#pragma once
+
+#include "shared/globals.hh"
+
+namespace config
+{
+class KeyBind;
+class GamepadAxis;
+class GamepadButton;
+} // namespace config
+
+namespace io
+{
+class ConfigMap;
+} // namespace io
+
+struct GLFWwindow;
+struct ImFont;
+
+namespace world
+{
+class Dimension;
+} // namespace world
+
+namespace globals
+{
+extern io::ConfigMap client_config;
+
+extern GLFWwindow* window;
+
+// Some gamesystems that aren't really
+// gameplay-oriented might still use client
+// framerate to interpolate discrete things
+// so it's still a good idea to keep these available
+extern float window_frametime;
+extern float window_frametime_avg;
+extern std::uint64_t window_frametime_us;
+extern std::uint64_t window_framecount;
+
+// https://gafferongames.com/post/fix_your_timestep/
+extern std::uint64_t fixed_accumulator;
+
+extern int width;
+extern int height;
+extern float aspect;
+
+extern GLuint world_fbo;
+extern GLuint world_fbo_color;
+extern GLuint world_fbo_depth;
+
+extern std::size_t num_drawcalls;
+extern std::size_t num_triangles;
+
+extern ENetHost* client_host;
+
+extern world::Dimension* dimension;
+extern entt::entity player;
+
+extern ImFont* font_unscii16;
+extern ImFont* font_unscii8;
+
+extern config::KeyBind* gui_keybind_ptr;
+extern config::GamepadAxis* gui_gamepad_axis_ptr;
+extern config::GamepadButton* gui_gamepad_button_ptr;
+
+extern unsigned int gui_scale;
+extern unsigned int gui_screen;
+
+extern ALCdevice* sound_dev;
+extern ALCcontext* sound_ctx;
+} // namespace globals
diff --git a/game/client/gui/background.cc b/game/client/gui/background.cc index 50fef01..d1500bb 100644 --- a/game/client/gui/background.cc +++ b/game/client/gui/background.cc @@ -1,39 +1,39 @@ -#include "client/pch.hh" - -#include "client/gui/background.hh" - -#include "core/math/constexpr.hh" - -#include "core/resource/resource.hh" - -#include "client/resource/texture_gui.hh" - -#include "client/globals.hh" - -static resource_ptr<TextureGUI> texture; - -void gui::background::init(void) -{ - texture = resource::load<TextureGUI>("textures/gui/background.png", TEXTURE_GUI_LOAD_VFLIP); - - if(texture == nullptr) { - spdlog::critical("background: texture load failed"); - std::terminate(); - } -} - -void gui::background::shutdown(void) -{ - texture = nullptr; -} - -void gui::background::layout(void) -{ - auto viewport = ImGui::GetMainViewport(); - auto draw_list = ImGui::GetBackgroundDrawList(); - - auto scaled_width = 0.75f * static_cast<float>(globals::width / globals::gui_scale); - auto scaled_height = 0.75f * static_cast<float>(globals::height / globals::gui_scale); - auto scale_uv = ImVec2(scaled_width / static_cast<float>(texture->size.x), scaled_height / static_cast<float>(texture->size.y)); - draw_list->AddImage(texture->handle, ImVec2(0.0f, 0.0f), viewport->Size, ImVec2(0.0f, 0.0f), scale_uv); -} +#include "client/pch.hh"
+
+#include "client/gui/background.hh"
+
+#include "core/math/constexpr.hh"
+
+#include "core/resource/resource.hh"
+
+#include "client/resource/texture_gui.hh"
+
+#include "client/globals.hh"
+
+static resource_ptr<TextureGUI> texture;
+
+void gui::background::init(void)
+{
+ texture = resource::load<TextureGUI>("textures/gui/background.png", TEXTURE_GUI_LOAD_VFLIP);
+
+ if(texture == nullptr) {
+ spdlog::critical("background: texture load failed");
+ std::terminate();
+ }
+}
+
+void gui::background::shutdown(void)
+{
+ texture = nullptr;
+}
+
+void gui::background::layout(void)
+{
+ auto viewport = ImGui::GetMainViewport();
+ auto draw_list = ImGui::GetBackgroundDrawList();
+
+ auto scaled_width = 0.75f * static_cast<float>(globals::width / globals::gui_scale);
+ auto scaled_height = 0.75f * static_cast<float>(globals::height / globals::gui_scale);
+ auto scale_uv = ImVec2(scaled_width / static_cast<float>(texture->size.x), scaled_height / static_cast<float>(texture->size.y));
+ draw_list->AddImage(texture->handle, ImVec2(0.0f, 0.0f), viewport->Size, ImVec2(0.0f, 0.0f), scale_uv);
+}
diff --git a/game/client/gui/background.hh b/game/client/gui/background.hh index 5c72a3f..6145484 100644 --- a/game/client/gui/background.hh +++ b/game/client/gui/background.hh @@ -1,8 +1,8 @@ -#pragma once - -namespace gui::background -{ -void init(void); -void shutdown(void); -void layout(void); -} // namespace gui::background +#pragma once
+
+namespace gui::background
+{
+void init(void);
+void shutdown(void);
+void layout(void);
+} // namespace gui::background
diff --git a/game/client/gui/bother.cc b/game/client/gui/bother.cc index d87f220..1bb7097 100644 --- a/game/client/gui/bother.cc +++ b/game/client/gui/bother.cc @@ -1,163 +1,163 @@ -#include "client/pch.hh" - -#include "client/gui/bother.hh" - -#include "shared/protocol.hh" - -#include "client/globals.hh" - -// Maximum amount of peers used for bothering -constexpr static std::size_t BOTHER_PEERS = 4; - -struct BotherQueueItem final { - unsigned int identity; - std::string hostname; - std::uint16_t port; -}; - -static ENetHost* bother_host; -static entt::dispatcher bother_dispatcher; -static std::unordered_set<unsigned int> bother_set; -static std::deque<BotherQueueItem> bother_queue; - -static void on_status_response_packet(const protocol::StatusResponse& packet) -{ - auto identity = static_cast<unsigned int>(reinterpret_cast<std::uintptr_t>(packet.peer->data)); - - bother_set.erase(identity); - - gui::BotherResponseEvent event; - event.identity = identity; - event.is_server_unreachable = false; - event.protocol_version = packet.version; - event.num_players = packet.num_players; - event.max_players = packet.max_players; - event.motd = packet.motd; - globals::dispatcher.trigger(event); - - enet_peer_disconnect(packet.peer, protocol::CHANNEL); -} - -void gui::bother::init(void) -{ - bother_host = enet_host_create(nullptr, BOTHER_PEERS, 1, 0, 0); - bother_dispatcher.clear(); - bother_set.clear(); - - bother_dispatcher.sink<protocol::StatusResponse>().connect<&on_status_response_packet>(); -} - -void gui::bother::shutdown(void) -{ - enet_host_destroy(bother_host); - bother_dispatcher.clear(); - bother_set.clear(); -} - -void gui::bother::update_late(void) -{ - unsigned int free_peers = 0U; - - // Figure out how much times we can call - // enet_host_connect and reallistically succeed - for(unsigned int i = 0U; i < bother_host->peerCount; ++i) { - if(bother_host->peers[i].state != ENET_PEER_STATE_DISCONNECTED) { - continue; - } - - free_peers += 1U; - } - - for(unsigned int i = 0U; (i < free_peers) && bother_queue.size(); ++i) { - const auto& item = bother_queue.front(); - - ENetAddress address; - enet_address_set_host(&address, item.hostname.c_str()); - address.port = enet_uint16(item.port); - - if(auto peer = enet_host_connect(bother_host, &address, 1, 0)) { - peer->data = reinterpret_cast<void*>(static_cast<std::uintptr_t>(item.identity)); - bother_set.insert(item.identity); - enet_host_flush(bother_host); - } - - bother_queue.pop_front(); - } - - ENetEvent enet_event; - - if(0 < enet_host_service(bother_host, &enet_event, 0)) { - if(enet_event.type == ENET_EVENT_TYPE_CONNECT) { - protocol::StatusRequest packet; - packet.version = protocol::VERSION; - protocol::send(enet_event.peer, protocol::encode(packet)); - return; - } - - if(enet_event.type == ENET_EVENT_TYPE_RECEIVE) { - protocol::decode(bother_dispatcher, enet_event.packet, enet_event.peer); - enet_packet_destroy(enet_event.packet); - return; - } - - if(enet_event.type == ENET_EVENT_TYPE_DISCONNECT) { - auto identity = static_cast<unsigned int>(reinterpret_cast<std::uintptr_t>(enet_event.peer->data)); - - if(bother_set.count(identity)) { - BotherResponseEvent event; - event.identity = identity; - event.is_server_unreachable = true; - globals::dispatcher.trigger(event); - } - - bother_set.erase(identity); - - return; - } - } -} - -void gui::bother::ping(unsigned int identity, std::string_view host, std::uint16_t port) -{ - if(bother_set.count(identity)) { - // Already in the process - return; - } - - for(const auto& item : bother_queue) { - if(item.identity == identity) { - // Already in the queue - return; - } - } - - BotherQueueItem item; - item.identity = identity; - item.hostname = host; - item.port = port; - - bother_queue.push_back(item); -} - -void gui::bother::cancel(unsigned int identity) -{ - bother_set.erase(identity); - - auto item = bother_queue.cbegin(); - - while(item != bother_queue.cend()) { - if(item->identity == identity) { - item = bother_queue.erase(item); - continue; - } - - item = std::next(item); - } - - for(unsigned int i = 0U; i < bother_host->peerCount; ++i) { - if(bother_host->peers[i].data == reinterpret_cast<void*>(static_cast<std::uintptr_t>(identity))) { - enet_peer_reset(&bother_host->peers[i]); - break; - } - } -} +#include "client/pch.hh"
+
+#include "client/gui/bother.hh"
+
+#include "shared/protocol.hh"
+
+#include "client/globals.hh"
+
+// Maximum amount of peers used for bothering
+constexpr static std::size_t BOTHER_PEERS = 4;
+
+struct BotherQueueItem final {
+ unsigned int identity;
+ std::string hostname;
+ std::uint16_t port;
+};
+
+static ENetHost* bother_host;
+static entt::dispatcher bother_dispatcher;
+static std::unordered_set<unsigned int> bother_set;
+static std::deque<BotherQueueItem> bother_queue;
+
+static void on_status_response_packet(const protocol::StatusResponse& packet)
+{
+ auto identity = static_cast<unsigned int>(reinterpret_cast<std::uintptr_t>(packet.peer->data));
+
+ bother_set.erase(identity);
+
+ gui::BotherResponseEvent event;
+ event.identity = identity;
+ event.is_server_unreachable = false;
+ event.protocol_version = packet.version;
+ event.num_players = packet.num_players;
+ event.max_players = packet.max_players;
+ event.motd = packet.motd;
+ globals::dispatcher.trigger(event);
+
+ enet_peer_disconnect(packet.peer, protocol::CHANNEL);
+}
+
+void gui::bother::init(void)
+{
+ bother_host = enet_host_create(nullptr, BOTHER_PEERS, 1, 0, 0);
+ bother_dispatcher.clear();
+ bother_set.clear();
+
+ bother_dispatcher.sink<protocol::StatusResponse>().connect<&on_status_response_packet>();
+}
+
+void gui::bother::shutdown(void)
+{
+ enet_host_destroy(bother_host);
+ bother_dispatcher.clear();
+ bother_set.clear();
+}
+
+void gui::bother::update_late(void)
+{
+ unsigned int free_peers = 0U;
+
+ // Figure out how much times we can call
+ // enet_host_connect and reallistically succeed
+ for(unsigned int i = 0U; i < bother_host->peerCount; ++i) {
+ if(bother_host->peers[i].state != ENET_PEER_STATE_DISCONNECTED) {
+ continue;
+ }
+
+ free_peers += 1U;
+ }
+
+ for(unsigned int i = 0U; (i < free_peers) && bother_queue.size(); ++i) {
+ const auto& item = bother_queue.front();
+
+ ENetAddress address;
+ enet_address_set_host(&address, item.hostname.c_str());
+ address.port = enet_uint16(item.port);
+
+ if(auto peer = enet_host_connect(bother_host, &address, 1, 0)) {
+ peer->data = reinterpret_cast<void*>(static_cast<std::uintptr_t>(item.identity));
+ bother_set.insert(item.identity);
+ enet_host_flush(bother_host);
+ }
+
+ bother_queue.pop_front();
+ }
+
+ ENetEvent enet_event;
+
+ if(0 < enet_host_service(bother_host, &enet_event, 0)) {
+ if(enet_event.type == ENET_EVENT_TYPE_CONNECT) {
+ protocol::StatusRequest packet;
+ packet.version = protocol::VERSION;
+ protocol::send(enet_event.peer, protocol::encode(packet));
+ return;
+ }
+
+ if(enet_event.type == ENET_EVENT_TYPE_RECEIVE) {
+ protocol::decode(bother_dispatcher, enet_event.packet, enet_event.peer);
+ enet_packet_destroy(enet_event.packet);
+ return;
+ }
+
+ if(enet_event.type == ENET_EVENT_TYPE_DISCONNECT) {
+ auto identity = static_cast<unsigned int>(reinterpret_cast<std::uintptr_t>(enet_event.peer->data));
+
+ if(bother_set.count(identity)) {
+ BotherResponseEvent event;
+ event.identity = identity;
+ event.is_server_unreachable = true;
+ globals::dispatcher.trigger(event);
+ }
+
+ bother_set.erase(identity);
+
+ return;
+ }
+ }
+}
+
+void gui::bother::ping(unsigned int identity, std::string_view host, std::uint16_t port)
+{
+ if(bother_set.count(identity)) {
+ // Already in the process
+ return;
+ }
+
+ for(const auto& item : bother_queue) {
+ if(item.identity == identity) {
+ // Already in the queue
+ return;
+ }
+ }
+
+ BotherQueueItem item;
+ item.identity = identity;
+ item.hostname = host;
+ item.port = port;
+
+ bother_queue.push_back(item);
+}
+
+void gui::bother::cancel(unsigned int identity)
+{
+ bother_set.erase(identity);
+
+ auto item = bother_queue.cbegin();
+
+ while(item != bother_queue.cend()) {
+ if(item->identity == identity) {
+ item = bother_queue.erase(item);
+ continue;
+ }
+
+ item = std::next(item);
+ }
+
+ for(unsigned int i = 0U; i < bother_host->peerCount; ++i) {
+ if(bother_host->peers[i].data == reinterpret_cast<void*>(static_cast<std::uintptr_t>(identity))) {
+ enet_peer_reset(&bother_host->peers[i]);
+ break;
+ }
+ }
+}
diff --git a/game/client/gui/bother.hh b/game/client/gui/bother.hh index c83294c..fc5bab4 100644 --- a/game/client/gui/bother.hh +++ b/game/client/gui/bother.hh @@ -1,22 +1,22 @@ -#pragma once - -namespace gui -{ -struct BotherResponseEvent final { - unsigned int identity; - bool is_server_unreachable; - std::uint32_t protocol_version; - std::uint16_t num_players; - std::uint16_t max_players; - std::string motd; -}; -} // namespace gui - -namespace gui::bother -{ -void init(void); -void shutdown(void); -void update_late(void); -void ping(unsigned int identity, std::string_view host, std::uint16_t port); -void cancel(unsigned int identity); -} // namespace gui::bother +#pragma once
+
+namespace gui
+{
+struct BotherResponseEvent final {
+ unsigned int identity;
+ bool is_server_unreachable;
+ std::uint32_t protocol_version;
+ std::uint16_t num_players;
+ std::uint16_t max_players;
+ std::string motd;
+};
+} // namespace gui
+
+namespace gui::bother
+{
+void init(void);
+void shutdown(void);
+void update_late(void);
+void ping(unsigned int identity, std::string_view host, std::uint16_t port);
+void cancel(unsigned int identity);
+} // namespace gui::bother
diff --git a/game/client/gui/chat.cc b/game/client/gui/chat.cc index 6e4498b..aaee8c6 100644 --- a/game/client/gui/chat.cc +++ b/game/client/gui/chat.cc @@ -1,273 +1,273 @@ -#include "client/pch.hh" - -#include "client/gui/chat.hh" - -#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" -#include "client/globals.hh" -#include "client/session.hh" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration; -constexpr static unsigned int MAX_HISTORY_SIZE = 128U; - -struct GuiChatMessage final { - std::uint64_t spawn; - std::string text; - ImVec4 color; -}; - -static config::KeyBind key_chat(GLFW_KEY_ENTER); -static config::Unsigned history_size(32U, 0U, MAX_HISTORY_SIZE); - -static std::deque<GuiChatMessage> history; -static std::string chat_input; -static bool needs_focus; - -static resource_ptr<SoundEffect> sfx_chat_message; - -static void append_text_message(const std::string& sender, const std::string& text) -{ - GuiChatMessage message; - message.spawn = globals::curtime; - message.text = std::format("<{}> {}", sender, text); - message.color = ImGui::GetStyleColorVec4(ImGuiCol_Text); - history.push_back(message); - - if(sfx_chat_message && session::is_ingame()) { - sound::play_ui(sfx_chat_message, false, 1.0f); - } -} - -static void append_player_join(const std::string& sender) -{ - GuiChatMessage message; - message.spawn = globals::curtime; - message.text = std::format("{} {}", sender, gui::language::resolve("chat.client_join")); - message.color = ImGui::GetStyleColorVec4(ImGuiCol_DragDropTarget); - history.push_back(message); - - if(sfx_chat_message && session::is_ingame()) { - sound::play_ui(sfx_chat_message, false, 1.0f); - } -} - -static void append_player_leave(const std::string& sender, const std::string& reason) -{ - GuiChatMessage message; - message.spawn = globals::curtime; - message.text = std::format("{} {} ({})", sender, gui::language::resolve("chat.client_left"), gui::language::resolve(reason.c_str())); - message.color = ImGui::GetStyleColorVec4(ImGuiCol_DragDropTarget); - history.push_back(message); - - if(sfx_chat_message && session::is_ingame()) { - sound::play_ui(sfx_chat_message, false, 1.0f); - } -} - -static void on_chat_message_packet(const protocol::ChatMessage& packet) -{ - if(packet.type == protocol::ChatMessage::TEXT_MESSAGE) { - append_text_message(packet.sender, packet.message); - return; - } - - if(packet.type == protocol::ChatMessage::PLAYER_JOIN) { - append_player_join(packet.sender); - return; - } - - if(packet.type == protocol::ChatMessage::PLAYER_LEAVE) { - append_player_leave(packet.sender, packet.message); - return; - } -} - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if(event.action == GLFW_PRESS) { - if((event.key == GLFW_KEY_ENTER) && (globals::gui_screen == GUI_CHAT)) { - if(!utils::is_whitespace(chat_input)) { - protocol::ChatMessage packet; - packet.type = protocol::ChatMessage::TEXT_MESSAGE; - packet.sender = client_game::username.get(); - packet.message = chat_input; - - protocol::send(session::peer, protocol::encode(packet)); - } - - globals::gui_screen = GUI_SCREEN_NONE; - - chat_input.clear(); - - return; - } - - if((event.key == GLFW_KEY_ESCAPE) && (globals::gui_screen == GUI_CHAT)) { - globals::gui_screen = GUI_SCREEN_NONE; - return; - } - - if(key_chat.equals(event.key) && !globals::gui_screen) { - globals::gui_screen = GUI_CHAT; - needs_focus = true; - return; - } - } -} - -void gui::client_chat::init(void) -{ - globals::client_config.add_value("chat.key", key_chat); - globals::client_config.add_value("chat.history_size", history_size); - - settings::add_keybind(2, key_chat, settings_location::KEYBOARD_MISC, "key.chat"); - settings::add_slider(1, history_size, settings_location::VIDEO_GUI, "chat.history_size", false); - - globals::dispatcher.sink<protocol::ChatMessage>().connect<&on_chat_message_packet>(); - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); - - sfx_chat_message = resource::load<SoundEffect>("sounds/ui/chat_message.wav"); -} - -void gui::client_chat::init_late(void) -{ -} - -void gui::client_chat::shutdown(void) -{ - sfx_chat_message = nullptr; -} - -void gui::client_chat::update(void) -{ - while(history.size() > history_size.get_value()) { - history.pop_front(); - } -} - -void gui::client_chat::layout(void) -{ - auto viewport = ImGui::GetMainViewport(); - auto window_start = ImVec2(0.0f, 0.0f); - auto window_size = ImVec2(0.75f * viewport->Size.x, viewport->Size.y); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - ImGui::PushFont(globals::font_unscii16, 8.0f); - - if(!ImGui::Begin("###chat", nullptr, WINDOW_FLAGS)) { - ImGui::End(); - return; - } - - auto& padding = ImGui::GetStyle().FramePadding; - auto& spacing = ImGui::GetStyle().ItemSpacing; - auto font = ImGui::GetFont(); - - auto draw_list = ImGui::GetWindowDrawList(); - - // The text input widget occupies the bottom part - // of the chat window, we need to reserve some space for it - auto ypos = window_size.y - 2.5f * ImGui::GetFontSize() - 2.0f * padding.y - 2.0f * spacing.y; - - if(globals::gui_screen == GUI_CHAT) { - if(needs_focus) { - ImGui::SetKeyboardFocusHere(); - needs_focus = false; - } - - ImGui::SetNextItemWidth(window_size.x + 32.0f * padding.x); - ImGui::SetCursorScreenPos(ImVec2(padding.x, ypos)); - ImGui::InputText("###chat.input", &chat_input); - } - - if(!client_game::hide_hud && ((globals::gui_screen == GUI_SCREEN_NONE) || (globals::gui_screen == GUI_CHAT))) { - for(auto it = history.crbegin(); it < history.crend(); ++it) { - auto text_size = ImGui::CalcTextSize(it->text.c_str(), it->text.c_str() + it->text.size(), false, window_size.x); - auto rect_size = ImVec2(window_size.x, text_size.y + 2.0f * padding.y); - - auto rect_pos = ImVec2(padding.x, ypos - text_size.y - 2.0f * padding.y); - auto rect_end = ImVec2(rect_pos.x + rect_size.x, rect_pos.y + rect_size.y); - auto text_pos = ImVec2(rect_pos.x + padding.x, rect_pos.y + padding.y); - - auto fadeout_seconds = 10.0f; - auto fadeout = std::exp(-1.0f * std::pow(1.0e-6 * static_cast<float>(globals::curtime - it->spawn) / fadeout_seconds, 10.0f)); - - float rect_alpha; - float text_alpha; - - if(globals::gui_screen == GUI_CHAT) { - rect_alpha = 0.75f; - text_alpha = 1.00f; - } - else { - rect_alpha = 0.50f * fadeout; - text_alpha = 1.00f * fadeout; - } - - auto rect_col = ImGui::GetColorU32(ImGuiCol_FrameBg, rect_alpha); - auto text_col = ImGui::GetColorU32(ImVec4(it->color.x, it->color.y, it->color.z, it->color.w * text_alpha)); - auto shadow_col = ImGui::GetColorU32(ImVec4(0.0f, 0.0f, 0.0f, text_alpha)); - - draw_list->AddRectFilled(rect_pos, rect_end, rect_col); - - imdraw_ext::text_shadow_w(it->text, text_pos, text_col, shadow_col, font, draw_list, 8.0f, window_size.x); - - ypos -= rect_size.y; - } - } - - ImGui::End(); - ImGui::PopFont(); -} - -void gui::client_chat::clear(void) -{ - history.clear(); -} - -void gui::client_chat::refresh_timings(void) -{ - for(auto it = history.begin(); it < history.end(); ++it) { - // Reset the spawn time so the fadeout timer - // is reset; SpawnPlayer handler might call this - it->spawn = globals::curtime; - } -} - -void gui::client_chat::print(const std::string& text) -{ - GuiChatMessage message = {}; - message.spawn = globals::curtime; - message.text = text; - message.color = ImGui::GetStyleColorVec4(ImGuiCol_Text); - history.push_back(message); - - if(sfx_chat_message && session::is_ingame()) { - sound::play_ui(sfx_chat_message, false, 1.0f); - } -} +#include "client/pch.hh"
+
+#include "client/gui/chat.hh"
+
+#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"
+#include "client/globals.hh"
+#include "client/session.hh"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration;
+constexpr static unsigned int MAX_HISTORY_SIZE = 128U;
+
+struct GuiChatMessage final {
+ std::uint64_t spawn;
+ std::string text;
+ ImVec4 color;
+};
+
+static config::KeyBind key_chat(GLFW_KEY_ENTER);
+static config::Unsigned history_size(32U, 0U, MAX_HISTORY_SIZE);
+
+static std::deque<GuiChatMessage> history;
+static std::string chat_input;
+static bool needs_focus;
+
+static resource_ptr<SoundEffect> sfx_chat_message;
+
+static void append_text_message(const std::string& sender, const std::string& text)
+{
+ GuiChatMessage message;
+ message.spawn = globals::curtime;
+ message.text = std::format("<{}> {}", sender, text);
+ message.color = ImGui::GetStyleColorVec4(ImGuiCol_Text);
+ history.push_back(message);
+
+ if(sfx_chat_message && session::is_ingame()) {
+ sound::play_ui(sfx_chat_message, false, 1.0f);
+ }
+}
+
+static void append_player_join(const std::string& sender)
+{
+ GuiChatMessage message;
+ message.spawn = globals::curtime;
+ message.text = std::format("{} {}", sender, gui::language::resolve("chat.client_join"));
+ message.color = ImGui::GetStyleColorVec4(ImGuiCol_DragDropTarget);
+ history.push_back(message);
+
+ if(sfx_chat_message && session::is_ingame()) {
+ sound::play_ui(sfx_chat_message, false, 1.0f);
+ }
+}
+
+static void append_player_leave(const std::string& sender, const std::string& reason)
+{
+ GuiChatMessage message;
+ message.spawn = globals::curtime;
+ message.text = std::format("{} {} ({})", sender, gui::language::resolve("chat.client_left"), gui::language::resolve(reason.c_str()));
+ message.color = ImGui::GetStyleColorVec4(ImGuiCol_DragDropTarget);
+ history.push_back(message);
+
+ if(sfx_chat_message && session::is_ingame()) {
+ sound::play_ui(sfx_chat_message, false, 1.0f);
+ }
+}
+
+static void on_chat_message_packet(const protocol::ChatMessage& packet)
+{
+ if(packet.type == protocol::ChatMessage::TEXT_MESSAGE) {
+ append_text_message(packet.sender, packet.message);
+ return;
+ }
+
+ if(packet.type == protocol::ChatMessage::PLAYER_JOIN) {
+ append_player_join(packet.sender);
+ return;
+ }
+
+ if(packet.type == protocol::ChatMessage::PLAYER_LEAVE) {
+ append_player_leave(packet.sender, packet.message);
+ return;
+ }
+}
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if(event.action == GLFW_PRESS) {
+ if((event.key == GLFW_KEY_ENTER) && (globals::gui_screen == GUI_CHAT)) {
+ if(!utils::is_whitespace(chat_input)) {
+ protocol::ChatMessage packet;
+ packet.type = protocol::ChatMessage::TEXT_MESSAGE;
+ packet.sender = client_game::username.get();
+ packet.message = chat_input;
+
+ protocol::send(session::peer, protocol::encode(packet));
+ }
+
+ globals::gui_screen = GUI_SCREEN_NONE;
+
+ chat_input.clear();
+
+ return;
+ }
+
+ if((event.key == GLFW_KEY_ESCAPE) && (globals::gui_screen == GUI_CHAT)) {
+ globals::gui_screen = GUI_SCREEN_NONE;
+ return;
+ }
+
+ if(key_chat.equals(event.key) && !globals::gui_screen) {
+ globals::gui_screen = GUI_CHAT;
+ needs_focus = true;
+ return;
+ }
+ }
+}
+
+void gui::client_chat::init(void)
+{
+ globals::client_config.add_value("chat.key", key_chat);
+ globals::client_config.add_value("chat.history_size", history_size);
+
+ settings::add_keybind(2, key_chat, settings_location::KEYBOARD_MISC, "key.chat");
+ settings::add_slider(1, history_size, settings_location::VIDEO_GUI, "chat.history_size", false);
+
+ globals::dispatcher.sink<protocol::ChatMessage>().connect<&on_chat_message_packet>();
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+
+ sfx_chat_message = resource::load<SoundEffect>("sounds/ui/chat_message.wav");
+}
+
+void gui::client_chat::init_late(void)
+{
+}
+
+void gui::client_chat::shutdown(void)
+{
+ sfx_chat_message = nullptr;
+}
+
+void gui::client_chat::update(void)
+{
+ while(history.size() > history_size.get_value()) {
+ history.pop_front();
+ }
+}
+
+void gui::client_chat::layout(void)
+{
+ auto viewport = ImGui::GetMainViewport();
+ auto window_start = ImVec2(0.0f, 0.0f);
+ auto window_size = ImVec2(0.75f * viewport->Size.x, viewport->Size.y);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ ImGui::PushFont(globals::font_unscii16, 8.0f);
+
+ if(!ImGui::Begin("###chat", nullptr, WINDOW_FLAGS)) {
+ ImGui::End();
+ return;
+ }
+
+ auto& padding = ImGui::GetStyle().FramePadding;
+ auto& spacing = ImGui::GetStyle().ItemSpacing;
+ auto font = ImGui::GetFont();
+
+ auto draw_list = ImGui::GetWindowDrawList();
+
+ // The text input widget occupies the bottom part
+ // of the chat window, we need to reserve some space for it
+ auto ypos = window_size.y - 2.5f * ImGui::GetFontSize() - 2.0f * padding.y - 2.0f * spacing.y;
+
+ if(globals::gui_screen == GUI_CHAT) {
+ if(needs_focus) {
+ ImGui::SetKeyboardFocusHere();
+ needs_focus = false;
+ }
+
+ ImGui::SetNextItemWidth(window_size.x + 32.0f * padding.x);
+ ImGui::SetCursorScreenPos(ImVec2(padding.x, ypos));
+ ImGui::InputText("###chat.input", &chat_input);
+ }
+
+ if(!client_game::hide_hud && ((globals::gui_screen == GUI_SCREEN_NONE) || (globals::gui_screen == GUI_CHAT))) {
+ for(auto it = history.crbegin(); it < history.crend(); ++it) {
+ auto text_size = ImGui::CalcTextSize(it->text.c_str(), it->text.c_str() + it->text.size(), false, window_size.x);
+ auto rect_size = ImVec2(window_size.x, text_size.y + 2.0f * padding.y);
+
+ auto rect_pos = ImVec2(padding.x, ypos - text_size.y - 2.0f * padding.y);
+ auto rect_end = ImVec2(rect_pos.x + rect_size.x, rect_pos.y + rect_size.y);
+ auto text_pos = ImVec2(rect_pos.x + padding.x, rect_pos.y + padding.y);
+
+ auto fadeout_seconds = 10.0f;
+ auto fadeout = std::exp(-1.0f * std::pow(1.0e-6 * static_cast<float>(globals::curtime - it->spawn) / fadeout_seconds, 10.0f));
+
+ float rect_alpha;
+ float text_alpha;
+
+ if(globals::gui_screen == GUI_CHAT) {
+ rect_alpha = 0.75f;
+ text_alpha = 1.00f;
+ }
+ else {
+ rect_alpha = 0.50f * fadeout;
+ text_alpha = 1.00f * fadeout;
+ }
+
+ auto rect_col = ImGui::GetColorU32(ImGuiCol_FrameBg, rect_alpha);
+ auto text_col = ImGui::GetColorU32(ImVec4(it->color.x, it->color.y, it->color.z, it->color.w * text_alpha));
+ auto shadow_col = ImGui::GetColorU32(ImVec4(0.0f, 0.0f, 0.0f, text_alpha));
+
+ draw_list->AddRectFilled(rect_pos, rect_end, rect_col);
+
+ imdraw_ext::text_shadow_w(it->text, text_pos, text_col, shadow_col, font, draw_list, 8.0f, window_size.x);
+
+ ypos -= rect_size.y;
+ }
+ }
+
+ ImGui::End();
+ ImGui::PopFont();
+}
+
+void gui::client_chat::clear(void)
+{
+ history.clear();
+}
+
+void gui::client_chat::refresh_timings(void)
+{
+ for(auto it = history.begin(); it < history.end(); ++it) {
+ // Reset the spawn time so the fadeout timer
+ // is reset; SpawnPlayer handler might call this
+ it->spawn = globals::curtime;
+ }
+}
+
+void gui::client_chat::print(const std::string& text)
+{
+ GuiChatMessage message = {};
+ message.spawn = globals::curtime;
+ message.text = text;
+ message.color = ImGui::GetStyleColorVec4(ImGuiCol_Text);
+ history.push_back(message);
+
+ if(sfx_chat_message && session::is_ingame()) {
+ sound::play_ui(sfx_chat_message, false, 1.0f);
+ }
+}
diff --git a/game/client/gui/chat.hh b/game/client/gui/chat.hh index 6a3ea33..2fc6fb3 100644 --- a/game/client/gui/chat.hh +++ b/game/client/gui/chat.hh @@ -1,17 +1,17 @@ -#pragma once - -namespace gui::client_chat -{ -void init(void); -void init_late(void); -void shutdown(void); -void update(void); -void layout(void); -} // namespace gui::client_chat - -namespace gui::client_chat -{ -void clear(void); -void refresh_timings(void); -void print(const std::string& string); -} // namespace gui::client_chat +#pragma once
+
+namespace gui::client_chat
+{
+void init(void);
+void init_late(void);
+void shutdown(void);
+void update(void);
+void layout(void);
+} // namespace gui::client_chat
+
+namespace gui::client_chat
+{
+void clear(void);
+void refresh_timings(void);
+void print(const std::string& string);
+} // namespace gui::client_chat
diff --git a/game/client/gui/crosshair.cc b/game/client/gui/crosshair.cc index 29b5fe5..b5650a9 100644 --- a/game/client/gui/crosshair.cc +++ b/game/client/gui/crosshair.cc @@ -1,43 +1,43 @@ -#include "client/pch.hh" - -#include "client/gui/crosshair.hh" - -#include "core/math/constexpr.hh" - -#include "core/resource/resource.hh" - -#include "client/resource/texture_gui.hh" - -#include "client/globals.hh" -#include "client/session.hh" - -static resource_ptr<TextureGUI> texture; - -void gui::crosshair::init(void) -{ - texture = resource::load<TextureGUI>( - "textures/gui/hud_crosshair.png", TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T | TEXTURE_GUI_LOAD_VFLIP); - - if(texture == nullptr) { - spdlog::critical("crosshair: texture load failed"); - std::terminate(); - } -} - -void gui::crosshair::shutdown(void) -{ - texture = nullptr; -} - -void gui::crosshair::layout(void) -{ - auto viewport = ImGui::GetMainViewport(); - auto draw_list = ImGui::GetForegroundDrawList(); - - auto scaled_width = math::max<int>(texture->size.x, globals::gui_scale * texture->size.x / 2); - auto scaled_height = math::max<int>(texture->size.y, globals::gui_scale * texture->size.y / 2); - auto start = ImVec2( - static_cast<int>(0.5f * viewport->Size.x) - (scaled_width / 2), static_cast<int>(0.5f * viewport->Size.y) - (scaled_height / 2)); - auto end = ImVec2(start.x + scaled_width, start.y + scaled_height); - draw_list->AddImage(texture->handle, start, end); -} +#include "client/pch.hh"
+
+#include "client/gui/crosshair.hh"
+
+#include "core/math/constexpr.hh"
+
+#include "core/resource/resource.hh"
+
+#include "client/resource/texture_gui.hh"
+
+#include "client/globals.hh"
+#include "client/session.hh"
+
+static resource_ptr<TextureGUI> texture;
+
+void gui::crosshair::init(void)
+{
+ texture = resource::load<TextureGUI>("textures/gui/hud_crosshair.png",
+ TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T | TEXTURE_GUI_LOAD_VFLIP);
+
+ if(texture == nullptr) {
+ spdlog::critical("crosshair: texture load failed");
+ std::terminate();
+ }
+}
+
+void gui::crosshair::shutdown(void)
+{
+ texture = nullptr;
+}
+
+void gui::crosshair::layout(void)
+{
+ auto viewport = ImGui::GetMainViewport();
+ auto draw_list = ImGui::GetForegroundDrawList();
+
+ auto scaled_width = math::max<int>(texture->size.x, globals::gui_scale * texture->size.x / 2);
+ auto scaled_height = math::max<int>(texture->size.y, globals::gui_scale * texture->size.y / 2);
+ auto start = ImVec2(static_cast<int>(0.5f * viewport->Size.x) - (scaled_width / 2),
+ static_cast<int>(0.5f * viewport->Size.y) - (scaled_height / 2));
+ auto end = ImVec2(start.x + scaled_width, start.y + scaled_height);
+ draw_list->AddImage(texture->handle, start, end);
+}
diff --git a/game/client/gui/crosshair.hh b/game/client/gui/crosshair.hh index 589727e..dca5725 100644 --- a/game/client/gui/crosshair.hh +++ b/game/client/gui/crosshair.hh @@ -1,8 +1,8 @@ -#pragma once - -namespace gui::crosshair -{ -void init(void); -void shutdown(void); -void layout(void); -} // namespace gui::crosshair +#pragma once
+
+namespace gui::crosshair
+{
+void init(void);
+void shutdown(void);
+void layout(void);
+} // namespace gui::crosshair
diff --git a/game/client/gui/direct_connection.cc b/game/client/gui/direct_connection.cc index 37372e2..dfbd05b 100644 --- a/game/client/gui/direct_connection.cc +++ b/game/client/gui/direct_connection.cc @@ -1,145 +1,145 @@ -#include "client/pch.hh" - -#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" -#include "client/globals.hh" -#include "client/session.hh" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration; - -static std::string str_title; -static std::string str_connect; -static std::string str_cancel; - -static std::string str_hostname; -static std::string str_password; - -static std::string direct_hostname; -static std::string direct_password; - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if((event.key == GLFW_KEY_ESCAPE) && (event.action == GLFW_PRESS)) { - if(globals::gui_screen == GUI_DIRECT_CONNECTION) { - globals::gui_screen = GUI_PLAY_MENU; - return; - } - } -} - -static void on_language_set(const gui::LanguageSetEvent& event) -{ - str_title = gui::language::resolve("direct_connection.title"); - str_connect = gui::language::resolve_gui("direct_connection.connect"); - str_cancel = gui::language::resolve_gui("direct_connection.cancel"); - - str_hostname = gui::language::resolve("direct_connection.hostname"); - str_password = gui::language::resolve("direct_connection.password"); -} - -static void connect_to_server(void) -{ - auto parts = utils::split(direct_hostname, ":"); - std::string parsed_hostname; - std::uint16_t parsed_port; - - if(!parts[0].empty()) { - parsed_hostname = parts[0]; - } - else { - parsed_hostname = std::string("localhost"); - } - - if(parts.size() >= 2) { - parsed_port = math::clamp<std::uint16_t>(strtoul(parts[1].c_str(), nullptr, 10), 1024, UINT16_MAX); - } - else { - parsed_port = protocol::PORT; - } - - session::connect(parsed_hostname.c_str(), parsed_port, direct_password.c_str()); -} - -void gui::direct_connection::init(void) -{ - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); - globals::dispatcher.sink<LanguageSetEvent>().connect<&on_language_set>(); -} - -void gui::direct_connection::layout(void) -{ - auto viewport = ImGui::GetMainViewport(); - auto window_start = ImVec2(0.25f * viewport->Size.x, 0.20f * viewport->Size.y); - auto window_size = ImVec2(0.50f * viewport->Size.x, 0.80f * viewport->Size.y); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - if(ImGui::Begin("###UIDirectConnect", nullptr, WINDOW_FLAGS)) { - const float title_width = ImGui::CalcTextSize(str_title.c_str()).x; - ImGui::SetCursorPosX(0.5f * (window_size.x - title_width)); - ImGui::TextUnformatted(str_title.c_str()); - - ImGui::Dummy(ImVec2(0.0f, 16.0f * globals::gui_scale)); - - ImGuiInputTextFlags hostname_flags = ImGuiInputTextFlags_CharsNoBlank; - - if(client_game::streamer_mode.get_value()) { - // Hide server hostname to avoid things like - // followers flooding the server that is streamed online - hostname_flags |= ImGuiInputTextFlags_Password; - } - - auto avail_width = ImGui::GetContentRegionAvail().x; - - ImGui::PushItemWidth(avail_width); - - ImGui::InputText("###UIDirectConnect_hostname", &direct_hostname, hostname_flags); - - if(ImGui::BeginItemTooltip()) { - ImGui::PushTextWrapPos(ImGui::GetFontSize() * 16.0f); - ImGui::TextUnformatted(str_hostname.c_str()); - ImGui::PopTextWrapPos(); - ImGui::EndTooltip(); - } - - ImGui::InputText("###UIDirectConnect_password", &direct_password, ImGuiInputTextFlags_Password); - - if(ImGui::BeginItemTooltip()) { - ImGui::PushTextWrapPos(ImGui::GetFontSize() * 16.0f); - ImGui::TextUnformatted(str_password.c_str()); - ImGui::PopTextWrapPos(); - ImGui::EndTooltip(); - } - - ImGui::PopItemWidth(); - - ImGui::Dummy(ImVec2(0.0f, 4.0f * globals::gui_scale)); - - ImGui::BeginDisabled(utils::is_whitespace(direct_hostname)); - - if(ImGui::Button(str_connect.c_str(), ImVec2(avail_width, 0.0f))) { - connect_to_server(); - } - - ImGui::EndDisabled(); - - if(ImGui::Button(str_cancel.c_str(), ImVec2(avail_width, 0.0f))) { - globals::gui_screen = GUI_PLAY_MENU; - } - } - - ImGui::End(); -} +#include "client/pch.hh"
+
+#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"
+#include "client/globals.hh"
+#include "client/session.hh"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration;
+
+static std::string str_title;
+static std::string str_connect;
+static std::string str_cancel;
+
+static std::string str_hostname;
+static std::string str_password;
+
+static std::string direct_hostname;
+static std::string direct_password;
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if((event.key == GLFW_KEY_ESCAPE) && (event.action == GLFW_PRESS)) {
+ if(globals::gui_screen == GUI_DIRECT_CONNECTION) {
+ globals::gui_screen = GUI_PLAY_MENU;
+ return;
+ }
+ }
+}
+
+static void on_language_set(const gui::LanguageSetEvent& event)
+{
+ str_title = gui::language::resolve("direct_connection.title");
+ str_connect = gui::language::resolve_gui("direct_connection.connect");
+ str_cancel = gui::language::resolve_gui("direct_connection.cancel");
+
+ str_hostname = gui::language::resolve("direct_connection.hostname");
+ str_password = gui::language::resolve("direct_connection.password");
+}
+
+static void connect_to_server(void)
+{
+ auto parts = utils::split(direct_hostname, ":");
+ std::string parsed_hostname;
+ std::uint16_t parsed_port;
+
+ if(!parts[0].empty()) {
+ parsed_hostname = parts[0];
+ }
+ else {
+ parsed_hostname = std::string("localhost");
+ }
+
+ if(parts.size() >= 2) {
+ parsed_port = math::clamp<std::uint16_t>(strtoul(parts[1].c_str(), nullptr, 10), 1024, UINT16_MAX);
+ }
+ else {
+ parsed_port = protocol::PORT;
+ }
+
+ session::connect(parsed_hostname.c_str(), parsed_port, direct_password.c_str());
+}
+
+void gui::direct_connection::init(void)
+{
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+ globals::dispatcher.sink<LanguageSetEvent>().connect<&on_language_set>();
+}
+
+void gui::direct_connection::layout(void)
+{
+ auto viewport = ImGui::GetMainViewport();
+ auto window_start = ImVec2(0.25f * viewport->Size.x, 0.20f * viewport->Size.y);
+ auto window_size = ImVec2(0.50f * viewport->Size.x, 0.80f * viewport->Size.y);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ if(ImGui::Begin("###UIDirectConnect", nullptr, WINDOW_FLAGS)) {
+ const float title_width = ImGui::CalcTextSize(str_title.c_str()).x;
+ ImGui::SetCursorPosX(0.5f * (window_size.x - title_width));
+ ImGui::TextUnformatted(str_title.c_str());
+
+ ImGui::Dummy(ImVec2(0.0f, 16.0f * globals::gui_scale));
+
+ ImGuiInputTextFlags hostname_flags = ImGuiInputTextFlags_CharsNoBlank;
+
+ if(client_game::streamer_mode.get_value()) {
+ // Hide server hostname to avoid things like
+ // followers flooding the server that is streamed online
+ hostname_flags |= ImGuiInputTextFlags_Password;
+ }
+
+ auto avail_width = ImGui::GetContentRegionAvail().x;
+
+ ImGui::PushItemWidth(avail_width);
+
+ ImGui::InputText("###UIDirectConnect_hostname", &direct_hostname, hostname_flags);
+
+ if(ImGui::BeginItemTooltip()) {
+ ImGui::PushTextWrapPos(ImGui::GetFontSize() * 16.0f);
+ ImGui::TextUnformatted(str_hostname.c_str());
+ ImGui::PopTextWrapPos();
+ ImGui::EndTooltip();
+ }
+
+ ImGui::InputText("###UIDirectConnect_password", &direct_password, ImGuiInputTextFlags_Password);
+
+ if(ImGui::BeginItemTooltip()) {
+ ImGui::PushTextWrapPos(ImGui::GetFontSize() * 16.0f);
+ ImGui::TextUnformatted(str_password.c_str());
+ ImGui::PopTextWrapPos();
+ ImGui::EndTooltip();
+ }
+
+ ImGui::PopItemWidth();
+
+ ImGui::Dummy(ImVec2(0.0f, 4.0f * globals::gui_scale));
+
+ ImGui::BeginDisabled(utils::is_whitespace(direct_hostname));
+
+ if(ImGui::Button(str_connect.c_str(), ImVec2(avail_width, 0.0f))) {
+ connect_to_server();
+ }
+
+ ImGui::EndDisabled();
+
+ if(ImGui::Button(str_cancel.c_str(), ImVec2(avail_width, 0.0f))) {
+ globals::gui_screen = GUI_PLAY_MENU;
+ }
+ }
+
+ ImGui::End();
+}
diff --git a/game/client/gui/direct_connection.hh b/game/client/gui/direct_connection.hh index aa02d7c..c63156b 100644 --- a/game/client/gui/direct_connection.hh +++ b/game/client/gui/direct_connection.hh @@ -1,7 +1,7 @@ -#pragma once - -namespace gui::direct_connection -{ -void init(void); -void layout(void); -} // namespace gui::direct_connection +#pragma once
+
+namespace gui::direct_connection
+{
+void init(void);
+void layout(void);
+} // namespace gui::direct_connection
diff --git a/game/client/gui/gui_screen.hh b/game/client/gui/gui_screen.hh index 2eae310..c29f701 100644 --- a/game/client/gui/gui_screen.hh +++ b/game/client/gui/gui_screen.hh @@ -1,10 +1,10 @@ -#pragma once - -constexpr static unsigned int GUI_SCREEN_NONE = 0x0000U; -constexpr static unsigned int GUI_MAIN_MENU = 0x0001U; -constexpr static unsigned int GUI_PLAY_MENU = 0x0002U; -constexpr static unsigned int GUI_SETTINGS = 0x0003U; -constexpr static unsigned int GUI_PROGRESS_BAR = 0x0004U; -constexpr static unsigned int GUI_MESSAGE_BOX = 0x0005U; -constexpr static unsigned int GUI_CHAT = 0x0006U; -constexpr static unsigned int GUI_DIRECT_CONNECTION = 0x0007U; +#pragma once
+
+constexpr static unsigned int GUI_SCREEN_NONE = 0x0000U;
+constexpr static unsigned int GUI_MAIN_MENU = 0x0001U;
+constexpr static unsigned int GUI_PLAY_MENU = 0x0002U;
+constexpr static unsigned int GUI_SETTINGS = 0x0003U;
+constexpr static unsigned int GUI_PROGRESS_BAR = 0x0004U;
+constexpr static unsigned int GUI_MESSAGE_BOX = 0x0005U;
+constexpr static unsigned int GUI_CHAT = 0x0006U;
+constexpr static unsigned int GUI_DIRECT_CONNECTION = 0x0007U;
diff --git a/game/client/gui/hotbar.cc b/game/client/gui/hotbar.cc index ca058a3..806d82b 100644 --- a/game/client/gui/hotbar.cc +++ b/game/client/gui/hotbar.cc @@ -1,183 +1,183 @@ -#include "client/pch.hh" - -#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" - -constexpr static float ITEM_SIZE = 20.0f; -constexpr static float ITEM_PADDING = 2.0f; -constexpr static float SELECTOR_PADDING = 1.0f; -constexpr static float HOTBAR_PADDING = 2.0f; - -unsigned int gui::hotbar::active_slot = 0U; -item_id gui::hotbar::slots[HOTBAR_SIZE]; - -static config::KeyBind hotbar_keys[HOTBAR_SIZE]; - -static resource_ptr<TextureGUI> hotbar_background; -static resource_ptr<TextureGUI> hotbar_selector; - -static ImU32 get_color_alpha(ImGuiCol style_color, float alpha) -{ - const auto& color = ImGui::GetStyleColorVec4(style_color); - return ImGui::GetColorU32(ImVec4(color.x, color.y, color.z, alpha)); -} - -static void update_hotbar_item(void) -{ - if(gui::hotbar::slots[gui::hotbar::active_slot] == NULL_ITEM_ID) { - gui::status_lines::unset(gui::STATUS_HOTBAR); - return; - } - - if(auto info = world::item_registry::find(gui::hotbar::slots[gui::hotbar::active_slot])) { - gui::status_lines::set(gui::STATUS_HOTBAR, info->name, ImVec4(1.0f, 1.0f, 1.0f, 1.0f), 5.0f); - return; - } -} - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if((event.action == GLFW_PRESS) && !globals::gui_screen) { - for(unsigned int i = 0U; i < HOTBAR_SIZE; ++i) { - if(hotbar_keys[i].equals(event.key)) { - gui::hotbar::active_slot = i; - update_hotbar_item(); - break; - } - } - } -} - -static void on_glfw_scroll(const io::GlfwScrollEvent& event) -{ - if(!globals::gui_screen) { - if(event.dy < 0.0) { - gui::hotbar::next_slot(); - return; - } - - if(event.dy > 0.0) { - gui::hotbar::prev_slot(); - return; - } - } -} - -void gui::hotbar::init(void) -{ - hotbar_keys[0].set_key(GLFW_KEY_1); - hotbar_keys[1].set_key(GLFW_KEY_2); - hotbar_keys[2].set_key(GLFW_KEY_3); - hotbar_keys[3].set_key(GLFW_KEY_4); - hotbar_keys[4].set_key(GLFW_KEY_5); - hotbar_keys[5].set_key(GLFW_KEY_6); - hotbar_keys[6].set_key(GLFW_KEY_7); - hotbar_keys[7].set_key(GLFW_KEY_8); - hotbar_keys[8].set_key(GLFW_KEY_9); - - globals::client_config.add_value("hotbar.key.0", hotbar_keys[0]); - globals::client_config.add_value("hotbar.key.1", hotbar_keys[1]); - globals::client_config.add_value("hotbar.key.3", hotbar_keys[2]); - globals::client_config.add_value("hotbar.key.4", hotbar_keys[3]); - globals::client_config.add_value("hotbar.key.5", hotbar_keys[4]); - globals::client_config.add_value("hotbar.key.6", hotbar_keys[5]); - globals::client_config.add_value("hotbar.key.7", hotbar_keys[6]); - globals::client_config.add_value("hotbar.key.8", hotbar_keys[7]); - globals::client_config.add_value("hotbar.key.9", hotbar_keys[8]); - - settings::add_keybind(10, hotbar_keys[0], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.0"); - settings::add_keybind(11, hotbar_keys[1], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.1"); - settings::add_keybind(12, hotbar_keys[2], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.2"); - settings::add_keybind(13, hotbar_keys[3], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.3"); - settings::add_keybind(14, hotbar_keys[4], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.4"); - settings::add_keybind(15, hotbar_keys[5], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.5"); - settings::add_keybind(16, hotbar_keys[6], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.6"); - settings::add_keybind(17, hotbar_keys[7], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.7"); - settings::add_keybind(18, hotbar_keys[8], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.8"); - - hotbar_background = resource::load<TextureGUI>("textures/gui/hud_hotbar.png", TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T); - hotbar_selector = resource::load<TextureGUI>("textures/gui/hud_selector.png", TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T); - - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); - globals::dispatcher.sink<io::GlfwScrollEvent>().connect<&on_glfw_scroll>(); -} - -void gui::hotbar::shutdown(void) -{ - hotbar_background = nullptr; - hotbar_selector = nullptr; -} - -void gui::hotbar::layout(void) -{ - auto& style = ImGui::GetStyle(); - - auto item_size = ITEM_SIZE * globals::gui_scale; - auto hotbar_width = HOTBAR_SIZE * item_size; - auto hotbar_padding = HOTBAR_PADDING * globals::gui_scale; - - auto viewport = ImGui::GetMainViewport(); - auto draw_list = ImGui::GetForegroundDrawList(); - - // Draw the hotbar background image - auto background_start = ImVec2(0.5f * viewport->Size.x - 0.5f * hotbar_width, viewport->Size.y - item_size - hotbar_padding); - auto background_end = ImVec2(background_start.x + hotbar_width, background_start.y + item_size); - draw_list->AddImage(hotbar_background->handle, background_start, background_end); - - // Draw the hotbar selector image - auto selector_padding_a = SELECTOR_PADDING * globals::gui_scale; - auto selector_padding_b = SELECTOR_PADDING * globals::gui_scale * 2.0f; - auto selector_start = ImVec2( - background_start.x + gui::hotbar::active_slot * item_size - selector_padding_a, background_start.y - selector_padding_a); - auto selector_end = ImVec2(selector_start.x + item_size + selector_padding_b, selector_start.y + item_size + selector_padding_b); - draw_list->AddImage(hotbar_selector->handle, selector_start, selector_end); - - // Figure out item texture padding values - auto item_padding_a = ITEM_PADDING * globals::gui_scale; - auto item_padding_b = ITEM_PADDING * globals::gui_scale * 2.0f; - - // Draw individual item textures in the hotbar - for(std::size_t i = 0; i < HOTBAR_SIZE; ++i) { - const auto info = world::item_registry::find(gui::hotbar::slots[i]); - - if((info == nullptr) || (info->cached_texture == nullptr)) { - // There's either no item in the slot - // or the item doesn't have a texture - continue; - } - - const auto item_start = ImVec2(background_start.x + i * item_size + item_padding_a, background_start.y + item_padding_a); - const auto item_end = ImVec2(item_start.x + item_size - item_padding_b, item_start.y + item_size - item_padding_b); - draw_list->AddImage(info->cached_texture->handle, item_start, item_end); - } -} - -void gui::hotbar::next_slot(void) -{ - gui::hotbar::active_slot += 1U; - gui::hotbar::active_slot %= HOTBAR_SIZE; - update_hotbar_item(); -} - -void gui::hotbar::prev_slot(void) -{ - gui::hotbar::active_slot += HOTBAR_SIZE - 1U; - gui::hotbar::active_slot %= HOTBAR_SIZE; - update_hotbar_item(); -} +#include "client/pch.hh"
+
+#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"
+
+constexpr static float ITEM_SIZE = 20.0f;
+constexpr static float ITEM_PADDING = 2.0f;
+constexpr static float SELECTOR_PADDING = 1.0f;
+constexpr static float HOTBAR_PADDING = 2.0f;
+
+unsigned int gui::hotbar::active_slot = 0U;
+item_id gui::hotbar::slots[HOTBAR_SIZE];
+
+static config::KeyBind hotbar_keys[HOTBAR_SIZE];
+
+static resource_ptr<TextureGUI> hotbar_background;
+static resource_ptr<TextureGUI> hotbar_selector;
+
+static ImU32 get_color_alpha(ImGuiCol style_color, float alpha)
+{
+ const auto& color = ImGui::GetStyleColorVec4(style_color);
+ return ImGui::GetColorU32(ImVec4(color.x, color.y, color.z, alpha));
+}
+
+static void update_hotbar_item(void)
+{
+ if(gui::hotbar::slots[gui::hotbar::active_slot] == NULL_ITEM_ID) {
+ gui::status_lines::unset(gui::STATUS_HOTBAR);
+ return;
+ }
+
+ if(auto info = world::item_registry::find(gui::hotbar::slots[gui::hotbar::active_slot])) {
+ gui::status_lines::set(gui::STATUS_HOTBAR, info->name, ImVec4(1.0f, 1.0f, 1.0f, 1.0f), 5.0f);
+ return;
+ }
+}
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if((event.action == GLFW_PRESS) && !globals::gui_screen) {
+ for(unsigned int i = 0U; i < HOTBAR_SIZE; ++i) {
+ if(hotbar_keys[i].equals(event.key)) {
+ gui::hotbar::active_slot = i;
+ update_hotbar_item();
+ break;
+ }
+ }
+ }
+}
+
+static void on_glfw_scroll(const io::GlfwScrollEvent& event)
+{
+ if(!globals::gui_screen) {
+ if(event.dy < 0.0) {
+ gui::hotbar::next_slot();
+ return;
+ }
+
+ if(event.dy > 0.0) {
+ gui::hotbar::prev_slot();
+ return;
+ }
+ }
+}
+
+void gui::hotbar::init(void)
+{
+ hotbar_keys[0].set_key(GLFW_KEY_1);
+ hotbar_keys[1].set_key(GLFW_KEY_2);
+ hotbar_keys[2].set_key(GLFW_KEY_3);
+ hotbar_keys[3].set_key(GLFW_KEY_4);
+ hotbar_keys[4].set_key(GLFW_KEY_5);
+ hotbar_keys[5].set_key(GLFW_KEY_6);
+ hotbar_keys[6].set_key(GLFW_KEY_7);
+ hotbar_keys[7].set_key(GLFW_KEY_8);
+ hotbar_keys[8].set_key(GLFW_KEY_9);
+
+ globals::client_config.add_value("hotbar.key.0", hotbar_keys[0]);
+ globals::client_config.add_value("hotbar.key.1", hotbar_keys[1]);
+ globals::client_config.add_value("hotbar.key.3", hotbar_keys[2]);
+ globals::client_config.add_value("hotbar.key.4", hotbar_keys[3]);
+ globals::client_config.add_value("hotbar.key.5", hotbar_keys[4]);
+ globals::client_config.add_value("hotbar.key.6", hotbar_keys[5]);
+ globals::client_config.add_value("hotbar.key.7", hotbar_keys[6]);
+ globals::client_config.add_value("hotbar.key.8", hotbar_keys[7]);
+ globals::client_config.add_value("hotbar.key.9", hotbar_keys[8]);
+
+ settings::add_keybind(10, hotbar_keys[0], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.0");
+ settings::add_keybind(11, hotbar_keys[1], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.1");
+ settings::add_keybind(12, hotbar_keys[2], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.2");
+ settings::add_keybind(13, hotbar_keys[3], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.3");
+ settings::add_keybind(14, hotbar_keys[4], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.4");
+ settings::add_keybind(15, hotbar_keys[5], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.5");
+ settings::add_keybind(16, hotbar_keys[6], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.6");
+ settings::add_keybind(17, hotbar_keys[7], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.7");
+ settings::add_keybind(18, hotbar_keys[8], settings_location::KEYBOARD_GAMEPLAY, "hotbar.slot.8");
+
+ hotbar_background = resource::load<TextureGUI>("textures/gui/hud_hotbar.png", TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T);
+ hotbar_selector = resource::load<TextureGUI>("textures/gui/hud_selector.png", TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T);
+
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+ globals::dispatcher.sink<io::GlfwScrollEvent>().connect<&on_glfw_scroll>();
+}
+
+void gui::hotbar::shutdown(void)
+{
+ hotbar_background = nullptr;
+ hotbar_selector = nullptr;
+}
+
+void gui::hotbar::layout(void)
+{
+ auto& style = ImGui::GetStyle();
+
+ auto item_size = ITEM_SIZE * globals::gui_scale;
+ auto hotbar_width = HOTBAR_SIZE * item_size;
+ auto hotbar_padding = HOTBAR_PADDING * globals::gui_scale;
+
+ auto viewport = ImGui::GetMainViewport();
+ auto draw_list = ImGui::GetForegroundDrawList();
+
+ // Draw the hotbar background image
+ auto background_start = ImVec2(0.5f * viewport->Size.x - 0.5f * hotbar_width, viewport->Size.y - item_size - hotbar_padding);
+ auto background_end = ImVec2(background_start.x + hotbar_width, background_start.y + item_size);
+ draw_list->AddImage(hotbar_background->handle, background_start, background_end);
+
+ // Draw the hotbar selector image
+ auto selector_padding_a = SELECTOR_PADDING * globals::gui_scale;
+ auto selector_padding_b = SELECTOR_PADDING * globals::gui_scale * 2.0f;
+ auto selector_start = ImVec2(background_start.x + gui::hotbar::active_slot * item_size - selector_padding_a,
+ background_start.y - selector_padding_a);
+ auto selector_end = ImVec2(selector_start.x + item_size + selector_padding_b, selector_start.y + item_size + selector_padding_b);
+ draw_list->AddImage(hotbar_selector->handle, selector_start, selector_end);
+
+ // Figure out item texture padding values
+ auto item_padding_a = ITEM_PADDING * globals::gui_scale;
+ auto item_padding_b = ITEM_PADDING * globals::gui_scale * 2.0f;
+
+ // Draw individual item textures in the hotbar
+ for(std::size_t i = 0; i < HOTBAR_SIZE; ++i) {
+ const auto info = world::item_registry::find(gui::hotbar::slots[i]);
+
+ if((info == nullptr) || (info->cached_texture == nullptr)) {
+ // There's either no item in the slot
+ // or the item doesn't have a texture
+ continue;
+ }
+
+ const auto item_start = ImVec2(background_start.x + i * item_size + item_padding_a, background_start.y + item_padding_a);
+ const auto item_end = ImVec2(item_start.x + item_size - item_padding_b, item_start.y + item_size - item_padding_b);
+ draw_list->AddImage(info->cached_texture->handle, item_start, item_end);
+ }
+}
+
+void gui::hotbar::next_slot(void)
+{
+ gui::hotbar::active_slot += 1U;
+ gui::hotbar::active_slot %= HOTBAR_SIZE;
+ update_hotbar_item();
+}
+
+void gui::hotbar::prev_slot(void)
+{
+ gui::hotbar::active_slot += HOTBAR_SIZE - 1U;
+ gui::hotbar::active_slot %= HOTBAR_SIZE;
+ update_hotbar_item();
+}
diff --git a/game/client/gui/hotbar.hh b/game/client/gui/hotbar.hh index 85d75aa..88ce791 100644 --- a/game/client/gui/hotbar.hh +++ b/game/client/gui/hotbar.hh @@ -1,27 +1,27 @@ -#pragma once - -#include "shared/types.hh" - -// TODO: design an inventory system and an item -// registry and integrate the hotbar into that system - -constexpr static unsigned int HOTBAR_SIZE = 9U; - -namespace gui::hotbar -{ -extern unsigned int active_slot; -extern item_id slots[HOTBAR_SIZE]; -} // namespace gui::hotbar - -namespace gui::hotbar -{ -void init(void); -void shutdown(void); -void layout(void); -} // namespace gui::hotbar - -namespace gui::hotbar -{ -void next_slot(void); -void prev_slot(void); -} // namespace gui::hotbar +#pragma once
+
+#include "shared/types.hh"
+
+// TODO: design an inventory system and an item
+// registry and integrate the hotbar into that system
+
+constexpr static unsigned int HOTBAR_SIZE = 9U;
+
+namespace gui::hotbar
+{
+extern unsigned int active_slot;
+extern item_id slots[HOTBAR_SIZE];
+} // namespace gui::hotbar
+
+namespace gui::hotbar
+{
+void init(void);
+void shutdown(void);
+void layout(void);
+} // namespace gui::hotbar
+
+namespace gui::hotbar
+{
+void next_slot(void);
+void prev_slot(void);
+} // namespace gui::hotbar
diff --git a/game/client/gui/imdraw_ext.cc b/game/client/gui/imdraw_ext.cc index 832f284..c3d40c9 100644 --- a/game/client/gui/imdraw_ext.cc +++ b/game/client/gui/imdraw_ext.cc @@ -1,34 +1,34 @@ -#include "client/pch.hh" - -#include "client/gui/imdraw_ext.hh" - -#include "client/globals.hh" - -void gui::imdraw_ext::text_shadow( - const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list) -{ - imdraw_ext::text_shadow(text, position, text_color, shadow_color, font, draw_list, font->LegacySize); -} - -void gui::imdraw_ext::text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, - ImDrawList* draw_list, float font_size) -{ - const auto shadow_position = ImVec2(position.x + 0.5f * globals::gui_scale, position.y + 0.5f * globals::gui_scale); - draw_list->AddText(font, globals::gui_scale * font_size, shadow_position, shadow_color, text.c_str(), text.c_str() + text.size()); - draw_list->AddText(font, globals::gui_scale * font_size, position, text_color, text.c_str(), text.c_str() + text.size()); -} - -void gui::imdraw_ext::text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, - ImDrawList* draw_list, float wrap_width) -{ - imdraw_ext::text_shadow_w(text, position, text_color, shadow_color, font, draw_list, font->LegacySize, wrap_width); -} - -void gui::imdraw_ext::text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, - ImDrawList* draw_list, float font_size, float wrap_width) -{ - const auto shadow_position = ImVec2(position.x + 0.5f * globals::gui_scale, position.y + 0.5f * globals::gui_scale); - draw_list->AddText( - font, globals::gui_scale * font_size, shadow_position, shadow_color, text.c_str(), text.c_str() + text.size(), wrap_width); - draw_list->AddText(font, globals::gui_scale * font_size, position, text_color, text.c_str(), text.c_str() + text.size(), wrap_width); -} +#include "client/pch.hh"
+
+#include "client/gui/imdraw_ext.hh"
+
+#include "client/globals.hh"
+
+void gui::imdraw_ext::text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font,
+ ImDrawList* draw_list)
+{
+ imdraw_ext::text_shadow(text, position, text_color, shadow_color, font, draw_list, font->LegacySize);
+}
+
+void gui::imdraw_ext::text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font,
+ ImDrawList* draw_list, float font_size)
+{
+ const auto shadow_position = ImVec2(position.x + 0.5f * globals::gui_scale, position.y + 0.5f * globals::gui_scale);
+ draw_list->AddText(font, globals::gui_scale * font_size, shadow_position, shadow_color, text.c_str(), text.c_str() + text.size());
+ draw_list->AddText(font, globals::gui_scale * font_size, position, text_color, text.c_str(), text.c_str() + text.size());
+}
+
+void gui::imdraw_ext::text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font,
+ ImDrawList* draw_list, float wrap_width)
+{
+ imdraw_ext::text_shadow_w(text, position, text_color, shadow_color, font, draw_list, font->LegacySize, wrap_width);
+}
+
+void gui::imdraw_ext::text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font,
+ ImDrawList* draw_list, float font_size, float wrap_width)
+{
+ const auto shadow_position = ImVec2(position.x + 0.5f * globals::gui_scale, position.y + 0.5f * globals::gui_scale);
+ draw_list->AddText(font, globals::gui_scale * font_size, shadow_position, shadow_color, text.c_str(), text.c_str() + text.size(),
+ wrap_width);
+ draw_list->AddText(font, globals::gui_scale * font_size, position, text_color, text.c_str(), text.c_str() + text.size(), wrap_width);
+}
diff --git a/game/client/gui/imdraw_ext.hh b/game/client/gui/imdraw_ext.hh index a7e1503..e1475b2 100644 --- a/game/client/gui/imdraw_ext.hh +++ b/game/client/gui/imdraw_ext.hh @@ -1,17 +1,17 @@ -#pragma once - -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, - float font_size); -} // namespace gui::imdraw_ext - -namespace gui::imdraw_ext -{ -void text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, - ImDrawList* draw_list, float wrap_width); -void text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, - ImDrawList* draw_list, float font_size, float wrap_width); -} // namespace gui::imdraw_ext +#pragma once
+
+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,
+ float font_size);
+} // namespace gui::imdraw_ext
+
+namespace gui::imdraw_ext
+{
+void text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font,
+ ImDrawList* draw_list, float wrap_width);
+void text_shadow_w(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font,
+ ImDrawList* draw_list, float font_size, float wrap_width);
+} // namespace gui::imdraw_ext
diff --git a/game/client/gui/language.cc b/game/client/gui/language.cc index f63dd99..57a43fe 100644 --- a/game/client/gui/language.cc +++ b/game/client/gui/language.cc @@ -1,201 +1,201 @@ -#include "client/pch.hh" - -#include "client/gui/language.hh" - -#include "core/config/string.hh" - -#include "core/io/config_map.hh" - -#include "client/gui/settings.hh" - -#include "client/globals.hh" - -constexpr static std::string_view DEFAULT_LANGUAGE = "en_US"; - -// Available languages are kept in a special manifest file which -// is essentially a key-value map of semi-IETF-compliant language tags -// and the language's endonym; after reading the manifest, the translation -// system knows what language it can load and will act accordingly -constexpr static std::string_view MANIFEST_PATH = "lang/manifest.json"; - -static gui::LanguageManifest manifest; -static gui::LanguageIterator current_language; -static std::unordered_map<std::string, std::string> language_map; -static std::unordered_map<std::string, gui::LanguageIterator> ietf_map; -static config::String config_language(DEFAULT_LANGUAGE); - -static void send_language_event(gui::LanguageIterator new_language) -{ - gui::LanguageSetEvent event; - event.new_language = new_language; - globals::dispatcher.trigger(event); -} - -void gui::language::init(void) -{ - globals::client_config.add_value("language", config_language); - - settings::add_language_select(0, settings_location::GENERAL, "language"); - - auto file = PHYSFS_openRead(std::string(MANIFEST_PATH).c_str()); - - if(file == nullptr) { - spdlog::critical("language: {}: {}", MANIFEST_PATH, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); - std::terminate(); - } - - auto source = std::string(PHYSFS_fileLength(file), char(0x00)); - PHYSFS_readBytes(file, source.data(), source.size()); - PHYSFS_close(file); - - auto jsonv = json_parse_string(source.c_str()); - const auto json = json_value_get_object(jsonv); - const auto count = json_object_get_count(json); - - if((jsonv == nullptr) || (json == nullptr) || (count == 0)) { - spdlog::critical("language: {}: parse error", MANIFEST_PATH); - json_value_free(jsonv); - std::terminate(); - } - - for(std::size_t i = 0; i < count; ++i) { - const auto ietf = json_object_get_name(json, i); - const auto value = json_object_get_value_at(json, i); - const auto endonym = json_value_get_string(value); - - if(ietf && endonym) { - LanguageInfo info; - info.ietf = std::string(ietf); - info.endonym = std::string(endonym); - info.display = std::format("{} ({})", endonym, ietf); - manifest.push_back(info); - } - } - - for(auto it = manifest.cbegin(); it != manifest.cend(); ++it) { - ietf_map.emplace(it->ietf, it); - } - - json_value_free(jsonv); - - // This is temporary! This value will - // be overriden in init_late after the - // config system updates config_language - current_language = manifest.cend(); -} - -void gui::language::init_late(void) -{ - auto user_language = ietf_map.find(config_language.get_value()); - - if(user_language != ietf_map.cend()) { - gui::language::set(user_language->second); - return; - } - - auto fallback = ietf_map.find(std::string(DEFAULT_LANGUAGE)); - - if(fallback != ietf_map.cend()) { - gui::language::set(fallback->second); - return; - } - - spdlog::critical("language: we're doomed!"); - spdlog::critical("language: {} doesn't exist!", DEFAULT_LANGUAGE); - std::terminate(); -} - -void gui::language::set(LanguageIterator new_language) -{ - if(new_language != manifest.cend()) { - auto path = std::format("lang/lang.{}.json", new_language->ietf); - - auto file = PHYSFS_openRead(path.c_str()); - - if(file == nullptr) { - spdlog::warn("language: {}: {}", path, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); - send_language_event(new_language); - return; - } - - auto source = std::string(PHYSFS_fileLength(file), char(0x00)); - PHYSFS_readBytes(file, source.data(), source.size()); - PHYSFS_close(file); - - auto jsonv = json_parse_string(source.c_str()); - const auto json = json_value_get_object(jsonv); - const auto count = json_object_get_count(json); - - if((jsonv == nullptr) || (json == nullptr) || (count == 0)) { - spdlog::warn("language: {}: parse error", path); - send_language_event(new_language); - json_value_free(jsonv); - return; - } - - language_map.clear(); - - for(size_t i = 0; i < count; ++i) { - const auto key = json_object_get_name(json, i); - const auto value = json_object_get_value_at(json, i); - const auto value_str = json_value_get_string(value); - - if(key && value_str) { - language_map.emplace(key, value_str); - continue; - } - } - - json_value_free(jsonv); - - current_language = new_language; - config_language.set(new_language->ietf.c_str()); - } - - send_language_event(new_language); -} - -gui::LanguageIterator gui::language::get_current(void) -{ - return current_language; -} - -gui::LanguageIterator gui::language::find(std::string_view ietf) -{ - const auto it = ietf_map.find(std::string(ietf)); - if(it != ietf_map.cend()) { - return it->second; - } - else { - return manifest.cend(); - } -} - -gui::LanguageIterator gui::language::cbegin(void) -{ - return manifest.cbegin(); -} - -gui::LanguageIterator gui::language::cend(void) -{ - return manifest.cend(); -} - -std::string_view gui::language::resolve(std::string_view key) -{ - const auto it = language_map.find(std::string(key)); - - if(it != language_map.cend()) { - return it->second; - } - - return key; -} - -std::string gui::language::resolve_gui(std::string_view key) -{ - // We need window tags to retain their hierarchy when a language - // dynamically changes; ImGui allows to provide hidden unique identifiers - // to GUI primitives that have their name change dynamically, so we're using this - return std::format("{}###{}", gui::language::resolve(key), key); -} +#include "client/pch.hh"
+
+#include "client/gui/language.hh"
+
+#include "core/config/string.hh"
+
+#include "core/io/config_map.hh"
+
+#include "client/gui/settings.hh"
+
+#include "client/globals.hh"
+
+constexpr static std::string_view DEFAULT_LANGUAGE = "en_US";
+
+// Available languages are kept in a special manifest file which
+// is essentially a key-value map of semi-IETF-compliant language tags
+// and the language's endonym; after reading the manifest, the translation
+// system knows what language it can load and will act accordingly
+constexpr static std::string_view MANIFEST_PATH = "lang/manifest.json";
+
+static gui::LanguageManifest manifest;
+static gui::LanguageIterator current_language;
+static std::unordered_map<std::string, std::string> language_map;
+static std::unordered_map<std::string, gui::LanguageIterator> ietf_map;
+static config::String config_language(DEFAULT_LANGUAGE);
+
+static void send_language_event(gui::LanguageIterator new_language)
+{
+ gui::LanguageSetEvent event;
+ event.new_language = new_language;
+ globals::dispatcher.trigger(event);
+}
+
+void gui::language::init(void)
+{
+ globals::client_config.add_value("language", config_language);
+
+ settings::add_language_select(0, settings_location::GENERAL, "language");
+
+ auto file = PHYSFS_openRead(std::string(MANIFEST_PATH).c_str());
+
+ if(file == nullptr) {
+ spdlog::critical("language: {}: {}", MANIFEST_PATH, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+ std::terminate();
+ }
+
+ auto source = std::string(PHYSFS_fileLength(file), char(0x00));
+ PHYSFS_readBytes(file, source.data(), source.size());
+ PHYSFS_close(file);
+
+ auto jsonv = json_parse_string(source.c_str());
+ const auto json = json_value_get_object(jsonv);
+ const auto count = json_object_get_count(json);
+
+ if((jsonv == nullptr) || (json == nullptr) || (count == 0)) {
+ spdlog::critical("language: {}: parse error", MANIFEST_PATH);
+ json_value_free(jsonv);
+ std::terminate();
+ }
+
+ for(std::size_t i = 0; i < count; ++i) {
+ const auto ietf = json_object_get_name(json, i);
+ const auto value = json_object_get_value_at(json, i);
+ const auto endonym = json_value_get_string(value);
+
+ if(ietf && endonym) {
+ LanguageInfo info;
+ info.ietf = std::string(ietf);
+ info.endonym = std::string(endonym);
+ info.display = std::format("{} ({})", endonym, ietf);
+ manifest.push_back(info);
+ }
+ }
+
+ for(auto it = manifest.cbegin(); it != manifest.cend(); ++it) {
+ ietf_map.emplace(it->ietf, it);
+ }
+
+ json_value_free(jsonv);
+
+ // This is temporary! This value will
+ // be overriden in init_late after the
+ // config system updates config_language
+ current_language = manifest.cend();
+}
+
+void gui::language::init_late(void)
+{
+ auto user_language = ietf_map.find(config_language.get_value());
+
+ if(user_language != ietf_map.cend()) {
+ gui::language::set(user_language->second);
+ return;
+ }
+
+ auto fallback = ietf_map.find(std::string(DEFAULT_LANGUAGE));
+
+ if(fallback != ietf_map.cend()) {
+ gui::language::set(fallback->second);
+ return;
+ }
+
+ spdlog::critical("language: we're doomed!");
+ spdlog::critical("language: {} doesn't exist!", DEFAULT_LANGUAGE);
+ std::terminate();
+}
+
+void gui::language::set(LanguageIterator new_language)
+{
+ if(new_language != manifest.cend()) {
+ auto path = std::format("lang/lang.{}.json", new_language->ietf);
+
+ auto file = PHYSFS_openRead(path.c_str());
+
+ if(file == nullptr) {
+ spdlog::warn("language: {}: {}", path, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+ send_language_event(new_language);
+ return;
+ }
+
+ auto source = std::string(PHYSFS_fileLength(file), char(0x00));
+ PHYSFS_readBytes(file, source.data(), source.size());
+ PHYSFS_close(file);
+
+ auto jsonv = json_parse_string(source.c_str());
+ const auto json = json_value_get_object(jsonv);
+ const auto count = json_object_get_count(json);
+
+ if((jsonv == nullptr) || (json == nullptr) || (count == 0)) {
+ spdlog::warn("language: {}: parse error", path);
+ send_language_event(new_language);
+ json_value_free(jsonv);
+ return;
+ }
+
+ language_map.clear();
+
+ for(size_t i = 0; i < count; ++i) {
+ const auto key = json_object_get_name(json, i);
+ const auto value = json_object_get_value_at(json, i);
+ const auto value_str = json_value_get_string(value);
+
+ if(key && value_str) {
+ language_map.emplace(key, value_str);
+ continue;
+ }
+ }
+
+ json_value_free(jsonv);
+
+ current_language = new_language;
+ config_language.set(new_language->ietf.c_str());
+ }
+
+ send_language_event(new_language);
+}
+
+gui::LanguageIterator gui::language::get_current(void)
+{
+ return current_language;
+}
+
+gui::LanguageIterator gui::language::find(std::string_view ietf)
+{
+ const auto it = ietf_map.find(std::string(ietf));
+ if(it != ietf_map.cend()) {
+ return it->second;
+ }
+ else {
+ return manifest.cend();
+ }
+}
+
+gui::LanguageIterator gui::language::cbegin(void)
+{
+ return manifest.cbegin();
+}
+
+gui::LanguageIterator gui::language::cend(void)
+{
+ return manifest.cend();
+}
+
+std::string_view gui::language::resolve(std::string_view key)
+{
+ const auto it = language_map.find(std::string(key));
+
+ if(it != language_map.cend()) {
+ return it->second;
+ }
+
+ return key;
+}
+
+std::string gui::language::resolve_gui(std::string_view key)
+{
+ // We need window tags to retain their hierarchy when a language
+ // dynamically changes; ImGui allows to provide hidden unique identifiers
+ // to GUI primitives that have their name change dynamically, so we're using this
+ return std::format("{}###{}", gui::language::resolve(key), key);
+}
diff --git a/game/client/gui/language.hh b/game/client/gui/language.hh index 90132d7..0628941 100644 --- a/game/client/gui/language.hh +++ b/game/client/gui/language.hh @@ -1,42 +1,42 @@ -#pragma once - -namespace gui -{ -struct LanguageInfo final { - std::string endonym; // Language's self-name - std::string display; // Display for the settings GUI - std::string ietf; // Semi-compliant language abbreviation -}; - -using LanguageManifest = std::vector<LanguageInfo>; -using LanguageIterator = LanguageManifest::const_iterator; - -struct LanguageSetEvent final { - LanguageIterator new_language; -}; -} // namespace gui - -namespace gui::language -{ -void init(void); -void init_late(void); -} // namespace gui::language - -namespace gui::language -{ -void set(LanguageIterator new_language); -} // namespace gui::language - -namespace gui::language -{ -LanguageIterator get_current(void); -LanguageIterator find(std::string_view ietf); -LanguageIterator cbegin(void); -LanguageIterator cend(void); -} // namespace gui::language - -namespace gui::language -{ -std::string_view resolve(std::string_view key); -std::string resolve_gui(std::string_view key); -} // namespace gui::language +#pragma once
+
+namespace gui
+{
+struct LanguageInfo final {
+ std::string endonym; // Language's self-name
+ std::string display; // Display for the settings GUI
+ std::string ietf; // Semi-compliant language abbreviation
+};
+
+using LanguageManifest = std::vector<LanguageInfo>;
+using LanguageIterator = LanguageManifest::const_iterator;
+
+struct LanguageSetEvent final {
+ LanguageIterator new_language;
+};
+} // namespace gui
+
+namespace gui::language
+{
+void init(void);
+void init_late(void);
+} // namespace gui::language
+
+namespace gui::language
+{
+void set(LanguageIterator new_language);
+} // namespace gui::language
+
+namespace gui::language
+{
+LanguageIterator get_current(void);
+LanguageIterator find(std::string_view ietf);
+LanguageIterator cbegin(void);
+LanguageIterator cend(void);
+} // namespace gui::language
+
+namespace gui::language
+{
+std::string_view resolve(std::string_view key);
+std::string resolve_gui(std::string_view key);
+} // namespace gui::language
diff --git a/game/client/gui/main_menu.cc b/game/client/gui/main_menu.cc index 3c68612..aa506d3 100644 --- a/game/client/gui/main_menu.cc +++ b/game/client/gui/main_menu.cc @@ -1,172 +1,172 @@ -#include "client/pch.hh" - -#include "client/gui/main_menu.hh" - -#include "core/math/constexpr.hh" - -#include "core/resource/resource.hh" - -#include "core/version.hh" - -#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" -#include "client/session.hh" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration; - -static std::string str_play; -static std::string str_resume; -static std::string str_settings; -static std::string str_leave; -static std::string str_quit; - -static resource_ptr<TextureGUI> title; -static float title_aspect; - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if(session::is_ingame() && (event.key == GLFW_KEY_ESCAPE) && (event.action == GLFW_PRESS)) { - if(globals::gui_screen == GUI_SCREEN_NONE) { - globals::gui_screen = GUI_MAIN_MENU; - return; - } - - if(globals::gui_screen == GUI_MAIN_MENU) { - globals::gui_screen = GUI_SCREEN_NONE; - return; - } - } -} - -static void on_language_set(const gui::LanguageSetEvent& event) -{ - str_play = gui::language::resolve_gui("main_menu.play"); - str_resume = gui::language::resolve_gui("main_menu.resume"); - str_settings = gui::language::resolve("main_menu.settings"); - str_leave = gui::language::resolve("main_menu.leave"); - str_quit = gui::language::resolve("main_menu.quit"); -} - -void gui::main_menu::init(void) -{ - title = resource::load<TextureGUI>("textures/gui/menu_title.png", TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T); - - if(title == nullptr) { - spdlog::critical("main_menu: texture load failed"); - std::terminate(); - } - - if(title->size.x > title->size.y) { - title_aspect = static_cast<float>(title->size.x) / static_cast<float>(title->size.y); - } - else { - title_aspect = static_cast<float>(title->size.y) / static_cast<float>(title->size.x); - } - - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); - globals::dispatcher.sink<LanguageSetEvent>().connect<&on_language_set>(); -} - -void gui::main_menu::shutdown(void) -{ - title = nullptr; -} - -void gui::main_menu::layout(void) -{ - const auto viewport = ImGui::GetMainViewport(); - const auto window_start = ImVec2(0.0f, viewport->Size.y * 0.15f); - const auto window_size = ImVec2(viewport->Size.x, viewport->Size.y); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - if(ImGui::Begin("###main_menu", nullptr, WINDOW_FLAGS)) { - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 2.0f * globals::gui_scale)); - - if(session::is_ingame()) { - ImGui::Dummy(ImVec2(0.0f, 32.0f * globals::gui_scale)); - } - else { - auto reference_height = 0.225f * window_size.y; - auto image_width = math::min(window_size.x, reference_height * title_aspect); - auto image_height = image_width / title_aspect; - ImGui::SetCursorPosX(0.5f * (window_size.x - image_width)); - ImGui::Image(title->handle, ImVec2(image_width, image_height)); - } - - ImGui::Dummy(ImVec2(0.0f, 24.0f * globals::gui_scale)); - - const float button_width = 240.0f * globals::gui_scale; - const float button_xpos = 0.5f * (window_size.x - button_width); - - if(session::is_ingame()) { - ImGui::SetCursorPosX(button_xpos); - - if(ImGui::Button(str_resume.c_str(), ImVec2(button_width, 0.0f))) { - globals::gui_screen = GUI_SCREEN_NONE; - } - - ImGui::Spacing(); - } - else { - ImGui::SetCursorPosX(button_xpos); - - if(ImGui::Button(str_play.c_str(), ImVec2(button_width, 0.0f))) { - globals::gui_screen = GUI_PLAY_MENU; - } - - ImGui::Spacing(); - } - - ImGui::SetCursorPosX(button_xpos); - - if(ImGui::Button(str_settings.c_str(), ImVec2(button_width, 0.0f))) { - globals::gui_screen = GUI_SETTINGS; - } - - ImGui::Spacing(); - - if(session::is_ingame()) { - ImGui::SetCursorPosX(button_xpos); - - if(ImGui::Button(str_leave.c_str(), ImVec2(button_width, 0.0f))) { - session::disconnect("protocol.client_disconnect"); - globals::gui_screen = GUI_PLAY_MENU; - gui::window_title::update(); - } - - ImGui::Spacing(); - } - else { - ImGui::SetCursorPosX(button_xpos); - - if(ImGui::Button(str_quit.c_str(), ImVec2(button_width, 0.0f))) { - glfwSetWindowShouldClose(globals::window, true); - } - - ImGui::Spacing(); - } - - if(!session::is_ingame()) { - const auto& padding = ImGui::GetStyle().FramePadding; - const auto& spacing = ImGui::GetStyle().ItemSpacing; - - ImGui::PushFont(globals::font_unscii8, 4.0f); - ImGui::SetCursorScreenPos(ImVec2(padding.x + spacing.x, window_size.y - ImGui::GetFontSize() - padding.y - spacing.y)); - ImGui::Text("Voxelius %*s", version::semver.size(), version::semver.data()); // string_view is not always null-terminated - ImGui::PopFont(); - } - - ImGui::PopStyleVar(); - } - - ImGui::End(); -} +#include "client/pch.hh"
+
+#include "client/gui/main_menu.hh"
+
+#include "core/math/constexpr.hh"
+
+#include "core/resource/resource.hh"
+
+#include "core/version.hh"
+
+#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"
+#include "client/session.hh"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration;
+
+static std::string str_play;
+static std::string str_resume;
+static std::string str_settings;
+static std::string str_leave;
+static std::string str_quit;
+
+static resource_ptr<TextureGUI> title;
+static float title_aspect;
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if(session::is_ingame() && (event.key == GLFW_KEY_ESCAPE) && (event.action == GLFW_PRESS)) {
+ if(globals::gui_screen == GUI_SCREEN_NONE) {
+ globals::gui_screen = GUI_MAIN_MENU;
+ return;
+ }
+
+ if(globals::gui_screen == GUI_MAIN_MENU) {
+ globals::gui_screen = GUI_SCREEN_NONE;
+ return;
+ }
+ }
+}
+
+static void on_language_set(const gui::LanguageSetEvent& event)
+{
+ str_play = gui::language::resolve_gui("main_menu.play");
+ str_resume = gui::language::resolve_gui("main_menu.resume");
+ str_settings = gui::language::resolve("main_menu.settings");
+ str_leave = gui::language::resolve("main_menu.leave");
+ str_quit = gui::language::resolve("main_menu.quit");
+}
+
+void gui::main_menu::init(void)
+{
+ title = resource::load<TextureGUI>("textures/gui/menu_title.png", TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T);
+
+ if(title == nullptr) {
+ spdlog::critical("main_menu: texture load failed");
+ std::terminate();
+ }
+
+ if(title->size.x > title->size.y) {
+ title_aspect = static_cast<float>(title->size.x) / static_cast<float>(title->size.y);
+ }
+ else {
+ title_aspect = static_cast<float>(title->size.y) / static_cast<float>(title->size.x);
+ }
+
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+ globals::dispatcher.sink<LanguageSetEvent>().connect<&on_language_set>();
+}
+
+void gui::main_menu::shutdown(void)
+{
+ title = nullptr;
+}
+
+void gui::main_menu::layout(void)
+{
+ const auto viewport = ImGui::GetMainViewport();
+ const auto window_start = ImVec2(0.0f, viewport->Size.y * 0.15f);
+ const auto window_size = ImVec2(viewport->Size.x, viewport->Size.y);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ if(ImGui::Begin("###main_menu", nullptr, WINDOW_FLAGS)) {
+ ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 2.0f * globals::gui_scale));
+
+ if(session::is_ingame()) {
+ ImGui::Dummy(ImVec2(0.0f, 32.0f * globals::gui_scale));
+ }
+ else {
+ auto reference_height = 0.225f * window_size.y;
+ auto image_width = math::min(window_size.x, reference_height * title_aspect);
+ auto image_height = image_width / title_aspect;
+ ImGui::SetCursorPosX(0.5f * (window_size.x - image_width));
+ ImGui::Image(title->handle, ImVec2(image_width, image_height));
+ }
+
+ ImGui::Dummy(ImVec2(0.0f, 24.0f * globals::gui_scale));
+
+ const float button_width = 240.0f * globals::gui_scale;
+ const float button_xpos = 0.5f * (window_size.x - button_width);
+
+ if(session::is_ingame()) {
+ ImGui::SetCursorPosX(button_xpos);
+
+ if(ImGui::Button(str_resume.c_str(), ImVec2(button_width, 0.0f))) {
+ globals::gui_screen = GUI_SCREEN_NONE;
+ }
+
+ ImGui::Spacing();
+ }
+ else {
+ ImGui::SetCursorPosX(button_xpos);
+
+ if(ImGui::Button(str_play.c_str(), ImVec2(button_width, 0.0f))) {
+ globals::gui_screen = GUI_PLAY_MENU;
+ }
+
+ ImGui::Spacing();
+ }
+
+ ImGui::SetCursorPosX(button_xpos);
+
+ if(ImGui::Button(str_settings.c_str(), ImVec2(button_width, 0.0f))) {
+ globals::gui_screen = GUI_SETTINGS;
+ }
+
+ ImGui::Spacing();
+
+ if(session::is_ingame()) {
+ ImGui::SetCursorPosX(button_xpos);
+
+ if(ImGui::Button(str_leave.c_str(), ImVec2(button_width, 0.0f))) {
+ session::disconnect("protocol.client_disconnect");
+ globals::gui_screen = GUI_PLAY_MENU;
+ gui::window_title::update();
+ }
+
+ ImGui::Spacing();
+ }
+ else {
+ ImGui::SetCursorPosX(button_xpos);
+
+ if(ImGui::Button(str_quit.c_str(), ImVec2(button_width, 0.0f))) {
+ glfwSetWindowShouldClose(globals::window, true);
+ }
+
+ ImGui::Spacing();
+ }
+
+ if(!session::is_ingame()) {
+ const auto& padding = ImGui::GetStyle().FramePadding;
+ const auto& spacing = ImGui::GetStyle().ItemSpacing;
+
+ ImGui::PushFont(globals::font_unscii8, 4.0f);
+ ImGui::SetCursorScreenPos(ImVec2(padding.x + spacing.x, window_size.y - ImGui::GetFontSize() - padding.y - spacing.y));
+ ImGui::Text("Voxelius %*s", version::semver.size(), version::semver.data()); // string_view is not always null-terminated
+ ImGui::PopFont();
+ }
+
+ ImGui::PopStyleVar();
+ }
+
+ ImGui::End();
+}
diff --git a/game/client/gui/main_menu.hh b/game/client/gui/main_menu.hh index 205f078..8e30e38 100644 --- a/game/client/gui/main_menu.hh +++ b/game/client/gui/main_menu.hh @@ -1,8 +1,8 @@ -#pragma once - -namespace gui::main_menu -{ -void init(void); -void shutdown(void); -void layout(void); -} // namespace gui::main_menu +#pragma once
+
+namespace gui::main_menu
+{
+void init(void);
+void shutdown(void);
+void layout(void);
+} // namespace gui::main_menu
diff --git a/game/client/gui/message_box.cc b/game/client/gui/message_box.cc index 59e2d33..b7f109a 100644 --- a/game/client/gui/message_box.cc +++ b/game/client/gui/message_box.cc @@ -1,95 +1,95 @@ -#include "client/pch.hh" - -#include "client/gui/message_box.hh" - -#include "client/gui/gui_screen.hh" -#include "client/gui/language.hh" - -#include "client/globals.hh" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration; - -struct Button final { - gui::message_box_action action; - std::string str_title; -}; - -static std::string str_title; -static std::string str_subtitle; -static std::vector<Button> buttons; - -void gui::message_box::init(void) -{ - str_title = std::string(); - str_subtitle = std::string(); - buttons.clear(); -} - -void gui::message_box::layout(void) -{ - const auto viewport = ImGui::GetMainViewport(); - const auto window_start = ImVec2(0.0f, viewport->Size.y * 0.30f); - const auto window_size = ImVec2(viewport->Size.x, viewport->Size.y * 0.70f); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - if(ImGui::Begin("###UIProgress", nullptr, WINDOW_FLAGS)) { - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 1.0f * globals::gui_scale)); - - const float title_width = ImGui::CalcTextSize(str_title.c_str()).x; - ImGui::SetCursorPosX(0.5f * (window_size.x - title_width)); - ImGui::TextUnformatted(str_title.c_str()); - - ImGui::Dummy(ImVec2(0.0f, 8.0f * globals::gui_scale)); - - if(!str_subtitle.empty()) { - const float subtitle_width = ImGui::CalcTextSize(str_subtitle.c_str()).x; - ImGui::SetCursorPosX(0.5f * (window_size.x - subtitle_width)); - ImGui::TextUnformatted(str_subtitle.c_str()); - } - - ImGui::Dummy(ImVec2(0.0f, 32.0f * globals::gui_scale)); - - for(const auto& button : buttons) { - const float button_width = 0.8f * ImGui::CalcItemWidth(); - ImGui::SetCursorPosX(0.5f * (window_size.x - button_width)); - - if(ImGui::Button(button.str_title.c_str(), ImVec2(button_width, 0.0f))) { - if(button.action) { - button.action(); - } - } - } - - ImGui::PopStyleVar(); - } - - ImGui::End(); -} - -void gui::message_box::reset(void) -{ - str_title.clear(); - str_subtitle.clear(); - buttons.clear(); -} - -void gui::message_box::set_title(std::string_view title) -{ - str_title = gui::language::resolve(title); -} - -void gui::message_box::set_subtitle(std::string_view subtitle) -{ - str_subtitle = gui::language::resolve(subtitle); -} - -void gui::message_box::add_button(std::string_view text, const message_box_action& action) -{ - Button button = {}; - button.str_title = std::format("{}###MessageBox_Button{}", gui::language::resolve(text), buttons.size()); - button.action = action; - - buttons.push_back(button); -} +#include "client/pch.hh"
+
+#include "client/gui/message_box.hh"
+
+#include "client/gui/gui_screen.hh"
+#include "client/gui/language.hh"
+
+#include "client/globals.hh"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration;
+
+struct Button final {
+ gui::message_box_action action;
+ std::string str_title;
+};
+
+static std::string str_title;
+static std::string str_subtitle;
+static std::vector<Button> buttons;
+
+void gui::message_box::init(void)
+{
+ str_title = std::string();
+ str_subtitle = std::string();
+ buttons.clear();
+}
+
+void gui::message_box::layout(void)
+{
+ const auto viewport = ImGui::GetMainViewport();
+ const auto window_start = ImVec2(0.0f, viewport->Size.y * 0.30f);
+ const auto window_size = ImVec2(viewport->Size.x, viewport->Size.y * 0.70f);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ if(ImGui::Begin("###UIProgress", nullptr, WINDOW_FLAGS)) {
+ ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 1.0f * globals::gui_scale));
+
+ const float title_width = ImGui::CalcTextSize(str_title.c_str()).x;
+ ImGui::SetCursorPosX(0.5f * (window_size.x - title_width));
+ ImGui::TextUnformatted(str_title.c_str());
+
+ ImGui::Dummy(ImVec2(0.0f, 8.0f * globals::gui_scale));
+
+ if(!str_subtitle.empty()) {
+ const float subtitle_width = ImGui::CalcTextSize(str_subtitle.c_str()).x;
+ ImGui::SetCursorPosX(0.5f * (window_size.x - subtitle_width));
+ ImGui::TextUnformatted(str_subtitle.c_str());
+ }
+
+ ImGui::Dummy(ImVec2(0.0f, 32.0f * globals::gui_scale));
+
+ for(const auto& button : buttons) {
+ const float button_width = 0.8f * ImGui::CalcItemWidth();
+ ImGui::SetCursorPosX(0.5f * (window_size.x - button_width));
+
+ if(ImGui::Button(button.str_title.c_str(), ImVec2(button_width, 0.0f))) {
+ if(button.action) {
+ button.action();
+ }
+ }
+ }
+
+ ImGui::PopStyleVar();
+ }
+
+ ImGui::End();
+}
+
+void gui::message_box::reset(void)
+{
+ str_title.clear();
+ str_subtitle.clear();
+ buttons.clear();
+}
+
+void gui::message_box::set_title(std::string_view title)
+{
+ str_title = gui::language::resolve(title);
+}
+
+void gui::message_box::set_subtitle(std::string_view subtitle)
+{
+ str_subtitle = gui::language::resolve(subtitle);
+}
+
+void gui::message_box::add_button(std::string_view text, const message_box_action& action)
+{
+ Button button = {};
+ button.str_title = std::format("{}###MessageBox_Button{}", gui::language::resolve(text), buttons.size());
+ button.action = action;
+
+ buttons.push_back(button);
+}
diff --git a/game/client/gui/message_box.hh b/game/client/gui/message_box.hh index 74a6fbf..06a3b8b 100644 --- a/game/client/gui/message_box.hh +++ b/game/client/gui/message_box.hh @@ -1,20 +1,20 @@ -#pragma once - -namespace gui -{ -using message_box_action = void (*)(void); -} // namespace gui - -namespace gui::message_box -{ -void init(void); -void layout(void); -void reset(void); -} // namespace gui::message_box - -namespace gui::message_box -{ -void set_title(std::string_view title); -void set_subtitle(std::string_view subtitle); -void add_button(std::string_view text, const message_box_action& action); -} // namespace gui::message_box +#pragma once
+
+namespace gui
+{
+using message_box_action = void (*)(void);
+} // namespace gui
+
+namespace gui::message_box
+{
+void init(void);
+void layout(void);
+void reset(void);
+} // namespace gui::message_box
+
+namespace gui::message_box
+{
+void set_title(std::string_view title);
+void set_subtitle(std::string_view subtitle);
+void add_button(std::string_view text, const message_box_action& action);
+} // namespace gui::message_box
diff --git a/game/client/gui/metrics.cc b/game/client/gui/metrics.cc index 57a6319..ef47880 100644 --- a/game/client/gui/metrics.cc +++ b/game/client/gui/metrics.cc @@ -1,103 +1,103 @@ -#include "client/pch.hh" - -#include "client/gui/metrics.hh" - -#include "core/version.hh" - -#include "shared/entity/grounded.hh" -#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; - -static std::basic_string<GLubyte> r_version; -static std::basic_string<GLubyte> r_renderer; - -void gui::metrics::init(void) -{ - r_version = std::basic_string<GLubyte>(glGetString(GL_VERSION)); - r_renderer = std::basic_string<GLubyte>(glGetString(GL_RENDERER)); -} - -void gui::metrics::layout(void) -{ - if(!session::is_ingame()) { - // Sanity check; we are checking this - // in client_game before calling layout - // on HUD-ish GUI systems but still - return; - } - - auto draw_list = ImGui::GetForegroundDrawList(); - - // FIXME: maybe use style colors instead of hardcoding? - auto text_color = ImGui::GetColorU32(ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); - auto shadow_color = ImGui::GetColorU32(ImVec4(0.1f, 0.1f, 0.1f, 1.0f)); - - auto font_size = 4.0f; - auto position = ImVec2(8.0f, 8.0f); - auto y_step = 1.5f * globals::gui_scale * font_size; - - // Draw version - auto version_line = std::format("Voxelius {} [{}]", version::semver, version::commit); - gui::imdraw_ext::text_shadow(version_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size); - position.y += 1.5f * y_step; - - // Draw client-side window framerate metrics - auto window_framerate = 1.0f / globals::window_frametime_avg; - auto window_frametime = 1000.0f * globals::window_frametime_avg; - auto window_fps_line = std::format("{:.02f} FPS [{:.02f} ms]", window_framerate, window_frametime); - gui::imdraw_ext::text_shadow(window_fps_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size); - position.y += y_step; - - // Draw world rendering metrics - auto drawcall_line = std::format("World: {} DC / {} TRI", globals::num_drawcalls, globals::num_triangles); - gui::imdraw_ext::text_shadow(drawcall_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size); - position.y += y_step; - - // Draw OpenGL version string - auto r_version_line = std::format("GL_VERSION: {}", reinterpret_cast<const char*>(r_version.c_str())); - gui::imdraw_ext::text_shadow(r_version_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size); - position.y += y_step; - - // Draw OpenGL renderer string - auto r_renderer_line = std::format("GL_RENDERER: {}", reinterpret_cast<const char*>(r_renderer.c_str())); - gui::imdraw_ext::text_shadow(r_renderer_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size); - position.y += 1.5f * y_step; - - const auto& head = globals::dimension->entities.get<entity::Head>(globals::player); - const auto& transform = globals::dimension->entities.get<entity::Transform>(globals::player); - const auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player); - - // Draw player voxel position - auto voxel_position = coord::to_voxel(transform.chunk, transform.local); - auto voxel_line = std::format("voxel: [{} {} {}]", voxel_position.x, voxel_position.y, voxel_position.z); - gui::imdraw_ext::text_shadow(voxel_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size); - position.y += y_step; - - // Draw player world position - auto world_line = std::format("world: [{} {} {}] [{:.03f} {:.03f} {:.03f}]", transform.chunk.x, transform.chunk.y, transform.chunk.z, - transform.local.x, transform.local.y, transform.local.z); - gui::imdraw_ext::text_shadow(world_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size); - position.y += y_step; - - // Draw player look angles - auto angles = glm::degrees(transform.angles + head.angles); - auto angle_line = std::format("angle: [{: .03f} {: .03f} {: .03f}]", angles[0], angles[1], angles[2]); - gui::imdraw_ext::text_shadow(angle_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size); - position.y += y_step; -} +#include "client/pch.hh"
+
+#include "client/gui/metrics.hh"
+
+#include "core/version.hh"
+
+#include "shared/entity/grounded.hh"
+#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;
+
+static std::basic_string<GLubyte> r_version;
+static std::basic_string<GLubyte> r_renderer;
+
+void gui::metrics::init(void)
+{
+ r_version = std::basic_string<GLubyte>(glGetString(GL_VERSION));
+ r_renderer = std::basic_string<GLubyte>(glGetString(GL_RENDERER));
+}
+
+void gui::metrics::layout(void)
+{
+ if(!session::is_ingame()) {
+ // Sanity check; we are checking this
+ // in client_game before calling layout
+ // on HUD-ish GUI systems but still
+ return;
+ }
+
+ auto draw_list = ImGui::GetForegroundDrawList();
+
+ // FIXME: maybe use style colors instead of hardcoding?
+ auto text_color = ImGui::GetColorU32(ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+ auto shadow_color = ImGui::GetColorU32(ImVec4(0.1f, 0.1f, 0.1f, 1.0f));
+
+ auto font_size = 4.0f;
+ auto position = ImVec2(8.0f, 8.0f);
+ auto y_step = 1.5f * globals::gui_scale * font_size;
+
+ // Draw version
+ auto version_line = std::format("Voxelius {} [{}]", version::semver, version::commit);
+ gui::imdraw_ext::text_shadow(version_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size);
+ position.y += 1.5f * y_step;
+
+ // Draw client-side window framerate metrics
+ auto window_framerate = 1.0f / globals::window_frametime_avg;
+ auto window_frametime = 1000.0f * globals::window_frametime_avg;
+ auto window_fps_line = std::format("{:.02f} FPS [{:.02f} ms]", window_framerate, window_frametime);
+ gui::imdraw_ext::text_shadow(window_fps_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size);
+ position.y += y_step;
+
+ // Draw world rendering metrics
+ auto drawcall_line = std::format("World: {} DC / {} TRI", globals::num_drawcalls, globals::num_triangles);
+ gui::imdraw_ext::text_shadow(drawcall_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size);
+ position.y += y_step;
+
+ // Draw OpenGL version string
+ auto r_version_line = std::format("GL_VERSION: {}", reinterpret_cast<const char*>(r_version.c_str()));
+ gui::imdraw_ext::text_shadow(r_version_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size);
+ position.y += y_step;
+
+ // Draw OpenGL renderer string
+ auto r_renderer_line = std::format("GL_RENDERER: {}", reinterpret_cast<const char*>(r_renderer.c_str()));
+ gui::imdraw_ext::text_shadow(r_renderer_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size);
+ position.y += 1.5f * y_step;
+
+ const auto& head = globals::dimension->entities.get<entity::Head>(globals::player);
+ const auto& transform = globals::dimension->entities.get<entity::Transform>(globals::player);
+ const auto& velocity = globals::dimension->entities.get<entity::Velocity>(globals::player);
+
+ // Draw player voxel position
+ auto voxel_position = coord::to_voxel(transform.chunk, transform.local);
+ auto voxel_line = std::format("voxel: [{} {} {}]", voxel_position.x, voxel_position.y, voxel_position.z);
+ gui::imdraw_ext::text_shadow(voxel_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size);
+ position.y += y_step;
+
+ // Draw player world position
+ auto world_line = std::format("world: [{} {} {}] [{:.03f} {:.03f} {:.03f}]", transform.chunk.x, transform.chunk.y, transform.chunk.z,
+ transform.local.x, transform.local.y, transform.local.z);
+ gui::imdraw_ext::text_shadow(world_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size);
+ position.y += y_step;
+
+ // Draw player look angles
+ auto angles = glm::degrees(transform.angles + head.angles);
+ auto angle_line = std::format("angle: [{: .03f} {: .03f} {: .03f}]", angles[0], angles[1], angles[2]);
+ gui::imdraw_ext::text_shadow(angle_line, position, text_color, shadow_color, globals::font_unscii8, draw_list, font_size);
+ position.y += y_step;
+}
diff --git a/game/client/gui/metrics.hh b/game/client/gui/metrics.hh index 4898332..6bec5cb 100644 --- a/game/client/gui/metrics.hh +++ b/game/client/gui/metrics.hh @@ -1,7 +1,7 @@ -#pragma once - -namespace gui::metrics -{ -void init(void); -void layout(void); -} // namespace gui::metrics +#pragma once
+
+namespace gui::metrics
+{
+void init(void);
+void layout(void);
+} // namespace gui::metrics
diff --git a/game/client/gui/play_menu.cc b/game/client/gui/play_menu.cc index 2951bf2..5b9887e 100644 --- a/game/client/gui/play_menu.cc +++ b/game/client/gui/play_menu.cc @@ -1,564 +1,564 @@ -#include "client/pch.hh" - -#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" - -#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" -#include "client/globals.hh" -#include "client/session.hh" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration; -constexpr static std::string_view DEFAULT_SERVER_NAME = "Voxelius Server"; -constexpr static std::string_view SERVERS_TXT = "servers.txt"; -constexpr static std::string_view WARNING_TOAST = "[!]"; - -constexpr static std::size_t MAX_SERVER_ITEM_NAME = 24; - -enum class item_status : unsigned int { - UNKNOWN = 0x0000U, - PINGING = 0x0001U, - REACHED = 0x0002U, - FAILURE = 0x0003U, -}; - -struct ServerStatusItem final { - std::string name; - std::string password; - std::string hostname; - std::uint16_t port; - - // Things pulled from bother events - std::uint32_t protocol_version; - std::uint16_t num_players; - std::uint16_t max_players; - std::string motd; - - // Unique identifier that monotonically - // grows with each new server added and - // doesn't reset with each server removed - unsigned int identity; - - item_status status; -}; - -static std::string str_tab_servers; - -static std::string str_join; -static std::string str_connect; -static std::string str_add; -static std::string str_edit; -static std::string str_remove; -static std::string str_refresh; - -static std::string str_status_init; -static std::string str_status_ping; -static std::string str_status_fail; - -static std::string str_outdated_client; -static std::string str_outdated_server; - -static std::string input_itemname; -static std::string input_hostname; -static std::string input_password; - -static unsigned int next_identity; -static std::deque<ServerStatusItem*> servers_deque; -static ServerStatusItem* selected_server; -static bool editing_server; -static bool adding_server; -static bool needs_focus; - -static void parse_hostname(ServerStatusItem* item, const std::string& hostname) -{ - auto parts = utils::split(hostname, ":"); - - if(!parts[0].empty()) { - item->hostname = parts[0]; - } - else { - item->hostname = std::string("localhost"); - } - - if(parts.size() >= 2) { - item->port = math::clamp<std::uint16_t>(strtoul(parts[1].c_str(), nullptr, 10), 1024, UINT16_MAX); - } - else { - item->port = protocol::PORT; - } -} - -static void add_new_server(void) -{ - auto item = new ServerStatusItem(); - item->port = protocol::PORT; - item->protocol_version = protocol::VERSION; - item->max_players = UINT16_MAX; - item->num_players = UINT16_MAX; - item->identity = next_identity; - item->status = item_status::UNKNOWN; - - next_identity += 1U; - - input_itemname = DEFAULT_SERVER_NAME; - input_hostname = std::string(); - input_password = std::string(); - - servers_deque.push_back(item); - selected_server = item; - editing_server = true; - adding_server = true; - needs_focus = true; -} - -static void edit_selected_server(void) -{ - input_itemname = selected_server->name; - - if(selected_server->port != protocol::PORT) { - input_hostname = std::format("{}:{}", selected_server->hostname, selected_server->port); - } - else { - input_hostname = selected_server->hostname; - } - - input_password = selected_server->password; - - editing_server = true; - needs_focus = true; -} - -static void remove_selected_server(void) -{ - gui::bother::cancel(selected_server->identity); - - for(auto it = servers_deque.cbegin(); it != servers_deque.cend(); ++it) { - if(selected_server == (*it)) { - delete selected_server; - selected_server = nullptr; - servers_deque.erase(it); - return; - } - } -} - -static void join_selected_server(void) -{ - if(!session::peer) { - session::connect(selected_server->hostname.c_str(), selected_server->port, selected_server->password.c_str()); - } -} - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if((event.key == GLFW_KEY_ESCAPE) && (event.action == GLFW_PRESS)) { - if(globals::gui_screen == GUI_PLAY_MENU) { - if(editing_server) { - if(adding_server) { - remove_selected_server(); - } - else { - input_itemname.clear(); - input_hostname.clear(); - input_password.clear(); - editing_server = false; - adding_server = false; - return; - } - } - - globals::gui_screen = GUI_MAIN_MENU; - selected_server = nullptr; - return; - } - } -} - -static void on_language_set(const gui::LanguageSetEvent& event) -{ - str_tab_servers = gui::language::resolve_gui("play_menu.tab.servers"); - - str_join = gui::language::resolve_gui("play_menu.join"); - str_connect = gui::language::resolve_gui("play_menu.connect"); - str_add = gui::language::resolve_gui("play_menu.add"); - str_edit = gui::language::resolve_gui("play_menu.edit"); - str_remove = gui::language::resolve_gui("play_menu.remove"); - str_refresh = gui::language::resolve_gui("play_menu.refresh"); - - str_status_init = gui::language::resolve("play_menu.status.init"); - str_status_ping = gui::language::resolve("play_menu.status.ping"); - str_status_fail = gui::language::resolve("play_menu.status.fail"); - - str_outdated_client = gui::language::resolve("play_menu.outdated_client"); - str_outdated_server = gui::language::resolve("play_menu.outdated_server"); -} - -static void on_bother_response(const gui::BotherResponseEvent& event) -{ - for(auto item : servers_deque) { - if(item->identity == event.identity) { - if(event.is_server_unreachable) { - item->protocol_version = 0U; - item->num_players = UINT16_MAX; - item->max_players = UINT16_MAX; - item->motd = str_status_fail; - item->status = item_status::FAILURE; - } - else { - item->protocol_version = event.protocol_version; - item->num_players = event.num_players; - item->max_players = event.max_players; - item->motd = event.motd; - item->status = item_status::REACHED; - } - - break; - } - } -} - -static void layout_server_item(ServerStatusItem* item) -{ - // Preserve the cursor at which we draw stuff - const ImVec2& cursor = ImGui::GetCursorScreenPos(); - const ImVec2& padding = ImGui::GetStyle().FramePadding; - const ImVec2& spacing = ImGui::GetStyle().ItemSpacing; - - const float item_width = ImGui::GetContentRegionAvail().x; - const float line_height = ImGui::GetTextLineHeightWithSpacing(); - const std::string sid = std::format("###play_menu.servers.{}", static_cast<void*>(item)); - if(ImGui::Selectable(sid.c_str(), (item == selected_server), 0, ImVec2(0.0, 2.0f * (line_height + padding.y + spacing.y)))) { - selected_server = item; - editing_server = false; - } - - if(ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) { - // Double clicked - join the selected server - join_selected_server(); - } - - ImDrawList* draw_list = ImGui::GetWindowDrawList(); - - if(item == selected_server) { - const ImVec2 start = ImVec2(cursor.x, cursor.y); - const ImVec2 end = ImVec2(start.x + item_width, start.y + 2.0f * (line_height + padding.y + spacing.y)); - draw_list->AddRect(start, end, ImGui::GetColorU32(ImGuiCol_Text), 0.0f, 0, globals::gui_scale); - } - - const ImVec2 name_pos = ImVec2(cursor.x + padding.x + 0.5f * spacing.x, cursor.y + padding.y); - draw_list->AddText(name_pos, ImGui::GetColorU32(ImGuiCol_Text), item->name.c_str(), item->name.c_str() + item->name.size()); - - if(item->status == item_status::REACHED) { - auto stats = std::format("{}/{}", item->num_players, item->max_players); - auto stats_width = ImGui::CalcTextSize(stats.c_str(), stats.c_str() + stats.size()).x; - auto stats_pos = ImVec2(cursor.x + item_width - stats_width - padding.x, cursor.y + padding.y); - draw_list->AddText(stats_pos, ImGui::GetColorU32(ImGuiCol_TextDisabled), stats.c_str(), stats.c_str() + stats.size()); - - if(item->protocol_version != protocol::VERSION) { - auto warning_size = ImGui::CalcTextSize(WARNING_TOAST.data(), WARNING_TOAST.data() + WARNING_TOAST.size()); - auto warning_pos = ImVec2(stats_pos.x - warning_size.x - padding.x - 4.0f * globals::gui_scale, cursor.y + padding.y); - auto warning_end = ImVec2(warning_pos.x + warning_size.x, warning_pos.y + warning_size.y); - draw_list->AddText(warning_pos, ImGui::GetColorU32(ImGuiCol_DragDropTarget), WARNING_TOAST.data(), - WARNING_TOAST.data() + WARNING_TOAST.size()); - - if(ImGui::IsMouseHoveringRect(warning_pos, warning_end)) { - ImGui::BeginTooltip(); - - if(item->protocol_version < protocol::VERSION) { - ImGui::TextUnformatted(str_outdated_server.c_str(), str_outdated_server.c_str() + str_outdated_server.size()); - } - else { - ImGui::TextUnformatted(str_outdated_client.c_str(), str_outdated_client.c_str() + str_outdated_client.size()); - } - - ImGui::EndTooltip(); - } - } - } - - ImU32 motd_color = {}; - const std::string* motd_text; - - switch(item->status) { - case item_status::UNKNOWN: - motd_color = ImGui::GetColorU32(ImGuiCol_TextDisabled); - motd_text = &str_status_init; - break; - case item_status::PINGING: - motd_color = ImGui::GetColorU32(ImGuiCol_TextDisabled); - motd_text = &str_status_ping; - break; - case item_status::REACHED: - motd_color = ImGui::GetColorU32(ImGuiCol_TextDisabled); - motd_text = &item->motd; - break; - default: - motd_color = ImGui::GetColorU32(ImGuiCol_PlotLinesHovered); - motd_text = &str_status_fail; - break; - } - - const ImVec2 motd_pos = ImVec2(cursor.x + padding.x + 0.5f * spacing.x, cursor.y + padding.y + line_height); - draw_list->AddText(motd_pos, motd_color, motd_text->c_str(), motd_text->c_str() + motd_text->size()); -} - -static void layout_server_edit(ServerStatusItem* item) -{ - if(needs_focus) { - ImGui::SetKeyboardFocusHere(); - needs_focus = false; - } - - ImGui::SetNextItemWidth(-0.25f * ImGui::GetContentRegionAvail().x); - ImGui::InputText("###play_menu.servers.edit_itemname", &input_itemname); - ImGui::SameLine(); - - const bool ignore_input = utils::is_whitespace(input_itemname) || input_hostname.empty(); - - ImGui::BeginDisabled(ignore_input); - - if(ImGui::Button("OK###play_menu.servers.submit_input", ImVec2(-1.0f, 0.0f)) - || (!ignore_input && ImGui::IsKeyPressed(ImGuiKey_Enter))) { - parse_hostname(item, input_hostname); - item->password = input_password; - item->name = input_itemname.substr(0, MAX_SERVER_ITEM_NAME); - item->status = item_status::UNKNOWN; - editing_server = false; - adding_server = false; - - input_itemname.clear(); - input_hostname.clear(); - - gui::bother::cancel(item->identity); - } - - ImGui::EndDisabled(); - - ImGuiInputTextFlags hostname_flags = ImGuiInputTextFlags_CharsNoBlank; - - if(client_game::streamer_mode.get_value()) { - // Hide server hostname to avoid things like - // followers flooding the server that is streamed online - hostname_flags |= ImGuiInputTextFlags_Password; - } - - ImGui::SetNextItemWidth(-0.50f * ImGui::GetContentRegionAvail().x); - ImGui::InputText("###play_menu.servers.edit_hostname", &input_hostname, hostname_flags); - ImGui::SameLine(); - - ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); - ImGui::InputText("###play_menu.servers.edit_password", &input_password, ImGuiInputTextFlags_Password); -} - -static void layout_servers(void) -{ - if(ImGui::BeginListBox("###play_menu.servers.listbox", ImVec2(-1.0f, -1.0f))) { - for(ServerStatusItem* item : servers_deque) { - if(editing_server && item == selected_server) { - layout_server_edit(item); - } - else { - layout_server_item(item); - } - } - - ImGui::EndListBox(); - } -} - -static void layout_servers_buttons(void) -{ - auto avail_width = ImGui::GetContentRegionAvail().x; - - // Can only join when selected and not editing - ImGui::BeginDisabled(!selected_server || editing_server); - - if(ImGui::Button(str_join.c_str(), ImVec2(-0.50f * avail_width, 0.0f))) { - join_selected_server(); - } - - ImGui::EndDisabled(); - ImGui::SameLine(); - - // Can only connect directly when not editing anything - ImGui::BeginDisabled(editing_server); - - if(ImGui::Button(str_connect.c_str(), ImVec2(-1.00f, 0.0f))) { - globals::gui_screen = GUI_DIRECT_CONNECTION; - } - - ImGui::EndDisabled(); - - // Can only add when not editing anything - ImGui::BeginDisabled(editing_server); - - if(ImGui::Button(str_add.c_str(), ImVec2(-0.75f * avail_width, 0.0f))) { - add_new_server(); - } - - ImGui::EndDisabled(); - ImGui::SameLine(); - - // Can only edit when selected and not editing - ImGui::BeginDisabled(!selected_server || editing_server); - - if(ImGui::Button(str_edit.c_str(), ImVec2(-0.50f * avail_width, 0.0f))) { - edit_selected_server(); - } - - ImGui::EndDisabled(); - ImGui::SameLine(); - - // Can only remove when selected and not editing - ImGui::BeginDisabled(!selected_server || editing_server); - - if(ImGui::Button(str_remove.c_str(), ImVec2(-0.25f * avail_width, 0.0f))) { - remove_selected_server(); - } - - ImGui::EndDisabled(); - ImGui::SameLine(); - - if(ImGui::Button(str_refresh.c_str(), ImVec2(-1.0f, 0.0f))) { - for(ServerStatusItem* item : servers_deque) { - if(item->status != item_status::PINGING) { - if(!editing_server || item != selected_server) { - item->status = item_status::UNKNOWN; - gui::bother::cancel(item->identity); - } - } - } - } -} - -void gui::play_menu::init(void) -{ - if(auto file = PHYSFS_openRead(std::string(SERVERS_TXT).c_str())) { - auto source = std::string(PHYSFS_fileLength(file), char(0x00)); - PHYSFS_readBytes(file, source.data(), source.size()); - PHYSFS_close(file); - - auto stream = std::istringstream(source); - auto line = std::string(); - - while(std::getline(stream, line)) { - auto parts = utils::split(line, "%"); - - auto item = new ServerStatusItem(); - item->port = protocol::PORT; - item->protocol_version = protocol::VERSION; - item->max_players = UINT16_MAX; - item->num_players = UINT16_MAX; - item->identity = next_identity; - item->status = item_status::UNKNOWN; - - next_identity += 1U; - - parse_hostname(item, parts[0]); - - if(parts.size() >= 2) { - item->password = parts[1]; - } - else { - item->password = std::string(); - } - - if(parts.size() >= 3) { - item->name = parts[2].substr(0, MAX_SERVER_ITEM_NAME); - } - else { - item->name = DEFAULT_SERVER_NAME; - } - - servers_deque.push_back(item); - } - } - - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); - globals::dispatcher.sink<LanguageSetEvent>().connect<&on_language_set>(); - globals::dispatcher.sink<BotherResponseEvent>().connect<&on_bother_response>(); -} - -void gui::play_menu::shutdown(void) -{ - std::ostringstream stream; - - for(const auto item : servers_deque) { - stream << std::format("{}:{}%{}%{}", item->hostname, item->port, item->password, item->name) << std::endl; - } - - if(auto file = PHYSFS_openWrite(std::string(SERVERS_TXT).c_str())) { - auto source = stream.str(); - PHYSFS_writeBytes(file, source.data(), source.size()); - PHYSFS_close(file); - } - - for(auto item : servers_deque) - delete item; - servers_deque.clear(); -} - -void gui::play_menu::layout(void) -{ - const auto viewport = ImGui::GetMainViewport(); - const auto window_start = ImVec2(viewport->Size.x * 0.05f, viewport->Size.y * 0.05f); - const auto window_size = ImVec2(viewport->Size.x * 0.90f, viewport->Size.y * 0.90f); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - if(ImGui::Begin("###play_menu", nullptr, WINDOW_FLAGS)) { - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(3.0f * globals::gui_scale, 3.0f * globals::gui_scale)); - - if(ImGui::BeginTabBar("###play_menu.tabs", ImGuiTabBarFlags_FittingPolicyResizeDown)) { - if(ImGui::TabItemButton("<<")) { - globals::gui_screen = GUI_MAIN_MENU; - selected_server = nullptr; - editing_server = false; - } - - if(ImGui::BeginTabItem(str_tab_servers.c_str())) { - if(ImGui::BeginChild("###play_menu.servers.child", ImVec2(0.0f, -2.0f * ImGui::GetFrameHeightWithSpacing()))) { - layout_servers(); - } - - ImGui::EndChild(); - - layout_servers_buttons(); - - ImGui::EndTabItem(); - } - - ImGui::EndTabBar(); - } - - ImGui::PopStyleVar(); - } - - ImGui::End(); -} - -void gui::play_menu::update_late(void) -{ - for(auto item : servers_deque) { - if(item->status == item_status::UNKNOWN) { - gui::bother::ping(item->identity, item->hostname.c_str(), item->port); - item->status = item_status::PINGING; - continue; - } - } -} +#include "client/pch.hh"
+
+#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"
+
+#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"
+#include "client/globals.hh"
+#include "client/session.hh"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration;
+constexpr static std::string_view DEFAULT_SERVER_NAME = "Voxelius Server";
+constexpr static std::string_view SERVERS_TXT = "servers.txt";
+constexpr static std::string_view WARNING_TOAST = "[!]";
+
+constexpr static std::size_t MAX_SERVER_ITEM_NAME = 24;
+
+enum class item_status : unsigned int {
+ UNKNOWN = 0x0000U,
+ PINGING = 0x0001U,
+ REACHED = 0x0002U,
+ FAILURE = 0x0003U,
+};
+
+struct ServerStatusItem final {
+ std::string name;
+ std::string password;
+ std::string hostname;
+ std::uint16_t port;
+
+ // Things pulled from bother events
+ std::uint32_t protocol_version;
+ std::uint16_t num_players;
+ std::uint16_t max_players;
+ std::string motd;
+
+ // Unique identifier that monotonically
+ // grows with each new server added and
+ // doesn't reset with each server removed
+ unsigned int identity;
+
+ item_status status;
+};
+
+static std::string str_tab_servers;
+
+static std::string str_join;
+static std::string str_connect;
+static std::string str_add;
+static std::string str_edit;
+static std::string str_remove;
+static std::string str_refresh;
+
+static std::string str_status_init;
+static std::string str_status_ping;
+static std::string str_status_fail;
+
+static std::string str_outdated_client;
+static std::string str_outdated_server;
+
+static std::string input_itemname;
+static std::string input_hostname;
+static std::string input_password;
+
+static unsigned int next_identity;
+static std::deque<ServerStatusItem*> servers_deque;
+static ServerStatusItem* selected_server;
+static bool editing_server;
+static bool adding_server;
+static bool needs_focus;
+
+static void parse_hostname(ServerStatusItem* item, const std::string& hostname)
+{
+ auto parts = utils::split(hostname, ":");
+
+ if(!parts[0].empty()) {
+ item->hostname = parts[0];
+ }
+ else {
+ item->hostname = std::string("localhost");
+ }
+
+ if(parts.size() >= 2) {
+ item->port = math::clamp<std::uint16_t>(strtoul(parts[1].c_str(), nullptr, 10), 1024, UINT16_MAX);
+ }
+ else {
+ item->port = protocol::PORT;
+ }
+}
+
+static void add_new_server(void)
+{
+ auto item = new ServerStatusItem();
+ item->port = protocol::PORT;
+ item->protocol_version = protocol::VERSION;
+ item->max_players = UINT16_MAX;
+ item->num_players = UINT16_MAX;
+ item->identity = next_identity;
+ item->status = item_status::UNKNOWN;
+
+ next_identity += 1U;
+
+ input_itemname = DEFAULT_SERVER_NAME;
+ input_hostname = std::string();
+ input_password = std::string();
+
+ servers_deque.push_back(item);
+ selected_server = item;
+ editing_server = true;
+ adding_server = true;
+ needs_focus = true;
+}
+
+static void edit_selected_server(void)
+{
+ input_itemname = selected_server->name;
+
+ if(selected_server->port != protocol::PORT) {
+ input_hostname = std::format("{}:{}", selected_server->hostname, selected_server->port);
+ }
+ else {
+ input_hostname = selected_server->hostname;
+ }
+
+ input_password = selected_server->password;
+
+ editing_server = true;
+ needs_focus = true;
+}
+
+static void remove_selected_server(void)
+{
+ gui::bother::cancel(selected_server->identity);
+
+ for(auto it = servers_deque.cbegin(); it != servers_deque.cend(); ++it) {
+ if(selected_server == (*it)) {
+ delete selected_server;
+ selected_server = nullptr;
+ servers_deque.erase(it);
+ return;
+ }
+ }
+}
+
+static void join_selected_server(void)
+{
+ if(!session::peer) {
+ session::connect(selected_server->hostname.c_str(), selected_server->port, selected_server->password.c_str());
+ }
+}
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if((event.key == GLFW_KEY_ESCAPE) && (event.action == GLFW_PRESS)) {
+ if(globals::gui_screen == GUI_PLAY_MENU) {
+ if(editing_server) {
+ if(adding_server) {
+ remove_selected_server();
+ }
+ else {
+ input_itemname.clear();
+ input_hostname.clear();
+ input_password.clear();
+ editing_server = false;
+ adding_server = false;
+ return;
+ }
+ }
+
+ globals::gui_screen = GUI_MAIN_MENU;
+ selected_server = nullptr;
+ return;
+ }
+ }
+}
+
+static void on_language_set(const gui::LanguageSetEvent& event)
+{
+ str_tab_servers = gui::language::resolve_gui("play_menu.tab.servers");
+
+ str_join = gui::language::resolve_gui("play_menu.join");
+ str_connect = gui::language::resolve_gui("play_menu.connect");
+ str_add = gui::language::resolve_gui("play_menu.add");
+ str_edit = gui::language::resolve_gui("play_menu.edit");
+ str_remove = gui::language::resolve_gui("play_menu.remove");
+ str_refresh = gui::language::resolve_gui("play_menu.refresh");
+
+ str_status_init = gui::language::resolve("play_menu.status.init");
+ str_status_ping = gui::language::resolve("play_menu.status.ping");
+ str_status_fail = gui::language::resolve("play_menu.status.fail");
+
+ str_outdated_client = gui::language::resolve("play_menu.outdated_client");
+ str_outdated_server = gui::language::resolve("play_menu.outdated_server");
+}
+
+static void on_bother_response(const gui::BotherResponseEvent& event)
+{
+ for(auto item : servers_deque) {
+ if(item->identity == event.identity) {
+ if(event.is_server_unreachable) {
+ item->protocol_version = 0U;
+ item->num_players = UINT16_MAX;
+ item->max_players = UINT16_MAX;
+ item->motd = str_status_fail;
+ item->status = item_status::FAILURE;
+ }
+ else {
+ item->protocol_version = event.protocol_version;
+ item->num_players = event.num_players;
+ item->max_players = event.max_players;
+ item->motd = event.motd;
+ item->status = item_status::REACHED;
+ }
+
+ break;
+ }
+ }
+}
+
+static void layout_server_item(ServerStatusItem* item)
+{
+ // Preserve the cursor at which we draw stuff
+ const ImVec2& cursor = ImGui::GetCursorScreenPos();
+ const ImVec2& padding = ImGui::GetStyle().FramePadding;
+ const ImVec2& spacing = ImGui::GetStyle().ItemSpacing;
+
+ const float item_width = ImGui::GetContentRegionAvail().x;
+ const float line_height = ImGui::GetTextLineHeightWithSpacing();
+ const std::string sid = std::format("###play_menu.servers.{}", static_cast<void*>(item));
+ if(ImGui::Selectable(sid.c_str(), (item == selected_server), 0, ImVec2(0.0, 2.0f * (line_height + padding.y + spacing.y)))) {
+ selected_server = item;
+ editing_server = false;
+ }
+
+ if(ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
+ // Double clicked - join the selected server
+ join_selected_server();
+ }
+
+ ImDrawList* draw_list = ImGui::GetWindowDrawList();
+
+ if(item == selected_server) {
+ const ImVec2 start = ImVec2(cursor.x, cursor.y);
+ const ImVec2 end = ImVec2(start.x + item_width, start.y + 2.0f * (line_height + padding.y + spacing.y));
+ draw_list->AddRect(start, end, ImGui::GetColorU32(ImGuiCol_Text), 0.0f, 0, globals::gui_scale);
+ }
+
+ const ImVec2 name_pos = ImVec2(cursor.x + padding.x + 0.5f * spacing.x, cursor.y + padding.y);
+ draw_list->AddText(name_pos, ImGui::GetColorU32(ImGuiCol_Text), item->name.c_str(), item->name.c_str() + item->name.size());
+
+ if(item->status == item_status::REACHED) {
+ auto stats = std::format("{}/{}", item->num_players, item->max_players);
+ auto stats_width = ImGui::CalcTextSize(stats.c_str(), stats.c_str() + stats.size()).x;
+ auto stats_pos = ImVec2(cursor.x + item_width - stats_width - padding.x, cursor.y + padding.y);
+ draw_list->AddText(stats_pos, ImGui::GetColorU32(ImGuiCol_TextDisabled), stats.c_str(), stats.c_str() + stats.size());
+
+ if(item->protocol_version != protocol::VERSION) {
+ auto warning_size = ImGui::CalcTextSize(WARNING_TOAST.data(), WARNING_TOAST.data() + WARNING_TOAST.size());
+ auto warning_pos = ImVec2(stats_pos.x - warning_size.x - padding.x - 4.0f * globals::gui_scale, cursor.y + padding.y);
+ auto warning_end = ImVec2(warning_pos.x + warning_size.x, warning_pos.y + warning_size.y);
+ draw_list->AddText(warning_pos, ImGui::GetColorU32(ImGuiCol_DragDropTarget), WARNING_TOAST.data(),
+ WARNING_TOAST.data() + WARNING_TOAST.size());
+
+ if(ImGui::IsMouseHoveringRect(warning_pos, warning_end)) {
+ ImGui::BeginTooltip();
+
+ if(item->protocol_version < protocol::VERSION) {
+ ImGui::TextUnformatted(str_outdated_server.c_str(), str_outdated_server.c_str() + str_outdated_server.size());
+ }
+ else {
+ ImGui::TextUnformatted(str_outdated_client.c_str(), str_outdated_client.c_str() + str_outdated_client.size());
+ }
+
+ ImGui::EndTooltip();
+ }
+ }
+ }
+
+ ImU32 motd_color = {};
+ const std::string* motd_text;
+
+ switch(item->status) {
+ case item_status::UNKNOWN:
+ motd_color = ImGui::GetColorU32(ImGuiCol_TextDisabled);
+ motd_text = &str_status_init;
+ break;
+ case item_status::PINGING:
+ motd_color = ImGui::GetColorU32(ImGuiCol_TextDisabled);
+ motd_text = &str_status_ping;
+ break;
+ case item_status::REACHED:
+ motd_color = ImGui::GetColorU32(ImGuiCol_TextDisabled);
+ motd_text = &item->motd;
+ break;
+ default:
+ motd_color = ImGui::GetColorU32(ImGuiCol_PlotLinesHovered);
+ motd_text = &str_status_fail;
+ break;
+ }
+
+ const ImVec2 motd_pos = ImVec2(cursor.x + padding.x + 0.5f * spacing.x, cursor.y + padding.y + line_height);
+ draw_list->AddText(motd_pos, motd_color, motd_text->c_str(), motd_text->c_str() + motd_text->size());
+}
+
+static void layout_server_edit(ServerStatusItem* item)
+{
+ if(needs_focus) {
+ ImGui::SetKeyboardFocusHere();
+ needs_focus = false;
+ }
+
+ ImGui::SetNextItemWidth(-0.25f * ImGui::GetContentRegionAvail().x);
+ ImGui::InputText("###play_menu.servers.edit_itemname", &input_itemname);
+ ImGui::SameLine();
+
+ const bool ignore_input = utils::is_whitespace(input_itemname) || input_hostname.empty();
+
+ ImGui::BeginDisabled(ignore_input);
+
+ if(ImGui::Button("OK###play_menu.servers.submit_input", ImVec2(-1.0f, 0.0f))
+ || (!ignore_input && ImGui::IsKeyPressed(ImGuiKey_Enter))) {
+ parse_hostname(item, input_hostname);
+ item->password = input_password;
+ item->name = input_itemname.substr(0, MAX_SERVER_ITEM_NAME);
+ item->status = item_status::UNKNOWN;
+ editing_server = false;
+ adding_server = false;
+
+ input_itemname.clear();
+ input_hostname.clear();
+
+ gui::bother::cancel(item->identity);
+ }
+
+ ImGui::EndDisabled();
+
+ ImGuiInputTextFlags hostname_flags = ImGuiInputTextFlags_CharsNoBlank;
+
+ if(client_game::streamer_mode.get_value()) {
+ // Hide server hostname to avoid things like
+ // followers flooding the server that is streamed online
+ hostname_flags |= ImGuiInputTextFlags_Password;
+ }
+
+ ImGui::SetNextItemWidth(-0.50f * ImGui::GetContentRegionAvail().x);
+ ImGui::InputText("###play_menu.servers.edit_hostname", &input_hostname, hostname_flags);
+ ImGui::SameLine();
+
+ ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+ ImGui::InputText("###play_menu.servers.edit_password", &input_password, ImGuiInputTextFlags_Password);
+}
+
+static void layout_servers(void)
+{
+ if(ImGui::BeginListBox("###play_menu.servers.listbox", ImVec2(-1.0f, -1.0f))) {
+ for(ServerStatusItem* item : servers_deque) {
+ if(editing_server && item == selected_server) {
+ layout_server_edit(item);
+ }
+ else {
+ layout_server_item(item);
+ }
+ }
+
+ ImGui::EndListBox();
+ }
+}
+
+static void layout_servers_buttons(void)
+{
+ auto avail_width = ImGui::GetContentRegionAvail().x;
+
+ // Can only join when selected and not editing
+ ImGui::BeginDisabled(!selected_server || editing_server);
+
+ if(ImGui::Button(str_join.c_str(), ImVec2(-0.50f * avail_width, 0.0f))) {
+ join_selected_server();
+ }
+
+ ImGui::EndDisabled();
+ ImGui::SameLine();
+
+ // Can only connect directly when not editing anything
+ ImGui::BeginDisabled(editing_server);
+
+ if(ImGui::Button(str_connect.c_str(), ImVec2(-1.00f, 0.0f))) {
+ globals::gui_screen = GUI_DIRECT_CONNECTION;
+ }
+
+ ImGui::EndDisabled();
+
+ // Can only add when not editing anything
+ ImGui::BeginDisabled(editing_server);
+
+ if(ImGui::Button(str_add.c_str(), ImVec2(-0.75f * avail_width, 0.0f))) {
+ add_new_server();
+ }
+
+ ImGui::EndDisabled();
+ ImGui::SameLine();
+
+ // Can only edit when selected and not editing
+ ImGui::BeginDisabled(!selected_server || editing_server);
+
+ if(ImGui::Button(str_edit.c_str(), ImVec2(-0.50f * avail_width, 0.0f))) {
+ edit_selected_server();
+ }
+
+ ImGui::EndDisabled();
+ ImGui::SameLine();
+
+ // Can only remove when selected and not editing
+ ImGui::BeginDisabled(!selected_server || editing_server);
+
+ if(ImGui::Button(str_remove.c_str(), ImVec2(-0.25f * avail_width, 0.0f))) {
+ remove_selected_server();
+ }
+
+ ImGui::EndDisabled();
+ ImGui::SameLine();
+
+ if(ImGui::Button(str_refresh.c_str(), ImVec2(-1.0f, 0.0f))) {
+ for(ServerStatusItem* item : servers_deque) {
+ if(item->status != item_status::PINGING) {
+ if(!editing_server || item != selected_server) {
+ item->status = item_status::UNKNOWN;
+ gui::bother::cancel(item->identity);
+ }
+ }
+ }
+ }
+}
+
+void gui::play_menu::init(void)
+{
+ if(auto file = PHYSFS_openRead(std::string(SERVERS_TXT).c_str())) {
+ auto source = std::string(PHYSFS_fileLength(file), char(0x00));
+ PHYSFS_readBytes(file, source.data(), source.size());
+ PHYSFS_close(file);
+
+ auto stream = std::istringstream(source);
+ auto line = std::string();
+
+ while(std::getline(stream, line)) {
+ auto parts = utils::split(line, "%");
+
+ auto item = new ServerStatusItem();
+ item->port = protocol::PORT;
+ item->protocol_version = protocol::VERSION;
+ item->max_players = UINT16_MAX;
+ item->num_players = UINT16_MAX;
+ item->identity = next_identity;
+ item->status = item_status::UNKNOWN;
+
+ next_identity += 1U;
+
+ parse_hostname(item, parts[0]);
+
+ if(parts.size() >= 2) {
+ item->password = parts[1];
+ }
+ else {
+ item->password = std::string();
+ }
+
+ if(parts.size() >= 3) {
+ item->name = parts[2].substr(0, MAX_SERVER_ITEM_NAME);
+ }
+ else {
+ item->name = DEFAULT_SERVER_NAME;
+ }
+
+ servers_deque.push_back(item);
+ }
+ }
+
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+ globals::dispatcher.sink<LanguageSetEvent>().connect<&on_language_set>();
+ globals::dispatcher.sink<BotherResponseEvent>().connect<&on_bother_response>();
+}
+
+void gui::play_menu::shutdown(void)
+{
+ std::ostringstream stream;
+
+ for(const auto item : servers_deque) {
+ stream << std::format("{}:{}%{}%{}", item->hostname, item->port, item->password, item->name) << std::endl;
+ }
+
+ if(auto file = PHYSFS_openWrite(std::string(SERVERS_TXT).c_str())) {
+ auto source = stream.str();
+ PHYSFS_writeBytes(file, source.data(), source.size());
+ PHYSFS_close(file);
+ }
+
+ for(auto item : servers_deque)
+ delete item;
+ servers_deque.clear();
+}
+
+void gui::play_menu::layout(void)
+{
+ const auto viewport = ImGui::GetMainViewport();
+ const auto window_start = ImVec2(viewport->Size.x * 0.05f, viewport->Size.y * 0.05f);
+ const auto window_size = ImVec2(viewport->Size.x * 0.90f, viewport->Size.y * 0.90f);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ if(ImGui::Begin("###play_menu", nullptr, WINDOW_FLAGS)) {
+ ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(3.0f * globals::gui_scale, 3.0f * globals::gui_scale));
+
+ if(ImGui::BeginTabBar("###play_menu.tabs", ImGuiTabBarFlags_FittingPolicyResizeDown)) {
+ if(ImGui::TabItemButton("<<")) {
+ globals::gui_screen = GUI_MAIN_MENU;
+ selected_server = nullptr;
+ editing_server = false;
+ }
+
+ if(ImGui::BeginTabItem(str_tab_servers.c_str())) {
+ if(ImGui::BeginChild("###play_menu.servers.child", ImVec2(0.0f, -2.0f * ImGui::GetFrameHeightWithSpacing()))) {
+ layout_servers();
+ }
+
+ ImGui::EndChild();
+
+ layout_servers_buttons();
+
+ ImGui::EndTabItem();
+ }
+
+ ImGui::EndTabBar();
+ }
+
+ ImGui::PopStyleVar();
+ }
+
+ ImGui::End();
+}
+
+void gui::play_menu::update_late(void)
+{
+ for(auto item : servers_deque) {
+ if(item->status == item_status::UNKNOWN) {
+ gui::bother::ping(item->identity, item->hostname.c_str(), item->port);
+ item->status = item_status::PINGING;
+ continue;
+ }
+ }
+}
diff --git a/game/client/gui/play_menu.hh b/game/client/gui/play_menu.hh index 1b1f003..15f7c89 100644 --- a/game/client/gui/play_menu.hh +++ b/game/client/gui/play_menu.hh @@ -1,9 +1,9 @@ -#pragma once - -namespace gui::play_menu -{ -void init(void); -void shutdown(void); -void layout(void); -void update_late(void); -} // namespace gui::play_menu +#pragma once
+
+namespace gui::play_menu
+{
+void init(void);
+void shutdown(void);
+void layout(void);
+void update_late(void);
+} // namespace gui::play_menu
diff --git a/game/client/gui/progress_bar.cc b/game/client/gui/progress_bar.cc index 8be2f8c..9266ce1 100644 --- a/game/client/gui/progress_bar.cc +++ b/game/client/gui/progress_bar.cc @@ -1,111 +1,111 @@ -#include "client/pch.hh" - -#include "client/gui/progress_bar.hh" - -#include "core/math/constexpr.hh" - -#include "client/gui/language.hh" - -#include "client/globals.hh" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration; - -static std::string str_title; -static std::string str_button; -static gui::progress_bar_action button_action; - -void gui::progress_bar::init(void) -{ - str_title = "Loading"; - str_button = std::string(); - button_action = nullptr; -} - -void gui::progress_bar::layout(void) -{ - const auto viewport = ImGui::GetMainViewport(); - const auto window_start = ImVec2(0.0f, viewport->Size.y * 0.30f); - const auto window_size = ImVec2(viewport->Size.x, viewport->Size.y * 0.70f); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - if(ImGui::Begin("###UIProgress", nullptr, WINDOW_FLAGS)) { - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 1.0f * globals::gui_scale)); - - const float title_width = ImGui::CalcTextSize(str_title.c_str()).x; - ImGui::SetCursorPosX(0.5f * (window_size.x - title_width)); - ImGui::TextUnformatted(str_title.c_str()); - - ImGui::Dummy(ImVec2(0.0f, 8.0f * globals::gui_scale)); - - const ImVec2 cursor = ImGui::GetCursorPos(); - - const std::size_t num_bars = 32; - const float spinner_width = 0.8f * ImGui::CalcItemWidth(); - const float bar_width = spinner_width / static_cast<float>(num_bars); - const float bar_height = 0.5f * ImGui::GetFrameHeight(); - - const float base_xpos = window_start.x + 0.5f * (window_size.x - spinner_width) + 0.5f; - const float base_ypos = window_start.y + cursor.y; - const float phase = 2.0f * ImGui::GetTime(); - - const ImVec4& background = ImGui::GetStyleColorVec4(ImGuiCol_Button); - const ImVec4& foreground = ImGui::GetStyleColorVec4(ImGuiCol_PlotHistogram); - - for(std::size_t i = 0; i < num_bars; ++i) { - const float sinval = std::sin(M_PI * static_cast<float>(i) / static_cast<float>(num_bars) - phase); - const float modifier = std::exp(-8.0f * (0.5f + 0.5f * sinval)); - - ImVec4 color = {}; - color.x = math::lerp(background.x, foreground.x, modifier); - color.y = math::lerp(background.y, foreground.y, modifier); - color.z = math::lerp(background.z, foreground.z, modifier); - color.w = math::lerp(background.w, foreground.w, modifier); - - const ImVec2 start = ImVec2(base_xpos + bar_width * i, base_ypos); - const ImVec2 end = ImVec2(start.x + bar_width, start.y + bar_height); - ImGui::GetWindowDrawList()->AddRectFilled(start, end, ImGui::GetColorU32(color)); - } - - // The NewLine call tricks ImGui into correctly padding the - // next widget that comes after the progress_bar spinner; this - // is needed to ensure the button is located in the correct place - ImGui::NewLine(); - - if(!str_button.empty()) { - ImGui::Dummy(ImVec2(0.0f, 32.0f * globals::gui_scale)); - - const float button_width = 0.8f * ImGui::CalcItemWidth(); - ImGui::SetCursorPosX(0.5f * (window_size.x - button_width)); - - if(ImGui::Button(str_button.c_str(), ImVec2(button_width, 0.0f))) { - if(button_action) { - button_action(); - } - } - } - - ImGui::PopStyleVar(); - } - - ImGui::End(); -} - -void gui::progress_bar::reset(void) -{ - str_title.clear(); - str_button.clear(); - button_action = nullptr; -} - -void gui::progress_bar::set_title(std::string_view title) -{ - str_title = gui::language::resolve(title); -} - -void gui::progress_bar::set_button(std::string_view text, const progress_bar_action& action) -{ - str_button = std::format("{}###ProgressBar_Button", gui::language::resolve(text)); - button_action = action; -} +#include "client/pch.hh"
+
+#include "client/gui/progress_bar.hh"
+
+#include "core/math/constexpr.hh"
+
+#include "client/gui/language.hh"
+
+#include "client/globals.hh"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration;
+
+static std::string str_title;
+static std::string str_button;
+static gui::progress_bar_action button_action;
+
+void gui::progress_bar::init(void)
+{
+ str_title = "Loading";
+ str_button = std::string();
+ button_action = nullptr;
+}
+
+void gui::progress_bar::layout(void)
+{
+ const auto viewport = ImGui::GetMainViewport();
+ const auto window_start = ImVec2(0.0f, viewport->Size.y * 0.30f);
+ const auto window_size = ImVec2(viewport->Size.x, viewport->Size.y * 0.70f);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ if(ImGui::Begin("###UIProgress", nullptr, WINDOW_FLAGS)) {
+ ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 1.0f * globals::gui_scale));
+
+ const float title_width = ImGui::CalcTextSize(str_title.c_str()).x;
+ ImGui::SetCursorPosX(0.5f * (window_size.x - title_width));
+ ImGui::TextUnformatted(str_title.c_str());
+
+ ImGui::Dummy(ImVec2(0.0f, 8.0f * globals::gui_scale));
+
+ const ImVec2 cursor = ImGui::GetCursorPos();
+
+ const std::size_t num_bars = 32;
+ const float spinner_width = 0.8f * ImGui::CalcItemWidth();
+ const float bar_width = spinner_width / static_cast<float>(num_bars);
+ const float bar_height = 0.5f * ImGui::GetFrameHeight();
+
+ const float base_xpos = window_start.x + 0.5f * (window_size.x - spinner_width) + 0.5f;
+ const float base_ypos = window_start.y + cursor.y;
+ const float phase = 2.0f * ImGui::GetTime();
+
+ const ImVec4& background = ImGui::GetStyleColorVec4(ImGuiCol_Button);
+ const ImVec4& foreground = ImGui::GetStyleColorVec4(ImGuiCol_PlotHistogram);
+
+ for(std::size_t i = 0; i < num_bars; ++i) {
+ const float sinval = std::sin(M_PI * static_cast<float>(i) / static_cast<float>(num_bars) - phase);
+ const float modifier = std::exp(-8.0f * (0.5f + 0.5f * sinval));
+
+ ImVec4 color = {};
+ color.x = math::lerp(background.x, foreground.x, modifier);
+ color.y = math::lerp(background.y, foreground.y, modifier);
+ color.z = math::lerp(background.z, foreground.z, modifier);
+ color.w = math::lerp(background.w, foreground.w, modifier);
+
+ const ImVec2 start = ImVec2(base_xpos + bar_width * i, base_ypos);
+ const ImVec2 end = ImVec2(start.x + bar_width, start.y + bar_height);
+ ImGui::GetWindowDrawList()->AddRectFilled(start, end, ImGui::GetColorU32(color));
+ }
+
+ // The NewLine call tricks ImGui into correctly padding the
+ // next widget that comes after the progress_bar spinner; this
+ // is needed to ensure the button is located in the correct place
+ ImGui::NewLine();
+
+ if(!str_button.empty()) {
+ ImGui::Dummy(ImVec2(0.0f, 32.0f * globals::gui_scale));
+
+ const float button_width = 0.8f * ImGui::CalcItemWidth();
+ ImGui::SetCursorPosX(0.5f * (window_size.x - button_width));
+
+ if(ImGui::Button(str_button.c_str(), ImVec2(button_width, 0.0f))) {
+ if(button_action) {
+ button_action();
+ }
+ }
+ }
+
+ ImGui::PopStyleVar();
+ }
+
+ ImGui::End();
+}
+
+void gui::progress_bar::reset(void)
+{
+ str_title.clear();
+ str_button.clear();
+ button_action = nullptr;
+}
+
+void gui::progress_bar::set_title(std::string_view title)
+{
+ str_title = gui::language::resolve(title);
+}
+
+void gui::progress_bar::set_button(std::string_view text, const progress_bar_action& action)
+{
+ str_button = std::format("{}###ProgressBar_Button", gui::language::resolve(text));
+ button_action = action;
+}
diff --git a/game/client/gui/progress_bar.hh b/game/client/gui/progress_bar.hh index 7a0581d..5f2e601 100644 --- a/game/client/gui/progress_bar.hh +++ b/game/client/gui/progress_bar.hh @@ -1,19 +1,19 @@ -#pragma once - -namespace gui -{ -using progress_bar_action = void (*)(void); -} // namespace gui - -namespace gui::progress_bar -{ -void init(void); -void layout(void); -} // namespace gui::progress_bar - -namespace gui::progress_bar -{ -void reset(void); -void set_title(std::string_view title); -void set_button(std::string_view text, const progress_bar_action& action); -} // namespace gui::progress_bar +#pragma once
+
+namespace gui
+{
+using progress_bar_action = void (*)(void);
+} // namespace gui
+
+namespace gui::progress_bar
+{
+void init(void);
+void layout(void);
+} // namespace gui::progress_bar
+
+namespace gui::progress_bar
+{
+void reset(void);
+void set_title(std::string_view title);
+void set_button(std::string_view text, const progress_bar_action& action);
+} // namespace gui::progress_bar
diff --git a/game/client/gui/scoreboard.cc b/game/client/gui/scoreboard.cc index fabd753..f875ef2 100644 --- a/game/client/gui/scoreboard.cc +++ b/game/client/gui/scoreboard.cc @@ -1,103 +1,103 @@ -#include "client/pch.hh" - -#include "client/gui/scoreboard.hh" - -#include "core/io/config_map.hh" - -#include "shared/protocol.hh" - -#include "client/config/keybind.hh" - -#include "client/gui/gui_screen.hh" -#include "client/gui/settings.hh" - -#include "client/globals.hh" -#include "client/session.hh" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = - ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoBackground; - -static config::KeyBind list_key(GLFW_KEY_TAB); - -static std::vector<std::string> usernames; -static float max_username_size; - -static void on_scoreboard_update_packet(const protocol::ScoreboardUpdate& packet) -{ - usernames = packet.names; - max_username_size = 0.0f; -} - -void gui::scoreboard::init(void) -{ - globals::client_config.add_value("scoreboard.key", list_key); - - settings::add_keybind(3, list_key, settings_location::KEYBOARD_MISC, "key.scoreboard"); - - globals::dispatcher.sink<protocol::ScoreboardUpdate>().connect<&on_scoreboard_update_packet>(); -} - -void gui::scoreboard::layout(void) -{ - if(globals::gui_screen == GUI_SCREEN_NONE && session::is_ingame() && glfwGetKey(globals::window, list_key.get_key()) == GLFW_PRESS) { - const auto viewport = ImGui::GetMainViewport(); - const auto window_start = ImVec2(0.0f, 0.0f); - const auto window_size = ImVec2(viewport->Size.x, viewport->Size.y); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - if(!ImGui::Begin("###chat", nullptr, WINDOW_FLAGS)) { - ImGui::End(); - return; - } - - ImGui::PushFont(globals::font_unscii16, 8.0f); - - const auto& padding = ImGui::GetStyle().FramePadding; - const auto& spacing = ImGui::GetStyle().ItemSpacing; - auto font = globals::font_unscii8; - - // Figure out the maximum username size - for(const auto& username : usernames) { - const ImVec2 size = ImGui::CalcTextSize(username.c_str(), username.c_str() + username.size()); - - if(size.x > max_username_size) { - max_username_size = size.x; - } - } - - // Having a minimum size allows for - // generally better in-game visibility - const float true_size = math::max<float>(0.25f * window_size.x, max_username_size); - - // Figure out username rect dimensions - const float rect_start_x = 0.5f * window_size.x - 0.5f * true_size; - const float rect_start_y = 0.15f * window_size.y; - const float rect_size_x = 2.0f * padding.x + true_size; - const float rect_size_y = 2.0f * padding.y + 0.5f * ImGui::GetFontSize(); - - // const ImU32 border_col = ImGui::GetColorU32(ImGuiCol_Border, 1.00f); - const ImU32 rect_col = ImGui::GetColorU32(ImGuiCol_FrameBg, 0.80f); - const ImU32 text_col = ImGui::GetColorU32(ImGuiCol_Text, 1.00f); - - ImDrawList* draw_list = ImGui::GetWindowDrawList(); - - // Slightly space apart individual rows - const float row_step_y = rect_size_y + 0.5f * spacing.y; - - for(std::size_t i = 0; i < usernames.size(); ++i) { - const ImVec2 rect_a = ImVec2(rect_start_x, rect_start_y + i * row_step_y); - const ImVec2 rect_b = ImVec2(rect_a.x + rect_size_x, rect_a.y + rect_size_y); - const ImVec2 text_pos = ImVec2(rect_a.x + padding.x, rect_a.y + padding.y); - - // draw_list->AddRect(rect_a, rect_b, border_col, 0.0f, ImDrawFlags_None, globals::gui_scale); - draw_list->AddRectFilled(rect_a, rect_b, rect_col, 0.0f, ImDrawFlags_None); - draw_list->AddText( - font, 0.5f * ImGui::GetFontSize(), text_pos, text_col, usernames[i].c_str(), usernames[i].c_str() + usernames[i].size()); - } - - ImGui::PopFont(); - ImGui::End(); - } -} +#include "client/pch.hh"
+
+#include "client/gui/scoreboard.hh"
+
+#include "core/io/config_map.hh"
+
+#include "shared/protocol.hh"
+
+#include "client/config/keybind.hh"
+
+#include "client/gui/gui_screen.hh"
+#include "client/gui/settings.hh"
+
+#include "client/globals.hh"
+#include "client/session.hh"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs
+ | ImGuiWindowFlags_NoBackground;
+
+static config::KeyBind list_key(GLFW_KEY_TAB);
+
+static std::vector<std::string> usernames;
+static float max_username_size;
+
+static void on_scoreboard_update_packet(const protocol::ScoreboardUpdate& packet)
+{
+ usernames = packet.names;
+ max_username_size = 0.0f;
+}
+
+void gui::scoreboard::init(void)
+{
+ globals::client_config.add_value("scoreboard.key", list_key);
+
+ settings::add_keybind(3, list_key, settings_location::KEYBOARD_MISC, "key.scoreboard");
+
+ globals::dispatcher.sink<protocol::ScoreboardUpdate>().connect<&on_scoreboard_update_packet>();
+}
+
+void gui::scoreboard::layout(void)
+{
+ if(globals::gui_screen == GUI_SCREEN_NONE && session::is_ingame() && glfwGetKey(globals::window, list_key.get_key()) == GLFW_PRESS) {
+ const auto viewport = ImGui::GetMainViewport();
+ const auto window_start = ImVec2(0.0f, 0.0f);
+ const auto window_size = ImVec2(viewport->Size.x, viewport->Size.y);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ if(!ImGui::Begin("###chat", nullptr, WINDOW_FLAGS)) {
+ ImGui::End();
+ return;
+ }
+
+ ImGui::PushFont(globals::font_unscii16, 8.0f);
+
+ const auto& padding = ImGui::GetStyle().FramePadding;
+ const auto& spacing = ImGui::GetStyle().ItemSpacing;
+ auto font = globals::font_unscii8;
+
+ // Figure out the maximum username size
+ for(const auto& username : usernames) {
+ const ImVec2 size = ImGui::CalcTextSize(username.c_str(), username.c_str() + username.size());
+
+ if(size.x > max_username_size) {
+ max_username_size = size.x;
+ }
+ }
+
+ // Having a minimum size allows for
+ // generally better in-game visibility
+ const float true_size = math::max<float>(0.25f * window_size.x, max_username_size);
+
+ // Figure out username rect dimensions
+ const float rect_start_x = 0.5f * window_size.x - 0.5f * true_size;
+ const float rect_start_y = 0.15f * window_size.y;
+ const float rect_size_x = 2.0f * padding.x + true_size;
+ const float rect_size_y = 2.0f * padding.y + 0.5f * ImGui::GetFontSize();
+
+ // const ImU32 border_col = ImGui::GetColorU32(ImGuiCol_Border, 1.00f);
+ const ImU32 rect_col = ImGui::GetColorU32(ImGuiCol_FrameBg, 0.80f);
+ const ImU32 text_col = ImGui::GetColorU32(ImGuiCol_Text, 1.00f);
+
+ ImDrawList* draw_list = ImGui::GetWindowDrawList();
+
+ // Slightly space apart individual rows
+ const float row_step_y = rect_size_y + 0.5f * spacing.y;
+
+ for(std::size_t i = 0; i < usernames.size(); ++i) {
+ const ImVec2 rect_a = ImVec2(rect_start_x, rect_start_y + i * row_step_y);
+ const ImVec2 rect_b = ImVec2(rect_a.x + rect_size_x, rect_a.y + rect_size_y);
+ const ImVec2 text_pos = ImVec2(rect_a.x + padding.x, rect_a.y + padding.y);
+
+ // draw_list->AddRect(rect_a, rect_b, border_col, 0.0f, ImDrawFlags_None, globals::gui_scale);
+ draw_list->AddRectFilled(rect_a, rect_b, rect_col, 0.0f, ImDrawFlags_None);
+ draw_list->AddText(font, 0.5f * ImGui::GetFontSize(), text_pos, text_col, usernames[i].c_str(),
+ usernames[i].c_str() + usernames[i].size());
+ }
+
+ ImGui::PopFont();
+ ImGui::End();
+ }
+}
diff --git a/game/client/gui/scoreboard.hh b/game/client/gui/scoreboard.hh index 320e185..5f1c59d 100644 --- a/game/client/gui/scoreboard.hh +++ b/game/client/gui/scoreboard.hh @@ -1,7 +1,7 @@ -#pragma once - -namespace gui::scoreboard -{ -void init(void); -void layout(void); -} // namespace gui::scoreboard +#pragma once
+
+namespace gui::scoreboard
+{
+void init(void);
+void layout(void);
+} // namespace gui::scoreboard
diff --git a/game/client/gui/settings.cc b/game/client/gui/settings.cc index 693f0d6..db26d8c 100644 --- a/game/client/gui/settings.cc +++ b/game/client/gui/settings.cc @@ -1,1069 +1,1069 @@ -#include "client/pch.hh" - -#include "client/gui/settings.hh" - -#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" - -#include "client/const.hh" -#include "client/globals.hh" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration; -constexpr static unsigned int NUM_LOCATIONS = static_cast<unsigned int>(settings_location::COUNT); - -enum class setting_type : unsigned int { - CHECKBOX = 0x0000U, ///< config::Boolean - INPUT_INT = 0x0001U, ///< config::Number<int> - INPUT_FLOAT = 0x0002U, ///< config::Number<float> - INPUT_UINT = 0x0003U, ///< config::Number<unsigned int> - INPUT_STRING = 0x0004U, ///< config::String - SLIDER_INT = 0x0005U, ///< config::Number<int> - SLIDER_FLOAT = 0x0006U, ///< config::Number<float> - SLIDER_UINT = 0x0007U, ///< config::Number<unsigned int> - STEPPER_INT = 0x0008U, ///< config::Number<int> - STEPPER_UINT = 0x0009U, ///< config::Number<unsigned int> - KEYBIND = 0x000AU, ///< config::KeyBind - GAMEPAD_AXIS = 0x000BU, ///< config::GamepadAxis - GAMEPAD_BUTTON = 0x000CU, ///< config::GamepadButton - LANGUAGE_SELECT = 0x000DU, ///< config::String internally -}; - -class SettingValue { -public: - virtual ~SettingValue(void) = default; - virtual void layout(void) const = 0; - void layout_tooltip(void) const; - void layout_label(void) const; - -public: - setting_type type; - std::string tooltip; - std::string title; - std::string name; - bool has_tooltip; - int priority; -}; - -class SettingValueWID : public SettingValue { -public: - virtual ~SettingValueWID(void) = default; - -public: - std::string wid; -}; - -class SettingValue_CheckBox final : public SettingValue { -public: - virtual ~SettingValue_CheckBox(void) = default; - virtual void layout(void) const override; - void refresh_wids(void); - -public: - config::Boolean* value; - std::string wids[2]; -}; - -class SettingValue_InputInt final : public SettingValueWID { -public: - virtual ~SettingValue_InputInt(void) = default; - virtual void layout(void) const override; - -public: - config::Int* value; -}; - -class SettingValue_InputFloat final : public SettingValueWID { -public: - virtual ~SettingValue_InputFloat(void) = default; - virtual void layout(void) const override; - -public: - std::string format; - config::Float* value; -}; - -class SettingValue_InputUnsigned final : public SettingValueWID { -public: - virtual ~SettingValue_InputUnsigned(void) = default; - virtual void layout(void) const override; - -public: - config::Unsigned* value; -}; - -class SettingValue_InputString final : public SettingValueWID { -public: - virtual ~SettingValue_InputString(void) = default; - virtual void layout(void) const override; - -public: - config::String* value; - bool allow_whitespace; -}; - -class SettingValue_SliderInt final : public SettingValueWID { -public: - virtual ~SettingValue_SliderInt(void) = default; - virtual void layout(void) const override; - -public: - config::Int* value; -}; - -class SettingValue_SliderFloat final : public SettingValueWID { -public: - virtual ~SettingValue_SliderFloat(void) = default; - virtual void layout(void) const override; - -public: - std::string format; - config::Float* value; -}; - -class SettingValue_SliderUnsigned final : public SettingValueWID { -public: - virtual ~SettingValue_SliderUnsigned(void) = default; - virtual void layout(void) const override; - -public: - config::Unsigned* value; -}; - -class SettingValue_StepperInt final : public SettingValue { -public: - virtual ~SettingValue_StepperInt(void) = default; - virtual void layout(void) const override; - void refresh_wids(void); - -public: - std::vector<std::string> wids; - config::Int* value; -}; - -class SettingValue_StepperUnsigned final : public SettingValue { -public: - virtual ~SettingValue_StepperUnsigned(void) = default; - virtual void layout(void) const override; - void refresh_wids(void); - -public: - std::vector<std::string> wids; - config::Unsigned* value; -}; - -class SettingValue_KeyBind final : public SettingValue { -public: - virtual ~SettingValue_KeyBind(void) = default; - virtual void layout(void) const override; - void refresh_wids(void); - -public: - std::string wids[2]; - config::KeyBind* value; -}; - -class SettingValue_GamepadAxis final : public SettingValue { -public: - virtual ~SettingValue_GamepadAxis(void) = default; - virtual void layout(void) const override; - void refresh_wids(void); - -public: - std::string wids[2]; - std::string wid_checkbox; - config::GamepadAxis* value; -}; - -class SettingValue_GamepadButton final : public SettingValue { -public: - virtual ~SettingValue_GamepadButton(void) = default; - virtual void layout(void) const override; - void refresh_wids(void); - -public: - std::string wids[2]; - config::GamepadButton* value; -}; - -class SettingValue_Language final : public SettingValueWID { -public: - virtual ~SettingValue_Language(void) = default; - virtual void layout(void) const override; -}; - -static std::string str_checkbox_false; -static std::string str_checkbox_true; - -static std::string str_tab_general; -static std::string str_tab_input; -static std::string str_tab_video; -static std::string str_tab_sound; - -static std::string str_input_keyboard; -static std::string str_input_gamepad; -static std::string str_input_mouse; - -static std::string str_keyboard_movement; -static std::string str_keyboard_gameplay; -static std::string str_keyboard_misc; - -static std::string str_gamepad_movement; -static std::string str_gamepad_gameplay; -static std::string str_gamepad_misc; - -static std::string str_gamepad_axis_prefix; -static std::string str_gamepad_button_prefix; -static std::string str_gamepad_checkbox_tooltip; - -static std::string str_video_gui; - -static std::string str_sound_levels; - -static std::vector<SettingValue*> values_all; -static std::vector<SettingValue*> values[NUM_LOCATIONS]; - -void SettingValue::layout_tooltip(void) const -{ - if(has_tooltip) { - ImGui::SameLine(); - ImGui::TextDisabled("[?]"); - - if(ImGui::BeginItemTooltip()) { - ImGui::PushTextWrapPos(ImGui::GetFontSize() * 16.0f); - ImGui::TextUnformatted(tooltip.c_str()); - ImGui::PopTextWrapPos(); - ImGui::EndTooltip(); - } - } -} - -void SettingValue::layout_label(void) const -{ - ImGui::SameLine(); - ImGui::TextUnformatted(title.c_str()); -} - -void SettingValue_CheckBox::refresh_wids(void) -{ - wids[0] = std::format("{}###{}", str_checkbox_false, static_cast<void*>(value)); - wids[1] = std::format("{}###{}", str_checkbox_true, static_cast<void*>(value)); -} - -void SettingValue_CheckBox::layout(void) const -{ - const auto& wid = value->get_value() ? wids[1] : wids[0]; - - if(ImGui::Button(wid.c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) { - value->set_value(!value->get_value()); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_InputInt::layout(void) const -{ - auto current_value = value->get_value(); - - if(ImGui::InputInt(wid.c_str(), ¤t_value)) { - value->set_value(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_InputFloat::layout(void) const -{ - auto current_value = value->get_value(); - - if(ImGui::InputFloat(wid.c_str(), ¤t_value, 0.0f, 0.0f, format.c_str())) { - value->set_value(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_InputUnsigned::layout(void) const -{ - auto current_value = static_cast<std::uint32_t>(value->get_value()); - - if(ImGui::InputScalar(wid.c_str(), ImGuiDataType_U32, ¤t_value)) { - value->set_value(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_InputString::layout(void) const -{ - ImGuiInputTextFlags flags; - std::string current_value(value->get_value()); - - if(allow_whitespace) { - flags = ImGuiInputTextFlags_AllowTabInput; - } - else { - flags = 0; - } - - if(ImGui::InputText(wid.c_str(), ¤t_value, flags)) { - value->set(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_SliderInt::layout(void) const -{ - auto current_value = value->get_value(); - - if(ImGui::SliderInt(wid.c_str(), ¤t_value, value->get_min_value(), value->get_max_value())) { - value->set_value(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_SliderFloat::layout(void) const -{ - auto current_value = value->get_value(); - - if(ImGui::SliderFloat(wid.c_str(), ¤t_value, value->get_min_value(), value->get_max_value(), format.c_str())) { - value->set_value(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_SliderUnsigned::layout(void) const -{ - auto current_value = static_cast<std::uint32_t>(value->get_value()); - auto min_value = static_cast<std::uint32_t>(value->get_min_value()); - auto max_value = static_cast<std::uint32_t>(value->get_max_value()); - - if(ImGui::SliderScalar(wid.c_str(), ImGuiDataType_U32, ¤t_value, &min_value, &max_value)) { - value->set_value(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_StepperInt::layout(void) const -{ - auto current_value = value->get_value(); - auto min_value = value->get_min_value(); - auto max_value = value->get_max_value(); - - auto current_wid = current_value - min_value; - - if(ImGui::Button(wids[current_wid].c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) { - current_value += 1; - } - - if(current_value > max_value) { - value->set_value(min_value); - } - else { - value->set_value(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_StepperInt::refresh_wids(void) -{ - for(std::size_t i = 0; i < wids.size(); ++i) { - auto key = std::format("settings.value.{}.{}", name, i); - wids[i] = std::format("{}###{}", gui::language::resolve(key.c_str()), static_cast<const void*>(value)); - } -} - -void SettingValue_StepperUnsigned::layout(void) const -{ - auto current_value = value->get_value(); - auto min_value = value->get_min_value(); - auto max_value = value->get_max_value(); - - auto current_wid = current_value - min_value; - - if(ImGui::Button(wids[current_wid].c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) { - current_value += 1U; - } - - if(current_value > max_value) { - value->set_value(min_value); - } - else { - value->set_value(current_value); - } - - layout_label(); - layout_tooltip(); -} - -void SettingValue_StepperUnsigned::refresh_wids(void) -{ - for(std::size_t i = 0; i < wids.size(); ++i) { - auto key = std::format("settings.value.{}.{}", name, i); - wids[i] = std::format("{}###{}", gui::language::resolve(key.c_str()), static_cast<const void*>(value)); - } -} - -void SettingValue_KeyBind::layout(void) const -{ - const auto is_active = ((globals::gui_keybind_ptr == value) && !globals::gui_gamepad_axis_ptr && !globals::gui_gamepad_button_ptr); - const auto& wid = is_active ? wids[0] : wids[1]; - - if(ImGui::Button(wid.c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) { - auto& io = ImGui::GetIO(); - io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableKeyboard; - globals::gui_keybind_ptr = value; - } - - layout_label(); -} - -void SettingValue_KeyBind::refresh_wids(void) -{ - wids[0] = std::format("...###{}", static_cast<const void*>(value)); - wids[1] = std::format("{}###{}", value->get(), static_cast<const void*>(value)); -} - -void SettingValue_GamepadAxis::layout(void) const -{ - const auto is_active = ((globals::gui_gamepad_axis_ptr == value) && !globals::gui_keybind_ptr && !globals::gui_gamepad_button_ptr); - const auto& wid = is_active ? wids[0] : wids[1]; - auto is_inverted = value->is_inverted(); - - if(ImGui::Button(wid.c_str(), ImVec2(ImGui::CalcItemWidth() - ImGui::GetFrameHeight() - ImGui::GetStyle().ItemSpacing.x, 0.0f))) { - auto& io = ImGui::GetIO(); - io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableKeyboard; - globals::gui_gamepad_axis_ptr = value; - } - - ImGui::SameLine(); - - if(ImGui::Checkbox(wid_checkbox.c_str(), &is_inverted)) { - value->set_inverted(is_inverted); - } - - if(ImGui::BeginItemTooltip()) { - ImGui::PushTextWrapPos(ImGui::GetFontSize() * 16.0f); - ImGui::TextUnformatted(str_gamepad_checkbox_tooltip.c_str()); - ImGui::PopTextWrapPos(); - ImGui::EndTooltip(); - } - - layout_label(); -} - -void SettingValue_GamepadAxis::refresh_wids(void) -{ - wids[0] = std::format("...###{}", static_cast<const void*>(value)); - wids[1] = std::format("{}###{}", value->get_name(), static_cast<const void*>(value)); - wid_checkbox = std::format("###CHECKBOX_{}", static_cast<const void*>(value)); -} - -void SettingValue_GamepadButton::layout(void) const -{ - const auto is_active = ((globals::gui_gamepad_button_ptr == value) && !globals::gui_keybind_ptr && !globals::gui_gamepad_axis_ptr); - const auto& wid = is_active ? wids[0] : wids[1]; - - if(ImGui::Button(wid.c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) { - auto& io = ImGui::GetIO(); - io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableKeyboard; - globals::gui_gamepad_button_ptr = value; - } - - layout_label(); -} - -void SettingValue_GamepadButton::refresh_wids(void) -{ - wids[0] = std::format("...###{}", static_cast<const void*>(value)); - wids[1] = std::format("{}###{}", value->get(), static_cast<const void*>(value)); -} - -void SettingValue_Language::layout(void) const -{ - auto current_language = gui::language::get_current(); - - if(ImGui::BeginCombo(wid.c_str(), current_language->endonym.c_str())) { - for(auto it = gui::language::cbegin(); it != gui::language::cend(); ++it) { - if(ImGui::Selectable(it->display.c_str(), it == current_language)) { - gui::language::set(it); - continue; - } - } - - ImGui::EndCombo(); - } - - layout_label(); - layout_tooltip(); -} - -static void refresh_input_wids(void) -{ - for(SettingValue* value : values_all) { - if(value->type == setting_type::KEYBIND) { - auto keybind = static_cast<SettingValue_KeyBind*>(value); - keybind->refresh_wids(); - continue; - } - - if(value->type == setting_type::GAMEPAD_AXIS) { - auto gamepad_axis = static_cast<SettingValue_GamepadAxis*>(value); - gamepad_axis->refresh_wids(); - continue; - } - - if(value->type == setting_type::GAMEPAD_BUTTON) { - auto gamepad_button = static_cast<SettingValue_GamepadButton*>(value); - gamepad_button->refresh_wids(); - } - } -} - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if((event.action == GLFW_PRESS) && (event.key != DEBUG_KEY)) { - if(globals::gui_keybind_ptr || globals::gui_gamepad_axis_ptr || globals::gui_gamepad_button_ptr) { - if(event.key == GLFW_KEY_ESCAPE) { - ImGuiIO& io = ImGui::GetIO(); - io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; - - globals::gui_keybind_ptr = nullptr; - globals::gui_gamepad_axis_ptr = nullptr; - globals::gui_gamepad_button_ptr = nullptr; - - return; - } - - ImGuiIO& io = ImGui::GetIO(); - io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; - - globals::gui_keybind_ptr->set_key(event.key); - globals::gui_keybind_ptr = nullptr; - - refresh_input_wids(); - - return; - } - - if((event.key == GLFW_KEY_ESCAPE) && (globals::gui_screen == GUI_SETTINGS)) { - globals::gui_screen = GUI_MAIN_MENU; - return; - } - } -} - -static void on_gamepad_axis(const io::GamepadAxisEvent& event) -{ - if(globals::gui_gamepad_axis_ptr) { - auto& io = ImGui::GetIO(); - io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; - - globals::gui_gamepad_axis_ptr->set_axis(event.axis); - globals::gui_gamepad_axis_ptr = nullptr; - - refresh_input_wids(); - - return; - } -} - -static void on_gamepad_button(const io::GamepadButtonEvent& event) -{ - if(globals::gui_gamepad_button_ptr) { - auto& io = ImGui::GetIO(); - io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; - - globals::gui_gamepad_button_ptr->set_button(event.button); - globals::gui_gamepad_button_ptr = nullptr; - - refresh_input_wids(); - - return; - } -} - -static void on_language_set(const gui::LanguageSetEvent& event) -{ - str_checkbox_false = gui::language::resolve("settings.checkbox.false"); - str_checkbox_true = gui::language::resolve("settings.checkbox.true"); - - str_tab_general = gui::language::resolve("settings.tab.general"); - str_tab_input = gui::language::resolve("settings.tab.input"); - str_tab_video = gui::language::resolve("settings.tab.video"); - str_tab_sound = gui::language::resolve("settings.tab.sound"); - - str_input_keyboard = gui::language::resolve("settings.input.keyboard"); - str_input_gamepad = gui::language::resolve("settings.input.gamepad"); - str_input_mouse = gui::language::resolve("settings.input.mouse"); - - str_keyboard_movement = gui::language::resolve("settings.keyboard.movement"); - str_keyboard_gameplay = gui::language::resolve("settings.keyboard.gameplay"); - str_keyboard_misc = gui::language::resolve("settings.keyboard.misc"); - - str_gamepad_movement = gui::language::resolve("settings.gamepad.movement"); - str_gamepad_gameplay = gui::language::resolve("settings.gamepad.gameplay"); - str_gamepad_misc = gui::language::resolve("settings.gamepad.misc"); - - str_gamepad_axis_prefix = gui::language::resolve("settings.gamepad.axis"); - str_gamepad_button_prefix = gui::language::resolve("settings.gamepad.button"); - str_gamepad_checkbox_tooltip = gui::language::resolve("settings.gamepad.checkbox_tooltip"); - - str_video_gui = gui::language::resolve("settings.video.gui"); - - str_sound_levels = gui::language::resolve("settings.sound.levels"); - - for(SettingValue* value : values_all) { - if(value->type == setting_type::CHECKBOX) { - auto checkbox = static_cast<SettingValue_CheckBox*>(value); - checkbox->refresh_wids(); - } - - if(value->type == setting_type::STEPPER_INT) { - auto stepper = static_cast<SettingValue_StepperInt*>(value); - stepper->refresh_wids(); - } - - if(value->type == setting_type::STEPPER_UINT) { - auto stepper = static_cast<SettingValue_StepperUnsigned*>(value); - stepper->refresh_wids(); - } - - value->title = gui::language::resolve(std::format("settings.value.{}", value->name).c_str()); - - if(value->has_tooltip) { - value->tooltip = gui::language::resolve(std::format("settings.tooltip.{}", value->name).c_str()); - } - } -} - -static void layout_values(settings_location location) -{ - ImGui::PushItemWidth(ImGui::CalcItemWidth() * 0.70f); - - for(const SettingValue* value : values[static_cast<unsigned int>(location)]) { - value->layout(); - } - - ImGui::PopItemWidth(); -} - -static void layout_general(void) -{ - if(ImGui::BeginChild("###settings.general.child")) { - layout_values(settings_location::GENERAL); - } - - ImGui::EndChild(); -} - -static void layout_input_keyboard(void) -{ - if(ImGui::BeginChild("###settings.input.keyboard.child")) { - ImGui::SeparatorText(str_keyboard_movement.c_str()); - layout_values(settings_location::KEYBOARD_MOVEMENT); - ImGui::SeparatorText(str_keyboard_gameplay.c_str()); - layout_values(settings_location::KEYBOARD_GAMEPLAY); - ImGui::SeparatorText(str_keyboard_misc.c_str()); - layout_values(settings_location::KEYBOARD_MISC); - } - - ImGui::EndChild(); -} - -static void layout_input_gamepad(void) -{ - if(ImGui::BeginChild("###settings.input.gamepad.child")) { - layout_values(settings_location::GAMEPAD); - ImGui::SeparatorText(str_gamepad_movement.c_str()); - layout_values(settings_location::GAMEPAD_MOVEMENT); - ImGui::SeparatorText(str_gamepad_gameplay.c_str()); - layout_values(settings_location::GAMEPAD_GAMEPLAY); - ImGui::SeparatorText(str_gamepad_misc.c_str()); - layout_values(settings_location::GAMEPAD_MISC); - } - - ImGui::EndChild(); -} - -static void layout_input_mouse(void) -{ - if(ImGui::BeginChild("###settings.input.mouse.child")) { - layout_values(settings_location::MOUSE); - } - - ImGui::EndChild(); -} - -static void layout_input(void) -{ - if(ImGui::BeginTabBar("###settings.input.tabs", ImGuiTabBarFlags_FittingPolicyResizeDown)) { - if(ImGui::BeginTabItem(str_input_keyboard.c_str())) { - layout_input_keyboard(); - ImGui::EndTabItem(); - } - - if(io::gamepad::available) { - if(ImGui::BeginTabItem(str_input_gamepad.c_str())) { - globals::gui_keybind_ptr = nullptr; - layout_input_gamepad(); - ImGui::EndTabItem(); - } - } - - if(ImGui::BeginTabItem(str_input_mouse.c_str())) { - globals::gui_keybind_ptr = nullptr; - layout_input_mouse(); - ImGui::EndTabItem(); - } - - ImGui::EndTabBar(); - } -} - -static void layout_video(void) -{ - if(ImGui::BeginChild("###settings.video.child")) { - layout_values(settings_location::VIDEO); - ImGui::SeparatorText(str_video_gui.c_str()); - layout_values(settings_location::VIDEO_GUI); - } - - ImGui::EndChild(); -} - -static void layout_sound(void) -{ - if(ImGui::BeginChild("###settings.sound.child")) { - layout_values(settings_location::SOUND); - ImGui::SeparatorText(str_sound_levels.c_str()); - layout_values(settings_location::SOUND_LEVELS); - } - - ImGui::EndChild(); -} - -void settings::init(void) -{ - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); - globals::dispatcher.sink<io::GamepadAxisEvent>().connect<&on_gamepad_axis>(); - globals::dispatcher.sink<io::GamepadButtonEvent>().connect<&on_gamepad_button>(); - globals::dispatcher.sink<gui::LanguageSetEvent>().connect<&on_language_set>(); -} - -void settings::init_late(void) -{ - for(std::size_t i = 0; i < NUM_LOCATIONS; ++i) { - std::sort(values[i].begin(), values[i].end(), [](const SettingValue* a, const SettingValue* b) { - return a->priority < b->priority; - }); - } - - refresh_input_wids(); -} - -void settings::shutdown(void) -{ - for(const SettingValue* value : values_all) - delete value; - for(std::size_t i = 0; i < NUM_LOCATIONS; values[i++].clear()) - ; - values_all.clear(); -} - -void settings::layout(void) -{ - const ImGuiViewport* viewport = ImGui::GetMainViewport(); - const ImVec2 window_start = ImVec2(viewport->Size.x * 0.05f, viewport->Size.y * 0.05f); - const ImVec2 window_size = ImVec2(viewport->Size.x * 0.90f, viewport->Size.y * 0.90f); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - if(ImGui::Begin("###settings", nullptr, WINDOW_FLAGS)) { - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(3.0f * globals::gui_scale, 3.0f * globals::gui_scale)); - - if(ImGui::BeginTabBar("###settings.tabs", ImGuiTabBarFlags_FittingPolicyResizeDown)) { - if(ImGui::TabItemButton("<<")) { - globals::gui_screen = GUI_MAIN_MENU; - globals::gui_keybind_ptr = nullptr; - } - - if(ImGui::BeginTabItem(str_tab_general.c_str())) { - globals::gui_keybind_ptr = nullptr; - layout_general(); - ImGui::EndTabItem(); - } - - if(ImGui::BeginTabItem(str_tab_input.c_str())) { - layout_input(); - ImGui::EndTabItem(); - } - - if(ImGui::BeginTabItem(str_tab_video.c_str())) { - globals::gui_keybind_ptr = nullptr; - layout_video(); - ImGui::EndTabItem(); - } - - if(globals::sound_ctx && globals::sound_dev) { - if(ImGui::BeginTabItem(str_tab_sound.c_str())) { - globals::gui_keybind_ptr = nullptr; - layout_sound(); - ImGui::EndTabItem(); - } - } - - ImGui::EndTabBar(); - } - - ImGui::PopStyleVar(); - } - - ImGui::End(); -} - -void settings::add_checkbox(int priority, config::Boolean& value, settings_location location, std::string_view name, bool tooltip) -{ - auto setting_value = new SettingValue_CheckBox; - setting_value->type = setting_type::CHECKBOX; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->refresh_wids(); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_input(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip) -{ - auto setting_value = new SettingValue_InputInt; - setting_value->type = setting_type::INPUT_INT; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value)); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_input( - int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip, std::string_view fmt) -{ - auto setting_value = new SettingValue_InputFloat; - setting_value->type = setting_type::INPUT_FLOAT; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->format = fmt; - setting_value->name = name; - - setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value)); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_input(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip) -{ - auto setting_value = new SettingValue_InputUnsigned; - setting_value->type = setting_type::INPUT_UINT; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value)); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_input( - int priority, config::String& value, settings_location location, std::string_view name, bool tooltip, bool allow_whitespace) -{ - auto setting_value = new SettingValue_InputString; - setting_value->type = setting_type::INPUT_STRING; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->allow_whitespace = allow_whitespace; - setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value)); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_slider(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip) -{ - auto setting_value = new SettingValue_SliderInt; - setting_value->type = setting_type::SLIDER_INT; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value)); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_slider( - int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip, std::string_view fmt) -{ - auto setting_value = new SettingValue_SliderFloat; - setting_value->type = setting_type::SLIDER_FLOAT; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->format = fmt; - setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value)); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_slider(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip) -{ - auto setting_value = new SettingValue_SliderUnsigned; - setting_value->type = setting_type::SLIDER_UINT; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value)); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_stepper(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip) -{ - auto setting_value = new SettingValue_StepperInt; - setting_value->type = setting_type::STEPPER_INT; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->wids.resize(value.get_max_value() - value.get_min_value() + 1); - setting_value->refresh_wids(); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_stepper(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip) -{ - auto setting_value = new SettingValue_StepperUnsigned; - setting_value->type = setting_type::STEPPER_UINT; - setting_value->priority = priority; - setting_value->has_tooltip = tooltip; - setting_value->value = &value; - setting_value->name = name; - - setting_value->wids.resize(value.get_max_value() - value.get_min_value() + 1); - setting_value->refresh_wids(); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_keybind(int priority, config::KeyBind& value, settings_location location, std::string_view name) -{ - auto setting_value = new SettingValue_KeyBind; - setting_value->type = setting_type::KEYBIND; - setting_value->priority = priority; - setting_value->has_tooltip = false; - setting_value->value = &value; - setting_value->name = name; - - setting_value->refresh_wids(); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_gamepad_axis(int priority, config::GamepadAxis& value, settings_location location, std::string_view name) -{ - auto setting_value = new SettingValue_GamepadAxis; - setting_value->type = setting_type::GAMEPAD_AXIS; - setting_value->priority = priority; - setting_value->has_tooltip = false; - setting_value->value = &value; - setting_value->name = name; - - setting_value->refresh_wids(); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_gamepad_button(int priority, config::GamepadButton& value, settings_location location, std::string_view name) -{ - auto setting_value = new SettingValue_GamepadButton; - setting_value->type = setting_type::GAMEPAD_BUTTON; - setting_value->priority = priority; - setting_value->has_tooltip = false; - setting_value->value = &value; - setting_value->name = name; - - setting_value->refresh_wids(); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} - -void settings::add_language_select(int priority, settings_location location, std::string_view name) -{ - auto setting_value = new SettingValue_Language; - setting_value->type = setting_type::LANGUAGE_SELECT; - setting_value->priority = priority; - setting_value->has_tooltip = false; - setting_value->name = name; - - setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value)); - - values[static_cast<unsigned int>(location)].push_back(setting_value); - values_all.push_back(setting_value); -} +#include "client/pch.hh"
+
+#include "client/gui/settings.hh"
+
+#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"
+
+#include "client/const.hh"
+#include "client/globals.hh"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration;
+constexpr static unsigned int NUM_LOCATIONS = static_cast<unsigned int>(settings_location::COUNT);
+
+enum class setting_type : unsigned int {
+ CHECKBOX = 0x0000U, ///< config::Boolean
+ INPUT_INT = 0x0001U, ///< config::Number<int>
+ INPUT_FLOAT = 0x0002U, ///< config::Number<float>
+ INPUT_UINT = 0x0003U, ///< config::Number<unsigned int>
+ INPUT_STRING = 0x0004U, ///< config::String
+ SLIDER_INT = 0x0005U, ///< config::Number<int>
+ SLIDER_FLOAT = 0x0006U, ///< config::Number<float>
+ SLIDER_UINT = 0x0007U, ///< config::Number<unsigned int>
+ STEPPER_INT = 0x0008U, ///< config::Number<int>
+ STEPPER_UINT = 0x0009U, ///< config::Number<unsigned int>
+ KEYBIND = 0x000AU, ///< config::KeyBind
+ GAMEPAD_AXIS = 0x000BU, ///< config::GamepadAxis
+ GAMEPAD_BUTTON = 0x000CU, ///< config::GamepadButton
+ LANGUAGE_SELECT = 0x000DU, ///< config::String internally
+};
+
+class SettingValue {
+public:
+ virtual ~SettingValue(void) = default;
+ virtual void layout(void) const = 0;
+ void layout_tooltip(void) const;
+ void layout_label(void) const;
+
+public:
+ setting_type type;
+ std::string tooltip;
+ std::string title;
+ std::string name;
+ bool has_tooltip;
+ int priority;
+};
+
+class SettingValueWID : public SettingValue {
+public:
+ virtual ~SettingValueWID(void) = default;
+
+public:
+ std::string wid;
+};
+
+class SettingValue_CheckBox final : public SettingValue {
+public:
+ virtual ~SettingValue_CheckBox(void) = default;
+ virtual void layout(void) const override;
+ void refresh_wids(void);
+
+public:
+ config::Boolean* value;
+ std::string wids[2];
+};
+
+class SettingValue_InputInt final : public SettingValueWID {
+public:
+ virtual ~SettingValue_InputInt(void) = default;
+ virtual void layout(void) const override;
+
+public:
+ config::Int* value;
+};
+
+class SettingValue_InputFloat final : public SettingValueWID {
+public:
+ virtual ~SettingValue_InputFloat(void) = default;
+ virtual void layout(void) const override;
+
+public:
+ std::string format;
+ config::Float* value;
+};
+
+class SettingValue_InputUnsigned final : public SettingValueWID {
+public:
+ virtual ~SettingValue_InputUnsigned(void) = default;
+ virtual void layout(void) const override;
+
+public:
+ config::Unsigned* value;
+};
+
+class SettingValue_InputString final : public SettingValueWID {
+public:
+ virtual ~SettingValue_InputString(void) = default;
+ virtual void layout(void) const override;
+
+public:
+ config::String* value;
+ bool allow_whitespace;
+};
+
+class SettingValue_SliderInt final : public SettingValueWID {
+public:
+ virtual ~SettingValue_SliderInt(void) = default;
+ virtual void layout(void) const override;
+
+public:
+ config::Int* value;
+};
+
+class SettingValue_SliderFloat final : public SettingValueWID {
+public:
+ virtual ~SettingValue_SliderFloat(void) = default;
+ virtual void layout(void) const override;
+
+public:
+ std::string format;
+ config::Float* value;
+};
+
+class SettingValue_SliderUnsigned final : public SettingValueWID {
+public:
+ virtual ~SettingValue_SliderUnsigned(void) = default;
+ virtual void layout(void) const override;
+
+public:
+ config::Unsigned* value;
+};
+
+class SettingValue_StepperInt final : public SettingValue {
+public:
+ virtual ~SettingValue_StepperInt(void) = default;
+ virtual void layout(void) const override;
+ void refresh_wids(void);
+
+public:
+ std::vector<std::string> wids;
+ config::Int* value;
+};
+
+class SettingValue_StepperUnsigned final : public SettingValue {
+public:
+ virtual ~SettingValue_StepperUnsigned(void) = default;
+ virtual void layout(void) const override;
+ void refresh_wids(void);
+
+public:
+ std::vector<std::string> wids;
+ config::Unsigned* value;
+};
+
+class SettingValue_KeyBind final : public SettingValue {
+public:
+ virtual ~SettingValue_KeyBind(void) = default;
+ virtual void layout(void) const override;
+ void refresh_wids(void);
+
+public:
+ std::string wids[2];
+ config::KeyBind* value;
+};
+
+class SettingValue_GamepadAxis final : public SettingValue {
+public:
+ virtual ~SettingValue_GamepadAxis(void) = default;
+ virtual void layout(void) const override;
+ void refresh_wids(void);
+
+public:
+ std::string wids[2];
+ std::string wid_checkbox;
+ config::GamepadAxis* value;
+};
+
+class SettingValue_GamepadButton final : public SettingValue {
+public:
+ virtual ~SettingValue_GamepadButton(void) = default;
+ virtual void layout(void) const override;
+ void refresh_wids(void);
+
+public:
+ std::string wids[2];
+ config::GamepadButton* value;
+};
+
+class SettingValue_Language final : public SettingValueWID {
+public:
+ virtual ~SettingValue_Language(void) = default;
+ virtual void layout(void) const override;
+};
+
+static std::string str_checkbox_false;
+static std::string str_checkbox_true;
+
+static std::string str_tab_general;
+static std::string str_tab_input;
+static std::string str_tab_video;
+static std::string str_tab_sound;
+
+static std::string str_input_keyboard;
+static std::string str_input_gamepad;
+static std::string str_input_mouse;
+
+static std::string str_keyboard_movement;
+static std::string str_keyboard_gameplay;
+static std::string str_keyboard_misc;
+
+static std::string str_gamepad_movement;
+static std::string str_gamepad_gameplay;
+static std::string str_gamepad_misc;
+
+static std::string str_gamepad_axis_prefix;
+static std::string str_gamepad_button_prefix;
+static std::string str_gamepad_checkbox_tooltip;
+
+static std::string str_video_gui;
+
+static std::string str_sound_levels;
+
+static std::vector<SettingValue*> values_all;
+static std::vector<SettingValue*> values[NUM_LOCATIONS];
+
+void SettingValue::layout_tooltip(void) const
+{
+ if(has_tooltip) {
+ ImGui::SameLine();
+ ImGui::TextDisabled("[?]");
+
+ if(ImGui::BeginItemTooltip()) {
+ ImGui::PushTextWrapPos(ImGui::GetFontSize() * 16.0f);
+ ImGui::TextUnformatted(tooltip.c_str());
+ ImGui::PopTextWrapPos();
+ ImGui::EndTooltip();
+ }
+ }
+}
+
+void SettingValue::layout_label(void) const
+{
+ ImGui::SameLine();
+ ImGui::TextUnformatted(title.c_str());
+}
+
+void SettingValue_CheckBox::refresh_wids(void)
+{
+ wids[0] = std::format("{}###{}", str_checkbox_false, static_cast<void*>(value));
+ wids[1] = std::format("{}###{}", str_checkbox_true, static_cast<void*>(value));
+}
+
+void SettingValue_CheckBox::layout(void) const
+{
+ const auto& wid = value->get_value() ? wids[1] : wids[0];
+
+ if(ImGui::Button(wid.c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) {
+ value->set_value(!value->get_value());
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_InputInt::layout(void) const
+{
+ auto current_value = value->get_value();
+
+ if(ImGui::InputInt(wid.c_str(), ¤t_value)) {
+ value->set_value(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_InputFloat::layout(void) const
+{
+ auto current_value = value->get_value();
+
+ if(ImGui::InputFloat(wid.c_str(), ¤t_value, 0.0f, 0.0f, format.c_str())) {
+ value->set_value(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_InputUnsigned::layout(void) const
+{
+ auto current_value = static_cast<std::uint32_t>(value->get_value());
+
+ if(ImGui::InputScalar(wid.c_str(), ImGuiDataType_U32, ¤t_value)) {
+ value->set_value(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_InputString::layout(void) const
+{
+ ImGuiInputTextFlags flags;
+ std::string current_value(value->get_value());
+
+ if(allow_whitespace) {
+ flags = ImGuiInputTextFlags_AllowTabInput;
+ }
+ else {
+ flags = 0;
+ }
+
+ if(ImGui::InputText(wid.c_str(), ¤t_value, flags)) {
+ value->set(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_SliderInt::layout(void) const
+{
+ auto current_value = value->get_value();
+
+ if(ImGui::SliderInt(wid.c_str(), ¤t_value, value->get_min_value(), value->get_max_value())) {
+ value->set_value(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_SliderFloat::layout(void) const
+{
+ auto current_value = value->get_value();
+
+ if(ImGui::SliderFloat(wid.c_str(), ¤t_value, value->get_min_value(), value->get_max_value(), format.c_str())) {
+ value->set_value(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_SliderUnsigned::layout(void) const
+{
+ auto current_value = static_cast<std::uint32_t>(value->get_value());
+ auto min_value = static_cast<std::uint32_t>(value->get_min_value());
+ auto max_value = static_cast<std::uint32_t>(value->get_max_value());
+
+ if(ImGui::SliderScalar(wid.c_str(), ImGuiDataType_U32, ¤t_value, &min_value, &max_value)) {
+ value->set_value(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_StepperInt::layout(void) const
+{
+ auto current_value = value->get_value();
+ auto min_value = value->get_min_value();
+ auto max_value = value->get_max_value();
+
+ auto current_wid = current_value - min_value;
+
+ if(ImGui::Button(wids[current_wid].c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) {
+ current_value += 1;
+ }
+
+ if(current_value > max_value) {
+ value->set_value(min_value);
+ }
+ else {
+ value->set_value(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_StepperInt::refresh_wids(void)
+{
+ for(std::size_t i = 0; i < wids.size(); ++i) {
+ auto key = std::format("settings.value.{}.{}", name, i);
+ wids[i] = std::format("{}###{}", gui::language::resolve(key.c_str()), static_cast<const void*>(value));
+ }
+}
+
+void SettingValue_StepperUnsigned::layout(void) const
+{
+ auto current_value = value->get_value();
+ auto min_value = value->get_min_value();
+ auto max_value = value->get_max_value();
+
+ auto current_wid = current_value - min_value;
+
+ if(ImGui::Button(wids[current_wid].c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) {
+ current_value += 1U;
+ }
+
+ if(current_value > max_value) {
+ value->set_value(min_value);
+ }
+ else {
+ value->set_value(current_value);
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+void SettingValue_StepperUnsigned::refresh_wids(void)
+{
+ for(std::size_t i = 0; i < wids.size(); ++i) {
+ auto key = std::format("settings.value.{}.{}", name, i);
+ wids[i] = std::format("{}###{}", gui::language::resolve(key.c_str()), static_cast<const void*>(value));
+ }
+}
+
+void SettingValue_KeyBind::layout(void) const
+{
+ const auto is_active = ((globals::gui_keybind_ptr == value) && !globals::gui_gamepad_axis_ptr && !globals::gui_gamepad_button_ptr);
+ const auto& wid = is_active ? wids[0] : wids[1];
+
+ if(ImGui::Button(wid.c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) {
+ auto& io = ImGui::GetIO();
+ io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableKeyboard;
+ globals::gui_keybind_ptr = value;
+ }
+
+ layout_label();
+}
+
+void SettingValue_KeyBind::refresh_wids(void)
+{
+ wids[0] = std::format("...###{}", static_cast<const void*>(value));
+ wids[1] = std::format("{}###{}", value->get(), static_cast<const void*>(value));
+}
+
+void SettingValue_GamepadAxis::layout(void) const
+{
+ const auto is_active = ((globals::gui_gamepad_axis_ptr == value) && !globals::gui_keybind_ptr && !globals::gui_gamepad_button_ptr);
+ const auto& wid = is_active ? wids[0] : wids[1];
+ auto is_inverted = value->is_inverted();
+
+ if(ImGui::Button(wid.c_str(), ImVec2(ImGui::CalcItemWidth() - ImGui::GetFrameHeight() - ImGui::GetStyle().ItemSpacing.x, 0.0f))) {
+ auto& io = ImGui::GetIO();
+ io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableKeyboard;
+ globals::gui_gamepad_axis_ptr = value;
+ }
+
+ ImGui::SameLine();
+
+ if(ImGui::Checkbox(wid_checkbox.c_str(), &is_inverted)) {
+ value->set_inverted(is_inverted);
+ }
+
+ if(ImGui::BeginItemTooltip()) {
+ ImGui::PushTextWrapPos(ImGui::GetFontSize() * 16.0f);
+ ImGui::TextUnformatted(str_gamepad_checkbox_tooltip.c_str());
+ ImGui::PopTextWrapPos();
+ ImGui::EndTooltip();
+ }
+
+ layout_label();
+}
+
+void SettingValue_GamepadAxis::refresh_wids(void)
+{
+ wids[0] = std::format("...###{}", static_cast<const void*>(value));
+ wids[1] = std::format("{}###{}", value->get_name(), static_cast<const void*>(value));
+ wid_checkbox = std::format("###CHECKBOX_{}", static_cast<const void*>(value));
+}
+
+void SettingValue_GamepadButton::layout(void) const
+{
+ const auto is_active = ((globals::gui_gamepad_button_ptr == value) && !globals::gui_keybind_ptr && !globals::gui_gamepad_axis_ptr);
+ const auto& wid = is_active ? wids[0] : wids[1];
+
+ if(ImGui::Button(wid.c_str(), ImVec2(ImGui::CalcItemWidth(), 0.0f))) {
+ auto& io = ImGui::GetIO();
+ io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableKeyboard;
+ globals::gui_gamepad_button_ptr = value;
+ }
+
+ layout_label();
+}
+
+void SettingValue_GamepadButton::refresh_wids(void)
+{
+ wids[0] = std::format("...###{}", static_cast<const void*>(value));
+ wids[1] = std::format("{}###{}", value->get(), static_cast<const void*>(value));
+}
+
+void SettingValue_Language::layout(void) const
+{
+ auto current_language = gui::language::get_current();
+
+ if(ImGui::BeginCombo(wid.c_str(), current_language->endonym.c_str())) {
+ for(auto it = gui::language::cbegin(); it != gui::language::cend(); ++it) {
+ if(ImGui::Selectable(it->display.c_str(), it == current_language)) {
+ gui::language::set(it);
+ continue;
+ }
+ }
+
+ ImGui::EndCombo();
+ }
+
+ layout_label();
+ layout_tooltip();
+}
+
+static void refresh_input_wids(void)
+{
+ for(SettingValue* value : values_all) {
+ if(value->type == setting_type::KEYBIND) {
+ auto keybind = static_cast<SettingValue_KeyBind*>(value);
+ keybind->refresh_wids();
+ continue;
+ }
+
+ if(value->type == setting_type::GAMEPAD_AXIS) {
+ auto gamepad_axis = static_cast<SettingValue_GamepadAxis*>(value);
+ gamepad_axis->refresh_wids();
+ continue;
+ }
+
+ if(value->type == setting_type::GAMEPAD_BUTTON) {
+ auto gamepad_button = static_cast<SettingValue_GamepadButton*>(value);
+ gamepad_button->refresh_wids();
+ }
+ }
+}
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if((event.action == GLFW_PRESS) && (event.key != DEBUG_KEY)) {
+ if(globals::gui_keybind_ptr || globals::gui_gamepad_axis_ptr || globals::gui_gamepad_button_ptr) {
+ if(event.key == GLFW_KEY_ESCAPE) {
+ ImGuiIO& io = ImGui::GetIO();
+ io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+
+ globals::gui_keybind_ptr = nullptr;
+ globals::gui_gamepad_axis_ptr = nullptr;
+ globals::gui_gamepad_button_ptr = nullptr;
+
+ return;
+ }
+
+ ImGuiIO& io = ImGui::GetIO();
+ io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+
+ globals::gui_keybind_ptr->set_key(event.key);
+ globals::gui_keybind_ptr = nullptr;
+
+ refresh_input_wids();
+
+ return;
+ }
+
+ if((event.key == GLFW_KEY_ESCAPE) && (globals::gui_screen == GUI_SETTINGS)) {
+ globals::gui_screen = GUI_MAIN_MENU;
+ return;
+ }
+ }
+}
+
+static void on_gamepad_axis(const io::GamepadAxisEvent& event)
+{
+ if(globals::gui_gamepad_axis_ptr) {
+ auto& io = ImGui::GetIO();
+ io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+
+ globals::gui_gamepad_axis_ptr->set_axis(event.axis);
+ globals::gui_gamepad_axis_ptr = nullptr;
+
+ refresh_input_wids();
+
+ return;
+ }
+}
+
+static void on_gamepad_button(const io::GamepadButtonEvent& event)
+{
+ if(globals::gui_gamepad_button_ptr) {
+ auto& io = ImGui::GetIO();
+ io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+
+ globals::gui_gamepad_button_ptr->set_button(event.button);
+ globals::gui_gamepad_button_ptr = nullptr;
+
+ refresh_input_wids();
+
+ return;
+ }
+}
+
+static void on_language_set(const gui::LanguageSetEvent& event)
+{
+ str_checkbox_false = gui::language::resolve("settings.checkbox.false");
+ str_checkbox_true = gui::language::resolve("settings.checkbox.true");
+
+ str_tab_general = gui::language::resolve("settings.tab.general");
+ str_tab_input = gui::language::resolve("settings.tab.input");
+ str_tab_video = gui::language::resolve("settings.tab.video");
+ str_tab_sound = gui::language::resolve("settings.tab.sound");
+
+ str_input_keyboard = gui::language::resolve("settings.input.keyboard");
+ str_input_gamepad = gui::language::resolve("settings.input.gamepad");
+ str_input_mouse = gui::language::resolve("settings.input.mouse");
+
+ str_keyboard_movement = gui::language::resolve("settings.keyboard.movement");
+ str_keyboard_gameplay = gui::language::resolve("settings.keyboard.gameplay");
+ str_keyboard_misc = gui::language::resolve("settings.keyboard.misc");
+
+ str_gamepad_movement = gui::language::resolve("settings.gamepad.movement");
+ str_gamepad_gameplay = gui::language::resolve("settings.gamepad.gameplay");
+ str_gamepad_misc = gui::language::resolve("settings.gamepad.misc");
+
+ str_gamepad_axis_prefix = gui::language::resolve("settings.gamepad.axis");
+ str_gamepad_button_prefix = gui::language::resolve("settings.gamepad.button");
+ str_gamepad_checkbox_tooltip = gui::language::resolve("settings.gamepad.checkbox_tooltip");
+
+ str_video_gui = gui::language::resolve("settings.video.gui");
+
+ str_sound_levels = gui::language::resolve("settings.sound.levels");
+
+ for(SettingValue* value : values_all) {
+ if(value->type == setting_type::CHECKBOX) {
+ auto checkbox = static_cast<SettingValue_CheckBox*>(value);
+ checkbox->refresh_wids();
+ }
+
+ if(value->type == setting_type::STEPPER_INT) {
+ auto stepper = static_cast<SettingValue_StepperInt*>(value);
+ stepper->refresh_wids();
+ }
+
+ if(value->type == setting_type::STEPPER_UINT) {
+ auto stepper = static_cast<SettingValue_StepperUnsigned*>(value);
+ stepper->refresh_wids();
+ }
+
+ value->title = gui::language::resolve(std::format("settings.value.{}", value->name).c_str());
+
+ if(value->has_tooltip) {
+ value->tooltip = gui::language::resolve(std::format("settings.tooltip.{}", value->name).c_str());
+ }
+ }
+}
+
+static void layout_values(settings_location location)
+{
+ ImGui::PushItemWidth(ImGui::CalcItemWidth() * 0.70f);
+
+ for(const SettingValue* value : values[static_cast<unsigned int>(location)]) {
+ value->layout();
+ }
+
+ ImGui::PopItemWidth();
+}
+
+static void layout_general(void)
+{
+ if(ImGui::BeginChild("###settings.general.child")) {
+ layout_values(settings_location::GENERAL);
+ }
+
+ ImGui::EndChild();
+}
+
+static void layout_input_keyboard(void)
+{
+ if(ImGui::BeginChild("###settings.input.keyboard.child")) {
+ ImGui::SeparatorText(str_keyboard_movement.c_str());
+ layout_values(settings_location::KEYBOARD_MOVEMENT);
+ ImGui::SeparatorText(str_keyboard_gameplay.c_str());
+ layout_values(settings_location::KEYBOARD_GAMEPLAY);
+ ImGui::SeparatorText(str_keyboard_misc.c_str());
+ layout_values(settings_location::KEYBOARD_MISC);
+ }
+
+ ImGui::EndChild();
+}
+
+static void layout_input_gamepad(void)
+{
+ if(ImGui::BeginChild("###settings.input.gamepad.child")) {
+ layout_values(settings_location::GAMEPAD);
+ ImGui::SeparatorText(str_gamepad_movement.c_str());
+ layout_values(settings_location::GAMEPAD_MOVEMENT);
+ ImGui::SeparatorText(str_gamepad_gameplay.c_str());
+ layout_values(settings_location::GAMEPAD_GAMEPLAY);
+ ImGui::SeparatorText(str_gamepad_misc.c_str());
+ layout_values(settings_location::GAMEPAD_MISC);
+ }
+
+ ImGui::EndChild();
+}
+
+static void layout_input_mouse(void)
+{
+ if(ImGui::BeginChild("###settings.input.mouse.child")) {
+ layout_values(settings_location::MOUSE);
+ }
+
+ ImGui::EndChild();
+}
+
+static void layout_input(void)
+{
+ if(ImGui::BeginTabBar("###settings.input.tabs", ImGuiTabBarFlags_FittingPolicyResizeDown)) {
+ if(ImGui::BeginTabItem(str_input_keyboard.c_str())) {
+ layout_input_keyboard();
+ ImGui::EndTabItem();
+ }
+
+ if(io::gamepad::available) {
+ if(ImGui::BeginTabItem(str_input_gamepad.c_str())) {
+ globals::gui_keybind_ptr = nullptr;
+ layout_input_gamepad();
+ ImGui::EndTabItem();
+ }
+ }
+
+ if(ImGui::BeginTabItem(str_input_mouse.c_str())) {
+ globals::gui_keybind_ptr = nullptr;
+ layout_input_mouse();
+ ImGui::EndTabItem();
+ }
+
+ ImGui::EndTabBar();
+ }
+}
+
+static void layout_video(void)
+{
+ if(ImGui::BeginChild("###settings.video.child")) {
+ layout_values(settings_location::VIDEO);
+ ImGui::SeparatorText(str_video_gui.c_str());
+ layout_values(settings_location::VIDEO_GUI);
+ }
+
+ ImGui::EndChild();
+}
+
+static void layout_sound(void)
+{
+ if(ImGui::BeginChild("###settings.sound.child")) {
+ layout_values(settings_location::SOUND);
+ ImGui::SeparatorText(str_sound_levels.c_str());
+ layout_values(settings_location::SOUND_LEVELS);
+ }
+
+ ImGui::EndChild();
+}
+
+void settings::init(void)
+{
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+ globals::dispatcher.sink<io::GamepadAxisEvent>().connect<&on_gamepad_axis>();
+ globals::dispatcher.sink<io::GamepadButtonEvent>().connect<&on_gamepad_button>();
+ globals::dispatcher.sink<gui::LanguageSetEvent>().connect<&on_language_set>();
+}
+
+void settings::init_late(void)
+{
+ for(std::size_t i = 0; i < NUM_LOCATIONS; ++i) {
+ std::sort(values[i].begin(), values[i].end(), [](const SettingValue* a, const SettingValue* b) {
+ return a->priority < b->priority;
+ });
+ }
+
+ refresh_input_wids();
+}
+
+void settings::shutdown(void)
+{
+ for(const SettingValue* value : values_all)
+ delete value;
+ for(std::size_t i = 0; i < NUM_LOCATIONS; values[i++].clear())
+ ;
+ values_all.clear();
+}
+
+void settings::layout(void)
+{
+ const ImGuiViewport* viewport = ImGui::GetMainViewport();
+ const ImVec2 window_start = ImVec2(viewport->Size.x * 0.05f, viewport->Size.y * 0.05f);
+ const ImVec2 window_size = ImVec2(viewport->Size.x * 0.90f, viewport->Size.y * 0.90f);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ if(ImGui::Begin("###settings", nullptr, WINDOW_FLAGS)) {
+ ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(3.0f * globals::gui_scale, 3.0f * globals::gui_scale));
+
+ if(ImGui::BeginTabBar("###settings.tabs", ImGuiTabBarFlags_FittingPolicyResizeDown)) {
+ if(ImGui::TabItemButton("<<")) {
+ globals::gui_screen = GUI_MAIN_MENU;
+ globals::gui_keybind_ptr = nullptr;
+ }
+
+ if(ImGui::BeginTabItem(str_tab_general.c_str())) {
+ globals::gui_keybind_ptr = nullptr;
+ layout_general();
+ ImGui::EndTabItem();
+ }
+
+ if(ImGui::BeginTabItem(str_tab_input.c_str())) {
+ layout_input();
+ ImGui::EndTabItem();
+ }
+
+ if(ImGui::BeginTabItem(str_tab_video.c_str())) {
+ globals::gui_keybind_ptr = nullptr;
+ layout_video();
+ ImGui::EndTabItem();
+ }
+
+ if(globals::sound_ctx && globals::sound_dev) {
+ if(ImGui::BeginTabItem(str_tab_sound.c_str())) {
+ globals::gui_keybind_ptr = nullptr;
+ layout_sound();
+ ImGui::EndTabItem();
+ }
+ }
+
+ ImGui::EndTabBar();
+ }
+
+ ImGui::PopStyleVar();
+ }
+
+ ImGui::End();
+}
+
+void settings::add_checkbox(int priority, config::Boolean& value, settings_location location, std::string_view name, bool tooltip)
+{
+ auto setting_value = new SettingValue_CheckBox;
+ setting_value->type = setting_type::CHECKBOX;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->refresh_wids();
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_input(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip)
+{
+ auto setting_value = new SettingValue_InputInt;
+ setting_value->type = setting_type::INPUT_INT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value));
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_input(int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip,
+ std::string_view fmt)
+{
+ auto setting_value = new SettingValue_InputFloat;
+ setting_value->type = setting_type::INPUT_FLOAT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->format = fmt;
+ setting_value->name = name;
+
+ setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value));
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_input(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip)
+{
+ auto setting_value = new SettingValue_InputUnsigned;
+ setting_value->type = setting_type::INPUT_UINT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value));
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_input(int priority, config::String& value, settings_location location, std::string_view name, bool tooltip,
+ bool allow_whitespace)
+{
+ auto setting_value = new SettingValue_InputString;
+ setting_value->type = setting_type::INPUT_STRING;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->allow_whitespace = allow_whitespace;
+ setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value));
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_slider(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip)
+{
+ auto setting_value = new SettingValue_SliderInt;
+ setting_value->type = setting_type::SLIDER_INT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value));
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_slider(int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip,
+ std::string_view fmt)
+{
+ auto setting_value = new SettingValue_SliderFloat;
+ setting_value->type = setting_type::SLIDER_FLOAT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->format = fmt;
+ setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value));
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_slider(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip)
+{
+ auto setting_value = new SettingValue_SliderUnsigned;
+ setting_value->type = setting_type::SLIDER_UINT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value->value));
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_stepper(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip)
+{
+ auto setting_value = new SettingValue_StepperInt;
+ setting_value->type = setting_type::STEPPER_INT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->wids.resize(value.get_max_value() - value.get_min_value() + 1);
+ setting_value->refresh_wids();
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_stepper(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip)
+{
+ auto setting_value = new SettingValue_StepperUnsigned;
+ setting_value->type = setting_type::STEPPER_UINT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = tooltip;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->wids.resize(value.get_max_value() - value.get_min_value() + 1);
+ setting_value->refresh_wids();
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_keybind(int priority, config::KeyBind& value, settings_location location, std::string_view name)
+{
+ auto setting_value = new SettingValue_KeyBind;
+ setting_value->type = setting_type::KEYBIND;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = false;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->refresh_wids();
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_gamepad_axis(int priority, config::GamepadAxis& value, settings_location location, std::string_view name)
+{
+ auto setting_value = new SettingValue_GamepadAxis;
+ setting_value->type = setting_type::GAMEPAD_AXIS;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = false;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->refresh_wids();
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_gamepad_button(int priority, config::GamepadButton& value, settings_location location, std::string_view name)
+{
+ auto setting_value = new SettingValue_GamepadButton;
+ setting_value->type = setting_type::GAMEPAD_BUTTON;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = false;
+ setting_value->value = &value;
+ setting_value->name = name;
+
+ setting_value->refresh_wids();
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
+
+void settings::add_language_select(int priority, settings_location location, std::string_view name)
+{
+ auto setting_value = new SettingValue_Language;
+ setting_value->type = setting_type::LANGUAGE_SELECT;
+ setting_value->priority = priority;
+ setting_value->has_tooltip = false;
+ setting_value->name = name;
+
+ setting_value->wid = std::format("###{}", static_cast<const void*>(setting_value));
+
+ values[static_cast<unsigned int>(location)].push_back(setting_value);
+ values_all.push_back(setting_value);
+}
diff --git a/game/client/gui/settings.hh b/game/client/gui/settings.hh index efb8ca4..472a61d 100644 --- a/game/client/gui/settings.hh +++ b/game/client/gui/settings.hh @@ -1,90 +1,90 @@ -#pragma once - -namespace config -{ -class Boolean; -class String; -} // namespace config - -namespace config -{ -class Int; -class Float; -class Unsigned; -} // namespace config - -namespace config -{ -class KeyBind; -class GamepadAxis; -class GamepadButton; -} // namespace config - -enum class settings_location : unsigned int { - GENERAL = 0x0000U, - KEYBOARD_MOVEMENT = 0x0001U, - KEYBOARD_GAMEPLAY = 0x0002U, - KEYBOARD_MISC = 0x0003U, - GAMEPAD = 0x0004U, - GAMEPAD_MOVEMENT = 0x0005U, - GAMEPAD_GAMEPLAY = 0x0006U, - GAMEPAD_MISC = 0x0007U, - MOUSE = 0x0008U, - VIDEO = 0x0009U, - VIDEO_GUI = 0x000AU, - SOUND = 0x000BU, - SOUND_LEVELS = 0x000CU, - COUNT = 0x000DU, -}; - -namespace settings -{ -void init(void); -void init_late(void); -void shutdown(void); -void layout(void); -} // namespace settings - -namespace settings -{ -void add_checkbox(int priority, config::Boolean& value, settings_location location, std::string_view name, bool tooltip); -} // namespace settings - -namespace settings -{ -void add_input(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip); -void add_input(int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip, - std::string_view fmt = "%.3f"); -void add_input(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip); -void add_input(int priority, config::String& value, settings_location location, std::string_view name, bool tooltip, bool allow_whitespace); -} // namespace settings - -namespace settings -{ -void add_slider(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip); -void add_slider(int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip, - std::string_view format = "%.3f"); -void add_slider(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip); -} // namespace settings - -namespace settings -{ -void add_stepper(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip); -void add_stepper(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip); -} // namespace settings - -namespace settings -{ -void add_keybind(int priority, config::KeyBind& value, settings_location location, std::string_view name); -} // namespace settings - -namespace settings -{ -void add_gamepad_axis(int priority, config::GamepadAxis& value, settings_location location, std::string_view name); -void add_gamepad_button(int priority, config::GamepadButton& value, settings_location location, std::string_view name); -} // namespace settings - -namespace settings -{ -void add_language_select(int priority, settings_location location, std::string_view name); -} // namespace settings +#pragma once
+
+namespace config
+{
+class Boolean;
+class String;
+} // namespace config
+
+namespace config
+{
+class Int;
+class Float;
+class Unsigned;
+} // namespace config
+
+namespace config
+{
+class KeyBind;
+class GamepadAxis;
+class GamepadButton;
+} // namespace config
+
+enum class settings_location : unsigned int {
+ GENERAL = 0x0000U,
+ KEYBOARD_MOVEMENT = 0x0001U,
+ KEYBOARD_GAMEPLAY = 0x0002U,
+ KEYBOARD_MISC = 0x0003U,
+ GAMEPAD = 0x0004U,
+ GAMEPAD_MOVEMENT = 0x0005U,
+ GAMEPAD_GAMEPLAY = 0x0006U,
+ GAMEPAD_MISC = 0x0007U,
+ MOUSE = 0x0008U,
+ VIDEO = 0x0009U,
+ VIDEO_GUI = 0x000AU,
+ SOUND = 0x000BU,
+ SOUND_LEVELS = 0x000CU,
+ COUNT = 0x000DU,
+};
+
+namespace settings
+{
+void init(void);
+void init_late(void);
+void shutdown(void);
+void layout(void);
+} // namespace settings
+
+namespace settings
+{
+void add_checkbox(int priority, config::Boolean& value, settings_location location, std::string_view name, bool tooltip);
+} // namespace settings
+
+namespace settings
+{
+void add_input(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip);
+void add_input(int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip,
+ std::string_view fmt = "%.3f");
+void add_input(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip);
+void add_input(int priority, config::String& value, settings_location location, std::string_view name, bool tooltip, bool allow_whitespace);
+} // namespace settings
+
+namespace settings
+{
+void add_slider(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip);
+void add_slider(int priority, config::Float& value, settings_location location, std::string_view name, bool tooltip,
+ std::string_view format = "%.3f");
+void add_slider(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip);
+} // namespace settings
+
+namespace settings
+{
+void add_stepper(int priority, config::Int& value, settings_location location, std::string_view name, bool tooltip);
+void add_stepper(int priority, config::Unsigned& value, settings_location location, std::string_view name, bool tooltip);
+} // namespace settings
+
+namespace settings
+{
+void add_keybind(int priority, config::KeyBind& value, settings_location location, std::string_view name);
+} // namespace settings
+
+namespace settings
+{
+void add_gamepad_axis(int priority, config::GamepadAxis& value, settings_location location, std::string_view name);
+void add_gamepad_button(int priority, config::GamepadButton& value, settings_location location, std::string_view name);
+} // namespace settings
+
+namespace settings
+{
+void add_language_select(int priority, settings_location location, std::string_view name);
+} // namespace settings
diff --git a/game/client/gui/splash.cc b/game/client/gui/splash.cc index 440df49..9990103 100644 --- a/game/client/gui/splash.cc +++ b/game/client/gui/splash.cc @@ -1,178 +1,178 @@ -#include "client/pch.hh" - -#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" - -constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration; - -constexpr static int SPLASH_COUNT = 4; -constexpr static std::size_t DELAY_MICROSECONDS = 2000000; -constexpr static std::string_view SPLASH_PATH = "textures/gui/client_splash.png"; - -static resource_ptr<TextureGUI> texture; -static float texture_aspect; -static float texture_alpha; - -static std::uint64_t end_time; -static std::string current_text; - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - end_time = UINT64_C(0); -} - -static void on_glfw_mouse_button(const io::GlfwMouseButtonEvent& event) -{ - end_time = UINT64_C(0); -} - -static void on_glfw_scroll(const io::GlfwScrollEvent& event) -{ - end_time = UINT64_C(0); -} - -void gui::client_splash::init(void) -{ - if(io::cmdline::contains("nosplash")) { - texture = nullptr; - texture_aspect = 0.0f; - texture_alpha = 0.0f; - return; - } - - std::random_device randev; - std::uniform_int_distribution<int> dist(0, SPLASH_COUNT - 1); - - texture = resource::load<TextureGUI>(SPLASH_PATH, TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T); - texture_aspect = 0.0f; - texture_alpha = 0.0f; - - if(texture) { - if(texture->size.x > texture->size.y) { - texture_aspect = static_cast<float>(texture->size.x) / static_cast<float>(texture->size.y); - } - else { - texture_aspect = static_cast<float>(texture->size.y) / static_cast<float>(texture->size.x); - } - - texture_alpha = 1.0f; - } -} - -void gui::client_splash::init_late(void) -{ - if(!texture) { - // We don't have to waste time - // rendering the missing client_splash texture - return; - } - - end_time = utils::unix_microseconds() + DELAY_MICROSECONDS; - - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); - globals::dispatcher.sink<io::GlfwMouseButtonEvent>().connect<&on_glfw_mouse_button>(); - globals::dispatcher.sink<io::GlfwScrollEvent>().connect<&on_glfw_scroll>(); - - current_text = gui::language::resolve("splash.skip_prompt"); - - while(!glfwWindowShouldClose(globals::window)) { - const std::uint64_t curtime = utils::unix_microseconds(); - const std::uint64_t remains = end_time - curtime; - - if(curtime >= end_time) { - break; - } - - texture_alpha = math::smoothstep(0.25f, 0.6f, static_cast<float>(remains) / static_cast<float>(DELAY_MICROSECONDS)); - - gui::client_splash::render(); - } - - globals::dispatcher.sink<io::GlfwKeyEvent>().disconnect<&on_glfw_key>(); - globals::dispatcher.sink<io::GlfwMouseButtonEvent>().disconnect<&on_glfw_mouse_button>(); - globals::dispatcher.sink<io::GlfwScrollEvent>().disconnect<&on_glfw_scroll>(); - - texture = nullptr; - texture_aspect = 0.0f; - texture_alpha = 0.0f; - end_time = UINT64_C(0); -} - -void gui::client_splash::render(void) -{ - if(!texture) { - // We don't have to waste time - // rendering the missing client_splash texture - return; - } - - // The client_splash is rendered outside the main - // render loop, so we have to manually begin - // and render both window and ImGui frames - ImGui_ImplOpenGL3_NewFrame(); - ImGui_ImplGlfw_NewFrame(); - ImGui::NewFrame(); - - glDisable(GL_DEPTH_TEST); - glBindFramebuffer(GL_FRAMEBUFFER, 0); - glViewport(0, 0, globals::width, globals::height); - - glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT); - - auto viewport = ImGui::GetMainViewport(); - auto window_start = ImVec2(0.0f, 0.0f); - auto window_size = ImVec2(viewport->Size.x, viewport->Size.y); - - ImGui::SetNextWindowPos(window_start); - ImGui::SetNextWindowSize(window_size); - - if(ImGui::Begin("###client_splash", nullptr, WINDOW_FLAGS)) { - const float image_width = 0.60f * viewport->Size.x; - const float image_height = image_width / texture_aspect; - const ImVec2 image_size = ImVec2(image_width, image_height); - - const float image_x = 0.5f * (viewport->Size.x - image_width); - const float image_y = 0.5f * (viewport->Size.y - image_height); - const ImVec2 image_pos = ImVec2(image_x, image_y); - - if(!current_text.empty()) { - ImGui::PushFont(globals::font_unscii8, 16.0f); - ImGui::SetCursorPos(ImVec2(16.0f, 16.0f)); - ImGui::TextDisabled("%s", current_text.c_str()); - ImGui::PopFont(); - } - - const ImVec2 uv_a = ImVec2(0.0f, 0.0f); - const ImVec2 uv_b = ImVec2(1.0f, 1.0f); - const ImVec4 tint = ImVec4(1.0f, 1.0f, 1.0f, texture_alpha); - - ImGui::SetCursorPos(image_pos); - ImGui::ImageWithBg(texture->handle, image_size, uv_a, uv_b, ImVec4(0.0f, 0.0f, 0.0f, 0.0f), tint); - } - - ImGui::End(); - - ImGui::Render(); - ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); - - glfwSwapBuffers(globals::window); - - glfwPollEvents(); -} +#include "client/pch.hh"
+
+#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"
+
+constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration;
+
+constexpr static int SPLASH_COUNT = 4;
+constexpr static std::size_t DELAY_MICROSECONDS = 2000000;
+constexpr static std::string_view SPLASH_PATH = "textures/gui/client_splash.png";
+
+static resource_ptr<TextureGUI> texture;
+static float texture_aspect;
+static float texture_alpha;
+
+static std::uint64_t end_time;
+static std::string current_text;
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ end_time = UINT64_C(0);
+}
+
+static void on_glfw_mouse_button(const io::GlfwMouseButtonEvent& event)
+{
+ end_time = UINT64_C(0);
+}
+
+static void on_glfw_scroll(const io::GlfwScrollEvent& event)
+{
+ end_time = UINT64_C(0);
+}
+
+void gui::client_splash::init(void)
+{
+ if(io::cmdline::contains("nosplash")) {
+ texture = nullptr;
+ texture_aspect = 0.0f;
+ texture_alpha = 0.0f;
+ return;
+ }
+
+ std::random_device randev;
+ std::uniform_int_distribution<int> dist(0, SPLASH_COUNT - 1);
+
+ texture = resource::load<TextureGUI>(SPLASH_PATH, TEXTURE_GUI_LOAD_CLAMP_S | TEXTURE_GUI_LOAD_CLAMP_T);
+ texture_aspect = 0.0f;
+ texture_alpha = 0.0f;
+
+ if(texture) {
+ if(texture->size.x > texture->size.y) {
+ texture_aspect = static_cast<float>(texture->size.x) / static_cast<float>(texture->size.y);
+ }
+ else {
+ texture_aspect = static_cast<float>(texture->size.y) / static_cast<float>(texture->size.x);
+ }
+
+ texture_alpha = 1.0f;
+ }
+}
+
+void gui::client_splash::init_late(void)
+{
+ if(!texture) {
+ // We don't have to waste time
+ // rendering the missing client_splash texture
+ return;
+ }
+
+ end_time = utils::unix_microseconds() + DELAY_MICROSECONDS;
+
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+ globals::dispatcher.sink<io::GlfwMouseButtonEvent>().connect<&on_glfw_mouse_button>();
+ globals::dispatcher.sink<io::GlfwScrollEvent>().connect<&on_glfw_scroll>();
+
+ current_text = gui::language::resolve("splash.skip_prompt");
+
+ while(!glfwWindowShouldClose(globals::window)) {
+ const std::uint64_t curtime = utils::unix_microseconds();
+ const std::uint64_t remains = end_time - curtime;
+
+ if(curtime >= end_time) {
+ break;
+ }
+
+ texture_alpha = math::smoothstep(0.25f, 0.6f, static_cast<float>(remains) / static_cast<float>(DELAY_MICROSECONDS));
+
+ gui::client_splash::render();
+ }
+
+ globals::dispatcher.sink<io::GlfwKeyEvent>().disconnect<&on_glfw_key>();
+ globals::dispatcher.sink<io::GlfwMouseButtonEvent>().disconnect<&on_glfw_mouse_button>();
+ globals::dispatcher.sink<io::GlfwScrollEvent>().disconnect<&on_glfw_scroll>();
+
+ texture = nullptr;
+ texture_aspect = 0.0f;
+ texture_alpha = 0.0f;
+ end_time = UINT64_C(0);
+}
+
+void gui::client_splash::render(void)
+{
+ if(!texture) {
+ // We don't have to waste time
+ // rendering the missing client_splash texture
+ return;
+ }
+
+ // The client_splash is rendered outside the main
+ // render loop, so we have to manually begin
+ // and render both window and ImGui frames
+ ImGui_ImplOpenGL3_NewFrame();
+ ImGui_ImplGlfw_NewFrame();
+ ImGui::NewFrame();
+
+ glDisable(GL_DEPTH_TEST);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ glViewport(0, 0, globals::width, globals::height);
+
+ glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ auto viewport = ImGui::GetMainViewport();
+ auto window_start = ImVec2(0.0f, 0.0f);
+ auto window_size = ImVec2(viewport->Size.x, viewport->Size.y);
+
+ ImGui::SetNextWindowPos(window_start);
+ ImGui::SetNextWindowSize(window_size);
+
+ if(ImGui::Begin("###client_splash", nullptr, WINDOW_FLAGS)) {
+ const float image_width = 0.60f * viewport->Size.x;
+ const float image_height = image_width / texture_aspect;
+ const ImVec2 image_size = ImVec2(image_width, image_height);
+
+ const float image_x = 0.5f * (viewport->Size.x - image_width);
+ const float image_y = 0.5f * (viewport->Size.y - image_height);
+ const ImVec2 image_pos = ImVec2(image_x, image_y);
+
+ if(!current_text.empty()) {
+ ImGui::PushFont(globals::font_unscii8, 16.0f);
+ ImGui::SetCursorPos(ImVec2(16.0f, 16.0f));
+ ImGui::TextDisabled("%s", current_text.c_str());
+ ImGui::PopFont();
+ }
+
+ const ImVec2 uv_a = ImVec2(0.0f, 0.0f);
+ const ImVec2 uv_b = ImVec2(1.0f, 1.0f);
+ const ImVec4 tint = ImVec4(1.0f, 1.0f, 1.0f, texture_alpha);
+
+ ImGui::SetCursorPos(image_pos);
+ ImGui::ImageWithBg(texture->handle, image_size, uv_a, uv_b, ImVec4(0.0f, 0.0f, 0.0f, 0.0f), tint);
+ }
+
+ ImGui::End();
+
+ ImGui::Render();
+ ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
+
+ glfwSwapBuffers(globals::window);
+
+ glfwPollEvents();
+}
diff --git a/game/client/gui/splash.hh b/game/client/gui/splash.hh index 3ce63e4..a28a9ad 100644 --- a/game/client/gui/splash.hh +++ b/game/client/gui/splash.hh @@ -1,8 +1,8 @@ -#pragma once - -namespace gui::client_splash -{ -void init(void); -void init_late(void); -void render(void); -} // namespace gui::client_splash +#pragma once
+
+namespace gui::client_splash
+{
+void init(void);
+void init_late(void);
+void render(void);
+} // namespace gui::client_splash
diff --git a/game/client/gui/status_lines.cc b/game/client/gui/status_lines.cc index 9d9ac4c..d1a919a 100644 --- a/game/client/gui/status_lines.cc +++ b/game/client/gui/status_lines.cc @@ -1,84 +1,84 @@ -#include "client/pch.hh" - -#include "client/gui/status_lines.hh" - -#include "client/gui/imdraw_ext.hh" - -#include "client/globals.hh" - -static float line_offsets[gui::STATUS_COUNT]; -static ImFont* line_fonts[gui::STATUS_COUNT]; -static float line_sizes[gui::STATUS_COUNT]; - -static ImVec4 line_text_colors[gui::STATUS_COUNT]; -static ImVec4 line_shadow_colors[gui::STATUS_COUNT]; -static std::string line_strings[gui::STATUS_COUNT]; -static std::uint64_t line_spawns[gui::STATUS_COUNT]; -static float line_fadeouts[gui::STATUS_COUNT]; - -void gui::status_lines::init(void) -{ - for(unsigned int i = 0U; i < STATUS_COUNT; ++i) { - line_text_colors[i] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f); - line_shadow_colors[i] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f); - line_strings[i] = std::string(); - line_spawns[i] = UINT64_MAX; - line_fadeouts[i] = 0.0f; - } -} - -void gui::status_lines::init_late(void) -{ - line_offsets[STATUS_DEBUG] = 64.0f; - line_offsets[STATUS_HOTBAR] = 40.0f; -} - -void gui::status_lines::layout(void) -{ - line_fonts[STATUS_DEBUG] = globals::font_unscii8; - line_sizes[STATUS_DEBUG] = 4.0f; - - line_fonts[STATUS_HOTBAR] = globals::font_unscii16; - line_sizes[STATUS_HOTBAR] = 8.0f; - - auto viewport = ImGui::GetMainViewport(); - auto draw_list = ImGui::GetForegroundDrawList(); - - for(unsigned int i = 0U; i < STATUS_COUNT; ++i) { - auto offset = line_offsets[i] * globals::gui_scale; - auto& text = line_strings[i]; - auto* font = line_fonts[i]; - - auto size = font->CalcTextSizeA(line_sizes[i] * globals::gui_scale, FLT_MAX, 0.0f, text.c_str(), text.c_str() + text.size()); - auto pos = ImVec2(0.5f * (viewport->Size.x - size.x), viewport->Size.y - offset); - - auto spawn = line_spawns[i]; - auto fadeout = line_fadeouts[i]; - auto alpha = std::exp(-1.0f * std::pow(1.0e-6f * static_cast<float>(globals::curtime - spawn) / fadeout, 10.0f)); - - auto& color = line_text_colors[i]; - auto& shadow = line_shadow_colors[i]; - auto color_U32 = ImGui::GetColorU32(ImVec4(color.x, color.y, color.z, color.w * alpha)); - auto shadow_U32 = ImGui::GetColorU32(ImVec4(shadow.x, shadow.y, shadow.z, color.w * alpha)); - - gui::imdraw_ext::text_shadow(text, pos, color_U32, shadow_U32, font, draw_list, line_sizes[i]); - } -} - -void gui::status_lines::set(unsigned int line, const std::string& text, const ImVec4& color, float fadeout) -{ - line_text_colors[line] = ImVec4(color.x, color.y, color.z, color.w); - line_shadow_colors[line] = ImVec4(color.x * 0.1f, color.y * 0.1f, color.z * 0.1f, color.w); - line_strings[line] = std::string(text); - line_spawns[line] = globals::curtime; - line_fadeouts[line] = fadeout; -} - -void gui::status_lines::unset(unsigned int line) -{ - line_text_colors[line] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f); - line_shadow_colors[line] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f); - line_strings[line] = std::string(); - line_spawns[line] = UINT64_C(0); - line_fadeouts[line] = 0.0f; -} +#include "client/pch.hh"
+
+#include "client/gui/status_lines.hh"
+
+#include "client/gui/imdraw_ext.hh"
+
+#include "client/globals.hh"
+
+static float line_offsets[gui::STATUS_COUNT];
+static ImFont* line_fonts[gui::STATUS_COUNT];
+static float line_sizes[gui::STATUS_COUNT];
+
+static ImVec4 line_text_colors[gui::STATUS_COUNT];
+static ImVec4 line_shadow_colors[gui::STATUS_COUNT];
+static std::string line_strings[gui::STATUS_COUNT];
+static std::uint64_t line_spawns[gui::STATUS_COUNT];
+static float line_fadeouts[gui::STATUS_COUNT];
+
+void gui::status_lines::init(void)
+{
+ for(unsigned int i = 0U; i < STATUS_COUNT; ++i) {
+ line_text_colors[i] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f);
+ line_shadow_colors[i] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f);
+ line_strings[i] = std::string();
+ line_spawns[i] = UINT64_MAX;
+ line_fadeouts[i] = 0.0f;
+ }
+}
+
+void gui::status_lines::init_late(void)
+{
+ line_offsets[STATUS_DEBUG] = 64.0f;
+ line_offsets[STATUS_HOTBAR] = 40.0f;
+}
+
+void gui::status_lines::layout(void)
+{
+ line_fonts[STATUS_DEBUG] = globals::font_unscii8;
+ line_sizes[STATUS_DEBUG] = 4.0f;
+
+ line_fonts[STATUS_HOTBAR] = globals::font_unscii16;
+ line_sizes[STATUS_HOTBAR] = 8.0f;
+
+ auto viewport = ImGui::GetMainViewport();
+ auto draw_list = ImGui::GetForegroundDrawList();
+
+ for(unsigned int i = 0U; i < STATUS_COUNT; ++i) {
+ auto offset = line_offsets[i] * globals::gui_scale;
+ auto& text = line_strings[i];
+ auto* font = line_fonts[i];
+
+ auto size = font->CalcTextSizeA(line_sizes[i] * globals::gui_scale, FLT_MAX, 0.0f, text.c_str(), text.c_str() + text.size());
+ auto pos = ImVec2(0.5f * (viewport->Size.x - size.x), viewport->Size.y - offset);
+
+ auto spawn = line_spawns[i];
+ auto fadeout = line_fadeouts[i];
+ auto alpha = std::exp(-1.0f * std::pow(1.0e-6f * static_cast<float>(globals::curtime - spawn) / fadeout, 10.0f));
+
+ auto& color = line_text_colors[i];
+ auto& shadow = line_shadow_colors[i];
+ auto color_U32 = ImGui::GetColorU32(ImVec4(color.x, color.y, color.z, color.w * alpha));
+ auto shadow_U32 = ImGui::GetColorU32(ImVec4(shadow.x, shadow.y, shadow.z, color.w * alpha));
+
+ gui::imdraw_ext::text_shadow(text, pos, color_U32, shadow_U32, font, draw_list, line_sizes[i]);
+ }
+}
+
+void gui::status_lines::set(unsigned int line, const std::string& text, const ImVec4& color, float fadeout)
+{
+ line_text_colors[line] = ImVec4(color.x, color.y, color.z, color.w);
+ line_shadow_colors[line] = ImVec4(color.x * 0.1f, color.y * 0.1f, color.z * 0.1f, color.w);
+ line_strings[line] = std::string(text);
+ line_spawns[line] = globals::curtime;
+ line_fadeouts[line] = fadeout;
+}
+
+void gui::status_lines::unset(unsigned int line)
+{
+ line_text_colors[line] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f);
+ line_shadow_colors[line] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f);
+ line_strings[line] = std::string();
+ line_spawns[line] = UINT64_C(0);
+ line_fadeouts[line] = 0.0f;
+}
diff --git a/game/client/gui/status_lines.hh b/game/client/gui/status_lines.hh index c86e248..7245d68 100644 --- a/game/client/gui/status_lines.hh +++ b/game/client/gui/status_lines.hh @@ -1,21 +1,21 @@ -#pragma once - -namespace gui -{ -constexpr static unsigned int STATUS_DEBUG = 0x0000; // generic debug line -constexpr static unsigned int STATUS_HOTBAR = 0x0001; // hotbar item line -constexpr static unsigned int STATUS_COUNT = 0x0002; -} // namespace gui - -namespace gui::status_lines -{ -void init(void); -void init_late(void); -void layout(void); -} // namespace gui::status_lines - -namespace gui::status_lines -{ -void set(unsigned int line, const std::string& text, const ImVec4& color, float fadeout); -void unset(unsigned int line); -} // namespace gui::status_lines +#pragma once
+
+namespace gui
+{
+constexpr static unsigned int STATUS_DEBUG = 0x0000; // generic debug line
+constexpr static unsigned int STATUS_HOTBAR = 0x0001; // hotbar item line
+constexpr static unsigned int STATUS_COUNT = 0x0002;
+} // namespace gui
+
+namespace gui::status_lines
+{
+void init(void);
+void init_late(void);
+void layout(void);
+} // namespace gui::status_lines
+
+namespace gui::status_lines
+{
+void set(unsigned int line, const std::string& text, const ImVec4& color, float fadeout);
+void unset(unsigned int line);
+} // namespace gui::status_lines
diff --git a/game/client/gui/window_title.cc b/game/client/gui/window_title.cc index 6f46668..6e2387c 100644 --- a/game/client/gui/window_title.cc +++ b/game/client/gui/window_title.cc @@ -1,23 +1,23 @@ -#include "client/pch.hh" - -#include "client/gui/window_title.hh" - -#include "core/version.hh" - -#include "shared/splash.hh" - -#include "client/globals.hh" - -void gui::window_title::update(void) -{ - std::string title; - - if(globals::sound_ctx && globals::sound_dev) { - title = std::format("Voxelius {}: {}", version::semver, splash::get()); - } - else { - title = std::format("Voxelius {}: {} [NOSOUND]", version::semver, splash::get()); - } - - glfwSetWindowTitle(globals::window, title.c_str()); -} +#include "client/pch.hh"
+
+#include "client/gui/window_title.hh"
+
+#include "core/version.hh"
+
+#include "shared/splash.hh"
+
+#include "client/globals.hh"
+
+void gui::window_title::update(void)
+{
+ std::string title;
+
+ if(globals::sound_ctx && globals::sound_dev) {
+ title = std::format("Voxelius {}: {}", version::semver, splash::get());
+ }
+ else {
+ title = std::format("Voxelius {}: {} [NOSOUND]", version::semver, splash::get());
+ }
+
+ glfwSetWindowTitle(globals::window, title.c_str());
+}
diff --git a/game/client/gui/window_title.hh b/game/client/gui/window_title.hh index af1ab7c..86e6a86 100644 --- a/game/client/gui/window_title.hh +++ b/game/client/gui/window_title.hh @@ -1,6 +1,6 @@ -#pragma once - -namespace gui::window_title -{ -void update(void); -} // namespace gui::window_title +#pragma once
+
+namespace gui::window_title
+{
+void update(void);
+} // namespace gui::window_title
diff --git a/game/client/io/gamepad.cc b/game/client/io/gamepad.cc index 3a71920..1407996 100644 --- a/game/client/io/gamepad.cc +++ b/game/client/io/gamepad.cc @@ -1,183 +1,183 @@ -#include "client/pch.hh" - -#include "client/io/gamepad.hh" - -#include "core/config/boolean.hh" -#include "core/config/number.hh" -#include "core/io/cmdline.hh" -#include "core/io/config_map.hh" -#include "core/math/constexpr.hh" - -#include "client/gui/settings.hh" -#include "client/io/glfw.hh" - -#include "client/globals.hh" -#include "client/toggles.hh" - -constexpr static int INVALID_GAMEPAD_ID = INT_MAX; -constexpr static std::size_t NUM_AXES = static_cast<std::size_t>(GLFW_GAMEPAD_AXIS_LAST + 1); -constexpr static std::size_t NUM_BUTTONS = static_cast<std::size_t>(GLFW_GAMEPAD_BUTTON_LAST + 1); -constexpr static float GAMEPAD_AXIS_EVENT_THRESHOLD = 0.5f; - -static int active_gamepad_id; - -bool io::gamepad::available = false; -config::Float io::gamepad::deadzone(0.00f, 0.00f, 0.66f); -config::Boolean io::gamepad::active(false); -GLFWgamepadstate io::gamepad::state; -GLFWgamepadstate io::gamepad::last_state; - -static void on_toggle_enable(const ToggleEnabledEvent& event) -{ - if(event.type == TOGGLE_USE_GAMEPAD) { - io::gamepad::active.set_value(true); - return; - } -} - -static void on_toggle_disable(const ToggleDisabledEvent& event) -{ - if(event.type == TOGGLE_USE_GAMEPAD) { - io::gamepad::active.set_value(false); - return; - } -} - -static void on_glfw_joystick_event(const io::GlfwJoystickEvent& event) -{ - if((event.event_type == GLFW_CONNECTED) && glfwJoystickIsGamepad(event.joystick_id) && (active_gamepad_id == INVALID_GAMEPAD_ID)) { - io::gamepad::available = true; - - active_gamepad_id = event.joystick_id; - - 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::info("gamepad: detected gamepad: {}", glfwGetGamepadName(event.joystick_id)); - - return; - } - - if((event.event_type == GLFW_DISCONNECTED) && (active_gamepad_id == event.joystick_id)) { - io::gamepad::available = false; - - active_gamepad_id = INVALID_GAMEPAD_ID; - - 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"); - - return; - } -} - -void io::gamepad::init(void) -{ - io::gamepad::available = false; - - active_gamepad_id = INVALID_GAMEPAD_ID; - - globals::client_config.add_value("gamepad.deadzone", io::gamepad::deadzone); - globals::client_config.add_value("gamepad.active", io::gamepad::active); - - settings::add_checkbox(0, io::gamepad::active, settings_location::GAMEPAD, "gamepad.active", true); - settings::add_slider(1, io::gamepad::deadzone, settings_location::GAMEPAD, "gamepad.deadzone", true, "%.03f"); - - auto mappings_path = io::cmdline::get_cstr("gpmap", "misc/gamecontrollerdb.txt"); - auto mappings_file = PHYSFS_openRead(mappings_path); - - if(mappings_file) { - spdlog::info("gamepad: using mappings from {}", mappings_path); - auto mappings_string = std::string(PHYSFS_fileLength(mappings_file), char(0x00)); - PHYSFS_readBytes(mappings_file, mappings_string.data(), mappings_string.size()); - glfwUpdateGamepadMappings(mappings_string.c_str()); - PHYSFS_close(mappings_file); - } - - for(int joystick = 0; joystick <= GLFW_JOYSTICK_LAST; joystick += 1) { - if(glfwJoystickIsGamepad(joystick)) { - io::gamepad::available = true; - - active_gamepad_id = joystick; - - 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::info("gamepad: detected gamepad: {}", glfwGetGamepadName(joystick)); - - break; - } - } - - for(int i = 0; i < NUM_AXES; io::gamepad::state.axes[i++] = 0.0f) { - // empty - } - - for(int i = 0; i < NUM_BUTTONS; io::gamepad::state.buttons[i++] = GLFW_RELEASE) { - // empty - } - - globals::dispatcher.sink<ToggleEnabledEvent>().connect<&on_toggle_enable>(); - globals::dispatcher.sink<ToggleDisabledEvent>().connect<&on_toggle_disable>(); - globals::dispatcher.sink<GlfwJoystickEvent>().connect<&on_glfw_joystick_event>(); -} - -void io::gamepad::update_late(void) -{ - if(active_gamepad_id == INVALID_GAMEPAD_ID) { - // No active gamepad found - return; - } - - 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)) { - GamepadAxisEvent event; - event.action = GLFW_PRESS; - event.axis = i; - globals::dispatcher.enqueue(event); - continue; - } - - if((math::abs(io::gamepad::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; - globals::dispatcher.enqueue(event); - continue; - } - } - - for(int i = 0; i < NUM_BUTTONS; ++i) { - if(io::gamepad::state.buttons[i] == io::gamepad::last_state.buttons[i]) { - // Nothing happens - continue; - } - - GamepadButtonEvent event; - event.action = io::gamepad::state.buttons[i]; - event.button = i; - globals::dispatcher.enqueue(event); - } - } - - io::gamepad::last_state = io::gamepad::state; -} +#include "client/pch.hh"
+
+#include "client/io/gamepad.hh"
+
+#include "core/config/boolean.hh"
+#include "core/config/number.hh"
+#include "core/io/cmdline.hh"
+#include "core/io/config_map.hh"
+#include "core/math/constexpr.hh"
+
+#include "client/gui/settings.hh"
+#include "client/io/glfw.hh"
+
+#include "client/globals.hh"
+#include "client/toggles.hh"
+
+constexpr static int INVALID_GAMEPAD_ID = INT_MAX;
+constexpr static std::size_t NUM_AXES = static_cast<std::size_t>(GLFW_GAMEPAD_AXIS_LAST + 1);
+constexpr static std::size_t NUM_BUTTONS = static_cast<std::size_t>(GLFW_GAMEPAD_BUTTON_LAST + 1);
+constexpr static float GAMEPAD_AXIS_EVENT_THRESHOLD = 0.5f;
+
+static int active_gamepad_id;
+
+bool io::gamepad::available = false;
+config::Float io::gamepad::deadzone(0.00f, 0.00f, 0.66f);
+config::Boolean io::gamepad::active(false);
+GLFWgamepadstate io::gamepad::state;
+GLFWgamepadstate io::gamepad::last_state;
+
+static void on_toggle_enable(const ToggleEnabledEvent& event)
+{
+ if(event.type == TOGGLE_USE_GAMEPAD) {
+ io::gamepad::active.set_value(true);
+ return;
+ }
+}
+
+static void on_toggle_disable(const ToggleDisabledEvent& event)
+{
+ if(event.type == TOGGLE_USE_GAMEPAD) {
+ io::gamepad::active.set_value(false);
+ return;
+ }
+}
+
+static void on_glfw_joystick_event(const io::GlfwJoystickEvent& event)
+{
+ if((event.event_type == GLFW_CONNECTED) && glfwJoystickIsGamepad(event.joystick_id) && (active_gamepad_id == INVALID_GAMEPAD_ID)) {
+ io::gamepad::available = true;
+
+ active_gamepad_id = event.joystick_id;
+
+ 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::info("gamepad: detected gamepad: {}", glfwGetGamepadName(event.joystick_id));
+
+ return;
+ }
+
+ if((event.event_type == GLFW_DISCONNECTED) && (active_gamepad_id == event.joystick_id)) {
+ io::gamepad::available = false;
+
+ active_gamepad_id = INVALID_GAMEPAD_ID;
+
+ 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");
+
+ return;
+ }
+}
+
+void io::gamepad::init(void)
+{
+ io::gamepad::available = false;
+
+ active_gamepad_id = INVALID_GAMEPAD_ID;
+
+ globals::client_config.add_value("gamepad.deadzone", io::gamepad::deadzone);
+ globals::client_config.add_value("gamepad.active", io::gamepad::active);
+
+ settings::add_checkbox(0, io::gamepad::active, settings_location::GAMEPAD, "gamepad.active", true);
+ settings::add_slider(1, io::gamepad::deadzone, settings_location::GAMEPAD, "gamepad.deadzone", true, "%.03f");
+
+ auto mappings_path = io::cmdline::get_cstr("gpmap", "misc/gamecontrollerdb.txt");
+ auto mappings_file = PHYSFS_openRead(mappings_path);
+
+ if(mappings_file) {
+ spdlog::info("gamepad: using mappings from {}", mappings_path);
+ auto mappings_string = std::string(PHYSFS_fileLength(mappings_file), char(0x00));
+ PHYSFS_readBytes(mappings_file, mappings_string.data(), mappings_string.size());
+ glfwUpdateGamepadMappings(mappings_string.c_str());
+ PHYSFS_close(mappings_file);
+ }
+
+ for(int joystick = 0; joystick <= GLFW_JOYSTICK_LAST; joystick += 1) {
+ if(glfwJoystickIsGamepad(joystick)) {
+ io::gamepad::available = true;
+
+ active_gamepad_id = joystick;
+
+ 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::info("gamepad: detected gamepad: {}", glfwGetGamepadName(joystick));
+
+ break;
+ }
+ }
+
+ for(int i = 0; i < NUM_AXES; io::gamepad::state.axes[i++] = 0.0f) {
+ // empty
+ }
+
+ for(int i = 0; i < NUM_BUTTONS; io::gamepad::state.buttons[i++] = GLFW_RELEASE) {
+ // empty
+ }
+
+ globals::dispatcher.sink<ToggleEnabledEvent>().connect<&on_toggle_enable>();
+ globals::dispatcher.sink<ToggleDisabledEvent>().connect<&on_toggle_disable>();
+ globals::dispatcher.sink<GlfwJoystickEvent>().connect<&on_glfw_joystick_event>();
+}
+
+void io::gamepad::update_late(void)
+{
+ if(active_gamepad_id == INVALID_GAMEPAD_ID) {
+ // No active gamepad found
+ return;
+ }
+
+ 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)) {
+ GamepadAxisEvent event;
+ event.action = GLFW_PRESS;
+ event.axis = i;
+ globals::dispatcher.enqueue(event);
+ continue;
+ }
+
+ if((math::abs(io::gamepad::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;
+ globals::dispatcher.enqueue(event);
+ continue;
+ }
+ }
+
+ for(int i = 0; i < NUM_BUTTONS; ++i) {
+ if(io::gamepad::state.buttons[i] == io::gamepad::last_state.buttons[i]) {
+ // Nothing happens
+ continue;
+ }
+
+ GamepadButtonEvent event;
+ event.action = io::gamepad::state.buttons[i];
+ event.button = i;
+ globals::dispatcher.enqueue(event);
+ }
+ }
+
+ io::gamepad::last_state = io::gamepad::state;
+}
diff --git a/game/client/io/gamepad.hh b/game/client/io/gamepad.hh index 9c56894..ff38127 100644 --- a/game/client/io/gamepad.hh +++ b/game/client/io/gamepad.hh @@ -1,50 +1,50 @@ -#pragma once - -namespace io -{ -constexpr static int INVALID_GAMEPAD_AXIS = INT_MAX; -constexpr static int INVALID_GAMEPAD_BUTTON = INT_MAX; -} // namespace io - -namespace config -{ -class Boolean; -class Float; -} // namespace config - -struct GLFWgamepadstate; - -namespace io::gamepad -{ -extern bool available; -extern config::Float deadzone; -extern config::Boolean active; -extern GLFWgamepadstate state; -extern GLFWgamepadstate last_state; -} // namespace io::gamepad - -namespace io::gamepad -{ -void init(void); -void update_late(void); -} // namespace io::gamepad - -namespace io -{ -// This simulates buttons using axes. When an axis -// value exceeds 1.5 times the deadzone, the event is -// queued with a GLFW_PRESS action, when it falls back -// below the threshold, the event is queued with GLFW_RELEASE action -struct GamepadAxisEvent final { - int action; - int axis; -}; - -// This smears GLFW event sugar over gamepad polling -// system. Whenever it detects a state change, the event -// is queued with an appropriate action -struct GamepadButtonEvent final { - int action; - int button; -}; -} // namespace io +#pragma once
+
+namespace io
+{
+constexpr static int INVALID_GAMEPAD_AXIS = INT_MAX;
+constexpr static int INVALID_GAMEPAD_BUTTON = INT_MAX;
+} // namespace io
+
+namespace config
+{
+class Boolean;
+class Float;
+} // namespace config
+
+struct GLFWgamepadstate;
+
+namespace io::gamepad
+{
+extern bool available;
+extern config::Float deadzone;
+extern config::Boolean active;
+extern GLFWgamepadstate state;
+extern GLFWgamepadstate last_state;
+} // namespace io::gamepad
+
+namespace io::gamepad
+{
+void init(void);
+void update_late(void);
+} // namespace io::gamepad
+
+namespace io
+{
+// This simulates buttons using axes. When an axis
+// value exceeds 1.5 times the deadzone, the event is
+// queued with a GLFW_PRESS action, when it falls back
+// below the threshold, the event is queued with GLFW_RELEASE action
+struct GamepadAxisEvent final {
+ int action;
+ int axis;
+};
+
+// This smears GLFW event sugar over gamepad polling
+// system. Whenever it detects a state change, the event
+// is queued with an appropriate action
+struct GamepadButtonEvent final {
+ int action;
+ int button;
+};
+} // namespace io
diff --git a/game/client/io/glfw.hh b/game/client/io/glfw.hh index ea3f4a7..bbd767a 100644 --- a/game/client/io/glfw.hh +++ b/game/client/io/glfw.hh @@ -1,40 +1,40 @@ -#ifndef CLIENTFW -#define CLIENTFW 1 -#pragma once - -namespace io -{ -struct GlfwCursorPosEvent final { - glm::fvec2 pos; -}; - -struct GlfwFramebufferSizeEvent final { - glm::ivec2 size; - float aspect; -}; - -struct GlfwJoystickEvent final { - int joystick_id; - int event_type; -}; - -struct GlfwKeyEvent final { - int key { GLFW_KEY_UNKNOWN }; - int scancode; - int action; - int mods; -}; - -struct GlfwMouseButtonEvent final { - int button { GLFW_KEY_UNKNOWN }; - int action; - int mods; -}; - -struct GlfwScrollEvent final { - float dx; - float dy; -}; -} // namespace io - -#endif // CLIENTFW +#ifndef CLIENTFW
+#define CLIENTFW 1
+#pragma once
+
+namespace io
+{
+struct GlfwCursorPosEvent final {
+ glm::fvec2 pos;
+};
+
+struct GlfwFramebufferSizeEvent final {
+ glm::ivec2 size;
+ float aspect;
+};
+
+struct GlfwJoystickEvent final {
+ int joystick_id;
+ int event_type;
+};
+
+struct GlfwKeyEvent final {
+ int key { GLFW_KEY_UNKNOWN };
+ int scancode;
+ int action;
+ int mods;
+};
+
+struct GlfwMouseButtonEvent final {
+ int button { GLFW_KEY_UNKNOWN };
+ int action;
+ int mods;
+};
+
+struct GlfwScrollEvent final {
+ float dx;
+ float dy;
+};
+} // namespace io
+
+#endif // CLIENTFW
diff --git a/game/client/main.cc b/game/client/main.cc index a1185e2..e20fd5c 100644 --- a/game/client/main.cc +++ b/game/client/main.cc @@ -1,449 +1,449 @@ -#include "client/pch.hh" - -#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" -#include "core/version.hh" - -#include "shared/game.hh" -#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" - -#include "client/const.hh" -#include "client/game.hh" -#include "client/globals.hh" - -#if defined(_WIN32) -extern "C" __declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001; -extern "C" __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1; -#endif - -static void on_glfw_error(int code, const char* message) -{ - spdlog::error("glfw: {}", message); -} - -static void on_glfw_char(GLFWwindow* window, unsigned int codepoint) -{ - ImGui_ImplGlfw_CharCallback(window, codepoint); -} - -static void on_glfw_cursor_enter(GLFWwindow* window, int entered) -{ - ImGui_ImplGlfw_CursorEnterCallback(window, entered); -} - -static void on_glfw_cursor_pos(GLFWwindow* window, double xpos, double ypos) -{ - io::GlfwCursorPosEvent event; - event.pos.x = static_cast<float>(xpos); - event.pos.y = static_cast<float>(ypos); - globals::dispatcher.trigger(event); - - ImGui_ImplGlfw_CursorPosCallback(window, xpos, ypos); -} - -static void on_glfw_framebuffer_size(GLFWwindow* window, int width, int height) -{ - if(glfwGetWindowAttrib(window, GLFW_ICONIFIED)) { - // Don't do anything if the window was just - // iconified (minimized); as it turns out minimized - // windows on WIN32 seem to be forced into 0x0 - return; - } - - globals::width = width; - globals::height = height; - globals::aspect = static_cast<float>(width) / static_cast<float>(height); - - io::GlfwFramebufferSizeEvent fb_event; - fb_event.size.x = globals::width; - fb_event.size.y = globals::height; - fb_event.aspect = globals::aspect; - globals::dispatcher.trigger(fb_event); -} - -static void on_glfw_key(GLFWwindow* window, int key, int scancode, int action, int mods) -{ - io::GlfwKeyEvent event; - event.key = key; - event.scancode = scancode; - event.action = action; - event.mods = mods; - globals::dispatcher.trigger(event); - - ImGui_ImplGlfw_KeyCallback(window, key, scancode, action, mods); -} - -static void on_glfw_joystick(int joystick_id, int event_type) -{ - io::GlfwJoystickEvent event; - event.joystick_id = joystick_id; - event.event_type = event_type; - globals::dispatcher.trigger(event); -} - -static void on_glfw_monitor_event(GLFWmonitor* monitor, int event) -{ - ImGui_ImplGlfw_MonitorCallback(monitor, event); -} - -static void on_glfw_mouse_button(GLFWwindow* window, int button, int action, int mods) -{ - io::GlfwMouseButtonEvent event; - event.button = button; - event.action = action; - event.mods = mods; - globals::dispatcher.trigger(event); - - ImGui_ImplGlfw_MouseButtonCallback(window, button, action, mods); -} - -static void on_glfw_scroll(GLFWwindow* window, double dx, double dy) -{ - io::GlfwScrollEvent event; - event.dx = static_cast<float>(dx); - event.dy = static_cast<float>(dy); - globals::dispatcher.trigger(event); - - ImGui_ImplGlfw_ScrollCallback(window, dx, dy); -} - -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) -{ - spdlog::info("opengl: {}", reinterpret_cast<const char*>(message)); -} - -static void on_termination_signal(int) -{ - spdlog::warn("client: received termination signal"); - glfwSetWindowShouldClose(globals::window, true); -} - -int main(int argc, char** argv) -{ - io::cmdline::create(argc, argv); - -#if defined(_WIN32) -#if defined(NDEBUG) - if(GetConsoleWindow() && !io::cmdline::contains("debug")) { - // Hide the console window on release builds - // unless explicitly specified to preserve it instead - FreeConsole(); - } -#else - if(GetConsoleWindow() && io::cmdline::contains("nodebug")) { - // Hide the console window on debug builds when - // explicitly specified by the user to hide it - FreeConsole(); - } -#endif -#endif - - shared_game::init(argc, argv); - - spdlog::info("Voxelius Client {}", version::semver); - - glfwSetErrorCallback(&on_glfw_error); - -#if defined(__unix__) - // Wayland constantly throws random bullshit at me - // when I'm dealing with pretty much anything cross-platform - // on pretty much any kind of UNIX and Linux distribution - glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); -#endif - - if(!glfwInit()) { - spdlog::critical("glfw: init failed"); - std::terminate(); - } - - glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API); - glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); - glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); - glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); - glfwWindowHint(GLFW_SAMPLES, 0); - - globals::window = glfwCreateWindow(DEFAULT_WIDTH, DEFAULT_HEIGHT, "Client", nullptr, nullptr); - - if(!globals::window) { - spdlog::critical("glfw: failed to open a window"); - std::terminate(); - } - - std::signal(SIGINT, &on_termination_signal); - std::signal(SIGTERM, &on_termination_signal); - - glfwMakeContextCurrent(globals::window); - glfwSwapInterval(1); - - if(!gladLoadGL(&glfwGetProcAddress)) { - spdlog::critical("glad: failed to load function pointers"); - std::terminate(); - } - - if(GLAD_GL_KHR_debug) { - if(!io::cmdline::contains("nodebug")) { - glEnable(GL_DEBUG_OUTPUT); - glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); - glDebugMessageCallback(&on_opengl_message, nullptr); - - // NVIDIA drivers tend to spam quote-unquote "useful" - // information about buffer usage into the debug callback - static const std::uint32_t ignore_nvidia_131185 = 131185; - glDebugMessageControl(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_OTHER, GL_DONT_CARE, 1, &ignore_nvidia_131185, GL_FALSE); - } - else { - spdlog::warn("glad: nodebug command line parameter found"); - spdlog::warn("glad: OpenGL errors will not be logged"); - } - } - else { - spdlog::warn("glad: KHR_debug extension not supported"); - spdlog::warn("glad: OpenGL errors will not be logged"); - } - - spdlog::info("opengl: version: {}", reinterpret_cast<const char*>(glGetString(GL_VERSION))); - spdlog::info("opengl: renderer: {}", reinterpret_cast<const char*>(glGetString(GL_RENDERER))); - - Image::register_resource(); - TextureGUI::register_resource(); - SoundEffect::register_resource(); - - glDisable(GL_MULTISAMPLE); - - IMGUI_CHECKVERSION(); - ImGui::CreateContext(); - ImGui::StyleColorsDark(); - ImGui_ImplGlfw_InitForOpenGL(globals::window, false); - ImGui_ImplOpenGL3_Init(nullptr); - - // The UI is scaled against a resolution defined by BASE_WIDTH and BASE_HEIGHT - // constants. However, UI scale of 1 doesn't look that good, so the window size is - // limited to a resolution that allows at least UI scale of 2 and is defined by MIN_WIDTH and MIN_HEIGHT. - glfwSetWindowSizeLimits(globals::window, MIN_WIDTH, MIN_HEIGHT, GLFW_DONT_CARE, GLFW_DONT_CARE); - - glfwSetCharCallback(globals::window, &on_glfw_char); - glfwSetCursorEnterCallback(globals::window, &on_glfw_cursor_enter); - glfwSetCursorPosCallback(globals::window, &on_glfw_cursor_pos); - glfwSetFramebufferSizeCallback(globals::window, &on_glfw_framebuffer_size); - glfwSetKeyCallback(globals::window, &on_glfw_key); - glfwSetMouseButtonCallback(globals::window, &on_glfw_mouse_button); - glfwSetScrollCallback(globals::window, &on_glfw_scroll); - glfwSetWindowFocusCallback(globals::window, &on_glfw_window_focus); - - glfwSetJoystickCallback(&on_glfw_joystick); - glfwSetMonitorCallback(&on_glfw_monitor_event); - - if(auto image = resource::load<Image>("textures/gui/window_icon.png")) { - GLFWimage icon_image; - icon_image.width = image->size.x; - icon_image.height = image->size.y; - icon_image.pixels = reinterpret_cast<unsigned char*>(image->pixels); - glfwSetWindowIcon(globals::window, 1, &icon_image); - } - - if(io::cmdline::contains("nosound")) { - spdlog::warn("client: sound disabled [per command line]"); - globals::sound_dev = nullptr; - globals::sound_ctx = nullptr; - } - else { - if(!saladLoadALdefault()) { - spdlog::warn("client: sound disabled [openal loading failed]"); - globals::sound_dev = nullptr; - globals::sound_ctx = nullptr; - } - else { - globals::sound_dev = alcOpenDevice(nullptr); - - if(globals::sound_dev == nullptr) { - spdlog::warn("client: sound disabled [no device]"); - globals::sound_ctx = nullptr; - } - else { - spdlog::info("sound: {}", reinterpret_cast<const char*>(alcGetString(globals::sound_dev, ALC_DEVICE_SPECIFIER))); - - globals::sound_ctx = alcCreateContext(globals::sound_dev, nullptr); - - if(globals::sound_ctx == nullptr) { - spdlog::warn("client: sound disabled [context creation failed]"); - alcCloseDevice(globals::sound_dev); - globals::sound_dev = nullptr; - } - else { - alcMakeContextCurrent(globals::sound_ctx); - } - } - } - } - - splash::init_client(); - - gui::window_title::update(); - - ImGuiIO& io = ImGui::GetIO(); - io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad; - io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; - - globals::fixed_frametime = 0.0f; - globals::fixed_frametime_avg = 0.0f; - globals::fixed_frametime_us = UINT64_MAX; - globals::fixed_framecount = 0; - - globals::curtime = utils::unix_microseconds(); - - globals::window_frametime = 0.0f; - globals::window_frametime_avg = 0.0f; - globals::window_frametime_us = 0; - globals::window_framecount = 0; - - int vmode_width = DEFAULT_WIDTH; - int vmode_height = DEFAULT_HEIGHT; - - if(auto vmode = io::cmdline::get_cstr("mode")) { - std::sscanf(vmode, "%dx%d", &vmode_width, &vmode_height); - vmode_height = math::max(vmode_height, MIN_HEIGHT); - vmode_width = math::max(vmode_width, MIN_WIDTH); - } - - glfwSetWindowSize(globals::window, vmode_width, vmode_height); - - client_game::init(); - - int wwidth, wheight; - glfwGetFramebufferSize(globals::window, &wwidth, &wheight); - on_glfw_framebuffer_size(globals::window, wwidth, wheight); - - threading::init(); - - globals::client_config.load_file("client.conf"); - globals::client_config.load_cmdline(); - - client_game::init_late(); - - auto last_curtime = globals::curtime; - - while(!glfwWindowShouldClose(globals::window)) { - globals::curtime = utils::unix_microseconds(); - - globals::window_frametime_us = globals::curtime - last_curtime; - globals::window_frametime = static_cast<float>(globals::window_frametime_us) / 1000000.0f; - globals::window_frametime_avg += globals::window_frametime; - globals::window_frametime_avg *= 0.5f; - - if(globals::fixed_frametime_us == UINT64_MAX) { - globals::fixed_framecount = 0; - globals::fixed_accumulator = 0; - } - else { - globals::fixed_accumulator += globals::window_frametime_us; - globals::fixed_framecount = globals::fixed_accumulator / globals::fixed_frametime_us; - globals::fixed_accumulator %= globals::fixed_frametime_us; - } - - globals::num_drawcalls = 0; - globals::num_triangles = 0; - - last_curtime = globals::curtime; - - for(std::uint64_t i = 0; i < globals::fixed_framecount; ++i) - client_game::fixed_update(); - client_game::update(); - - ImGui_ImplOpenGL3_NewFrame(); - ImGui_ImplGlfw_NewFrame(); - ImGui::NewFrame(); - - glDisable(GL_BLEND); - - glDisable(GL_DEPTH_TEST); - glBindFramebuffer(GL_FRAMEBUFFER, 0); - glViewport(0, 0, globals::width, globals::height); - - glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT); - - // Make sure there is no stray program object - // being bound to the context. Usually third-party - // overlay software (such as RivaTuner) injects itself - // into the rendering loop and binds internal objects, - // which creates an incomprehensible visual mess - glUseProgram(0); - - client_game::render(); - - client_game::layout(); - - ImGui::Render(); - ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); - - glfwSwapBuffers(globals::window); - - for(std::uint64_t i = 0; i < globals::fixed_framecount; ++i) - client_game::fixed_update_late(); - client_game::update_late(); - - glfwPollEvents(); - - // EnTT provides two ways of dispatching events: - // queued and immediate. When glfwPollEvents() is - // called, immediate events are triggered across - // the application, whilst queued ones are triggered - // later by calling entt::dispatcher::update() - globals::dispatcher.update(); - - globals::window_framecount += 1; - - resource::soft_cleanup(); - - threading::update(); - } - - client_game::shutdown(); - - resource::hard_cleanup(); - - spdlog::info("client: shutdown after {} frames", globals::window_framecount); - spdlog::info("client: average framerate: {:.03f} FPS", 1.0f / globals::window_frametime_avg); - spdlog::info("client: average frametime: {:.03f} ms", 1000.0f * globals::window_frametime_avg); - - ImGui_ImplOpenGL3_Shutdown(); - ImGui_ImplGlfw_Shutdown(); - ImGui::DestroyContext(); - - if(globals::sound_ctx) { - alcMakeContextCurrent(nullptr); - alcDestroyContext(globals::sound_ctx); - alcCloseDevice(globals::sound_dev); - } - - glfwDestroyWindow(globals::window); - glfwTerminate(); - - globals::client_config.save_file("client.conf"); - - threading::shutdown(); - - shared_game::shutdown(); - - return EXIT_SUCCESS; -} +#include "client/pch.hh"
+
+#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"
+#include "core/version.hh"
+
+#include "shared/game.hh"
+#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"
+
+#include "client/const.hh"
+#include "client/game.hh"
+#include "client/globals.hh"
+
+#if defined(_WIN32)
+extern "C" __declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001;
+extern "C" __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+#endif
+
+static void on_glfw_error(int code, const char* message)
+{
+ spdlog::error("glfw: {}", message);
+}
+
+static void on_glfw_char(GLFWwindow* window, unsigned int codepoint)
+{
+ ImGui_ImplGlfw_CharCallback(window, codepoint);
+}
+
+static void on_glfw_cursor_enter(GLFWwindow* window, int entered)
+{
+ ImGui_ImplGlfw_CursorEnterCallback(window, entered);
+}
+
+static void on_glfw_cursor_pos(GLFWwindow* window, double xpos, double ypos)
+{
+ io::GlfwCursorPosEvent event;
+ event.pos.x = static_cast<float>(xpos);
+ event.pos.y = static_cast<float>(ypos);
+ globals::dispatcher.trigger(event);
+
+ ImGui_ImplGlfw_CursorPosCallback(window, xpos, ypos);
+}
+
+static void on_glfw_framebuffer_size(GLFWwindow* window, int width, int height)
+{
+ if(glfwGetWindowAttrib(window, GLFW_ICONIFIED)) {
+ // Don't do anything if the window was just
+ // iconified (minimized); as it turns out minimized
+ // windows on WIN32 seem to be forced into 0x0
+ return;
+ }
+
+ globals::width = width;
+ globals::height = height;
+ globals::aspect = static_cast<float>(width) / static_cast<float>(height);
+
+ io::GlfwFramebufferSizeEvent fb_event;
+ fb_event.size.x = globals::width;
+ fb_event.size.y = globals::height;
+ fb_event.aspect = globals::aspect;
+ globals::dispatcher.trigger(fb_event);
+}
+
+static void on_glfw_key(GLFWwindow* window, int key, int scancode, int action, int mods)
+{
+ io::GlfwKeyEvent event;
+ event.key = key;
+ event.scancode = scancode;
+ event.action = action;
+ event.mods = mods;
+ globals::dispatcher.trigger(event);
+
+ ImGui_ImplGlfw_KeyCallback(window, key, scancode, action, mods);
+}
+
+static void on_glfw_joystick(int joystick_id, int event_type)
+{
+ io::GlfwJoystickEvent event;
+ event.joystick_id = joystick_id;
+ event.event_type = event_type;
+ globals::dispatcher.trigger(event);
+}
+
+static void on_glfw_monitor_event(GLFWmonitor* monitor, int event)
+{
+ ImGui_ImplGlfw_MonitorCallback(monitor, event);
+}
+
+static void on_glfw_mouse_button(GLFWwindow* window, int button, int action, int mods)
+{
+ io::GlfwMouseButtonEvent event;
+ event.button = button;
+ event.action = action;
+ event.mods = mods;
+ globals::dispatcher.trigger(event);
+
+ ImGui_ImplGlfw_MouseButtonCallback(window, button, action, mods);
+}
+
+static void on_glfw_scroll(GLFWwindow* window, double dx, double dy)
+{
+ io::GlfwScrollEvent event;
+ event.dx = static_cast<float>(dx);
+ event.dy = static_cast<float>(dy);
+ globals::dispatcher.trigger(event);
+
+ ImGui_ImplGlfw_ScrollCallback(window, dx, dy);
+}
+
+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)
+{
+ spdlog::info("opengl: {}", reinterpret_cast<const char*>(message));
+}
+
+static void on_termination_signal(int)
+{
+ spdlog::warn("client: received termination signal");
+ glfwSetWindowShouldClose(globals::window, true);
+}
+
+int main(int argc, char** argv)
+{
+ io::cmdline::create(argc, argv);
+
+#if defined(_WIN32)
+#if defined(NDEBUG)
+ if(GetConsoleWindow() && !io::cmdline::contains("debug")) {
+ // Hide the console window on release builds
+ // unless explicitly specified to preserve it instead
+ FreeConsole();
+ }
+#else
+ if(GetConsoleWindow() && io::cmdline::contains("nodebug")) {
+ // Hide the console window on debug builds when
+ // explicitly specified by the user to hide it
+ FreeConsole();
+ }
+#endif
+#endif
+
+ shared_game::init(argc, argv);
+
+ spdlog::info("Voxelius Client {}", version::semver);
+
+ glfwSetErrorCallback(&on_glfw_error);
+
+#if defined(__unix__)
+ // Wayland constantly throws random bullshit at me
+ // when I'm dealing with pretty much anything cross-platform
+ // on pretty much any kind of UNIX and Linux distribution
+ glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
+#endif
+
+ if(!glfwInit()) {
+ spdlog::critical("glfw: init failed");
+ std::terminate();
+ }
+
+ glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
+ glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+ glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+ glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+ glfwWindowHint(GLFW_SAMPLES, 0);
+
+ globals::window = glfwCreateWindow(DEFAULT_WIDTH, DEFAULT_HEIGHT, "Client", nullptr, nullptr);
+
+ if(!globals::window) {
+ spdlog::critical("glfw: failed to open a window");
+ std::terminate();
+ }
+
+ std::signal(SIGINT, &on_termination_signal);
+ std::signal(SIGTERM, &on_termination_signal);
+
+ glfwMakeContextCurrent(globals::window);
+ glfwSwapInterval(1);
+
+ if(!gladLoadGL(&glfwGetProcAddress)) {
+ spdlog::critical("glad: failed to load function pointers");
+ std::terminate();
+ }
+
+ if(GLAD_GL_KHR_debug) {
+ if(!io::cmdline::contains("nodebug")) {
+ glEnable(GL_DEBUG_OUTPUT);
+ glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+ glDebugMessageCallback(&on_opengl_message, nullptr);
+
+ // NVIDIA drivers tend to spam quote-unquote "useful"
+ // information about buffer usage into the debug callback
+ static const std::uint32_t ignore_nvidia_131185 = 131185;
+ glDebugMessageControl(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_OTHER, GL_DONT_CARE, 1, &ignore_nvidia_131185, GL_FALSE);
+ }
+ else {
+ spdlog::warn("glad: nodebug command line parameter found");
+ spdlog::warn("glad: OpenGL errors will not be logged");
+ }
+ }
+ else {
+ spdlog::warn("glad: KHR_debug extension not supported");
+ spdlog::warn("glad: OpenGL errors will not be logged");
+ }
+
+ spdlog::info("opengl: version: {}", reinterpret_cast<const char*>(glGetString(GL_VERSION)));
+ spdlog::info("opengl: renderer: {}", reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
+
+ Image::register_resource();
+ TextureGUI::register_resource();
+ SoundEffect::register_resource();
+
+ glDisable(GL_MULTISAMPLE);
+
+ IMGUI_CHECKVERSION();
+ ImGui::CreateContext();
+ ImGui::StyleColorsDark();
+ ImGui_ImplGlfw_InitForOpenGL(globals::window, false);
+ ImGui_ImplOpenGL3_Init(nullptr);
+
+ // The UI is scaled against a resolution defined by BASE_WIDTH and BASE_HEIGHT
+ // constants. However, UI scale of 1 doesn't look that good, so the window size is
+ // limited to a resolution that allows at least UI scale of 2 and is defined by MIN_WIDTH and MIN_HEIGHT.
+ glfwSetWindowSizeLimits(globals::window, MIN_WIDTH, MIN_HEIGHT, GLFW_DONT_CARE, GLFW_DONT_CARE);
+
+ glfwSetCharCallback(globals::window, &on_glfw_char);
+ glfwSetCursorEnterCallback(globals::window, &on_glfw_cursor_enter);
+ glfwSetCursorPosCallback(globals::window, &on_glfw_cursor_pos);
+ glfwSetFramebufferSizeCallback(globals::window, &on_glfw_framebuffer_size);
+ glfwSetKeyCallback(globals::window, &on_glfw_key);
+ glfwSetMouseButtonCallback(globals::window, &on_glfw_mouse_button);
+ glfwSetScrollCallback(globals::window, &on_glfw_scroll);
+ glfwSetWindowFocusCallback(globals::window, &on_glfw_window_focus);
+
+ glfwSetJoystickCallback(&on_glfw_joystick);
+ glfwSetMonitorCallback(&on_glfw_monitor_event);
+
+ if(auto image = resource::load<Image>("textures/gui/window_icon.png")) {
+ GLFWimage icon_image;
+ icon_image.width = image->size.x;
+ icon_image.height = image->size.y;
+ icon_image.pixels = reinterpret_cast<unsigned char*>(image->pixels);
+ glfwSetWindowIcon(globals::window, 1, &icon_image);
+ }
+
+ if(io::cmdline::contains("nosound")) {
+ spdlog::warn("client: sound disabled [per command line]");
+ globals::sound_dev = nullptr;
+ globals::sound_ctx = nullptr;
+ }
+ else {
+ if(!saladLoadALdefault()) {
+ spdlog::warn("client: sound disabled [openal loading failed]");
+ globals::sound_dev = nullptr;
+ globals::sound_ctx = nullptr;
+ }
+ else {
+ globals::sound_dev = alcOpenDevice(nullptr);
+
+ if(globals::sound_dev == nullptr) {
+ spdlog::warn("client: sound disabled [no device]");
+ globals::sound_ctx = nullptr;
+ }
+ else {
+ spdlog::info("sound: {}", reinterpret_cast<const char*>(alcGetString(globals::sound_dev, ALC_DEVICE_SPECIFIER)));
+
+ globals::sound_ctx = alcCreateContext(globals::sound_dev, nullptr);
+
+ if(globals::sound_ctx == nullptr) {
+ spdlog::warn("client: sound disabled [context creation failed]");
+ alcCloseDevice(globals::sound_dev);
+ globals::sound_dev = nullptr;
+ }
+ else {
+ alcMakeContextCurrent(globals::sound_ctx);
+ }
+ }
+ }
+ }
+
+ splash::init_client();
+
+ gui::window_title::update();
+
+ ImGuiIO& io = ImGui::GetIO();
+ io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad;
+ io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+
+ globals::fixed_frametime = 0.0f;
+ globals::fixed_frametime_avg = 0.0f;
+ globals::fixed_frametime_us = UINT64_MAX;
+ globals::fixed_framecount = 0;
+
+ globals::curtime = utils::unix_microseconds();
+
+ globals::window_frametime = 0.0f;
+ globals::window_frametime_avg = 0.0f;
+ globals::window_frametime_us = 0;
+ globals::window_framecount = 0;
+
+ int vmode_width = DEFAULT_WIDTH;
+ int vmode_height = DEFAULT_HEIGHT;
+
+ if(auto vmode = io::cmdline::get_cstr("mode")) {
+ std::sscanf(vmode, "%dx%d", &vmode_width, &vmode_height);
+ vmode_height = math::max(vmode_height, MIN_HEIGHT);
+ vmode_width = math::max(vmode_width, MIN_WIDTH);
+ }
+
+ glfwSetWindowSize(globals::window, vmode_width, vmode_height);
+
+ client_game::init();
+
+ int wwidth, wheight;
+ glfwGetFramebufferSize(globals::window, &wwidth, &wheight);
+ on_glfw_framebuffer_size(globals::window, wwidth, wheight);
+
+ threading::init();
+
+ globals::client_config.load_file("client.conf");
+ globals::client_config.load_cmdline();
+
+ client_game::init_late();
+
+ auto last_curtime = globals::curtime;
+
+ while(!glfwWindowShouldClose(globals::window)) {
+ globals::curtime = utils::unix_microseconds();
+
+ globals::window_frametime_us = globals::curtime - last_curtime;
+ globals::window_frametime = static_cast<float>(globals::window_frametime_us) / 1000000.0f;
+ globals::window_frametime_avg += globals::window_frametime;
+ globals::window_frametime_avg *= 0.5f;
+
+ if(globals::fixed_frametime_us == UINT64_MAX) {
+ globals::fixed_framecount = 0;
+ globals::fixed_accumulator = 0;
+ }
+ else {
+ globals::fixed_accumulator += globals::window_frametime_us;
+ globals::fixed_framecount = globals::fixed_accumulator / globals::fixed_frametime_us;
+ globals::fixed_accumulator %= globals::fixed_frametime_us;
+ }
+
+ globals::num_drawcalls = 0;
+ globals::num_triangles = 0;
+
+ last_curtime = globals::curtime;
+
+ for(std::uint64_t i = 0; i < globals::fixed_framecount; ++i)
+ client_game::fixed_update();
+ client_game::update();
+
+ ImGui_ImplOpenGL3_NewFrame();
+ ImGui_ImplGlfw_NewFrame();
+ ImGui::NewFrame();
+
+ glDisable(GL_BLEND);
+
+ glDisable(GL_DEPTH_TEST);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ glViewport(0, 0, globals::width, globals::height);
+
+ glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ // Make sure there is no stray program object
+ // being bound to the context. Usually third-party
+ // overlay software (such as RivaTuner) injects itself
+ // into the rendering loop and binds internal objects,
+ // which creates an incomprehensible visual mess
+ glUseProgram(0);
+
+ client_game::render();
+
+ client_game::layout();
+
+ ImGui::Render();
+ ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
+
+ glfwSwapBuffers(globals::window);
+
+ for(std::uint64_t i = 0; i < globals::fixed_framecount; ++i)
+ client_game::fixed_update_late();
+ client_game::update_late();
+
+ glfwPollEvents();
+
+ // EnTT provides two ways of dispatching events:
+ // queued and immediate. When glfwPollEvents() is
+ // called, immediate events are triggered across
+ // the application, whilst queued ones are triggered
+ // later by calling entt::dispatcher::update()
+ globals::dispatcher.update();
+
+ globals::window_framecount += 1;
+
+ resource::soft_cleanup();
+
+ threading::update();
+ }
+
+ client_game::shutdown();
+
+ resource::hard_cleanup();
+
+ spdlog::info("client: shutdown after {} frames", globals::window_framecount);
+ spdlog::info("client: average framerate: {:.03f} FPS", 1.0f / globals::window_frametime_avg);
+ spdlog::info("client: average frametime: {:.03f} ms", 1000.0f * globals::window_frametime_avg);
+
+ ImGui_ImplOpenGL3_Shutdown();
+ ImGui_ImplGlfw_Shutdown();
+ ImGui::DestroyContext();
+
+ if(globals::sound_ctx) {
+ alcMakeContextCurrent(nullptr);
+ alcDestroyContext(globals::sound_ctx);
+ alcCloseDevice(globals::sound_dev);
+ }
+
+ glfwDestroyWindow(globals::window);
+ glfwTerminate();
+
+ globals::client_config.save_file("client.conf");
+
+ threading::shutdown();
+
+ shared_game::shutdown();
+
+ return EXIT_SUCCESS;
+}
diff --git a/game/client/pch.hh b/game/client/pch.hh index 3832081..e6d5681 100644 --- a/game/client/pch.hh +++ b/game/client/pch.hh @@ -1,28 +1,28 @@ -#pragma once - -#include <shared/pch.hh> - -#include <AL/al.h> -#include <AL/alc.h> -#include <AL/salad.h> - -#include <dr_mp3.h> -#include <dr_wav.h> - -#include <GLFW/glfw3.h> - -#include <glad/gl.h> - -#include <imgui.h> -#include <imgui_impl_glfw.h> -#include <imgui_impl_opengl3.h> -#include <imgui_stdlib.h> - -#if defined(_WIN32) -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif - -#if defined(__unix__) -#include <dlfcn.h> -#endif +#pragma once
+
+#include <shared/pch.hh>
+
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <AL/salad.h>
+
+#include <dr_mp3.h>
+#include <dr_wav.h>
+
+#include <GLFW/glfw3.h>
+
+#include <glad/gl.h>
+
+#include <imgui.h>
+#include <imgui_impl_glfw.h>
+#include <imgui_impl_opengl3.h>
+#include <imgui_stdlib.h>
+
+#if defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
+#if defined(__unix__)
+#include <dlfcn.h>
+#endif
diff --git a/game/client/program.cc b/game/client/program.cc index e35716d..9eba02f 100644 --- a/game/client/program.cc +++ b/game/client/program.cc @@ -1,224 +1,224 @@ -#include "client/pch.hh" - -#include "client/program.hh" - -#include "core/utils/string.hh" - -// This fills up the array of source lines and figures out -// which lines are to be dynamically resolved as variant macros -static void parse_source(std::string_view source, std::vector<std::string>& out_lines, std::vector<GL_VariedMacro>& out_variants) -{ - std::string line; - std::istringstream stream = std::istringstream(std::string(source)); - unsigned long line_number = 0UL; - - out_lines.clear(); - out_variants.clear(); - - while(std::getline(stream, line)) { - unsigned int macro_index = {}; - char macro_name[128] = {}; - - if(std::sscanf(line.c_str(), " # pragma variant [ %u ] %127[^, \"\t\r\n]", ¯o_index, ¯o_name) == 2) { - if(out_variants.size() <= macro_index) { - out_variants.resize(macro_index + 1U); - } - - out_variants[macro_index].name = macro_name; - out_variants[macro_index].line = line_number; - out_variants[macro_index].value = std::numeric_limits<unsigned int>::max(); - - out_lines.push_back(std::string()); - line_number += 1UL; - } - else { - out_lines.push_back(line); - line_number += 1UL; - } - } -} - -static GLuint compile_shader(std::string_view path, const char* source, GLenum shader_stage) -{ - GLuint shader = glCreateShader(shader_stage); - glShaderSource(shader, 1, &source, nullptr); - glCompileShader(shader); - - GLint info_log_length; - glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &info_log_length); - - if(info_log_length >= 2) { - std::basic_string<GLchar> info_log; - info_log.resize(info_log_length); - glGetShaderInfoLog(shader, info_log_length, nullptr, info_log.data()); - spdlog::info("gl_program: {}: shader information:", path); - spdlog::info(info_log); - } - - GLint compile_status; - glGetShaderiv(shader, GL_COMPILE_STATUS, &compile_status); - - if(!compile_status) { - glDeleteShader(shader); - return 0; - } - - return shader; -} - -bool GL_Program::setup(std::string_view vpath, std::string_view fpath) -{ - destroy(); - - vert_path = std::string(vpath); - frag_path = std::string(fpath); - - auto vfile = PHYSFS_openRead(vert_path.c_str()); - - if(vfile == nullptr) { - spdlog::warn("gl_program: {}: {}", vpath, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); - return false; - } - - auto vsource = std::string(PHYSFS_fileLength(vfile), char(0x00)); - PHYSFS_readBytes(vfile, vsource.data(), vsource.size()); - PHYSFS_close(vfile); - - auto ffile = PHYSFS_openRead(frag_path.c_str()); - - if(ffile == nullptr) { - spdlog::warn("gl_program: {}: {}", fpath, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); - return false; - } - - auto fsource = std::string(PHYSFS_fileLength(ffile), char(0x00)); - PHYSFS_readBytes(ffile, fsource.data(), fsource.size()); - PHYSFS_close(ffile); - - parse_source(vsource.c_str(), vert_source, vert_variants); - parse_source(fsource.c_str(), frag_source, frag_variants); - - needs_update = true; - handle = 0; - - return true; -} - -bool GL_Program::update(void) -{ - if(!needs_update) { - // The program is already up to - // date with the internal state - return true; - } - - for(const auto& macro : vert_variants) - vert_source[macro.line] = std::format("#define {} {}", macro.name, macro.value); - for(const auto& macro : frag_variants) - frag_source[macro.line] = std::format("#define {} {}", macro.name, macro.value); - - std::string vsource(utils::join(vert_source, "\r\n")); - std::string fsource(utils::join(frag_source, "\r\n")); - - GLuint vert = compile_shader(vert_path.c_str(), vsource.c_str(), GL_VERTEX_SHADER); - GLuint frag = compile_shader(frag_path.c_str(), fsource.c_str(), GL_FRAGMENT_SHADER); - - if(!vert || !frag) { - // needs_update = false; - glDeleteShader(frag); - glDeleteShader(vert); - return false; - } - - handle = glCreateProgram(); - glAttachShader(handle, vert); - glAttachShader(handle, frag); - glLinkProgram(handle); - - GLint info_log_length; - glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &info_log_length); - - if(info_log_length >= 2) { - std::basic_string<GLchar> info_log; - info_log.resize(info_log_length); - glGetProgramInfoLog(handle, info_log_length, nullptr, info_log.data()); - spdlog::info("gl_program: [{}; {}]: program information", vert, frag); - spdlog::info(info_log); - } - - glDeleteShader(frag); - glDeleteShader(vert); - - GLint link_status; - glGetProgramiv(handle, GL_LINK_STATUS, &link_status); - - if(!link_status) { - // needs_update = false; - glDeleteProgram(handle); - return false; - } - - for(auto& uniform : uniforms) { - // NOTE: GL seems to silently ignore invalid uniform - // locations (-1); should we write something into logs about this? - uniform.location = glGetUniformLocation(handle, uniform.name.c_str()); - } - - needs_update = false; - return true; -} - -void GL_Program::destroy(void) -{ - if(handle) { - glDeleteProgram(handle); - handle = 0; - } - - uniforms.clear(); - - frag_variants.clear(); - frag_source.clear(); - frag_path = std::string(); - - vert_variants.clear(); - vert_source.clear(); - vert_path = std::string(); - - needs_update = false; -} - -std::size_t GL_Program::add_uniform(std::string_view name) -{ - for(std::size_t i = 0; i < uniforms.size(); ++i) { - if(0 == uniforms[i].name.compare(name)) { - return i; - } - } - - const std::size_t index = uniforms.size(); - uniforms.push_back(GL_Uniform()); - uniforms[index].location = -1; - uniforms[index].name = name; - return index; -} - -void GL_Program::set_variant_vert(unsigned int variant, unsigned int value) -{ - if(variant < vert_variants.size()) { - if(value != vert_variants[variant].value) { - vert_variants[variant].value = value; - needs_update = true; - } - } -} - -void GL_Program::set_variant_frag(unsigned int variant, unsigned int value) -{ - if(variant < frag_variants.size()) { - if(value != frag_variants[variant].value) { - frag_variants[variant].value = value; - needs_update = true; - } - } -} +#include "client/pch.hh"
+
+#include "client/program.hh"
+
+#include "core/utils/string.hh"
+
+// This fills up the array of source lines and figures out
+// which lines are to be dynamically resolved as variant macros
+static void parse_source(std::string_view source, std::vector<std::string>& out_lines, std::vector<GL_VariedMacro>& out_variants)
+{
+ std::string line;
+ std::istringstream stream = std::istringstream(std::string(source));
+ unsigned long line_number = 0UL;
+
+ out_lines.clear();
+ out_variants.clear();
+
+ while(std::getline(stream, line)) {
+ unsigned int macro_index = {};
+ char macro_name[128] = {};
+
+ if(std::sscanf(line.c_str(), " # pragma variant [ %u ] %127[^, \"\t\r\n]", ¯o_index, ¯o_name) == 2) {
+ if(out_variants.size() <= macro_index) {
+ out_variants.resize(macro_index + 1U);
+ }
+
+ out_variants[macro_index].name = macro_name;
+ out_variants[macro_index].line = line_number;
+ out_variants[macro_index].value = std::numeric_limits<unsigned int>::max();
+
+ out_lines.push_back(std::string());
+ line_number += 1UL;
+ }
+ else {
+ out_lines.push_back(line);
+ line_number += 1UL;
+ }
+ }
+}
+
+static GLuint compile_shader(std::string_view path, const char* source, GLenum shader_stage)
+{
+ GLuint shader = glCreateShader(shader_stage);
+ glShaderSource(shader, 1, &source, nullptr);
+ glCompileShader(shader);
+
+ GLint info_log_length;
+ glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &info_log_length);
+
+ if(info_log_length >= 2) {
+ std::basic_string<GLchar> info_log;
+ info_log.resize(info_log_length);
+ glGetShaderInfoLog(shader, info_log_length, nullptr, info_log.data());
+ spdlog::info("gl_program: {}: shader information:", path);
+ spdlog::info(info_log);
+ }
+
+ GLint compile_status;
+ glGetShaderiv(shader, GL_COMPILE_STATUS, &compile_status);
+
+ if(!compile_status) {
+ glDeleteShader(shader);
+ return 0;
+ }
+
+ return shader;
+}
+
+bool GL_Program::setup(std::string_view vpath, std::string_view fpath)
+{
+ destroy();
+
+ vert_path = std::string(vpath);
+ frag_path = std::string(fpath);
+
+ auto vfile = PHYSFS_openRead(vert_path.c_str());
+
+ if(vfile == nullptr) {
+ spdlog::warn("gl_program: {}: {}", vpath, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+ return false;
+ }
+
+ auto vsource = std::string(PHYSFS_fileLength(vfile), char(0x00));
+ PHYSFS_readBytes(vfile, vsource.data(), vsource.size());
+ PHYSFS_close(vfile);
+
+ auto ffile = PHYSFS_openRead(frag_path.c_str());
+
+ if(ffile == nullptr) {
+ spdlog::warn("gl_program: {}: {}", fpath, PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode()));
+ return false;
+ }
+
+ auto fsource = std::string(PHYSFS_fileLength(ffile), char(0x00));
+ PHYSFS_readBytes(ffile, fsource.data(), fsource.size());
+ PHYSFS_close(ffile);
+
+ parse_source(vsource.c_str(), vert_source, vert_variants);
+ parse_source(fsource.c_str(), frag_source, frag_variants);
+
+ needs_update = true;
+ handle = 0;
+
+ return true;
+}
+
+bool GL_Program::update(void)
+{
+ if(!needs_update) {
+ // The program is already up to
+ // date with the internal state
+ return true;
+ }
+
+ for(const auto& macro : vert_variants)
+ vert_source[macro.line] = std::format("#define {} {}", macro.name, macro.value);
+ for(const auto& macro : frag_variants)
+ frag_source[macro.line] = std::format("#define {} {}", macro.name, macro.value);
+
+ std::string vsource(utils::join(vert_source, "\r\n"));
+ std::string fsource(utils::join(frag_source, "\r\n"));
+
+ GLuint vert = compile_shader(vert_path.c_str(), vsource.c_str(), GL_VERTEX_SHADER);
+ GLuint frag = compile_shader(frag_path.c_str(), fsource.c_str(), GL_FRAGMENT_SHADER);
+
+ if(!vert || !frag) {
+ // needs_update = false;
+ glDeleteShader(frag);
+ glDeleteShader(vert);
+ return false;
+ }
+
+ handle = glCreateProgram();
+ glAttachShader(handle, vert);
+ glAttachShader(handle, frag);
+ glLinkProgram(handle);
+
+ GLint info_log_length;
+ glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &info_log_length);
+
+ if(info_log_length >= 2) {
+ std::basic_string<GLchar> info_log;
+ info_log.resize(info_log_length);
+ glGetProgramInfoLog(handle, info_log_length, nullptr, info_log.data());
+ spdlog::info("gl_program: [{}; {}]: program information", vert, frag);
+ spdlog::info(info_log);
+ }
+
+ glDeleteShader(frag);
+ glDeleteShader(vert);
+
+ GLint link_status;
+ glGetProgramiv(handle, GL_LINK_STATUS, &link_status);
+
+ if(!link_status) {
+ // needs_update = false;
+ glDeleteProgram(handle);
+ return false;
+ }
+
+ for(auto& uniform : uniforms) {
+ // NOTE: GL seems to silently ignore invalid uniform
+ // locations (-1); should we write something into logs about this?
+ uniform.location = glGetUniformLocation(handle, uniform.name.c_str());
+ }
+
+ needs_update = false;
+ return true;
+}
+
+void GL_Program::destroy(void)
+{
+ if(handle) {
+ glDeleteProgram(handle);
+ handle = 0;
+ }
+
+ uniforms.clear();
+
+ frag_variants.clear();
+ frag_source.clear();
+ frag_path = std::string();
+
+ vert_variants.clear();
+ vert_source.clear();
+ vert_path = std::string();
+
+ needs_update = false;
+}
+
+std::size_t GL_Program::add_uniform(std::string_view name)
+{
+ for(std::size_t i = 0; i < uniforms.size(); ++i) {
+ if(0 == uniforms[i].name.compare(name)) {
+ return i;
+ }
+ }
+
+ const std::size_t index = uniforms.size();
+ uniforms.push_back(GL_Uniform());
+ uniforms[index].location = -1;
+ uniforms[index].name = name;
+ return index;
+}
+
+void GL_Program::set_variant_vert(unsigned int variant, unsigned int value)
+{
+ if(variant < vert_variants.size()) {
+ if(value != vert_variants[variant].value) {
+ vert_variants[variant].value = value;
+ needs_update = true;
+ }
+ }
+}
+
+void GL_Program::set_variant_frag(unsigned int variant, unsigned int value)
+{
+ if(variant < frag_variants.size()) {
+ if(value != frag_variants[variant].value) {
+ frag_variants[variant].value = value;
+ needs_update = true;
+ }
+ }
+}
diff --git a/game/client/program.hh b/game/client/program.hh index af78513..bf35417 100644 --- a/game/client/program.hh +++ b/game/client/program.hh @@ -1,34 +1,34 @@ -#pragma once - -struct GL_VariedMacro final { - std::string name; - unsigned long line; - unsigned int value; -}; - -struct GL_Uniform final { - std::string name; - GLint location; -}; - -class GL_Program final { -public: - bool setup(std::string_view vpath, std::string_view fpath); - void destroy(void); - bool update(void); - - std::size_t add_uniform(std::string_view name); - void set_variant_vert(unsigned int variant, unsigned int value); - void set_variant_frag(unsigned int variant, unsigned int value); - -public: - std::string vert_path; - std::string frag_path; - std::vector<std::string> vert_source; - std::vector<std::string> frag_source; - std::vector<GL_VariedMacro> vert_variants; - std::vector<GL_VariedMacro> frag_variants; - std::vector<GL_Uniform> uniforms; - bool needs_update; - GLuint handle; -}; +#pragma once
+
+struct GL_VariedMacro final {
+ std::string name;
+ unsigned long line;
+ unsigned int value;
+};
+
+struct GL_Uniform final {
+ std::string name;
+ GLint location;
+};
+
+class GL_Program final {
+public:
+ bool setup(std::string_view vpath, std::string_view fpath);
+ void destroy(void);
+ bool update(void);
+
+ std::size_t add_uniform(std::string_view name);
+ void set_variant_vert(unsigned int variant, unsigned int value);
+ void set_variant_frag(unsigned int variant, unsigned int value);
+
+public:
+ std::string vert_path;
+ std::string frag_path;
+ std::vector<std::string> vert_source;
+ std::vector<std::string> frag_source;
+ std::vector<GL_VariedMacro> vert_variants;
+ std::vector<GL_VariedMacro> frag_variants;
+ std::vector<GL_Uniform> uniforms;
+ bool needs_update;
+ GLuint handle;
+};
diff --git a/game/client/receive.cc b/game/client/receive.cc index a253911..d6dcac0 100644 --- a/game/client/receive.cc +++ b/game/client/receive.cc @@ -1,192 +1,192 @@ -#include "client/pch.hh" - -#include "client/receive.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/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" -#include "client/session.hh" - -static bool synchronize_entity_id(world::Dimension* dimension, entt::entity entity) -{ - if(dimension->entities.valid(entity)) { - // Entity ID already exists - return true; - } - - auto created = dimension->entities.create(entity); - - if(created == entity) { - // Synchronized successfully - return true; - } - - session::disconnect("protocol.entity_id_desync"); - spdlog::critical("receive: entity desync: network {} resolved as client {}", static_cast<std::uint64_t>(entity), - static_cast<std::uint64_t>(created)); - - gui::message_box::reset(); - gui::message_box::set_title("disconnected.disconnected"); - gui::message_box::set_subtitle("protocol.entity_id_desync"); - gui::message_box::add_button("disconnected.back", [](void) { - globals::gui_screen = GUI_PLAY_MENU; - gui::window_title::update(); - }); - - globals::gui_screen = GUI_MESSAGE_BOX; - - return false; -} - -static void on_dimension_info_packet(const protocol::DimensionInfo& packet) -{ - if(session::peer) { - if(globals::dimension) { - delete globals::dimension; - globals::dimension = nullptr; - globals::player = entt::null; - } - - globals::dimension = new world::Dimension(packet.name.c_str(), packet.gravity); - } -} - -static void on_chunk_voxels_packet(const protocol::ChunkVoxels& packet) -{ - if(session::peer && globals::dimension) { - auto chunk = globals::dimension->create_chunk(packet.chunk); - chunk->set_voxels(packet.voxels); - - world::ChunkUpdateEvent event; - event.dimension = globals::dimension; - event.cpos = packet.chunk; - event.chunk = chunk; - - globals::dispatcher.trigger(event); - - return; - } -} - -static void on_entity_head_packet(const protocol::EntityHead& packet) -{ - if(session::peer && globals::dimension) { - if(synchronize_entity_id(globals::dimension, packet.entity)) { - auto& component = globals::dimension->entities.get_or_emplace<entity::Head>(packet.entity); - auto& prevcomp = globals::dimension->entities.get_or_emplace<entity::client::HeadPrev>(packet.entity); - - // Store the previous component state - prevcomp.angles = component.angles; - prevcomp.offset = component.offset; - - // Assign the new component state - component.angles = packet.angles; - } - } -} - -static void on_entity_transform_packet(const protocol::EntityTransform& packet) -{ - if(session::peer && globals::dimension) { - if(synchronize_entity_id(globals::dimension, packet.entity)) { - auto& component = globals::dimension->entities.get_or_emplace<entity::Transform>(packet.entity); - auto& prevcomp = globals::dimension->entities.get_or_emplace<entity::client::TransformPrev>(packet.entity); - - // Store the previous component state - prevcomp.angles = component.angles; - prevcomp.chunk = component.chunk; - prevcomp.local = component.local; - - // Assign the new component state - component.angles = packet.angles; - component.chunk = packet.chunk; - component.local = packet.local; - } - } -} - -static void on_entity_velocity_packet(const protocol::EntityVelocity& packet) -{ - if(session::peer && globals::dimension) { - if(synchronize_entity_id(globals::dimension, packet.entity)) { - auto& component = globals::dimension->entities.get_or_emplace<entity::Velocity>(packet.entity); - component.value = packet.value; - } - } -} - -static void on_entity_player_packet(const protocol::EntityPlayer& packet) -{ - if(session::peer && globals::dimension) { - if(synchronize_entity_id(globals::dimension, packet.entity)) { - entity::client::create_player(globals::dimension, packet.entity); - } - } -} - -static void on_spawn_player_packet(const protocol::SpawnPlayer& packet) -{ - if(session::peer && globals::dimension) { - if(synchronize_entity_id(globals::dimension, packet.entity)) { - entity::client::create_player(globals::dimension, packet.entity); - - globals::player = packet.entity; - globals::gui_screen = GUI_SCREEN_NONE; - - gui::client_chat::refresh_timings(); - - gui::window_title::update(); - } - } -} - -static void on_remove_entity_packet(const protocol::RemoveEntity& packet) -{ - if(globals::dimension) { - if(packet.entity == globals::player) { - globals::player = entt::null; - } - - globals::dimension->entities.destroy(packet.entity); - } -} - -static void on_generic_sound_packet(const protocol::GenericSound& packet) -{ - sound::play_generic(packet.sound.c_str(), packet.looping, packet.pitch); -} - -static void on_entity_sound_packet(const protocol::EntitySound& packet) -{ - sound::play_entity(packet.entity, packet.sound.c_str(), packet.looping, packet.pitch); -} - -void client_receive::init(void) -{ - globals::dispatcher.sink<protocol::DimensionInfo>().connect<&on_dimension_info_packet>(); - globals::dispatcher.sink<protocol::ChunkVoxels>().connect<&on_chunk_voxels_packet>(); - globals::dispatcher.sink<protocol::EntityHead>().connect<&on_entity_head_packet>(); - globals::dispatcher.sink<protocol::EntityTransform>().connect<&on_entity_transform_packet>(); - globals::dispatcher.sink<protocol::EntityVelocity>().connect<&on_entity_velocity_packet>(); - globals::dispatcher.sink<protocol::EntityPlayer>().connect<&on_entity_player_packet>(); - globals::dispatcher.sink<protocol::SpawnPlayer>().connect<&on_spawn_player_packet>(); - globals::dispatcher.sink<protocol::RemoveEntity>().connect<&on_remove_entity_packet>(); - globals::dispatcher.sink<protocol::GenericSound>().connect<&on_generic_sound_packet>(); - globals::dispatcher.sink<protocol::EntitySound>().connect<&on_entity_sound_packet>(); -} +#include "client/pch.hh"
+
+#include "client/receive.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/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"
+#include "client/session.hh"
+
+static bool synchronize_entity_id(world::Dimension* dimension, entt::entity entity)
+{
+ if(dimension->entities.valid(entity)) {
+ // Entity ID already exists
+ return true;
+ }
+
+ auto created = dimension->entities.create(entity);
+
+ if(created == entity) {
+ // Synchronized successfully
+ return true;
+ }
+
+ session::disconnect("protocol.entity_id_desync");
+ spdlog::critical("receive: entity desync: network {} resolved as client {}", static_cast<std::uint64_t>(entity),
+ static_cast<std::uint64_t>(created));
+
+ gui::message_box::reset();
+ gui::message_box::set_title("disconnected.disconnected");
+ gui::message_box::set_subtitle("protocol.entity_id_desync");
+ gui::message_box::add_button("disconnected.back", [](void) {
+ globals::gui_screen = GUI_PLAY_MENU;
+ gui::window_title::update();
+ });
+
+ globals::gui_screen = GUI_MESSAGE_BOX;
+
+ return false;
+}
+
+static void on_dimension_info_packet(const protocol::DimensionInfo& packet)
+{
+ if(session::peer) {
+ if(globals::dimension) {
+ delete globals::dimension;
+ globals::dimension = nullptr;
+ globals::player = entt::null;
+ }
+
+ globals::dimension = new world::Dimension(packet.name.c_str(), packet.gravity);
+ }
+}
+
+static void on_chunk_voxels_packet(const protocol::ChunkVoxels& packet)
+{
+ if(session::peer && globals::dimension) {
+ auto chunk = globals::dimension->create_chunk(packet.chunk);
+ chunk->set_voxels(packet.voxels);
+
+ world::ChunkUpdateEvent event;
+ event.dimension = globals::dimension;
+ event.cpos = packet.chunk;
+ event.chunk = chunk;
+
+ globals::dispatcher.trigger(event);
+
+ return;
+ }
+}
+
+static void on_entity_head_packet(const protocol::EntityHead& packet)
+{
+ if(session::peer && globals::dimension) {
+ if(synchronize_entity_id(globals::dimension, packet.entity)) {
+ auto& component = globals::dimension->entities.get_or_emplace<entity::Head>(packet.entity);
+ auto& prevcomp = globals::dimension->entities.get_or_emplace<entity::client::HeadPrev>(packet.entity);
+
+ // Store the previous component state
+ prevcomp.angles = component.angles;
+ prevcomp.offset = component.offset;
+
+ // Assign the new component state
+ component.angles = packet.angles;
+ }
+ }
+}
+
+static void on_entity_transform_packet(const protocol::EntityTransform& packet)
+{
+ if(session::peer && globals::dimension) {
+ if(synchronize_entity_id(globals::dimension, packet.entity)) {
+ auto& component = globals::dimension->entities.get_or_emplace<entity::Transform>(packet.entity);
+ auto& prevcomp = globals::dimension->entities.get_or_emplace<entity::client::TransformPrev>(packet.entity);
+
+ // Store the previous component state
+ prevcomp.angles = component.angles;
+ prevcomp.chunk = component.chunk;
+ prevcomp.local = component.local;
+
+ // Assign the new component state
+ component.angles = packet.angles;
+ component.chunk = packet.chunk;
+ component.local = packet.local;
+ }
+ }
+}
+
+static void on_entity_velocity_packet(const protocol::EntityVelocity& packet)
+{
+ if(session::peer && globals::dimension) {
+ if(synchronize_entity_id(globals::dimension, packet.entity)) {
+ auto& component = globals::dimension->entities.get_or_emplace<entity::Velocity>(packet.entity);
+ component.value = packet.value;
+ }
+ }
+}
+
+static void on_entity_player_packet(const protocol::EntityPlayer& packet)
+{
+ if(session::peer && globals::dimension) {
+ if(synchronize_entity_id(globals::dimension, packet.entity)) {
+ entity::client::create_player(globals::dimension, packet.entity);
+ }
+ }
+}
+
+static void on_spawn_player_packet(const protocol::SpawnPlayer& packet)
+{
+ if(session::peer && globals::dimension) {
+ if(synchronize_entity_id(globals::dimension, packet.entity)) {
+ entity::client::create_player(globals::dimension, packet.entity);
+
+ globals::player = packet.entity;
+ globals::gui_screen = GUI_SCREEN_NONE;
+
+ gui::client_chat::refresh_timings();
+
+ gui::window_title::update();
+ }
+ }
+}
+
+static void on_remove_entity_packet(const protocol::RemoveEntity& packet)
+{
+ if(globals::dimension) {
+ if(packet.entity == globals::player) {
+ globals::player = entt::null;
+ }
+
+ globals::dimension->entities.destroy(packet.entity);
+ }
+}
+
+static void on_generic_sound_packet(const protocol::GenericSound& packet)
+{
+ sound::play_generic(packet.sound.c_str(), packet.looping, packet.pitch);
+}
+
+static void on_entity_sound_packet(const protocol::EntitySound& packet)
+{
+ sound::play_entity(packet.entity, packet.sound.c_str(), packet.looping, packet.pitch);
+}
+
+void client_receive::init(void)
+{
+ globals::dispatcher.sink<protocol::DimensionInfo>().connect<&on_dimension_info_packet>();
+ globals::dispatcher.sink<protocol::ChunkVoxels>().connect<&on_chunk_voxels_packet>();
+ globals::dispatcher.sink<protocol::EntityHead>().connect<&on_entity_head_packet>();
+ globals::dispatcher.sink<protocol::EntityTransform>().connect<&on_entity_transform_packet>();
+ globals::dispatcher.sink<protocol::EntityVelocity>().connect<&on_entity_velocity_packet>();
+ globals::dispatcher.sink<protocol::EntityPlayer>().connect<&on_entity_player_packet>();
+ globals::dispatcher.sink<protocol::SpawnPlayer>().connect<&on_spawn_player_packet>();
+ globals::dispatcher.sink<protocol::RemoveEntity>().connect<&on_remove_entity_packet>();
+ globals::dispatcher.sink<protocol::GenericSound>().connect<&on_generic_sound_packet>();
+ globals::dispatcher.sink<protocol::EntitySound>().connect<&on_entity_sound_packet>();
+}
diff --git a/game/client/receive.hh b/game/client/receive.hh index d675392..d958581 100644 --- a/game/client/receive.hh +++ b/game/client/receive.hh @@ -1,6 +1,6 @@ -#pragma once - -namespace client_receive -{ -void init(void); -} // namespace client_receive +#pragma once
+
+namespace client_receive
+{
+void init(void);
+} // namespace client_receive
diff --git a/game/client/resource/sound_effect.cc b/game/client/resource/sound_effect.cc index 4fb3e82..d6cc7c5 100644 --- a/game/client/resource/sound_effect.cc +++ b/game/client/resource/sound_effect.cc @@ -1,90 +1,90 @@ -#include "client/pch.hh" - -#include "client/resource/sound_effect.hh" - -#include "core/resource/resource.hh" - -#include "core/utils/physfs.hh" - -#include "client/globals.hh" - -static std::size_t drwav_read_physfs(void* file, void* output, std::size_t count) -{ - return static_cast<std::size_t>(PHYSFS_readBytes(reinterpret_cast<PHYSFS_File*>(file), output, count)); -} - -static drwav_bool32 drwav_seek_physfs(void* file, int offset, drwav_seek_origin origin) -{ - if(origin == drwav_seek_origin_current) { - return PHYSFS_seek(reinterpret_cast<PHYSFS_File*>(file), PHYSFS_tell(reinterpret_cast<PHYSFS_File*>(file)) + offset); - } - else { - return PHYSFS_seek(reinterpret_cast<PHYSFS_File*>(file), offset); - } -} - -static const void* sound_effect_load_func(const char* name, std::uint32_t flags) -{ - assert(name); - - if(globals::sound_ctx == nullptr) { - // Sound is disabled - return nullptr; - } - - auto file = PHYSFS_openRead(name); - - if(file == nullptr) { - spdlog::warn("sfx: {}: {}", name, utils::physfs_error()); - return nullptr; - } - - drwav wav_info; - - if(!drwav_init(&wav_info, &drwav_read_physfs, &drwav_seek_physfs, file, nullptr)) { - spdlog::warn("sfx: {}: drwav_init failed", name); - PHYSFS_close(file); - return nullptr; - } - - if(wav_info.channels != 1) { - spdlog::warn("sfx: {}: only mono sound files are allowed", name); - drwav_uninit(&wav_info); - PHYSFS_close(file); - return nullptr; - } - - auto samples = new ALshort[wav_info.totalPCMFrameCount]; - auto count = drwav_read_pcm_frames_s16(&wav_info, wav_info.totalPCMFrameCount, reinterpret_cast<drwav_int16*>(samples)); - auto sample_rate = static_cast<ALsizei>(wav_info.sampleRate); - auto length = static_cast<ALsizei>(count * sizeof(ALshort)); - - drwav_uninit(&wav_info); - PHYSFS_close(file); - - auto new_resource = new SoundEffect(); - new_resource->name = std::string(name); - - alGenBuffers(1, &new_resource->buffer); - alBufferData(new_resource->buffer, AL_FORMAT_MONO16, samples, length, sample_rate); - - delete[] samples; - - return new_resource; -} - -static void sound_effect_free_func(const void* resource) -{ - assert(resource); - - auto sound_effect = reinterpret_cast<const SoundEffect*>(resource); - - alDeleteBuffers(1, &sound_effect->buffer); - - delete sound_effect; -} - -void SoundEffect::register_resource(void) -{ - resource::register_loader<SoundEffect>(&sound_effect_load_func, &sound_effect_free_func); -} +#include "client/pch.hh"
+
+#include "client/resource/sound_effect.hh"
+
+#include "core/resource/resource.hh"
+
+#include "core/utils/physfs.hh"
+
+#include "client/globals.hh"
+
+static std::size_t drwav_read_physfs(void* file, void* output, std::size_t count)
+{
+ return static_cast<std::size_t>(PHYSFS_readBytes(reinterpret_cast<PHYSFS_File*>(file), output, count));
+}
+
+static drwav_bool32 drwav_seek_physfs(void* file, int offset, drwav_seek_origin origin)
+{
+ if(origin == drwav_seek_origin_current) {
+ return PHYSFS_seek(reinterpret_cast<PHYSFS_File*>(file), PHYSFS_tell(reinterpret_cast<PHYSFS_File*>(file)) + offset);
+ }
+ else {
+ return PHYSFS_seek(reinterpret_cast<PHYSFS_File*>(file), offset);
+ }
+}
+
+static const void* sound_effect_load_func(const char* name, std::uint32_t flags)
+{
+ assert(name);
+
+ if(globals::sound_ctx == nullptr) {
+ // Sound is disabled
+ return nullptr;
+ }
+
+ auto file = PHYSFS_openRead(name);
+
+ if(file == nullptr) {
+ spdlog::warn("sfx: {}: {}", name, utils::physfs_error());
+ return nullptr;
+ }
+
+ drwav wav_info;
+
+ if(!drwav_init(&wav_info, &drwav_read_physfs, &drwav_seek_physfs, file, nullptr)) {
+ spdlog::warn("sfx: {}: drwav_init failed", name);
+ PHYSFS_close(file);
+ return nullptr;
+ }
+
+ if(wav_info.channels != 1) {
+ spdlog::warn("sfx: {}: only mono sound files are allowed", name);
+ drwav_uninit(&wav_info);
+ PHYSFS_close(file);
+ return nullptr;
+ }
+
+ auto samples = new ALshort[wav_info.totalPCMFrameCount];
+ auto count = drwav_read_pcm_frames_s16(&wav_info, wav_info.totalPCMFrameCount, reinterpret_cast<drwav_int16*>(samples));
+ auto sample_rate = static_cast<ALsizei>(wav_info.sampleRate);
+ auto length = static_cast<ALsizei>(count * sizeof(ALshort));
+
+ drwav_uninit(&wav_info);
+ PHYSFS_close(file);
+
+ auto new_resource = new SoundEffect();
+ new_resource->name = std::string(name);
+
+ alGenBuffers(1, &new_resource->buffer);
+ alBufferData(new_resource->buffer, AL_FORMAT_MONO16, samples, length, sample_rate);
+
+ delete[] samples;
+
+ return new_resource;
+}
+
+static void sound_effect_free_func(const void* resource)
+{
+ assert(resource);
+
+ auto sound_effect = reinterpret_cast<const SoundEffect*>(resource);
+
+ alDeleteBuffers(1, &sound_effect->buffer);
+
+ delete sound_effect;
+}
+
+void SoundEffect::register_resource(void)
+{
+ resource::register_loader<SoundEffect>(&sound_effect_load_func, &sound_effect_free_func);
+}
diff --git a/game/client/resource/sound_effect.hh b/game/client/resource/sound_effect.hh index f2db33b..ab68ed2 100644 --- a/game/client/resource/sound_effect.hh +++ b/game/client/resource/sound_effect.hh @@ -1,8 +1,8 @@ -#pragma once - -struct SoundEffect final { - static void register_resource(void); - - std::string name; - ALuint buffer; -}; +#pragma once
+
+struct SoundEffect final {
+ static void register_resource(void);
+
+ std::string name;
+ ALuint buffer;
+};
diff --git a/game/client/resource/texture_gui.cc b/game/client/resource/texture_gui.cc index beb2f54..be8a6ed 100644 --- a/game/client/resource/texture_gui.cc +++ b/game/client/resource/texture_gui.cc @@ -1,83 +1,83 @@ -#include "client/pch.hh" - -#include "client/resource/texture_gui.hh" - -#include "core/resource/image.hh" -#include "core/resource/resource.hh" - -static const void* texture_gui_load_func(const char* name, std::uint32_t flags) -{ - assert(name); - - unsigned int image_load_flags = 0U; - - if(flags & TEXTURE_GUI_LOAD_VFLIP) { - image_load_flags |= IMAGE_LOAD_FLIP; - } - - if(flags & TEXTURE_GUI_LOAD_GRAYSCALE) { - image_load_flags |= IMAGE_LOAD_GRAY; - } - - if(auto image = resource::load<Image>(name, image_load_flags)) { - GLuint gl_texture; - - glGenTextures(1, &gl_texture); - glBindTexture(GL_TEXTURE_2D, gl_texture); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image->size.x, image->size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); - - if(flags & TEXTURE_GUI_LOAD_CLAMP_S) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - } - else { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - } - - if(flags & TEXTURE_GUI_LOAD_CLAMP_T) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - } - else { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - } - - if(flags & TEXTURE_GUI_LOAD_LINEAR_MAG) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - } - else { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - } - - if(flags & TEXTURE_GUI_LOAD_LINEAR_MIN) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - } - else { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - } - - auto new_resource = new TextureGUI(); - new_resource->handle = static_cast<ImTextureID>(gl_texture); - new_resource->size.x = image->size.x; - new_resource->size.y = image->size.y; - - return new_resource; - } - - return nullptr; -} - -static void texture_gui_free_func(const void* resource) -{ - assert(resource); - - auto texture_gui = reinterpret_cast<const TextureGUI*>(resource); - auto gl_texture = static_cast<GLuint>(texture_gui->handle); - - glDeleteTextures(1, &gl_texture); - - delete texture_gui; -} - -void TextureGUI::register_resource(void) -{ - resource::register_loader<TextureGUI>(&texture_gui_load_func, &texture_gui_free_func); -} +#include "client/pch.hh"
+
+#include "client/resource/texture_gui.hh"
+
+#include "core/resource/image.hh"
+#include "core/resource/resource.hh"
+
+static const void* texture_gui_load_func(const char* name, std::uint32_t flags)
+{
+ assert(name);
+
+ unsigned int image_load_flags = 0U;
+
+ if(flags & TEXTURE_GUI_LOAD_VFLIP) {
+ image_load_flags |= IMAGE_LOAD_FLIP;
+ }
+
+ if(flags & TEXTURE_GUI_LOAD_GRAYSCALE) {
+ image_load_flags |= IMAGE_LOAD_GRAY;
+ }
+
+ if(auto image = resource::load<Image>(name, image_load_flags)) {
+ GLuint gl_texture;
+
+ glGenTextures(1, &gl_texture);
+ glBindTexture(GL_TEXTURE_2D, gl_texture);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image->size.x, image->size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
+
+ if(flags & TEXTURE_GUI_LOAD_CLAMP_S) {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ }
+ else {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ }
+
+ if(flags & TEXTURE_GUI_LOAD_CLAMP_T) {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ }
+ else {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+ }
+
+ if(flags & TEXTURE_GUI_LOAD_LINEAR_MAG) {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ }
+ else {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ }
+
+ if(flags & TEXTURE_GUI_LOAD_LINEAR_MIN) {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ }
+ else {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ }
+
+ auto new_resource = new TextureGUI();
+ new_resource->handle = static_cast<ImTextureID>(gl_texture);
+ new_resource->size.x = image->size.x;
+ new_resource->size.y = image->size.y;
+
+ return new_resource;
+ }
+
+ return nullptr;
+}
+
+static void texture_gui_free_func(const void* resource)
+{
+ assert(resource);
+
+ auto texture_gui = reinterpret_cast<const TextureGUI*>(resource);
+ auto gl_texture = static_cast<GLuint>(texture_gui->handle);
+
+ glDeleteTextures(1, &gl_texture);
+
+ delete texture_gui;
+}
+
+void TextureGUI::register_resource(void)
+{
+ resource::register_loader<TextureGUI>(&texture_gui_load_func, &texture_gui_free_func);
+}
diff --git a/game/client/resource/texture_gui.hh b/game/client/resource/texture_gui.hh index 2d42c83..9ce0535 100644 --- a/game/client/resource/texture_gui.hh +++ b/game/client/resource/texture_gui.hh @@ -1,15 +1,15 @@ -#pragma once - -constexpr static unsigned int TEXTURE_GUI_LOAD_CLAMP_S = 0x0001; -constexpr static unsigned int TEXTURE_GUI_LOAD_CLAMP_T = 0x0002; -constexpr static unsigned int TEXTURE_GUI_LOAD_LINEAR_MAG = 0x0004; -constexpr static unsigned int TEXTURE_GUI_LOAD_LINEAR_MIN = 0x0008; -constexpr static unsigned int TEXTURE_GUI_LOAD_VFLIP = 0x0010; -constexpr static unsigned int TEXTURE_GUI_LOAD_GRAYSCALE = 0x0020; - -struct TextureGUI final { - static void register_resource(void); - - ImTextureID handle; - glm::ivec2 size; -}; +#pragma once
+
+constexpr static unsigned int TEXTURE_GUI_LOAD_CLAMP_S = 0x0001;
+constexpr static unsigned int TEXTURE_GUI_LOAD_CLAMP_T = 0x0002;
+constexpr static unsigned int TEXTURE_GUI_LOAD_LINEAR_MAG = 0x0004;
+constexpr static unsigned int TEXTURE_GUI_LOAD_LINEAR_MIN = 0x0008;
+constexpr static unsigned int TEXTURE_GUI_LOAD_VFLIP = 0x0010;
+constexpr static unsigned int TEXTURE_GUI_LOAD_GRAYSCALE = 0x0020;
+
+struct TextureGUI final {
+ static void register_resource(void);
+
+ ImTextureID handle;
+ glm::ivec2 size;
+};
diff --git a/game/client/screenshot.cc b/game/client/screenshot.cc index 9b573ef..87ab5e7 100644 --- a/game/client/screenshot.cc +++ b/game/client/screenshot.cc @@ -1,86 +1,86 @@ -#include "client/pch.hh" - -#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" -#include "client/toggles.hh" - -static config::KeyBind screenshot_key(GLFW_KEY_F2); - -static void stbi_png_physfs_callback(void* context, void* data, int size) -{ - PHYSFS_writeBytes(reinterpret_cast<PHYSFS_File*>(context), data, size); -} - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if(!globals::gui_keybind_ptr && !toggles::is_sequence_await) { - if(screenshot_key.equals(event.key) && (event.action == GLFW_PRESS)) { - screenshot::take(); - return; - } - } -} - -void screenshot::init(void) -{ - globals::client_config.add_value("screenshot.key", screenshot_key); - - settings::add_keybind(0, screenshot_key, settings_location::KEYBOARD_MISC, "key.screenshot"); - - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); -} - -void screenshot::take(void) -{ - auto stride = 3 * globals::width; - auto length = 3 * globals::width * globals::height; - auto pixels = new std::byte[length]; - - glBindFramebuffer(GL_FRAMEBUFFER, 0); - - GLint old_pack_alignment; - glGetIntegerv(GL_PACK_ALIGNMENT, &old_pack_alignment); - - // The window can be of any size, including irregular - // values such as, say 641x480, while there is a default - // alignment value of sorts that might result in a corrupted - // image; we set GL_PACK_ALIGNMENT to 1, enabling byte-alignment - glPixelStorei(GL_PACK_ALIGNMENT, 1); - - glReadPixels(0, 0, globals::width, globals::height, GL_RGB, GL_UNSIGNED_BYTE, pixels); - - // Restore the old pack alignment value - glPixelStorei(GL_PACK_ALIGNMENT, old_pack_alignment); - - const auto directory = std::string("screenshots"); - const auto filename = std::format("{}.png", utils::unix_microseconds()); - const auto filepath = std::format("{}/{}", directory, filename); - - PHYSFS_mkdir(directory.c_str()); - - if(auto file = PHYSFS_openWrite(filepath.c_str())) { - stbi_flip_vertically_on_write(true); - stbi_write_png_to_func(&stbi_png_physfs_callback, file, globals::width, globals::height, 3, pixels, stride); - - spdlog::info("screenshot: wrote {}", filepath); - - gui::client_chat::print(std::format("{} {}", gui::language::resolve("chat.screenshot_message"), filename)); - - PHYSFS_close(file); - } - - delete[] pixels; -} +#include "client/pch.hh"
+
+#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"
+#include "client/toggles.hh"
+
+static config::KeyBind screenshot_key(GLFW_KEY_F2);
+
+static void stbi_png_physfs_callback(void* context, void* data, int size)
+{
+ PHYSFS_writeBytes(reinterpret_cast<PHYSFS_File*>(context), data, size);
+}
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if(!globals::gui_keybind_ptr && !toggles::is_sequence_await) {
+ if(screenshot_key.equals(event.key) && (event.action == GLFW_PRESS)) {
+ screenshot::take();
+ return;
+ }
+ }
+}
+
+void screenshot::init(void)
+{
+ globals::client_config.add_value("screenshot.key", screenshot_key);
+
+ settings::add_keybind(0, screenshot_key, settings_location::KEYBOARD_MISC, "key.screenshot");
+
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+}
+
+void screenshot::take(void)
+{
+ auto stride = 3 * globals::width;
+ auto length = 3 * globals::width * globals::height;
+ auto pixels = new std::byte[length];
+
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+ GLint old_pack_alignment;
+ glGetIntegerv(GL_PACK_ALIGNMENT, &old_pack_alignment);
+
+ // The window can be of any size, including irregular
+ // values such as, say 641x480, while there is a default
+ // alignment value of sorts that might result in a corrupted
+ // image; we set GL_PACK_ALIGNMENT to 1, enabling byte-alignment
+ glPixelStorei(GL_PACK_ALIGNMENT, 1);
+
+ glReadPixels(0, 0, globals::width, globals::height, GL_RGB, GL_UNSIGNED_BYTE, pixels);
+
+ // Restore the old pack alignment value
+ glPixelStorei(GL_PACK_ALIGNMENT, old_pack_alignment);
+
+ const auto directory = std::string("screenshots");
+ const auto filename = std::format("{}.png", utils::unix_microseconds());
+ const auto filepath = std::format("{}/{}", directory, filename);
+
+ PHYSFS_mkdir(directory.c_str());
+
+ if(auto file = PHYSFS_openWrite(filepath.c_str())) {
+ stbi_flip_vertically_on_write(true);
+ stbi_write_png_to_func(&stbi_png_physfs_callback, file, globals::width, globals::height, 3, pixels, stride);
+
+ spdlog::info("screenshot: wrote {}", filepath);
+
+ gui::client_chat::print(std::format("{} {}", gui::language::resolve("chat.screenshot_message"), filename));
+
+ PHYSFS_close(file);
+ }
+
+ delete[] pixels;
+}
diff --git a/game/client/screenshot.hh b/game/client/screenshot.hh index fecbd2f..b76507e 100644 --- a/game/client/screenshot.hh +++ b/game/client/screenshot.hh @@ -1,7 +1,7 @@ -#pragma once - -namespace screenshot -{ -void init(void); -void take(void); -} // namespace screenshot +#pragma once
+
+namespace screenshot
+{
+void init(void);
+void take(void);
+} // namespace screenshot
diff --git a/game/client/session.cc b/game/client/session.cc index 96bd28a..7e0d36c 100644 --- a/game/client/session.cc +++ b/game/client/session.cc @@ -1,307 +1,307 @@ -#include "client/pch.hh" - -#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" - -#include "shared/coord.hh" -#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" -#include "client/globals.hh" - -ENetPeer* session::peer = nullptr; -std::uint16_t session::client_index = UINT16_MAX; -std::uint64_t session::client_identity = UINT64_MAX; - -static std::uint64_t server_password_hash = UINT64_MAX; - -static void set_fixed_tickrate(std::uint16_t tickrate) -{ - globals::fixed_frametime_us = 1000000U / math::clamp<std::uint64_t>(tickrate, 10U, 300U); - globals::fixed_frametime = static_cast<float>(globals::fixed_frametime_us) / 1000000.0f; - globals::fixed_accumulator = 0; -} - -static void on_login_response_packet(const protocol::LoginResponse& packet) -{ - spdlog::info("session: assigned client_index={}", packet.client_index); - spdlog::info("session: assigned client_identity={}", packet.client_identity); - spdlog::info("session: server ticks at {} TPS", packet.server_tickrate); - - session::client_index = packet.client_index; - session::client_identity = packet.client_identity; - - set_fixed_tickrate(packet.server_tickrate); - - gui::progress_bar::set_title("connecting.loading_world"); -} - -static void on_disconnect_packet(const protocol::Disconnect& packet) -{ - enet_peer_disconnect(session::peer, 0); - - spdlog::info("session: disconnected: {}", packet.reason); - - gui::client_chat::clear(); - - session::peer = nullptr; - session::client_index = UINT16_MAX; - session::client_identity = UINT64_MAX; - - globals::fixed_frametime_us = UINT64_MAX; - globals::fixed_frametime = 0.0f; - globals::fixed_accumulator = 0; - - server_password_hash = UINT64_MAX; - - delete globals::dimension; - globals::player = entt::null; - globals::dimension = nullptr; - - gui::message_box::reset(); - gui::message_box::set_title("disconnected.disconnected"); - gui::message_box::set_subtitle(packet.reason.c_str()); - gui::message_box::add_button("disconnected.back", [](void) { - globals::gui_screen = GUI_PLAY_MENU; - gui::window_title::update(); - }); - - globals::gui_screen = GUI_MESSAGE_BOX; -} - -static void on_set_voxel_packet(const protocol::SetVoxel& packet) -{ - auto cpos = coord::to_chunk(packet.vpos); - auto lpos = coord::to_local(packet.vpos); - auto index = coord::to_index(lpos); - - if(auto chunk = globals::dimension->find_chunk(cpos)) { - if(chunk->get_voxel(index) != packet.voxel) { - chunk->set_voxel(packet.voxel, index); - - world::ChunkUpdateEvent event; - event.dimension = globals::dimension; - event.chunk = chunk; - event.cpos = cpos; - - // Send a generic ChunkUpdate event to shake - // up the mesher; directly calling world::set_voxel - // here would result in a networked feedback loop - // caused by event handler below tripping - globals::dispatcher.trigger(event); - } - } -} - -// NOTE: [session] is a good place for this since [receive] -// handles entity data sent by the server and [session] handles -// everything else network related that is not player movement -static void on_voxel_set(const world::VoxelSetEvent& event) -{ - if(session::peer) { - // Propagate changes to the server - // FIXME: should we also validate things here or wait for the server to do so - protocol::SetVoxel packet; - packet.vpos = coord::to_voxel(event.cpos, event.lpos); - packet.voxel = event.voxel; - - protocol::send(session::peer, protocol::encode(packet)); - } -} - -void session::init(void) -{ - session::peer = nullptr; - session::client_index = UINT16_MAX; - session::client_identity = UINT64_MAX; - - globals::fixed_frametime_us = UINT64_MAX; - globals::fixed_frametime = 0.0f; - globals::fixed_accumulator = 0; - - server_password_hash = UINT64_MAX; - - globals::dispatcher.sink<protocol::LoginResponse>().connect<&on_login_response_packet>(); - globals::dispatcher.sink<protocol::Disconnect>().connect<&on_disconnect_packet>(); - globals::dispatcher.sink<protocol::SetVoxel>().connect<&on_set_voxel_packet>(); - - globals::dispatcher.sink<world::VoxelSetEvent>().connect<&on_voxel_set>(); -} - -void session::shutdown(void) -{ - session::disconnect("protocol.client_shutdown"); - - globals::fixed_frametime_us = UINT64_MAX; - globals::fixed_frametime = 0.0f; - globals::fixed_accumulator = 0; -} - -void session::invalidate(void) -{ - if(session::peer) { - enet_peer_reset(session::peer); - - gui::message_box::reset(); - gui::message_box::set_title("disconnected.disconnected"); - gui::message_box::set_subtitle("enet.peer_connection_timeout"); - gui::message_box::add_button("disconnected.back", [](void) { - globals::gui_screen = GUI_PLAY_MENU; - gui::window_title::update(); - }); - - globals::gui_screen = GUI_MESSAGE_BOX; - } - - gui::client_chat::clear(); - - session::peer = nullptr; - session::client_index = UINT16_MAX; - session::client_identity = UINT64_MAX; - - globals::fixed_frametime_us = UINT64_MAX; - globals::fixed_frametime = 0.0f; - globals::fixed_accumulator = 0; - - server_password_hash = UINT64_MAX; - - delete globals::dimension; - globals::player = entt::null; - globals::dimension = nullptr; -} - -void session::connect(std::string_view host, std::uint16_t port, std::string_view password) -{ - ENetAddress address; - enet_address_set_host(&address, std::string(host).c_str()); - address.port = port; - - session::peer = enet_host_connect(globals::client_host, &address, 1, 0); - session::client_index = UINT16_MAX; - session::client_identity = UINT64_MAX; - - globals::fixed_frametime_us = UINT64_MAX; - globals::fixed_frametime = 0.0f; - globals::fixed_accumulator = 0; - - server_password_hash = math::crc64(password.data(), password.size()); - - if(!session::peer) { - server_password_hash = UINT64_MAX; - - gui::message_box::reset(); - gui::message_box::set_title("disconnected.disconnected"); - gui::message_box::set_subtitle("enet.peer_connection_failed"); - gui::message_box::add_button("disconnected.back", [](void) { - globals::gui_screen = GUI_PLAY_MENU; - gui::window_title::update(); - }); - - globals::gui_screen = GUI_MESSAGE_BOX; - - return; - } - - gui::progress_bar::reset(); - gui::progress_bar::set_title("connecting.connecting"); - gui::progress_bar::set_button("connecting.cancel_button", [](void) { - enet_peer_disconnect(session::peer, 0); - - session::peer = nullptr; - session::client_index = UINT16_MAX; - session::client_identity = UINT64_MAX; - - globals::fixed_frametime_us = UINT64_MAX; - globals::fixed_frametime = 0.0f; - globals::fixed_accumulator = 0; - - server_password_hash = UINT64_MAX; - - delete globals::dimension; - globals::player = entt::null; - globals::dimension = nullptr; - - globals::gui_screen = GUI_PLAY_MENU; - }); - - globals::gui_screen = GUI_PROGRESS_BAR; -} - -void session::disconnect(std::string_view reason) -{ - if(session::peer) { - protocol::Disconnect packet; - packet.reason = std::string(reason); - - protocol::send(session::peer, protocol::encode(packet)); - - enet_host_flush(globals::client_host); - enet_host_service(globals::client_host, nullptr, 50); - enet_peer_reset(session::peer); - - session::peer = nullptr; - session::client_index = UINT16_MAX; - session::client_identity = UINT64_MAX; - - globals::fixed_frametime_us = UINT64_MAX; - globals::fixed_frametime = 0.0f; - globals::fixed_accumulator = 0; - - server_password_hash = UINT64_MAX; - - delete globals::dimension; - globals::player = entt::null; - globals::dimension = nullptr; - - gui::client_chat::clear(); - } -} - -void session::send_login_request(void) -{ - protocol::LoginRequest packet; - packet.version = protocol::VERSION; - packet.voxel_registry_checksum = world::voxel_registry::calculate_checksum(); - packet.item_registry_checksum = world::item_registry::calculate_checksum(); - packet.password_hash = server_password_hash; - packet.username = client_game::username.get(); - - protocol::send(session::peer, protocol::encode(packet)); - - server_password_hash = UINT64_MAX; - - gui::progress_bar::set_title("connecting.logging_in"); - globals::gui_screen = GUI_PROGRESS_BAR; -} - -bool session::is_ingame(void) -{ - if(globals::dimension) { - return globals::dimension->entities.valid(globals::player); - } - else { - return false; - } -} +#include "client/pch.hh"
+
+#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"
+
+#include "shared/coord.hh"
+#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"
+#include "client/globals.hh"
+
+ENetPeer* session::peer = nullptr;
+std::uint16_t session::client_index = UINT16_MAX;
+std::uint64_t session::client_identity = UINT64_MAX;
+
+static std::uint64_t server_password_hash = UINT64_MAX;
+
+static void set_fixed_tickrate(std::uint16_t tickrate)
+{
+ globals::fixed_frametime_us = 1000000U / math::clamp<std::uint64_t>(tickrate, 10U, 300U);
+ globals::fixed_frametime = static_cast<float>(globals::fixed_frametime_us) / 1000000.0f;
+ globals::fixed_accumulator = 0;
+}
+
+static void on_login_response_packet(const protocol::LoginResponse& packet)
+{
+ spdlog::info("session: assigned client_index={}", packet.client_index);
+ spdlog::info("session: assigned client_identity={}", packet.client_identity);
+ spdlog::info("session: server ticks at {} TPS", packet.server_tickrate);
+
+ session::client_index = packet.client_index;
+ session::client_identity = packet.client_identity;
+
+ set_fixed_tickrate(packet.server_tickrate);
+
+ gui::progress_bar::set_title("connecting.loading_world");
+}
+
+static void on_disconnect_packet(const protocol::Disconnect& packet)
+{
+ enet_peer_disconnect(session::peer, 0);
+
+ spdlog::info("session: disconnected: {}", packet.reason);
+
+ gui::client_chat::clear();
+
+ session::peer = nullptr;
+ session::client_index = UINT16_MAX;
+ session::client_identity = UINT64_MAX;
+
+ globals::fixed_frametime_us = UINT64_MAX;
+ globals::fixed_frametime = 0.0f;
+ globals::fixed_accumulator = 0;
+
+ server_password_hash = UINT64_MAX;
+
+ delete globals::dimension;
+ globals::player = entt::null;
+ globals::dimension = nullptr;
+
+ gui::message_box::reset();
+ gui::message_box::set_title("disconnected.disconnected");
+ gui::message_box::set_subtitle(packet.reason.c_str());
+ gui::message_box::add_button("disconnected.back", [](void) {
+ globals::gui_screen = GUI_PLAY_MENU;
+ gui::window_title::update();
+ });
+
+ globals::gui_screen = GUI_MESSAGE_BOX;
+}
+
+static void on_set_voxel_packet(const protocol::SetVoxel& packet)
+{
+ auto cpos = coord::to_chunk(packet.vpos);
+ auto lpos = coord::to_local(packet.vpos);
+ auto index = coord::to_index(lpos);
+
+ if(auto chunk = globals::dimension->find_chunk(cpos)) {
+ if(chunk->get_voxel(index) != packet.voxel) {
+ chunk->set_voxel(packet.voxel, index);
+
+ world::ChunkUpdateEvent event;
+ event.dimension = globals::dimension;
+ event.chunk = chunk;
+ event.cpos = cpos;
+
+ // Send a generic ChunkUpdate event to shake
+ // up the mesher; directly calling world::set_voxel
+ // here would result in a networked feedback loop
+ // caused by event handler below tripping
+ globals::dispatcher.trigger(event);
+ }
+ }
+}
+
+// NOTE: [session] is a good place for this since [receive]
+// handles entity data sent by the server and [session] handles
+// everything else network related that is not player movement
+static void on_voxel_set(const world::VoxelSetEvent& event)
+{
+ if(session::peer) {
+ // Propagate changes to the server
+ // FIXME: should we also validate things here or wait for the server to do so
+ protocol::SetVoxel packet;
+ packet.vpos = coord::to_voxel(event.cpos, event.lpos);
+ packet.voxel = event.voxel;
+
+ protocol::send(session::peer, protocol::encode(packet));
+ }
+}
+
+void session::init(void)
+{
+ session::peer = nullptr;
+ session::client_index = UINT16_MAX;
+ session::client_identity = UINT64_MAX;
+
+ globals::fixed_frametime_us = UINT64_MAX;
+ globals::fixed_frametime = 0.0f;
+ globals::fixed_accumulator = 0;
+
+ server_password_hash = UINT64_MAX;
+
+ globals::dispatcher.sink<protocol::LoginResponse>().connect<&on_login_response_packet>();
+ globals::dispatcher.sink<protocol::Disconnect>().connect<&on_disconnect_packet>();
+ globals::dispatcher.sink<protocol::SetVoxel>().connect<&on_set_voxel_packet>();
+
+ globals::dispatcher.sink<world::VoxelSetEvent>().connect<&on_voxel_set>();
+}
+
+void session::shutdown(void)
+{
+ session::disconnect("protocol.client_shutdown");
+
+ globals::fixed_frametime_us = UINT64_MAX;
+ globals::fixed_frametime = 0.0f;
+ globals::fixed_accumulator = 0;
+}
+
+void session::invalidate(void)
+{
+ if(session::peer) {
+ enet_peer_reset(session::peer);
+
+ gui::message_box::reset();
+ gui::message_box::set_title("disconnected.disconnected");
+ gui::message_box::set_subtitle("enet.peer_connection_timeout");
+ gui::message_box::add_button("disconnected.back", [](void) {
+ globals::gui_screen = GUI_PLAY_MENU;
+ gui::window_title::update();
+ });
+
+ globals::gui_screen = GUI_MESSAGE_BOX;
+ }
+
+ gui::client_chat::clear();
+
+ session::peer = nullptr;
+ session::client_index = UINT16_MAX;
+ session::client_identity = UINT64_MAX;
+
+ globals::fixed_frametime_us = UINT64_MAX;
+ globals::fixed_frametime = 0.0f;
+ globals::fixed_accumulator = 0;
+
+ server_password_hash = UINT64_MAX;
+
+ delete globals::dimension;
+ globals::player = entt::null;
+ globals::dimension = nullptr;
+}
+
+void session::connect(std::string_view host, std::uint16_t port, std::string_view password)
+{
+ ENetAddress address;
+ enet_address_set_host(&address, std::string(host).c_str());
+ address.port = port;
+
+ session::peer = enet_host_connect(globals::client_host, &address, 1, 0);
+ session::client_index = UINT16_MAX;
+ session::client_identity = UINT64_MAX;
+
+ globals::fixed_frametime_us = UINT64_MAX;
+ globals::fixed_frametime = 0.0f;
+ globals::fixed_accumulator = 0;
+
+ server_password_hash = math::crc64(password.data(), password.size());
+
+ if(!session::peer) {
+ server_password_hash = UINT64_MAX;
+
+ gui::message_box::reset();
+ gui::message_box::set_title("disconnected.disconnected");
+ gui::message_box::set_subtitle("enet.peer_connection_failed");
+ gui::message_box::add_button("disconnected.back", [](void) {
+ globals::gui_screen = GUI_PLAY_MENU;
+ gui::window_title::update();
+ });
+
+ globals::gui_screen = GUI_MESSAGE_BOX;
+
+ return;
+ }
+
+ gui::progress_bar::reset();
+ gui::progress_bar::set_title("connecting.connecting");
+ gui::progress_bar::set_button("connecting.cancel_button", [](void) {
+ enet_peer_disconnect(session::peer, 0);
+
+ session::peer = nullptr;
+ session::client_index = UINT16_MAX;
+ session::client_identity = UINT64_MAX;
+
+ globals::fixed_frametime_us = UINT64_MAX;
+ globals::fixed_frametime = 0.0f;
+ globals::fixed_accumulator = 0;
+
+ server_password_hash = UINT64_MAX;
+
+ delete globals::dimension;
+ globals::player = entt::null;
+ globals::dimension = nullptr;
+
+ globals::gui_screen = GUI_PLAY_MENU;
+ });
+
+ globals::gui_screen = GUI_PROGRESS_BAR;
+}
+
+void session::disconnect(std::string_view reason)
+{
+ if(session::peer) {
+ protocol::Disconnect packet;
+ packet.reason = std::string(reason);
+
+ protocol::send(session::peer, protocol::encode(packet));
+
+ enet_host_flush(globals::client_host);
+ enet_host_service(globals::client_host, nullptr, 50);
+ enet_peer_reset(session::peer);
+
+ session::peer = nullptr;
+ session::client_index = UINT16_MAX;
+ session::client_identity = UINT64_MAX;
+
+ globals::fixed_frametime_us = UINT64_MAX;
+ globals::fixed_frametime = 0.0f;
+ globals::fixed_accumulator = 0;
+
+ server_password_hash = UINT64_MAX;
+
+ delete globals::dimension;
+ globals::player = entt::null;
+ globals::dimension = nullptr;
+
+ gui::client_chat::clear();
+ }
+}
+
+void session::send_login_request(void)
+{
+ protocol::LoginRequest packet;
+ packet.version = protocol::VERSION;
+ packet.voxel_registry_checksum = world::voxel_registry::calculate_checksum();
+ packet.item_registry_checksum = world::item_registry::calculate_checksum();
+ packet.password_hash = server_password_hash;
+ packet.username = client_game::username.get();
+
+ protocol::send(session::peer, protocol::encode(packet));
+
+ server_password_hash = UINT64_MAX;
+
+ gui::progress_bar::set_title("connecting.logging_in");
+ globals::gui_screen = GUI_PROGRESS_BAR;
+}
+
+bool session::is_ingame(void)
+{
+ if(globals::dimension) {
+ return globals::dimension->entities.valid(globals::player);
+ }
+ else {
+ return false;
+ }
+}
diff --git a/game/client/session.hh b/game/client/session.hh index f61d62d..8f4353e 100644 --- a/game/client/session.hh +++ b/game/client/session.hh @@ -1,27 +1,27 @@ -#pragma once - -namespace session -{ -extern ENetPeer* peer; -extern std::uint16_t client_index; -extern std::uint64_t client_identity; -} // namespace session - -namespace session -{ -void init(void); -void shutdown(void); -void invalidate(void); -} // namespace session - -namespace session -{ -void connect(std::string_view hostname, std::uint16_t port, std::string_view password); -void disconnect(std::string_view reason); -void send_login_request(void); -} // namespace session - -namespace session -{ -bool is_ingame(void); -} // namespace session +#pragma once
+
+namespace session
+{
+extern ENetPeer* peer;
+extern std::uint16_t client_index;
+extern std::uint64_t client_identity;
+} // namespace session
+
+namespace session
+{
+void init(void);
+void shutdown(void);
+void invalidate(void);
+} // namespace session
+
+namespace session
+{
+void connect(std::string_view hostname, std::uint16_t port, std::string_view password);
+void disconnect(std::string_view reason);
+void send_login_request(void);
+} // namespace session
+
+namespace session
+{
+bool is_ingame(void);
+} // namespace session
diff --git a/game/client/sound/sound.cc b/game/client/sound/sound.cc index e77289c..403bd3e 100644 --- a/game/client/sound/sound.cc +++ b/game/client/sound/sound.cc @@ -1,211 +1,211 @@ -#include "client/pch.hh" - -#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" - -#include "shared/coord.hh" -#include "shared/protocol.hh" - -#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" -#include "client/globals.hh" -#include "client/session.hh" - -config::Float sound::volume_master(100.0f, 0.0f, 100.0f); -config::Float sound::volume_effects(100.0f, 0.0f, 100.0f); -config::Float sound::volume_music(100.0f, 0.0f, 100.0f); -config::Float sound::volume_ui(100.0f, 0.0f, 100.0f); - -static ALuint generic_source; -static ALuint player_source; -static ALuint ui_source; - -static resource_ptr<SoundEffect> sfx_generic; -static resource_ptr<SoundEffect> sfx_player; -static resource_ptr<SoundEffect> sfx_ui; - -void sound::init_config(void) -{ - globals::client_config.add_value("sound.volume_master", sound::volume_master); - globals::client_config.add_value("sound.volume_effects", sound::volume_effects); - globals::client_config.add_value("sound.volume_music", sound::volume_music); - globals::client_config.add_value("sound.volume_ui", sound::volume_ui); - - settings::add_slider(1, sound::volume_master, settings_location::SOUND, "sound.volume_master", false, "%.0f%%"); - - settings::add_slider(0, sound::volume_effects, settings_location::SOUND_LEVELS, "sound.volume_effects", false, "%.0f%%"); - settings::add_slider(1, sound::volume_music, settings_location::SOUND_LEVELS, "sound.volume_music", false, "%.0f%%"); - settings::add_slider(2, sound::volume_ui, settings_location::SOUND_LEVELS, "sound.volume_ui", false, "%.0f%%"); -} - -void sound::init(void) -{ - alGenSources(1, &generic_source); - alSourcei(generic_source, AL_SOURCE_RELATIVE, AL_TRUE); - alSource3f(generic_source, AL_POSITION, 0.0f, 0.0f, 0.0f); - alSource3f(generic_source, AL_VELOCITY, 0.0f, 0.0f, 0.0f); - - alGenSources(1, &player_source); - alSourcei(player_source, AL_SOURCE_RELATIVE, AL_TRUE); - alSource3f(player_source, AL_POSITION, 0.0f, 0.0f, 0.0f); - alSource3f(player_source, AL_VELOCITY, 0.0f, 0.0f, 0.0f); - - alGenSources(1, &ui_source); - alSourcei(ui_source, AL_SOURCE_RELATIVE, AL_TRUE); - alSource3f(ui_source, AL_POSITION, 0.0f, 0.0f, 0.0f); - alSource3f(ui_source, AL_VELOCITY, 0.0f, 0.0f, 0.0f); - - sfx_generic = nullptr; - sfx_player = nullptr; - sfx_ui = nullptr; -} - -void sound::init_late(void) -{ -} - -void sound::shutdown(void) -{ - sfx_ui = nullptr; - sfx_player = nullptr; - sfx_generic = nullptr; - - alDeleteBuffers(1, &ui_source); - alDeleteSources(1, &generic_source); - alDeleteSources(1, &player_source); -} - -void sound::update(void) -{ - auto effects_gain = math::clamp(0.01f * sound::volume_effects.get_value(), 0.0f, 1.0f); - alSourcef(generic_source, AL_GAIN, effects_gain); - alSourcef(player_source, AL_GAIN, effects_gain); - - auto ui_gain = math::clamp(0.01f * sound::volume_ui.get_value(), 0.0f, 1.0f); - alSourcef(ui_source, AL_GAIN, ui_gain); -} - -void sound::play_generic(std::string_view sound, bool looping, float pitch) -{ - if(sound.size()) { - sound::play_generic(resource::load<SoundEffect>(sound), looping, pitch); - } - else { - sound::play_generic(static_cast<resource_ptr<SoundEffect>>(nullptr), looping, pitch); - } -} - -void sound::play_entity(entt::entity entity, std::string_view sound, bool looping, float pitch) -{ - if(sound.size()) { - sound::play_entity(entity, resource::load<SoundEffect>(sound), looping, pitch); - } - else { - sound::play_entity(entity, static_cast<resource_ptr<SoundEffect>>(nullptr), looping, pitch); - } -} - -void sound::play_player(std::string_view sound, bool looping, float pitch) -{ - if(sound.size()) { - sound::play_player(resource::load<SoundEffect>(sound), looping, pitch); - } - else { - sound::play_player(static_cast<resource_ptr<SoundEffect>>(nullptr), looping, pitch); - } -} - -void sound::play_ui(std::string_view sound, bool looping, float pitch) -{ - if(sound.size()) { - sound::play_ui(resource::load<SoundEffect>(sound), looping, pitch); - } - else { - sound::play_ui(static_cast<resource_ptr<SoundEffect>>(nullptr), looping, pitch); - } -} - -void sound::play_generic(resource_ptr<SoundEffect> sound, bool looping, float pitch) -{ - alSourceRewind(generic_source); - - sfx_generic = sound; - - if(sfx_generic) { - alSourcei(generic_source, AL_BUFFER, sfx_generic->buffer); - alSourcei(generic_source, AL_LOOPING, looping); - alSourcef(generic_source, AL_PITCH, math::clamp(pitch, MIN_PITCH, MAX_PITCH)); - alSourcePlay(generic_source); - } -} - -void sound::play_entity(entt::entity entity, resource_ptr<SoundEffect> sound, bool looping, float pitch) -{ - if(globals::dimension && globals::dimension->entities.valid(entity)) { - if(auto emitter = globals::dimension->entities.try_get<entity::SoundEmitter>(entity)) { - alSourceRewind(emitter->source); - - emitter->sound = sound; - - if(emitter->sound) { - alSourcei(emitter->source, AL_BUFFER, emitter->sound->buffer); - alSourcei(emitter->source, AL_LOOPING, looping); - alSourcef(emitter->source, AL_PITCH, math::clamp(pitch, MIN_PITCH, MAX_PITCH)); - alSourcePlay(emitter->source); - } - } - } -} - -void sound::play_player(resource_ptr<SoundEffect> sound, bool looping, float pitch) -{ - if(sound && session::is_ingame()) { - protocol::EntitySound packet; - packet.entity = globals::player; - packet.sound = sound->name; - packet.looping = looping; - packet.pitch = pitch; - - protocol::send(session::peer, protocol::encode(packet)); - } - - alSourceRewind(player_source); - - sfx_player = sound; - - if(sfx_player) { - alSourcei(player_source, AL_BUFFER, sfx_player->buffer); - alSourcei(player_source, AL_LOOPING, looping); - alSourcef(player_source, AL_PITCH, math::clamp(pitch, MIN_PITCH, MAX_PITCH)); - alSourcePlay(player_source); - } -} - -void sound::play_ui(resource_ptr<SoundEffect> sound, bool looping, float pitch) -{ - alSourceRewind(ui_source); - - sfx_ui = sound; - - if(sfx_ui) { - alSourcei(ui_source, AL_BUFFER, sfx_ui->buffer); - alSourcei(ui_source, AL_LOOPING, looping); - alSourcef(ui_source, AL_PITCH, math::clamp(pitch, MIN_PITCH, MAX_PITCH)); - alSourcePlay(ui_source); - } -} +#include "client/pch.hh"
+
+#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"
+
+#include "shared/coord.hh"
+#include "shared/protocol.hh"
+
+#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"
+#include "client/globals.hh"
+#include "client/session.hh"
+
+config::Float sound::volume_master(100.0f, 0.0f, 100.0f);
+config::Float sound::volume_effects(100.0f, 0.0f, 100.0f);
+config::Float sound::volume_music(100.0f, 0.0f, 100.0f);
+config::Float sound::volume_ui(100.0f, 0.0f, 100.0f);
+
+static ALuint generic_source;
+static ALuint player_source;
+static ALuint ui_source;
+
+static resource_ptr<SoundEffect> sfx_generic;
+static resource_ptr<SoundEffect> sfx_player;
+static resource_ptr<SoundEffect> sfx_ui;
+
+void sound::init_config(void)
+{
+ globals::client_config.add_value("sound.volume_master", sound::volume_master);
+ globals::client_config.add_value("sound.volume_effects", sound::volume_effects);
+ globals::client_config.add_value("sound.volume_music", sound::volume_music);
+ globals::client_config.add_value("sound.volume_ui", sound::volume_ui);
+
+ settings::add_slider(1, sound::volume_master, settings_location::SOUND, "sound.volume_master", false, "%.0f%%");
+
+ settings::add_slider(0, sound::volume_effects, settings_location::SOUND_LEVELS, "sound.volume_effects", false, "%.0f%%");
+ settings::add_slider(1, sound::volume_music, settings_location::SOUND_LEVELS, "sound.volume_music", false, "%.0f%%");
+ settings::add_slider(2, sound::volume_ui, settings_location::SOUND_LEVELS, "sound.volume_ui", false, "%.0f%%");
+}
+
+void sound::init(void)
+{
+ alGenSources(1, &generic_source);
+ alSourcei(generic_source, AL_SOURCE_RELATIVE, AL_TRUE);
+ alSource3f(generic_source, AL_POSITION, 0.0f, 0.0f, 0.0f);
+ alSource3f(generic_source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+
+ alGenSources(1, &player_source);
+ alSourcei(player_source, AL_SOURCE_RELATIVE, AL_TRUE);
+ alSource3f(player_source, AL_POSITION, 0.0f, 0.0f, 0.0f);
+ alSource3f(player_source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+
+ alGenSources(1, &ui_source);
+ alSourcei(ui_source, AL_SOURCE_RELATIVE, AL_TRUE);
+ alSource3f(ui_source, AL_POSITION, 0.0f, 0.0f, 0.0f);
+ alSource3f(ui_source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+
+ sfx_generic = nullptr;
+ sfx_player = nullptr;
+ sfx_ui = nullptr;
+}
+
+void sound::init_late(void)
+{
+}
+
+void sound::shutdown(void)
+{
+ sfx_ui = nullptr;
+ sfx_player = nullptr;
+ sfx_generic = nullptr;
+
+ alDeleteBuffers(1, &ui_source);
+ alDeleteSources(1, &generic_source);
+ alDeleteSources(1, &player_source);
+}
+
+void sound::update(void)
+{
+ auto effects_gain = math::clamp(0.01f * sound::volume_effects.get_value(), 0.0f, 1.0f);
+ alSourcef(generic_source, AL_GAIN, effects_gain);
+ alSourcef(player_source, AL_GAIN, effects_gain);
+
+ auto ui_gain = math::clamp(0.01f * sound::volume_ui.get_value(), 0.0f, 1.0f);
+ alSourcef(ui_source, AL_GAIN, ui_gain);
+}
+
+void sound::play_generic(std::string_view sound, bool looping, float pitch)
+{
+ if(sound.size()) {
+ sound::play_generic(resource::load<SoundEffect>(sound), looping, pitch);
+ }
+ else {
+ sound::play_generic(static_cast<resource_ptr<SoundEffect>>(nullptr), looping, pitch);
+ }
+}
+
+void sound::play_entity(entt::entity entity, std::string_view sound, bool looping, float pitch)
+{
+ if(sound.size()) {
+ sound::play_entity(entity, resource::load<SoundEffect>(sound), looping, pitch);
+ }
+ else {
+ sound::play_entity(entity, static_cast<resource_ptr<SoundEffect>>(nullptr), looping, pitch);
+ }
+}
+
+void sound::play_player(std::string_view sound, bool looping, float pitch)
+{
+ if(sound.size()) {
+ sound::play_player(resource::load<SoundEffect>(sound), looping, pitch);
+ }
+ else {
+ sound::play_player(static_cast<resource_ptr<SoundEffect>>(nullptr), looping, pitch);
+ }
+}
+
+void sound::play_ui(std::string_view sound, bool looping, float pitch)
+{
+ if(sound.size()) {
+ sound::play_ui(resource::load<SoundEffect>(sound), looping, pitch);
+ }
+ else {
+ sound::play_ui(static_cast<resource_ptr<SoundEffect>>(nullptr), looping, pitch);
+ }
+}
+
+void sound::play_generic(resource_ptr<SoundEffect> sound, bool looping, float pitch)
+{
+ alSourceRewind(generic_source);
+
+ sfx_generic = sound;
+
+ if(sfx_generic) {
+ alSourcei(generic_source, AL_BUFFER, sfx_generic->buffer);
+ alSourcei(generic_source, AL_LOOPING, looping);
+ alSourcef(generic_source, AL_PITCH, math::clamp(pitch, MIN_PITCH, MAX_PITCH));
+ alSourcePlay(generic_source);
+ }
+}
+
+void sound::play_entity(entt::entity entity, resource_ptr<SoundEffect> sound, bool looping, float pitch)
+{
+ if(globals::dimension && globals::dimension->entities.valid(entity)) {
+ if(auto emitter = globals::dimension->entities.try_get<entity::SoundEmitter>(entity)) {
+ alSourceRewind(emitter->source);
+
+ emitter->sound = sound;
+
+ if(emitter->sound) {
+ alSourcei(emitter->source, AL_BUFFER, emitter->sound->buffer);
+ alSourcei(emitter->source, AL_LOOPING, looping);
+ alSourcef(emitter->source, AL_PITCH, math::clamp(pitch, MIN_PITCH, MAX_PITCH));
+ alSourcePlay(emitter->source);
+ }
+ }
+ }
+}
+
+void sound::play_player(resource_ptr<SoundEffect> sound, bool looping, float pitch)
+{
+ if(sound && session::is_ingame()) {
+ protocol::EntitySound packet;
+ packet.entity = globals::player;
+ packet.sound = sound->name;
+ packet.looping = looping;
+ packet.pitch = pitch;
+
+ protocol::send(session::peer, protocol::encode(packet));
+ }
+
+ alSourceRewind(player_source);
+
+ sfx_player = sound;
+
+ if(sfx_player) {
+ alSourcei(player_source, AL_BUFFER, sfx_player->buffer);
+ alSourcei(player_source, AL_LOOPING, looping);
+ alSourcef(player_source, AL_PITCH, math::clamp(pitch, MIN_PITCH, MAX_PITCH));
+ alSourcePlay(player_source);
+ }
+}
+
+void sound::play_ui(resource_ptr<SoundEffect> sound, bool looping, float pitch)
+{
+ alSourceRewind(ui_source);
+
+ sfx_ui = sound;
+
+ if(sfx_ui) {
+ alSourcei(ui_source, AL_BUFFER, sfx_ui->buffer);
+ alSourcei(ui_source, AL_LOOPING, looping);
+ alSourcef(ui_source, AL_PITCH, math::clamp(pitch, MIN_PITCH, MAX_PITCH));
+ alSourcePlay(ui_source);
+ }
+}
diff --git a/game/client/sound/sound.hh b/game/client/sound/sound.hh index d96d0c4..c794845 100644 --- a/game/client/sound/sound.hh +++ b/game/client/sound/sound.hh @@ -1,43 +1,43 @@ -#pragma once - -#include "core/resource/resource.hh" - -namespace config -{ -class Float; -} // namespace config - -struct SoundEffect; - -namespace sound -{ -extern config::Float volume_master; -extern config::Float volume_effects; -extern config::Float volume_music; -extern config::Float volume_ui; -} // namespace sound - -namespace sound -{ -void init_config(void); -void init(void); -void init_late(void); -void shutdown(void); -void update(void); -} // namespace sound - -namespace sound -{ -void play_generic(std::string_view sound, bool looping, float pitch); -void play_entity(entt::entity entity, std::string_view sound, bool looping, float pitch); -void play_player(std::string_view sound, bool looping, float pitch); -void play_ui(std::string_view sound, bool looping, float pitch); -} // namespace sound - -namespace sound -{ -void play_generic(resource_ptr<SoundEffect> sound, bool looping, float pitch); -void play_entity(entt::entity entity, resource_ptr<SoundEffect> sound, bool looping, float pitch); -void play_player(resource_ptr<SoundEffect> sound, bool looping, float pitch); -void play_ui(resource_ptr<SoundEffect> sound, bool looping, float pitch); -} // namespace sound +#pragma once
+
+#include "core/resource/resource.hh"
+
+namespace config
+{
+class Float;
+} // namespace config
+
+struct SoundEffect;
+
+namespace sound
+{
+extern config::Float volume_master;
+extern config::Float volume_effects;
+extern config::Float volume_music;
+extern config::Float volume_ui;
+} // namespace sound
+
+namespace sound
+{
+void init_config(void);
+void init(void);
+void init_late(void);
+void shutdown(void);
+void update(void);
+} // namespace sound
+
+namespace sound
+{
+void play_generic(std::string_view sound, bool looping, float pitch);
+void play_entity(entt::entity entity, std::string_view sound, bool looping, float pitch);
+void play_player(std::string_view sound, bool looping, float pitch);
+void play_ui(std::string_view sound, bool looping, float pitch);
+} // namespace sound
+
+namespace sound
+{
+void play_generic(resource_ptr<SoundEffect> sound, bool looping, float pitch);
+void play_entity(entt::entity entity, resource_ptr<SoundEffect> sound, bool looping, float pitch);
+void play_player(resource_ptr<SoundEffect> sound, bool looping, float pitch);
+void play_ui(resource_ptr<SoundEffect> sound, bool looping, float pitch);
+} // namespace sound
diff --git a/game/client/toggles.cc b/game/client/toggles.cc index 833e099..34d03c7 100644 --- a/game/client/toggles.cc +++ b/game/client/toggles.cc @@ -1,157 +1,157 @@ -#include "client/pch.hh" - -#include "client/toggles.hh" - -#include "core/io/config_map.hh" - -#include "client/gui/chat.hh" -#include "client/gui/language.hh" - -#include "client/io/gamepad.hh" -#include "client/io/glfw.hh" - -#include "client/const.hh" -#include "client/globals.hh" - -struct ToggleInfo final { - std::string_view description; - int glfw_keycode; - bool is_enabled; -}; - -bool toggles::is_sequence_await = false; - -static ToggleInfo toggle_infos[TOGGLE_COUNT]; - -static void print_toggle_state(const ToggleInfo& info) -{ - if(info.description.size()) { - if(info.is_enabled) { - gui::client_chat::print(std::format("[toggles] {} ON", info.description)); - } - else { - gui::client_chat::print(std::format("[toggles] {} OFF", info.description)); - } - } -} - -static void toggle_value(ToggleInfo& info, toggle_type type) -{ - if(info.is_enabled) { - info.is_enabled = false; - globals::dispatcher.trigger(ToggleDisabledEvent { type }); - } - else { - info.is_enabled = true; - globals::dispatcher.trigger(ToggleEnabledEvent { type }); - } - - print_toggle_state(info); -} - -static void on_glfw_key(const io::GlfwKeyEvent& event) -{ - if(globals::gui_keybind_ptr) { - // The UI keybind subsystem has the authority - // over debug toggles and it hogs the input keys - return; - } - - if(event.key == DEBUG_KEY) { - if(event.action == GLFW_PRESS) { - toggles::is_sequence_await = true; - ImGui::GetIO().ConfigFlags &= ~ImGuiConfigFlags_NavEnableKeyboard; - return; - } - - if(event.action == GLFW_RELEASE) { - toggles::is_sequence_await = false; - ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; - return; - } - } - - if((event.action == GLFW_PRESS) && toggles::is_sequence_await) { - if(event.key == GLFW_KEY_L) { - // This causes the language subsystem - // to re-parse the JSON file essentially - // causing the game to soft-reload language - gui::language::set(gui::language::get_current()); - return; - } - - for(toggle_type i = 0; i < TOGGLE_COUNT; ++i) { - if(event.key == toggle_infos[i].glfw_keycode) { - toggle_value(toggle_infos[i], i); - return; - } - } - } -} - -void toggles::init(void) -{ - toggle_infos[TOGGLE_WIREFRAME].description = "wireframe"; - toggle_infos[TOGGLE_WIREFRAME].glfw_keycode = GLFW_KEY_Z; - toggle_infos[TOGGLE_WIREFRAME].is_enabled = false; - - toggle_infos[TOGGLE_FULLBRIGHT].description = "fullbright"; - toggle_infos[TOGGLE_FULLBRIGHT].glfw_keycode = GLFW_KEY_J; - toggle_infos[TOGGLE_FULLBRIGHT].is_enabled = false; - - toggle_infos[TOGGLE_CHUNK_AABB].description = "chunk Borders"; - toggle_infos[TOGGLE_CHUNK_AABB].glfw_keycode = GLFW_KEY_G; - toggle_infos[TOGGLE_CHUNK_AABB].is_enabled = false; - - toggle_infos[TOGGLE_METRICS_UI].description = std::string_view(); - toggle_infos[TOGGLE_METRICS_UI].glfw_keycode = GLFW_KEY_V; - toggle_infos[TOGGLE_METRICS_UI].is_enabled = false; - - toggle_infos[TOGGLE_USE_GAMEPAD].description = "gamepad input"; - toggle_infos[TOGGLE_USE_GAMEPAD].glfw_keycode = GLFW_KEY_P; - toggle_infos[TOGGLE_USE_GAMEPAD].is_enabled = false; - - toggle_infos[TOGGLE_PM_FLIGHT].description = "flight mode"; - toggle_infos[TOGGLE_PM_FLIGHT].glfw_keycode = GLFW_KEY_F; - toggle_infos[TOGGLE_PM_FLIGHT].is_enabled = false; - - globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>(); -} - -void toggles::init_late(void) -{ - for(toggle_type i = 0; i < TOGGLE_COUNT; ++i) { - if(toggle_infos[i].is_enabled) { - globals::dispatcher.trigger(ToggleEnabledEvent { i }); - } - else { - globals::dispatcher.trigger(ToggleDisabledEvent { i }); - } - } -} - -bool toggles::get(toggle_type type) -{ - if(type < TOGGLE_COUNT) { - return toggle_infos[type].is_enabled; - } - else { - return false; - } -} - -void toggles::set(toggle_type type, bool value) -{ - if(type < TOGGLE_COUNT) { - if(value) { - toggle_infos[type].is_enabled = true; - globals::dispatcher.trigger(ToggleEnabledEvent { type }); - } - else { - toggle_infos[type].is_enabled = false; - globals::dispatcher.trigger(ToggleDisabledEvent { type }); - } - - print_toggle_state(toggle_infos[type]); - } -} +#include "client/pch.hh"
+
+#include "client/toggles.hh"
+
+#include "core/io/config_map.hh"
+
+#include "client/gui/chat.hh"
+#include "client/gui/language.hh"
+
+#include "client/io/gamepad.hh"
+#include "client/io/glfw.hh"
+
+#include "client/const.hh"
+#include "client/globals.hh"
+
+struct ToggleInfo final {
+ std::string_view description;
+ int glfw_keycode;
+ bool is_enabled;
+};
+
+bool toggles::is_sequence_await = false;
+
+static ToggleInfo toggle_infos[TOGGLE_COUNT];
+
+static void print_toggle_state(const ToggleInfo& info)
+{
+ if(info.description.size()) {
+ if(info.is_enabled) {
+ gui::client_chat::print(std::format("[toggles] {} ON", info.description));
+ }
+ else {
+ gui::client_chat::print(std::format("[toggles] {} OFF", info.description));
+ }
+ }
+}
+
+static void toggle_value(ToggleInfo& info, toggle_type type)
+{
+ if(info.is_enabled) {
+ info.is_enabled = false;
+ globals::dispatcher.trigger(ToggleDisabledEvent { type });
+ }
+ else {
+ info.is_enabled = true;
+ globals::dispatcher.trigger(ToggleEnabledEvent { type });
+ }
+
+ print_toggle_state(info);
+}
+
+static void on_glfw_key(const io::GlfwKeyEvent& event)
+{
+ if(globals::gui_keybind_ptr) {
+ // The UI keybind subsystem has the authority
+ // over debug toggles and it hogs the input keys
+ return;
+ }
+
+ if(event.key == DEBUG_KEY) {
+ if(event.action == GLFW_PRESS) {
+ toggles::is_sequence_await = true;
+ ImGui::GetIO().ConfigFlags &= ~ImGuiConfigFlags_NavEnableKeyboard;
+ return;
+ }
+
+ if(event.action == GLFW_RELEASE) {
+ toggles::is_sequence_await = false;
+ ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+ return;
+ }
+ }
+
+ if((event.action == GLFW_PRESS) && toggles::is_sequence_await) {
+ if(event.key == GLFW_KEY_L) {
+ // This causes the language subsystem
+ // to re-parse the JSON file essentially
+ // causing the game to soft-reload language
+ gui::language::set(gui::language::get_current());
+ return;
+ }
+
+ for(toggle_type i = 0; i < TOGGLE_COUNT; ++i) {
+ if(event.key == toggle_infos[i].glfw_keycode) {
+ toggle_value(toggle_infos[i], i);
+ return;
+ }
+ }
+ }
+}
+
+void toggles::init(void)
+{
+ toggle_infos[TOGGLE_WIREFRAME].description = "wireframe";
+ toggle_infos[TOGGLE_WIREFRAME].glfw_keycode = GLFW_KEY_Z;
+ toggle_infos[TOGGLE_WIREFRAME].is_enabled = false;
+
+ toggle_infos[TOGGLE_FULLBRIGHT].description = "fullbright";
+ toggle_infos[TOGGLE_FULLBRIGHT].glfw_keycode = GLFW_KEY_J;
+ toggle_infos[TOGGLE_FULLBRIGHT].is_enabled = false;
+
+ toggle_infos[TOGGLE_CHUNK_AABB].description = "chunk Borders";
+ toggle_infos[TOGGLE_CHUNK_AABB].glfw_keycode = GLFW_KEY_G;
+ toggle_infos[TOGGLE_CHUNK_AABB].is_enabled = false;
+
+ toggle_infos[TOGGLE_METRICS_UI].description = std::string_view();
+ toggle_infos[TOGGLE_METRICS_UI].glfw_keycode = GLFW_KEY_V;
+ toggle_infos[TOGGLE_METRICS_UI].is_enabled = false;
+
+ toggle_infos[TOGGLE_USE_GAMEPAD].description = "gamepad input";
+ toggle_infos[TOGGLE_USE_GAMEPAD].glfw_keycode = GLFW_KEY_P;
+ toggle_infos[TOGGLE_USE_GAMEPAD].is_enabled = false;
+
+ toggle_infos[TOGGLE_PM_FLIGHT].description = "flight mode";
+ toggle_infos[TOGGLE_PM_FLIGHT].glfw_keycode = GLFW_KEY_F;
+ toggle_infos[TOGGLE_PM_FLIGHT].is_enabled = false;
+
+ globals::dispatcher.sink<io::GlfwKeyEvent>().connect<&on_glfw_key>();
+}
+
+void toggles::init_late(void)
+{
+ for(toggle_type i = 0; i < TOGGLE_COUNT; ++i) {
+ if(toggle_infos[i].is_enabled) {
+ globals::dispatcher.trigger(ToggleEnabledEvent { i });
+ }
+ else {
+ globals::dispatcher.trigger(ToggleDisabledEvent { i });
+ }
+ }
+}
+
+bool toggles::get(toggle_type type)
+{
+ if(type < TOGGLE_COUNT) {
+ return toggle_infos[type].is_enabled;
+ }
+ else {
+ return false;
+ }
+}
+
+void toggles::set(toggle_type type, bool value)
+{
+ if(type < TOGGLE_COUNT) {
+ if(value) {
+ toggle_infos[type].is_enabled = true;
+ globals::dispatcher.trigger(ToggleEnabledEvent { type });
+ }
+ else {
+ toggle_infos[type].is_enabled = false;
+ globals::dispatcher.trigger(ToggleDisabledEvent { type });
+ }
+
+ print_toggle_state(toggle_infos[type]);
+ }
+}
diff --git a/game/client/toggles.hh b/game/client/toggles.hh index d051a92..8ef780e 100644 --- a/game/client/toggles.hh +++ b/game/client/toggles.hh @@ -1,35 +1,35 @@ -#pragma once - -using toggle_type = unsigned int; -constexpr static toggle_type TOGGLE_WIREFRAME = 0x0000U; // Render things in wireframe mode -constexpr static toggle_type TOGGLE_FULLBRIGHT = 0x0001U; // Render things without lighting -constexpr static toggle_type TOGGLE_CHUNK_AABB = 0x0002U; // Render chunk bounding boxes -constexpr static toggle_type TOGGLE_METRICS_UI = 0x0003U; // Render debug metrics overlay -constexpr static toggle_type TOGGLE_USE_GAMEPAD = 0x0004U; // Use gamepad for player movement -constexpr static toggle_type TOGGLE_PM_FLIGHT = 0x0005U; // Enable flight for player movement -constexpr static std::size_t TOGGLE_COUNT = 0x0006U; - -struct ToggleEnabledEvent final { - toggle_type type; -}; - -struct ToggleDisabledEvent final { - toggle_type type; -}; - -namespace toggles -{ -// The value is true whenever the debug -// toggles manager awaits for a sequenced key -// to be pressed. During this no input should -// be processed by any other gameplay system -extern bool is_sequence_await; -} // namespace toggles - -namespace toggles -{ -void init(void); -void init_late(void); -bool get(toggle_type type); -void set(toggle_type type, bool value); -} // namespace toggles +#pragma once
+
+using toggle_type = unsigned int;
+constexpr static toggle_type TOGGLE_WIREFRAME = 0x0000U; // Render things in wireframe mode
+constexpr static toggle_type TOGGLE_FULLBRIGHT = 0x0001U; // Render things without lighting
+constexpr static toggle_type TOGGLE_CHUNK_AABB = 0x0002U; // Render chunk bounding boxes
+constexpr static toggle_type TOGGLE_METRICS_UI = 0x0003U; // Render debug metrics overlay
+constexpr static toggle_type TOGGLE_USE_GAMEPAD = 0x0004U; // Use gamepad for player movement
+constexpr static toggle_type TOGGLE_PM_FLIGHT = 0x0005U; // Enable flight for player movement
+constexpr static std::size_t TOGGLE_COUNT = 0x0006U;
+
+struct ToggleEnabledEvent final {
+ toggle_type type;
+};
+
+struct ToggleDisabledEvent final {
+ toggle_type type;
+};
+
+namespace toggles
+{
+// The value is true whenever the debug
+// toggles manager awaits for a sequenced key
+// to be pressed. During this no input should
+// be processed by any other gameplay system
+extern bool is_sequence_await;
+} // namespace toggles
+
+namespace toggles
+{
+void init(void);
+void init_late(void);
+bool get(toggle_type type);
+void set(toggle_type type, bool value);
+} // namespace toggles
diff --git a/game/client/world/chunk_mesher.cc b/game/client/world/chunk_mesher.cc index e2f1e10..a8ee817 100644 --- a/game/client/world/chunk_mesher.cc +++ b/game/client/world/chunk_mesher.cc @@ -1,484 +1,484 @@ -#include "client/pch.hh" - -#include "client/world/chunk_mesher.hh" - -#include "core/math/crc64.hh" - -#include "core/threading.hh" - -#include "shared/world/chunk.hh" -#include "shared/world/dimension.hh" -#include "shared/world/voxel_registry.hh" - -#include "shared/coord.hh" - -#include "client/world/chunk_quad.hh" -#include "client/world/voxel_atlas.hh" - -#include "client/globals.hh" -#include "client/session.hh" - -using QuadBuilder = std::vector<world::ChunkQuad>; - -using CachedChunkCoord = unsigned short; -constexpr static CachedChunkCoord CPOS_ITSELF = 0x0000; -constexpr static CachedChunkCoord CPOS_NORTH = 0x0001; -constexpr static CachedChunkCoord CPOS_SOUTH = 0x0002; -constexpr static CachedChunkCoord CPOS_EAST = 0x0003; -constexpr static CachedChunkCoord CPOS_WEST = 0x0004; -constexpr static CachedChunkCoord CPOS_TOP = 0x0005; -constexpr static CachedChunkCoord CPOS_BOTTOM = 0x0006; -constexpr static const size_t NUM_CACHED_CPOS = 7; - -static const CachedChunkCoord get_cached_cpos(const chunk_pos& pivot, const chunk_pos& cpos) -{ - static const CachedChunkCoord nx[3] = { CPOS_WEST, 0, CPOS_EAST }; - static const CachedChunkCoord ny[3] = { CPOS_BOTTOM, 0, CPOS_TOP }; - static const CachedChunkCoord nz[3] = { CPOS_NORTH, 0, CPOS_SOUTH }; - - if(pivot != cpos) { - chunk_pos delta = pivot - cpos; - delta[0] = math::clamp<std::int64_t>(delta[0], -1, 1); - delta[1] = math::clamp<std::int64_t>(delta[1], -1, 1); - delta[2] = math::clamp<std::int64_t>(delta[2], -1, 1); - - if(delta[0]) { - return nx[delta[0] + 1]; - } - else if(delta[1]) { - return ny[delta[1] + 1]; - } - else { - return nz[delta[2] + 1]; - } - } - - return CPOS_ITSELF; -} - -static world::voxel_facing get_facing(world::voxel_face face, world::voxel_type type) -{ - if(type == world::voxel_type::CROSS) { - switch(face) { - case world::voxel_face::CROSS_NESW: - return world::voxel_facing::NESW; - case world::voxel_face::CROSS_NWSE: - return world::voxel_facing::NWSE; - default: - return world::voxel_facing::NORTH; - } - } - - switch(face) { - case world::voxel_face::CUBE_NORTH: - return world::voxel_facing::NORTH; - case world::voxel_face::CUBE_SOUTH: - return world::voxel_facing::SOUTH; - case world::voxel_face::CUBE_EAST: - return world::voxel_facing::EAST; - case world::voxel_face::CUBE_WEST: - return world::voxel_facing::WEST; - case world::voxel_face::CUBE_TOP: - return world::voxel_facing::UP; - case world::voxel_face::CUBE_BOTTOM: - return world::voxel_facing::DOWN; - default: - return world::voxel_facing::NORTH; - } -} - -class GL_MeshingTask final : public Task { -public: - explicit GL_MeshingTask(entt::entity entity, const chunk_pos& cpos); - virtual ~GL_MeshingTask(void) = default; - virtual void process(void) override; - virtual void finalize(void) override; - -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 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); - -private: - std::array<world::VoxelStorage, NUM_CACHED_CPOS> m_cache; - std::vector<QuadBuilder> m_quads_b; // blending - std::vector<QuadBuilder> m_quads_s; // solid - entt::entity m_entity; - chunk_pos m_cpos; -}; - -GL_MeshingTask::GL_MeshingTask(entt::entity entity, const chunk_pos& cpos) -{ - m_entity = entity; - m_cpos = cpos; - - cache_chunk(m_cpos); - cache_chunk(m_cpos + DIR_NORTH<chunk_pos::value_type>); - cache_chunk(m_cpos + DIR_SOUTH<chunk_pos::value_type>); - cache_chunk(m_cpos + DIR_EAST<chunk_pos::value_type>); - cache_chunk(m_cpos + DIR_WEST<chunk_pos::value_type>); - cache_chunk(m_cpos + DIR_DOWN<chunk_pos::value_type>); - cache_chunk(m_cpos + DIR_UP<chunk_pos::value_type>); -} - -void GL_MeshingTask::process(void) -{ - m_quads_b.resize(world::voxel_atlas::plane_count()); - m_quads_s.resize(world::voxel_atlas::plane_count()); - - const auto& voxels = m_cache.at(CPOS_ITSELF); - - for(std::size_t i = 0; i < CHUNK_VOLUME; ++i) { - if(m_status == task_status::CANCELLED) { - m_quads_b.clear(); - m_quads_s.clear(); - return; - } - - const auto voxel = voxels[i]; - const auto lpos = coord::to_local(i); - - const auto info = world::voxel_registry::find(voxel); - - if(info == nullptr) { - // Either a NULL_VOXEL_ID or something went - // horribly wrong and we don't what this is - continue; - } - - world::voxel_vis vis = 0; - - if(vis_test(voxel, info, lpos + DIR_NORTH<local_pos::value_type>)) { - vis |= world::VIS_NORTH; - } - - if(vis_test(voxel, info, lpos + DIR_SOUTH<local_pos::value_type>)) { - vis |= world::VIS_SOUTH; - } - - if(vis_test(voxel, info, lpos + DIR_EAST<local_pos::value_type>)) { - vis |= world::VIS_EAST; - } - - if(vis_test(voxel, info, lpos + DIR_WEST<local_pos::value_type>)) { - vis |= world::VIS_WEST; - } - - if(vis_test(voxel, info, lpos + DIR_UP<local_pos::value_type>)) { - vis |= world::VIS_UP; - } - - if(vis_test(voxel, info, lpos + DIR_DOWN<local_pos::value_type>)) { - vis |= world::VIS_DOWN; - } - - const auto vpos = coord::to_voxel(m_cpos, lpos); - const auto entropy_src = vpos[0] * vpos[1] * vpos[2]; - const auto entropy = math::crc64(&entropy_src, sizeof(entropy_src)); - - // FIXME: handle different voxel types - make_cube(voxel, info, lpos, vis, entropy); - } -} - -void GL_MeshingTask::finalize(void) -{ - if(!globals::dimension || !globals::dimension->chunks.valid(m_entity)) { - // We either disconnected or something - // else happened that invalidated the entity - return; - } - - auto& component = globals::dimension->chunks.emplace_or_replace<world::ChunkMesh>(m_entity); - - const std::size_t plane_count_nb = m_quads_s.size(); - const std::size_t plane_count_b = m_quads_b.size(); - - bool has_no_submeshes_b = true; - bool has_no_submeshes_nb = true; - - component.quad_nb.resize(plane_count_nb); - component.quad_b.resize(plane_count_b); - - for(std::size_t plane = 0; plane < plane_count_nb; ++plane) { - auto& builder = m_quads_s[plane]; - auto& buffer = component.quad_nb[plane]; - - if(builder.empty()) { - if(buffer.handle) { - glDeleteBuffers(1, &buffer.handle); - buffer.handle = 0; - buffer.size = 0; - } - } - else { - if(!buffer.handle) { - glGenBuffers(1, &buffer.handle); - } - - glBindBuffer(GL_ARRAY_BUFFER, buffer.handle); - glBufferData(GL_ARRAY_BUFFER, sizeof(world::ChunkQuad) * builder.size(), builder.data(), GL_STATIC_DRAW); - buffer.size = builder.size(); - has_no_submeshes_nb = false; - } - } - - for(std::size_t plane = 0; plane < plane_count_b; ++plane) { - auto& builder = m_quads_b[plane]; - auto& buffer = component.quad_b[plane]; - - if(builder.empty()) { - if(buffer.handle) { - glDeleteBuffers(1, &buffer.handle); - buffer.handle = 0; - buffer.size = 0; - } - } - else { - if(!buffer.handle) { - glGenBuffers(1, &buffer.handle); - } - - glBindBuffer(GL_ARRAY_BUFFER, buffer.handle); - glBufferData(GL_ARRAY_BUFFER, sizeof(world::ChunkQuad) * builder.size(), builder.data(), GL_STATIC_DRAW); - buffer.size = builder.size(); - has_no_submeshes_b = false; - } - } - - if(has_no_submeshes_b && has_no_submeshes_nb) { - globals::dimension->chunks.remove<world::ChunkMesh>(m_entity); - } -} - -bool GL_MeshingTask::vis_test(voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos) const -{ - const auto pvpos = coord::to_voxel(m_cpos, lpos); - const auto pcpos = coord::to_chunk(pvpos); - const auto plpos = coord::to_local(pvpos); - const auto index = coord::to_index(plpos); - - const auto cached_cpos = get_cached_cpos(m_cpos, pcpos); - const auto& voxels = m_cache.at(cached_cpos); - const auto neighbour = voxels[index]; - - bool result; - - if(neighbour == NULL_VOXEL_ID) { - result = true; - } - else if(neighbour == voxel) { - result = false; - } - else if(auto neighbour_info = world::voxel_registry::find(neighbour)) { - if(neighbour_info->blending != info->blending) { - // Voxel types that use blending are semi-transparent; - // this means they're rendered using a different setup - // and they must have visible faces with opaque voxels - result = neighbour_info->blending; - } - else { - result = false; - } - } - else { - result = false; - } - - return result; -} - -void GL_MeshingTask::push_quad_a(const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face) -{ - const world::voxel_facing facing = get_facing(face, info->type); - const world::VoxelTexture& vtex = info->textures[static_cast<std::size_t>(face)]; - - if(info->blending) { - m_quads_b[vtex.cached_plane].push_back(make_chunk_quad(pos, size, facing, vtex.cached_offset, vtex.paths.size())); - } - else { - m_quads_s[vtex.cached_plane].push_back(make_chunk_quad(pos, size, facing, vtex.cached_offset, vtex.paths.size())); - } -} - -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<std::size_t>(face)]; - const std::size_t entropy_mod = entropy % vtex.paths.size(); - - if(info->blending) { - m_quads_b[vtex.cached_plane].push_back(make_chunk_quad(pos, size, facing, vtex.cached_offset + entropy_mod, 0)); - } - else { - m_quads_s[vtex.cached_plane].push_back(make_chunk_quad(pos, size, facing, vtex.cached_offset + entropy_mod, 0)); - } -} - -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); - - if(info->animated) { - if(vis & world::VIS_NORTH) { - push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_NORTH); - } - - if(vis & world::VIS_SOUTH) { - push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_SOUTH); - } - - if(vis & world::VIS_EAST) { - push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_EAST); - } - - if(vis & world::VIS_WEST) { - push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_WEST); - } - - if(vis & world::VIS_UP) { - push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_TOP); - } - - if(vis & world::VIS_DOWN) { - push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_BOTTOM); - } - } - else { - if(vis & world::VIS_NORTH) { - push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_NORTH, entropy); - } - - if(vis & world::VIS_SOUTH) { - push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_SOUTH, entropy); - } - - if(vis & world::VIS_EAST) { - push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_EAST, entropy); - } - - if(vis & world::VIS_WEST) { - push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_WEST, entropy); - } - - if(vis & world::VIS_UP) { - push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_TOP, entropy); - } - - if(vis & world::VIS_DOWN) { - push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_BOTTOM, entropy); - } - } -} - -void GL_MeshingTask::cache_chunk(const chunk_pos& cpos) -{ - const auto index = get_cached_cpos(m_cpos, cpos); - - if(const auto chunk = globals::dimension->find_chunk(cpos)) { - m_cache[index] = chunk->get_voxels(); - return; - } -} - -// Bogus internal flag component -struct NeedsMeshingComponent final {}; - -static void on_chunk_create(const world::ChunkCreateEvent& event) -{ - const std::array<chunk_pos, 6> neighbours = { - event.cpos + DIR_NORTH<chunk_pos::value_type>, - event.cpos + DIR_SOUTH<chunk_pos::value_type>, - event.cpos + DIR_EAST<chunk_pos::value_type>, - event.cpos + DIR_WEST<chunk_pos::value_type>, - event.cpos + DIR_UP<chunk_pos::value_type>, - event.cpos + DIR_DOWN<chunk_pos::value_type>, - }; - - globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(event.chunk->get_entity()); - - for(const chunk_pos& cpos : neighbours) { - if(const world::Chunk* chunk = globals::dimension->find_chunk(cpos)) { - globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(chunk->get_entity()); - continue; - } - } -} - -static void on_chunk_update(const world::ChunkUpdateEvent& event) -{ - const std::array<chunk_pos, 6> neighbours = { - event.cpos + DIR_NORTH<chunk_pos::value_type>, - event.cpos + DIR_SOUTH<chunk_pos::value_type>, - event.cpos + DIR_EAST<chunk_pos::value_type>, - event.cpos + DIR_WEST<chunk_pos::value_type>, - event.cpos + DIR_UP<chunk_pos::value_type>, - event.cpos + DIR_DOWN<chunk_pos::value_type>, - }; - - globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(event.chunk->get_entity()); - - for(const chunk_pos& cpos : neighbours) { - if(const world::Chunk* chunk = globals::dimension->find_chunk(cpos)) { - globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(chunk->get_entity()); - continue; - } - } -} - -static void on_voxel_set(const world::VoxelSetEvent& event) -{ - globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(event.chunk->get_entity()); - - std::vector<chunk_pos> neighbours; - - for(int dim = 0; dim < 3; dim += 1) { - chunk_pos offset = chunk_pos(0, 0, 0); - offset[dim] = 1; - - if(event.lpos[dim] == 0) { - neighbours.push_back(event.cpos - offset); - continue; - } - - if(event.lpos[dim] == (CHUNK_SIZE - 1)) { - neighbours.push_back(event.cpos + offset); - continue; - } - } - - for(const chunk_pos& cpos : neighbours) { - if(const world::Chunk* chunk = globals::dimension->find_chunk(cpos)) { - globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(chunk->get_entity()); - continue; - } - } -} - -void world::chunk_mesher::init(void) -{ - globals::dispatcher.sink<ChunkCreateEvent>().connect<&on_chunk_create>(); - globals::dispatcher.sink<ChunkUpdateEvent>().connect<&on_chunk_update>(); - globals::dispatcher.sink<VoxelSetEvent>().connect<&on_voxel_set>(); -} - -void world::chunk_mesher::shutdown(void) -{ -} - -void world::chunk_mesher::update(void) -{ - if(session::is_ingame()) { - const auto group = globals::dimension->chunks.group<NeedsMeshingComponent>(entt::get<ChunkComponent>); - for(const auto [entity, chunk] : group.each()) { - globals::dimension->chunks.remove<NeedsMeshingComponent>(entity); - threading::submit<GL_MeshingTask>(entity, chunk.cpos); - } - } -} +#include "client/pch.hh"
+
+#include "client/world/chunk_mesher.hh"
+
+#include "core/math/crc64.hh"
+
+#include "core/threading.hh"
+
+#include "shared/world/chunk.hh"
+#include "shared/world/dimension.hh"
+#include "shared/world/voxel_registry.hh"
+
+#include "shared/coord.hh"
+
+#include "client/world/chunk_quad.hh"
+#include "client/world/voxel_atlas.hh"
+
+#include "client/globals.hh"
+#include "client/session.hh"
+
+using QuadBuilder = std::vector<world::ChunkQuad>;
+
+using CachedChunkCoord = unsigned short;
+constexpr static CachedChunkCoord CPOS_ITSELF = 0x0000;
+constexpr static CachedChunkCoord CPOS_NORTH = 0x0001;
+constexpr static CachedChunkCoord CPOS_SOUTH = 0x0002;
+constexpr static CachedChunkCoord CPOS_EAST = 0x0003;
+constexpr static CachedChunkCoord CPOS_WEST = 0x0004;
+constexpr static CachedChunkCoord CPOS_TOP = 0x0005;
+constexpr static CachedChunkCoord CPOS_BOTTOM = 0x0006;
+constexpr static const size_t NUM_CACHED_CPOS = 7;
+
+static const CachedChunkCoord get_cached_cpos(const chunk_pos& pivot, const chunk_pos& cpos)
+{
+ static const CachedChunkCoord nx[3] = { CPOS_WEST, 0, CPOS_EAST };
+ static const CachedChunkCoord ny[3] = { CPOS_BOTTOM, 0, CPOS_TOP };
+ static const CachedChunkCoord nz[3] = { CPOS_NORTH, 0, CPOS_SOUTH };
+
+ if(pivot != cpos) {
+ chunk_pos delta = pivot - cpos;
+ delta[0] = math::clamp<std::int64_t>(delta[0], -1, 1);
+ delta[1] = math::clamp<std::int64_t>(delta[1], -1, 1);
+ delta[2] = math::clamp<std::int64_t>(delta[2], -1, 1);
+
+ if(delta[0]) {
+ return nx[delta[0] + 1];
+ }
+ else if(delta[1]) {
+ return ny[delta[1] + 1];
+ }
+ else {
+ return nz[delta[2] + 1];
+ }
+ }
+
+ return CPOS_ITSELF;
+}
+
+static world::voxel_facing get_facing(world::voxel_face face, world::voxel_type type)
+{
+ if(type == world::voxel_type::CROSS) {
+ switch(face) {
+ case world::voxel_face::CROSS_NESW:
+ return world::voxel_facing::NESW;
+ case world::voxel_face::CROSS_NWSE:
+ return world::voxel_facing::NWSE;
+ default:
+ return world::voxel_facing::NORTH;
+ }
+ }
+
+ switch(face) {
+ case world::voxel_face::CUBE_NORTH:
+ return world::voxel_facing::NORTH;
+ case world::voxel_face::CUBE_SOUTH:
+ return world::voxel_facing::SOUTH;
+ case world::voxel_face::CUBE_EAST:
+ return world::voxel_facing::EAST;
+ case world::voxel_face::CUBE_WEST:
+ return world::voxel_facing::WEST;
+ case world::voxel_face::CUBE_TOP:
+ return world::voxel_facing::UP;
+ case world::voxel_face::CUBE_BOTTOM:
+ return world::voxel_facing::DOWN;
+ default:
+ return world::voxel_facing::NORTH;
+ }
+}
+
+class GL_MeshingTask final : public Task {
+public:
+ explicit GL_MeshingTask(entt::entity entity, const chunk_pos& cpos);
+ virtual ~GL_MeshingTask(void) = default;
+ virtual void process(void) override;
+ virtual void finalize(void) override;
+
+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 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);
+
+private:
+ std::array<world::VoxelStorage, NUM_CACHED_CPOS> m_cache;
+ std::vector<QuadBuilder> m_quads_b; // blending
+ std::vector<QuadBuilder> m_quads_s; // solid
+ entt::entity m_entity;
+ chunk_pos m_cpos;
+};
+
+GL_MeshingTask::GL_MeshingTask(entt::entity entity, const chunk_pos& cpos)
+{
+ m_entity = entity;
+ m_cpos = cpos;
+
+ cache_chunk(m_cpos);
+ cache_chunk(m_cpos + DIR_NORTH<chunk_pos::value_type>);
+ cache_chunk(m_cpos + DIR_SOUTH<chunk_pos::value_type>);
+ cache_chunk(m_cpos + DIR_EAST<chunk_pos::value_type>);
+ cache_chunk(m_cpos + DIR_WEST<chunk_pos::value_type>);
+ cache_chunk(m_cpos + DIR_DOWN<chunk_pos::value_type>);
+ cache_chunk(m_cpos + DIR_UP<chunk_pos::value_type>);
+}
+
+void GL_MeshingTask::process(void)
+{
+ m_quads_b.resize(world::voxel_atlas::plane_count());
+ m_quads_s.resize(world::voxel_atlas::plane_count());
+
+ const auto& voxels = m_cache.at(CPOS_ITSELF);
+
+ for(std::size_t i = 0; i < CHUNK_VOLUME; ++i) {
+ if(m_status == task_status::CANCELLED) {
+ m_quads_b.clear();
+ m_quads_s.clear();
+ return;
+ }
+
+ const auto voxel = voxels[i];
+ const auto lpos = coord::to_local(i);
+
+ const auto info = world::voxel_registry::find(voxel);
+
+ if(info == nullptr) {
+ // Either a NULL_VOXEL_ID or something went
+ // horribly wrong and we don't what this is
+ continue;
+ }
+
+ world::voxel_vis vis = 0;
+
+ if(vis_test(voxel, info, lpos + DIR_NORTH<local_pos::value_type>)) {
+ vis |= world::VIS_NORTH;
+ }
+
+ if(vis_test(voxel, info, lpos + DIR_SOUTH<local_pos::value_type>)) {
+ vis |= world::VIS_SOUTH;
+ }
+
+ if(vis_test(voxel, info, lpos + DIR_EAST<local_pos::value_type>)) {
+ vis |= world::VIS_EAST;
+ }
+
+ if(vis_test(voxel, info, lpos + DIR_WEST<local_pos::value_type>)) {
+ vis |= world::VIS_WEST;
+ }
+
+ if(vis_test(voxel, info, lpos + DIR_UP<local_pos::value_type>)) {
+ vis |= world::VIS_UP;
+ }
+
+ if(vis_test(voxel, info, lpos + DIR_DOWN<local_pos::value_type>)) {
+ vis |= world::VIS_DOWN;
+ }
+
+ const auto vpos = coord::to_voxel(m_cpos, lpos);
+ const auto entropy_src = vpos[0] * vpos[1] * vpos[2];
+ const auto entropy = math::crc64(&entropy_src, sizeof(entropy_src));
+
+ // FIXME: handle different voxel types
+ make_cube(voxel, info, lpos, vis, entropy);
+ }
+}
+
+void GL_MeshingTask::finalize(void)
+{
+ if(!globals::dimension || !globals::dimension->chunks.valid(m_entity)) {
+ // We either disconnected or something
+ // else happened that invalidated the entity
+ return;
+ }
+
+ auto& component = globals::dimension->chunks.emplace_or_replace<world::ChunkMesh>(m_entity);
+
+ const std::size_t plane_count_nb = m_quads_s.size();
+ const std::size_t plane_count_b = m_quads_b.size();
+
+ bool has_no_submeshes_b = true;
+ bool has_no_submeshes_nb = true;
+
+ component.quad_nb.resize(plane_count_nb);
+ component.quad_b.resize(plane_count_b);
+
+ for(std::size_t plane = 0; plane < plane_count_nb; ++plane) {
+ auto& builder = m_quads_s[plane];
+ auto& buffer = component.quad_nb[plane];
+
+ if(builder.empty()) {
+ if(buffer.handle) {
+ glDeleteBuffers(1, &buffer.handle);
+ buffer.handle = 0;
+ buffer.size = 0;
+ }
+ }
+ else {
+ if(!buffer.handle) {
+ glGenBuffers(1, &buffer.handle);
+ }
+
+ glBindBuffer(GL_ARRAY_BUFFER, buffer.handle);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(world::ChunkQuad) * builder.size(), builder.data(), GL_STATIC_DRAW);
+ buffer.size = builder.size();
+ has_no_submeshes_nb = false;
+ }
+ }
+
+ for(std::size_t plane = 0; plane < plane_count_b; ++plane) {
+ auto& builder = m_quads_b[plane];
+ auto& buffer = component.quad_b[plane];
+
+ if(builder.empty()) {
+ if(buffer.handle) {
+ glDeleteBuffers(1, &buffer.handle);
+ buffer.handle = 0;
+ buffer.size = 0;
+ }
+ }
+ else {
+ if(!buffer.handle) {
+ glGenBuffers(1, &buffer.handle);
+ }
+
+ glBindBuffer(GL_ARRAY_BUFFER, buffer.handle);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(world::ChunkQuad) * builder.size(), builder.data(), GL_STATIC_DRAW);
+ buffer.size = builder.size();
+ has_no_submeshes_b = false;
+ }
+ }
+
+ if(has_no_submeshes_b && has_no_submeshes_nb) {
+ globals::dimension->chunks.remove<world::ChunkMesh>(m_entity);
+ }
+}
+
+bool GL_MeshingTask::vis_test(voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos) const
+{
+ const auto pvpos = coord::to_voxel(m_cpos, lpos);
+ const auto pcpos = coord::to_chunk(pvpos);
+ const auto plpos = coord::to_local(pvpos);
+ const auto index = coord::to_index(plpos);
+
+ const auto cached_cpos = get_cached_cpos(m_cpos, pcpos);
+ const auto& voxels = m_cache.at(cached_cpos);
+ const auto neighbour = voxels[index];
+
+ bool result;
+
+ if(neighbour == NULL_VOXEL_ID) {
+ result = true;
+ }
+ else if(neighbour == voxel) {
+ result = false;
+ }
+ else if(auto neighbour_info = world::voxel_registry::find(neighbour)) {
+ if(neighbour_info->blending != info->blending) {
+ // Voxel types that use blending are semi-transparent;
+ // this means they're rendered using a different setup
+ // and they must have visible faces with opaque voxels
+ result = neighbour_info->blending;
+ }
+ else {
+ result = false;
+ }
+ }
+ else {
+ result = false;
+ }
+
+ return result;
+}
+
+void GL_MeshingTask::push_quad_a(const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face)
+{
+ const world::voxel_facing facing = get_facing(face, info->type);
+ const world::VoxelTexture& vtex = info->textures[static_cast<std::size_t>(face)];
+
+ if(info->blending) {
+ m_quads_b[vtex.cached_plane].push_back(make_chunk_quad(pos, size, facing, vtex.cached_offset, vtex.paths.size()));
+ }
+ else {
+ m_quads_s[vtex.cached_plane].push_back(make_chunk_quad(pos, size, facing, vtex.cached_offset, vtex.paths.size()));
+ }
+}
+
+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<std::size_t>(face)];
+ const std::size_t entropy_mod = entropy % vtex.paths.size();
+
+ if(info->blending) {
+ m_quads_b[vtex.cached_plane].push_back(make_chunk_quad(pos, size, facing, vtex.cached_offset + entropy_mod, 0));
+ }
+ else {
+ m_quads_s[vtex.cached_plane].push_back(make_chunk_quad(pos, size, facing, vtex.cached_offset + entropy_mod, 0));
+ }
+}
+
+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);
+
+ if(info->animated) {
+ if(vis & world::VIS_NORTH) {
+ push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_NORTH);
+ }
+
+ if(vis & world::VIS_SOUTH) {
+ push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_SOUTH);
+ }
+
+ if(vis & world::VIS_EAST) {
+ push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_EAST);
+ }
+
+ if(vis & world::VIS_WEST) {
+ push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_WEST);
+ }
+
+ if(vis & world::VIS_UP) {
+ push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_TOP);
+ }
+
+ if(vis & world::VIS_DOWN) {
+ push_quad_a(info, fpos, fsize, world::voxel_face::CUBE_BOTTOM);
+ }
+ }
+ else {
+ if(vis & world::VIS_NORTH) {
+ push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_NORTH, entropy);
+ }
+
+ if(vis & world::VIS_SOUTH) {
+ push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_SOUTH, entropy);
+ }
+
+ if(vis & world::VIS_EAST) {
+ push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_EAST, entropy);
+ }
+
+ if(vis & world::VIS_WEST) {
+ push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_WEST, entropy);
+ }
+
+ if(vis & world::VIS_UP) {
+ push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_TOP, entropy);
+ }
+
+ if(vis & world::VIS_DOWN) {
+ push_quad_v(info, fpos, fsize, world::voxel_face::CUBE_BOTTOM, entropy);
+ }
+ }
+}
+
+void GL_MeshingTask::cache_chunk(const chunk_pos& cpos)
+{
+ const auto index = get_cached_cpos(m_cpos, cpos);
+
+ if(const auto chunk = globals::dimension->find_chunk(cpos)) {
+ m_cache[index] = chunk->get_voxels();
+ return;
+ }
+}
+
+// Bogus internal flag component
+struct NeedsMeshingComponent final {};
+
+static void on_chunk_create(const world::ChunkCreateEvent& event)
+{
+ const std::array<chunk_pos, 6> neighbours = {
+ event.cpos + DIR_NORTH<chunk_pos::value_type>,
+ event.cpos + DIR_SOUTH<chunk_pos::value_type>,
+ event.cpos + DIR_EAST<chunk_pos::value_type>,
+ event.cpos + DIR_WEST<chunk_pos::value_type>,
+ event.cpos + DIR_UP<chunk_pos::value_type>,
+ event.cpos + DIR_DOWN<chunk_pos::value_type>,
+ };
+
+ globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(event.chunk->get_entity());
+
+ for(const chunk_pos& cpos : neighbours) {
+ if(const world::Chunk* chunk = globals::dimension->find_chunk(cpos)) {
+ globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(chunk->get_entity());
+ continue;
+ }
+ }
+}
+
+static void on_chunk_update(const world::ChunkUpdateEvent& event)
+{
+ const std::array<chunk_pos, 6> neighbours = {
+ event.cpos + DIR_NORTH<chunk_pos::value_type>,
+ event.cpos + DIR_SOUTH<chunk_pos::value_type>,
+ event.cpos + DIR_EAST<chunk_pos::value_type>,
+ event.cpos + DIR_WEST<chunk_pos::value_type>,
+ event.cpos + DIR_UP<chunk_pos::value_type>,
+ event.cpos + DIR_DOWN<chunk_pos::value_type>,
+ };
+
+ globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(event.chunk->get_entity());
+
+ for(const chunk_pos& cpos : neighbours) {
+ if(const world::Chunk* chunk = globals::dimension->find_chunk(cpos)) {
+ globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(chunk->get_entity());
+ continue;
+ }
+ }
+}
+
+static void on_voxel_set(const world::VoxelSetEvent& event)
+{
+ globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(event.chunk->get_entity());
+
+ std::vector<chunk_pos> neighbours;
+
+ for(int dim = 0; dim < 3; dim += 1) {
+ chunk_pos offset = chunk_pos(0, 0, 0);
+ offset[dim] = 1;
+
+ if(event.lpos[dim] == 0) {
+ neighbours.push_back(event.cpos - offset);
+ continue;
+ }
+
+ if(event.lpos[dim] == (CHUNK_SIZE - 1)) {
+ neighbours.push_back(event.cpos + offset);
+ continue;
+ }
+ }
+
+ for(const chunk_pos& cpos : neighbours) {
+ if(const world::Chunk* chunk = globals::dimension->find_chunk(cpos)) {
+ globals::dimension->chunks.emplace_or_replace<NeedsMeshingComponent>(chunk->get_entity());
+ continue;
+ }
+ }
+}
+
+void world::chunk_mesher::init(void)
+{
+ globals::dispatcher.sink<ChunkCreateEvent>().connect<&on_chunk_create>();
+ globals::dispatcher.sink<ChunkUpdateEvent>().connect<&on_chunk_update>();
+ globals::dispatcher.sink<VoxelSetEvent>().connect<&on_voxel_set>();
+}
+
+void world::chunk_mesher::shutdown(void)
+{
+}
+
+void world::chunk_mesher::update(void)
+{
+ if(session::is_ingame()) {
+ const auto group = globals::dimension->chunks.group<NeedsMeshingComponent>(entt::get<ChunkComponent>);
+ for(const auto [entity, chunk] : group.each()) {
+ globals::dimension->chunks.remove<NeedsMeshingComponent>(entity);
+ threading::submit<GL_MeshingTask>(entity, chunk.cpos);
+ }
+ }
+}
diff --git a/game/client/world/chunk_mesher.hh b/game/client/world/chunk_mesher.hh index cb0c7c5..1ef5035 100644 --- a/game/client/world/chunk_mesher.hh +++ b/game/client/world/chunk_mesher.hh @@ -1,18 +1,18 @@ -#pragma once - -#include "client/world/chunk_vbo.hh" - -namespace world -{ -struct ChunkMesh final { - std::vector<ChunkVBO> quad_nb; - std::vector<ChunkVBO> quad_b; -}; -} // namespace world - -namespace world::chunk_mesher -{ -void init(void); -void shutdown(void); -void update(void); -} // namespace world::chunk_mesher +#pragma once
+
+#include "client/world/chunk_vbo.hh"
+
+namespace world
+{
+struct ChunkMesh final {
+ std::vector<ChunkVBO> quad_nb;
+ std::vector<ChunkVBO> quad_b;
+};
+} // namespace world
+
+namespace world::chunk_mesher
+{
+void init(void);
+void shutdown(void);
+void update(void);
+} // namespace world::chunk_mesher
diff --git a/game/client/world/chunk_quad.hh b/game/client/world/chunk_quad.hh index d160b7e..c15bb7a 100644 --- a/game/client/world/chunk_quad.hh +++ b/game/client/world/chunk_quad.hh @@ -1,41 +1,41 @@ -#pragma once - -#include "core/math/constexpr.hh" - -#include "shared/world/voxel_registry.hh" - -namespace world -{ -// [0] XXXXXXXXYYYYYYYYZZZZZZZZWWWWHHHH -// [1] FFFFTTTTTTTTTTTAAAAA------------ -using ChunkQuad = std::array<std::uint32_t, 2>; -} // namespace world - -namespace world -{ -constexpr inline static ChunkQuad make_chunk_quad(const glm::fvec3& position, const glm::fvec2& size, voxel_facing facing, - std::size_t texture, std::size_t frames) -{ - ChunkQuad result = {}; - result[0] = 0x00000000; - result[1] = 0x00000000; - - // [0] XXXXXXXXYYYYYYYYZZZZZZZZ-------- - result[0] |= (0x000000FFU & static_cast<std::uint32_t>(position.x * 16.0f)) << 24U; - result[0] |= (0x000000FFU & static_cast<std::uint32_t>(position.y * 16.0f)) << 16U; - result[0] |= (0x000000FFU & static_cast<std::uint32_t>(position.z * 16.0f)) << 8U; - - // [0] ------------------------WWWWHHHH - result[0] |= (0x0000000FU & static_cast<std::uint32_t>(size.x * 16.0f - 1.0f)) << 4U; - result[0] |= (0x0000000FU & static_cast<std::uint32_t>(size.y * 16.0f - 1.0f)); - - // [1] FFFF---------------------------- - result[1] |= (0x0000000FU & static_cast<std::uint32_t>(facing)) << 28U; - - // [1] ----TTTTTTTTTTTAAAAA------------ - result[1] |= (0x000007FFU & static_cast<std::uint32_t>(texture)) << 17U; - result[1] |= (0x0000001FU & static_cast<std::uint32_t>(frames)) << 12U; - - return result; -} -} // namespace world +#pragma once
+
+#include "core/math/constexpr.hh"
+
+#include "shared/world/voxel_registry.hh"
+
+namespace world
+{
+// [0] XXXXXXXXYYYYYYYYZZZZZZZZWWWWHHHH
+// [1] FFFFTTTTTTTTTTTAAAAA------------
+using ChunkQuad = std::array<std::uint32_t, 2>;
+} // namespace world
+
+namespace world
+{
+constexpr inline static ChunkQuad make_chunk_quad(const glm::fvec3& position, const glm::fvec2& size, voxel_facing facing,
+ std::size_t texture, std::size_t frames)
+{
+ ChunkQuad result = {};
+ result[0] = 0x00000000;
+ result[1] = 0x00000000;
+
+ // [0] XXXXXXXXYYYYYYYYZZZZZZZZ--------
+ result[0] |= (0x000000FFU & static_cast<std::uint32_t>(position.x * 16.0f)) << 24U;
+ result[0] |= (0x000000FFU & static_cast<std::uint32_t>(position.y * 16.0f)) << 16U;
+ result[0] |= (0x000000FFU & static_cast<std::uint32_t>(position.z * 16.0f)) << 8U;
+
+ // [0] ------------------------WWWWHHHH
+ result[0] |= (0x0000000FU & static_cast<std::uint32_t>(size.x * 16.0f - 1.0f)) << 4U;
+ result[0] |= (0x0000000FU & static_cast<std::uint32_t>(size.y * 16.0f - 1.0f));
+
+ // [1] FFFF----------------------------
+ result[1] |= (0x0000000FU & static_cast<std::uint32_t>(facing)) << 28U;
+
+ // [1] ----TTTTTTTTTTTAAAAA------------
+ result[1] |= (0x000007FFU & static_cast<std::uint32_t>(texture)) << 17U;
+ result[1] |= (0x0000001FU & static_cast<std::uint32_t>(frames)) << 12U;
+
+ return result;
+}
+} // namespace world
diff --git a/game/client/world/chunk_renderer.cc b/game/client/world/chunk_renderer.cc index 23ce4ec..1b195d7 100644 --- a/game/client/world/chunk_renderer.cc +++ b/game/client/world/chunk_renderer.cc @@ -1,204 +1,204 @@ -#include "client/pch.hh" - -#include "client/world/chunk_renderer.hh" - -#include "core/config/boolean.hh" -#include "core/config/number.hh" - -#include "core/io/config_map.hh" - -#include "shared/world/chunk.hh" -#include "shared/world/dimension.hh" - -#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" -#include "client/world/skybox.hh" -#include "client/world/voxel_anims.hh" -#include "client/world/voxel_atlas.hh" - -#include "client/game.hh" -#include "client/globals.hh" -#include "client/program.hh" -#include "client/toggles.hh" - -// ONLY TOUCH THESE IF THE RESPECTIVE SHADER -// VARIANT MACRO DECLARATIONS LAYOUT CHANGED AS WELL -constexpr static unsigned int WORLD_CURVATURE = 0U; -constexpr static unsigned int WORLD_FOG = 1U; - -static config::Boolean depth_sort_chunks(true); - -static GL_Program quad_program; -static std::size_t u_quad_vproj_matrix; -static std::size_t u_quad_world_position; -static std::size_t u_quad_timings; -static std::size_t u_quad_fog_color; -static std::size_t u_quad_view_distance; -static std::size_t u_quad_textures; -static GLuint quad_vaobj; -static GLuint quad_vbo; - -void world::chunk_renderer::init(void) -{ - globals::client_config.add_value("chunk_renderer.depth_sort_chunks", depth_sort_chunks); - - settings::add_checkbox(5, depth_sort_chunks, settings_location::VIDEO, "chunk_renderer.depth_sort_chunks", false); - - if(!quad_program.setup("shaders/chunk_quad.vert", "shaders/chunk_quad.frag")) { - spdlog::critical("chunk_renderer: quad_program: setup failed"); - std::terminate(); - } - - u_quad_vproj_matrix = quad_program.add_uniform("u_ViewProjMatrix"); - u_quad_world_position = quad_program.add_uniform("u_WorldPosition"); - u_quad_timings = quad_program.add_uniform("u_Timings"); - u_quad_fog_color = quad_program.add_uniform("u_FogColor"); - u_quad_view_distance = quad_program.add_uniform("u_ViewDistance"); - u_quad_textures = quad_program.add_uniform("u_Textures"); - - const glm::fvec3 vertices[4] = { - glm::fvec3(1.0f, 0.0f, 1.0f), - glm::fvec3(1.0f, 0.0f, 0.0f), - glm::fvec3(0.0f, 0.0f, 1.0f), - glm::fvec3(0.0f, 0.0f, 0.0f), - }; - - glGenVertexArrays(1, &quad_vaobj); - glBindVertexArray(quad_vaobj); - - glGenBuffers(1, &quad_vbo); - glBindBuffer(GL_ARRAY_BUFFER, quad_vbo); - glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW); - - glEnableVertexAttribArray(0); - glVertexAttribDivisor(0, 0); - glVertexAttribPointer(0, 3, GL_FLOAT, false, sizeof(glm::fvec3), nullptr); -} - -void world::chunk_renderer::shutdown(void) -{ - glDeleteBuffers(1, &quad_vbo); - glDeleteVertexArrays(1, &quad_vaobj); - quad_program.destroy(); -} - -void world::chunk_renderer::render(void) -{ - glEnable(GL_DEPTH_TEST); - glDepthFunc(GL_LEQUAL); - glLineWidth(1.0f); - - if(toggles::get(TOGGLE_WIREFRAME)) { - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); - } - else { - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - } - - quad_program.set_variant_vert(WORLD_CURVATURE, client_game::world_curvature.get_value()); - quad_program.set_variant_vert(WORLD_FOG, client_game::fog_mode.get_value()); - quad_program.set_variant_frag(WORLD_FOG, client_game::fog_mode.get_value()); - - if(!quad_program.update()) { - spdlog::critical("chunk_renderer: quad_program: update failed"); - quad_program.destroy(); - std::terminate(); - } - - GLuint timings[3]; - timings[0] = globals::window_frametime; - timings[1] = globals::window_frametime_avg; - timings[2] = world::voxel_anims::frame; - - const auto group = globals::dimension->chunks.group<ChunkComponent>(entt::get<world::ChunkMesh>); - - if(depth_sort_chunks.get_value()) { - // FIXME: speed! sorting every frame doesn't look - // like a good idea. Can we store the group elsewhere and - // still have all the up-to-date chunk things inside? - group.sort([](entt::entity ea, entt::entity eb) { - const auto dir_a = globals::dimension->chunks.get<ChunkComponent>(ea).cpos - entity::camera::position_chunk; - const auto dir_b = globals::dimension->chunks.get<ChunkComponent>(eb).cpos - entity::camera::position_chunk; - - const auto da = dir_a[0] * dir_a[0] + dir_a[1] * dir_a[1] + dir_a[2] * dir_a[2]; - const auto db = dir_b[0] * dir_b[0] + dir_b[1] * dir_b[1] + dir_b[2] * dir_b[2]; - - return da > db; - }); - } - - for(std::size_t plane_id = 0; plane_id < world::voxel_atlas::plane_count(); ++plane_id) { - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D_ARRAY, world::voxel_atlas::plane_texture(plane_id)); - - glBindVertexArray(quad_vaobj); - - glUseProgram(quad_program.handle); - glUniformMatrix4fv(quad_program.uniforms[u_quad_vproj_matrix].location, 1, false, glm::value_ptr(entity::camera::matrix)); - glUniform3uiv(quad_program.uniforms[u_quad_timings].location, 1, timings); - glUniform4fv(quad_program.uniforms[u_quad_fog_color].location, 1, glm::value_ptr(world::skybox::fog_color)); - glUniform1f(quad_program.uniforms[u_quad_view_distance].location, entity::camera::view_distance.get_value() * CHUNK_SIZE); - glUniform1i(quad_program.uniforms[u_quad_textures].location, 0); // GL_TEXTURE0 - - glDisable(GL_BLEND); - - glEnable(GL_CULL_FACE); - glCullFace(GL_BACK); - glFrontFace(GL_CCW); - - for(const auto [entity, chunk, mesh] : group.each()) { - if(plane_id < mesh.quad_nb.size() && mesh.quad_nb[plane_id].handle && mesh.quad_nb[plane_id].size) { - const auto wpos = coord::to_fvec3(chunk.cpos - entity::camera::position_chunk); - glUniform3fv(quad_program.uniforms[u_quad_world_position].location, 1, glm::value_ptr(wpos)); - - glBindBuffer(GL_ARRAY_BUFFER, mesh.quad_nb[plane_id].handle); - - glEnableVertexAttribArray(1); - glVertexAttribDivisor(1, 1); - glVertexAttribIPointer(1, 2, GL_UNSIGNED_INT, sizeof(ChunkQuad), nullptr); - - glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, mesh.quad_nb[plane_id].size); - - globals::num_drawcalls += 1; - globals::num_triangles += 2 * mesh.quad_nb[plane_id].size; - } - } - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - for(const auto [entity, chunk, mesh] : group.each()) { - if(plane_id < mesh.quad_b.size() && mesh.quad_b[plane_id].handle && mesh.quad_b[plane_id].size) { - const auto wpos = coord::to_fvec3(chunk.cpos - entity::camera::position_chunk); - glUniform3fv(quad_program.uniforms[u_quad_world_position].location, 1, glm::value_ptr(wpos)); - - glBindBuffer(GL_ARRAY_BUFFER, mesh.quad_b[plane_id].handle); - - glEnableVertexAttribArray(1); - glVertexAttribDivisor(1, 1); - glVertexAttribIPointer(1, 2, GL_UNSIGNED_INT, sizeof(ChunkQuad), nullptr); - - glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, mesh.quad_b[plane_id].size); - - globals::num_drawcalls += 1; - globals::num_triangles += 2 * mesh.quad_b[plane_id].size; - } - } - } - - if(toggles::get(TOGGLE_CHUNK_AABB)) { - world::outline::prepare(); - - for(const auto [entity, chunk, mesh] : group.each()) { - const auto size = glm::fvec3(CHUNK_SIZE, CHUNK_SIZE, CHUNK_SIZE); - world::outline::cube(chunk.cpos, glm::fvec3(0.0f, 0.0f, 0.0f), size, 1.0f, glm::fvec4(1.0f, 1.0f, 0.0f, 1.0f)); - } - } -} +#include "client/pch.hh"
+
+#include "client/world/chunk_renderer.hh"
+
+#include "core/config/boolean.hh"
+#include "core/config/number.hh"
+
+#include "core/io/config_map.hh"
+
+#include "shared/world/chunk.hh"
+#include "shared/world/dimension.hh"
+
+#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"
+#include "client/world/skybox.hh"
+#include "client/world/voxel_anims.hh"
+#include "client/world/voxel_atlas.hh"
+
+#include "client/game.hh"
+#include "client/globals.hh"
+#include "client/program.hh"
+#include "client/toggles.hh"
+
+// ONLY TOUCH THESE IF THE RESPECTIVE SHADER
+// VARIANT MACRO DECLARATIONS LAYOUT CHANGED AS WELL
+constexpr static unsigned int WORLD_CURVATURE = 0U;
+constexpr static unsigned int WORLD_FOG = 1U;
+
+static config::Boolean depth_sort_chunks(true);
+
+static GL_Program quad_program;
+static std::size_t u_quad_vproj_matrix;
+static std::size_t u_quad_world_position;
+static std::size_t u_quad_timings;
+static std::size_t u_quad_fog_color;
+static std::size_t u_quad_view_distance;
+static std::size_t u_quad_textures;
+static GLuint quad_vaobj;
+static GLuint quad_vbo;
+
+void world::chunk_renderer::init(void)
+{
+ globals::client_config.add_value("chunk_renderer.depth_sort_chunks", depth_sort_chunks);
+
+ settings::add_checkbox(5, depth_sort_chunks, settings_location::VIDEO, "chunk_renderer.depth_sort_chunks", false);
+
+ if(!quad_program.setup("shaders/chunk_quad.vert", "shaders/chunk_quad.frag")) {
+ spdlog::critical("chunk_renderer: quad_program: setup failed");
+ std::terminate();
+ }
+
+ u_quad_vproj_matrix = quad_program.add_uniform("u_ViewProjMatrix");
+ u_quad_world_position = quad_program.add_uniform("u_WorldPosition");
+ u_quad_timings = quad_program.add_uniform("u_Timings");
+ u_quad_fog_color = quad_program.add_uniform("u_FogColor");
+ u_quad_view_distance = quad_program.add_uniform("u_ViewDistance");
+ u_quad_textures = quad_program.add_uniform("u_Textures");
+
+ const glm::fvec3 vertices[4] = {
+ glm::fvec3(1.0f, 0.0f, 1.0f),
+ glm::fvec3(1.0f, 0.0f, 0.0f),
+ glm::fvec3(0.0f, 0.0f, 1.0f),
+ glm::fvec3(0.0f, 0.0f, 0.0f),
+ };
+
+ glGenVertexArrays(1, &quad_vaobj);
+ glBindVertexArray(quad_vaobj);
+
+ glGenBuffers(1, &quad_vbo);
+ glBindBuffer(GL_ARRAY_BUFFER, quad_vbo);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
+
+ glEnableVertexAttribArray(0);
+ glVertexAttribDivisor(0, 0);
+ glVertexAttribPointer(0, 3, GL_FLOAT, false, sizeof(glm::fvec3), nullptr);
+}
+
+void world::chunk_renderer::shutdown(void)
+{
+ glDeleteBuffers(1, &quad_vbo);
+ glDeleteVertexArrays(1, &quad_vaobj);
+ quad_program.destroy();
+}
+
+void world::chunk_renderer::render(void)
+{
+ glEnable(GL_DEPTH_TEST);
+ glDepthFunc(GL_LEQUAL);
+ glLineWidth(1.0f);
+
+ if(toggles::get(TOGGLE_WIREFRAME)) {
+ glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+ }
+ else {
+ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+ }
+
+ quad_program.set_variant_vert(WORLD_CURVATURE, client_game::world_curvature.get_value());
+ quad_program.set_variant_vert(WORLD_FOG, client_game::fog_mode.get_value());
+ quad_program.set_variant_frag(WORLD_FOG, client_game::fog_mode.get_value());
+
+ if(!quad_program.update()) {
+ spdlog::critical("chunk_renderer: quad_program: update failed");
+ quad_program.destroy();
+ std::terminate();
+ }
+
+ GLuint timings[3];
+ timings[0] = globals::window_frametime;
+ timings[1] = globals::window_frametime_avg;
+ timings[2] = world::voxel_anims::frame;
+
+ const auto group = globals::dimension->chunks.group<ChunkComponent>(entt::get<world::ChunkMesh>);
+
+ if(depth_sort_chunks.get_value()) {
+ // FIXME: speed! sorting every frame doesn't look
+ // like a good idea. Can we store the group elsewhere and
+ // still have all the up-to-date chunk things inside?
+ group.sort([](entt::entity ea, entt::entity eb) {
+ const auto dir_a = globals::dimension->chunks.get<ChunkComponent>(ea).cpos - entity::camera::position_chunk;
+ const auto dir_b = globals::dimension->chunks.get<ChunkComponent>(eb).cpos - entity::camera::position_chunk;
+
+ const auto da = dir_a[0] * dir_a[0] + dir_a[1] * dir_a[1] + dir_a[2] * dir_a[2];
+ const auto db = dir_b[0] * dir_b[0] + dir_b[1] * dir_b[1] + dir_b[2] * dir_b[2];
+
+ return da > db;
+ });
+ }
+
+ for(std::size_t plane_id = 0; plane_id < world::voxel_atlas::plane_count(); ++plane_id) {
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D_ARRAY, world::voxel_atlas::plane_texture(plane_id));
+
+ glBindVertexArray(quad_vaobj);
+
+ glUseProgram(quad_program.handle);
+ glUniformMatrix4fv(quad_program.uniforms[u_quad_vproj_matrix].location, 1, false, glm::value_ptr(entity::camera::matrix));
+ glUniform3uiv(quad_program.uniforms[u_quad_timings].location, 1, timings);
+ glUniform4fv(quad_program.uniforms[u_quad_fog_color].location, 1, glm::value_ptr(world::skybox::fog_color));
+ glUniform1f(quad_program.uniforms[u_quad_view_distance].location, entity::camera::view_distance.get_value() * CHUNK_SIZE);
+ glUniform1i(quad_program.uniforms[u_quad_textures].location, 0); // GL_TEXTURE0
+
+ glDisable(GL_BLEND);
+
+ glEnable(GL_CULL_FACE);
+ glCullFace(GL_BACK);
+ glFrontFace(GL_CCW);
+
+ for(const auto [entity, chunk, mesh] : group.each()) {
+ if(plane_id < mesh.quad_nb.size() && mesh.quad_nb[plane_id].handle && mesh.quad_nb[plane_id].size) {
+ const auto wpos = coord::to_fvec3(chunk.cpos - entity::camera::position_chunk);
+ glUniform3fv(quad_program.uniforms[u_quad_world_position].location, 1, glm::value_ptr(wpos));
+
+ glBindBuffer(GL_ARRAY_BUFFER, mesh.quad_nb[plane_id].handle);
+
+ glEnableVertexAttribArray(1);
+ glVertexAttribDivisor(1, 1);
+ glVertexAttribIPointer(1, 2, GL_UNSIGNED_INT, sizeof(ChunkQuad), nullptr);
+
+ glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, mesh.quad_nb[plane_id].size);
+
+ globals::num_drawcalls += 1;
+ globals::num_triangles += 2 * mesh.quad_nb[plane_id].size;
+ }
+ }
+
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ for(const auto [entity, chunk, mesh] : group.each()) {
+ if(plane_id < mesh.quad_b.size() && mesh.quad_b[plane_id].handle && mesh.quad_b[plane_id].size) {
+ const auto wpos = coord::to_fvec3(chunk.cpos - entity::camera::position_chunk);
+ glUniform3fv(quad_program.uniforms[u_quad_world_position].location, 1, glm::value_ptr(wpos));
+
+ glBindBuffer(GL_ARRAY_BUFFER, mesh.quad_b[plane_id].handle);
+
+ glEnableVertexAttribArray(1);
+ glVertexAttribDivisor(1, 1);
+ glVertexAttribIPointer(1, 2, GL_UNSIGNED_INT, sizeof(ChunkQuad), nullptr);
+
+ glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, mesh.quad_b[plane_id].size);
+
+ globals::num_drawcalls += 1;
+ globals::num_triangles += 2 * mesh.quad_b[plane_id].size;
+ }
+ }
+ }
+
+ if(toggles::get(TOGGLE_CHUNK_AABB)) {
+ world::outline::prepare();
+
+ for(const auto [entity, chunk, mesh] : group.each()) {
+ const auto size = glm::fvec3(CHUNK_SIZE, CHUNK_SIZE, CHUNK_SIZE);
+ world::outline::cube(chunk.cpos, glm::fvec3(0.0f, 0.0f, 0.0f), size, 1.0f, glm::fvec4(1.0f, 1.0f, 0.0f, 1.0f));
+ }
+ }
+}
diff --git a/game/client/world/chunk_renderer.hh b/game/client/world/chunk_renderer.hh index 2b73225..88b381f 100644 --- a/game/client/world/chunk_renderer.hh +++ b/game/client/world/chunk_renderer.hh @@ -1,8 +1,8 @@ -#pragma once - -namespace world::chunk_renderer -{ -void init(void); -void shutdown(void); -void render(void); -} // namespace world::chunk_renderer +#pragma once
+
+namespace world::chunk_renderer
+{
+void init(void);
+void shutdown(void);
+void render(void);
+} // namespace world::chunk_renderer
diff --git a/game/client/world/chunk_vbo.hh b/game/client/world/chunk_vbo.hh index 175b34f..9fedf0d 100644 --- a/game/client/world/chunk_vbo.hh +++ b/game/client/world/chunk_vbo.hh @@ -1,22 +1,22 @@ -#pragma once - -namespace world -{ -class ChunkVBO final { -public: - std::size_t size; - GLuint handle; - -public: - inline ~ChunkVBO(void) - { - // The ChunkVBO structure is meant to be a part - // of the ChunkMesh component within the EnTT registry; - // When the registry is cleaned or a chunk is removed, components - // are expected to be safely disposed of so we need a destructor; - if(handle) { - glDeleteBuffers(1, &handle); - } - } -}; -} // namespace world +#pragma once
+
+namespace world
+{
+class ChunkVBO final {
+public:
+ std::size_t size;
+ GLuint handle;
+
+public:
+ inline ~ChunkVBO(void)
+ {
+ // The ChunkVBO structure is meant to be a part
+ // of the ChunkMesh component within the EnTT registry;
+ // When the registry is cleaned or a chunk is removed, components
+ // are expected to be safely disposed of so we need a destructor;
+ if(handle) {
+ glDeleteBuffers(1, &handle);
+ }
+ }
+};
+} // namespace world
diff --git a/game/client/world/chunk_visibility.cc b/game/client/world/chunk_visibility.cc index 871c04b..e8828ee 100644 --- a/game/client/world/chunk_visibility.cc +++ b/game/client/world/chunk_visibility.cc @@ -1,90 +1,90 @@ -#include "client/pch.hh" - -#include "client/world/chunk_visibility.hh" - -#include "core/config/number.hh" - -#include "core/math/vectors.hh" - -#include "shared/world/chunk.hh" -#include "shared/world/chunk_aabb.hh" -#include "shared/world/dimension.hh" - -#include "shared/protocol.hh" - -#include "client/entity/camera.hh" - -#include "client/globals.hh" -#include "client/session.hh" - -// Sending a somewhat large amount of network packets -// can easily overwhelm both client, server and the network -// channel created between the two. To prevent this from happening -// we throttle the client's ever increasing itch for new chunks -constexpr static unsigned int MAX_CHUNKS_REQUESTS_PER_FRAME = 16U; - -static world::ChunkAABB current_view_box; -static world::ChunkAABB previous_view_box; -static std::vector<chunk_pos> requests; - -static void update_requests(void) -{ - requests.clear(); - - for(auto cx = current_view_box.min.x; cx != current_view_box.max.x; cx += 1) - for(auto cy = current_view_box.min.y; cy != current_view_box.max.y; cy += 1) - for(auto cz = current_view_box.min.z; cz != current_view_box.max.z; cz += 1) { - auto cpos = chunk_pos(cx, cy, cz); - - if(!globals::dimension->find_chunk(cpos)) { - requests.push_back(cpos); - } - } - - std::sort(requests.begin(), requests.end(), [](const chunk_pos& cpos_a, const chunk_pos& cpos_b) { - auto da = math::distance2(cpos_a, entity::camera::position_chunk); - auto db = math::distance2(cpos_b, entity::camera::position_chunk); - return da > db; - }); -} - -void world::chunk_visibility::update_late(void) -{ - current_view_box.min = entity::camera::position_chunk - static_cast<chunk_pos::value_type>(entity::camera::view_distance.get_value()); - current_view_box.max = entity::camera::position_chunk + static_cast<chunk_pos::value_type>(entity::camera::view_distance.get_value()); - - if(!session::is_ingame()) { - // This makes sure the previous view box - // is always different from the current one - previous_view_box.min = chunk_pos(INT32_MIN, INT32_MIN, INT32_MIN); - previous_view_box.max = chunk_pos(INT32_MAX, INT32_MAX, INT32_MAX); - return; - } - - if((current_view_box.min != previous_view_box.min) || (current_view_box.max != previous_view_box.max)) { - update_requests(); - } - - for(unsigned int i = 0U; i < MAX_CHUNKS_REQUESTS_PER_FRAME; ++i) { - if(requests.empty()) { - // Done sending requests - break; - } - - protocol::RequestChunk packet; - packet.cpos = requests.back(); - protocol::send(session::peer, protocol::encode(packet)); - - requests.pop_back(); - } - - auto view = globals::dimension->chunks.view<ChunkComponent>(); - - for(const auto [entity, chunk] : view.each()) { - if(!current_view_box.contains(chunk.cpos)) { - globals::dimension->remove_chunk(entity); - } - } - - previous_view_box = current_view_box; -} +#include "client/pch.hh"
+
+#include "client/world/chunk_visibility.hh"
+
+#include "core/config/number.hh"
+
+#include "core/math/vectors.hh"
+
+#include "shared/world/chunk.hh"
+#include "shared/world/chunk_aabb.hh"
+#include "shared/world/dimension.hh"
+
+#include "shared/protocol.hh"
+
+#include "client/entity/camera.hh"
+
+#include "client/globals.hh"
+#include "client/session.hh"
+
+// Sending a somewhat large amount of network packets
+// can easily overwhelm both client, server and the network
+// channel created between the two. To prevent this from happening
+// we throttle the client's ever increasing itch for new chunks
+constexpr static unsigned int MAX_CHUNKS_REQUESTS_PER_FRAME = 16U;
+
+static world::ChunkAABB current_view_box;
+static world::ChunkAABB previous_view_box;
+static std::vector<chunk_pos> requests;
+
+static void update_requests(void)
+{
+ requests.clear();
+
+ for(auto cx = current_view_box.min.x; cx != current_view_box.max.x; cx += 1)
+ for(auto cy = current_view_box.min.y; cy != current_view_box.max.y; cy += 1)
+ for(auto cz = current_view_box.min.z; cz != current_view_box.max.z; cz += 1) {
+ auto cpos = chunk_pos(cx, cy, cz);
+
+ if(!globals::dimension->find_chunk(cpos)) {
+ requests.push_back(cpos);
+ }
+ }
+
+ std::sort(requests.begin(), requests.end(), [](const chunk_pos& cpos_a, const chunk_pos& cpos_b) {
+ auto da = math::distance2(cpos_a, entity::camera::position_chunk);
+ auto db = math::distance2(cpos_b, entity::camera::position_chunk);
+ return da > db;
+ });
+}
+
+void world::chunk_visibility::update_late(void)
+{
+ current_view_box.min = entity::camera::position_chunk - static_cast<chunk_pos::value_type>(entity::camera::view_distance.get_value());
+ current_view_box.max = entity::camera::position_chunk + static_cast<chunk_pos::value_type>(entity::camera::view_distance.get_value());
+
+ if(!session::is_ingame()) {
+ // This makes sure the previous view box
+ // is always different from the current one
+ previous_view_box.min = chunk_pos(INT32_MIN, INT32_MIN, INT32_MIN);
+ previous_view_box.max = chunk_pos(INT32_MAX, INT32_MAX, INT32_MAX);
+ return;
+ }
+
+ if((current_view_box.min != previous_view_box.min) || (current_view_box.max != previous_view_box.max)) {
+ update_requests();
+ }
+
+ for(unsigned int i = 0U; i < MAX_CHUNKS_REQUESTS_PER_FRAME; ++i) {
+ if(requests.empty()) {
+ // Done sending requests
+ break;
+ }
+
+ protocol::RequestChunk packet;
+ packet.cpos = requests.back();
+ protocol::send(session::peer, protocol::encode(packet));
+
+ requests.pop_back();
+ }
+
+ auto view = globals::dimension->chunks.view<ChunkComponent>();
+
+ for(const auto [entity, chunk] : view.each()) {
+ if(!current_view_box.contains(chunk.cpos)) {
+ globals::dimension->remove_chunk(entity);
+ }
+ }
+
+ previous_view_box = current_view_box;
+}
diff --git a/game/client/world/chunk_visibility.hh b/game/client/world/chunk_visibility.hh index 8d1f3cd..e9b2d89 100644 --- a/game/client/world/chunk_visibility.hh +++ b/game/client/world/chunk_visibility.hh @@ -1,6 +1,6 @@ -#pragma once - -namespace world::chunk_visibility -{ -void update_late(void); -} // namespace world::chunk_visibility +#pragma once
+
+namespace world::chunk_visibility
+{
+void update_late(void);
+} // namespace world::chunk_visibility
diff --git a/game/client/world/outline.cc b/game/client/world/outline.cc index 396d297..62f9624 100644 --- a/game/client/world/outline.cc +++ b/game/client/world/outline.cc @@ -1,150 +1,150 @@ -#include "client/pch.hh" - -#include "client/world/outline.hh" - -#include "core/config/boolean.hh" -#include "core/config/number.hh" - -#include "shared/coord.hh" - -#include "client/entity/camera.hh" - -#include "client/const.hh" -#include "client/game.hh" -#include "client/program.hh" - -// ONLY TOUCH THESE IF THE RESPECTIVE SHADER -// VARIANT MACRO DECLARATIONS LAYOUT CHANGED AS WELL -constexpr static unsigned int WORLD_CURVATURE = 0U; - -static GL_Program program; -static std::size_t u_vpmatrix; -static std::size_t u_worldpos; -static std::size_t u_viewdist; -static std::size_t u_modulate; -static std::size_t u_scale; - -static GLuint vaobj; -static GLuint cube_vbo; -static GLuint line_vbo; - -void world::outline::init(void) -{ - if(!program.setup("shaders/outline.vert", "shaders/outline.frag")) { - spdlog::critical("outline: program setup failed"); - std::terminate(); - } - - u_vpmatrix = program.add_uniform("u_ViewProjMatrix"); - u_worldpos = program.add_uniform("u_WorldPosition"); - u_viewdist = program.add_uniform("u_ViewDistance"); - u_modulate = program.add_uniform("u_Modulate"); - u_scale = program.add_uniform("u_Scale"); - - const glm::fvec3 cube_vertices[24] = { - glm::fvec3(0.0f, 0.0f, 0.0f), - glm::fvec3(0.0f, 1.0f, 0.0f), - glm::fvec3(0.0f, 1.0f, 0.0f), - glm::fvec3(1.0f, 1.0f, 0.0f), - glm::fvec3(1.0f, 1.0f, 0.0f), - glm::fvec3(1.0f, 0.0f, 0.0f), - glm::fvec3(1.0f, 0.0f, 0.0f), - glm::fvec3(0.0f, 0.0f, 0.0f), - - glm::fvec3(0.0f, 0.0f, 1.0f), - glm::fvec3(0.0f, 1.0f, 1.0f), - glm::fvec3(0.0f, 1.0f, 1.0f), - glm::fvec3(1.0f, 1.0f, 1.0f), - glm::fvec3(1.0f, 1.0f, 1.0f), - glm::fvec3(1.0f, 0.0f, 1.0f), - glm::fvec3(1.0f, 0.0f, 1.0f), - glm::fvec3(0.0f, 0.0f, 1.0f), - - glm::fvec3(0.0f, 0.0f, 0.0f), - glm::fvec3(0.0f, 0.0f, 1.0f), - glm::fvec3(0.0f, 1.0f, 0.0f), - glm::fvec3(0.0f, 1.0f, 1.0f), - glm::fvec3(1.0f, 0.0f, 0.0f), - glm::fvec3(1.0f, 0.0f, 1.0f), - glm::fvec3(1.0f, 1.0f, 0.0f), - glm::fvec3(1.0f, 1.0f, 1.0f), - }; - - glGenBuffers(1, &cube_vbo); - glBindBuffer(GL_ARRAY_BUFFER, cube_vbo); - glBufferData(GL_ARRAY_BUFFER, sizeof(cube_vertices), cube_vertices, GL_STATIC_DRAW); - - const glm::fvec3 line_vertices[2] = { - glm::fvec3(0.0f, 0.0f, 0.0f), - glm::fvec3(1.0f, 1.0f, 1.0f), - }; - - glGenBuffers(1, &line_vbo); - glBindBuffer(GL_ARRAY_BUFFER, line_vbo); - glBufferData(GL_ARRAY_BUFFER, sizeof(line_vertices), line_vertices, GL_STATIC_DRAW); - - glGenVertexArrays(1, &vaobj); - - glBindVertexArray(vaobj); - glEnableVertexAttribArray(0); - glVertexAttribDivisor(0, 0); -} - -void world::outline::shutdown(void) -{ - glDeleteVertexArrays(1, &vaobj); - glDeleteBuffers(1, &line_vbo); - glDeleteBuffers(1, &cube_vbo); - program.destroy(); -} - -void world::outline::prepare(void) -{ - program.set_variant_vert(WORLD_CURVATURE, client_game::world_curvature.get_value()); - - if(!program.update()) { - spdlog::critical("outline_renderer: program update failed"); - std::terminate(); - } - - glDisable(GL_CULL_FACE); - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - - glUseProgram(program.handle); - glUniformMatrix4fv(program.uniforms[u_vpmatrix].location, 1, false, glm::value_ptr(entity::camera::matrix)); - glUniform1f(program.uniforms[u_viewdist].location, CHUNK_SIZE * entity::camera::view_distance.get_value()); - - glBindVertexArray(vaobj); - glEnableVertexAttribArray(0); - glVertexAttribDivisor(0, 0); -} - -void world::outline::cube(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color) -{ - auto patch_cpos = cpos - entity::camera::position_chunk; - - glLineWidth(thickness); - - glUniform3fv(program.uniforms[u_worldpos].location, 1, glm::value_ptr(coord::to_fvec3(patch_cpos, fpos))); - glUniform4fv(program.uniforms[u_modulate].location, 1, glm::value_ptr(color)); - glUniform3fv(program.uniforms[u_scale].location, 1, glm::value_ptr(size)); - - glBindBuffer(GL_ARRAY_BUFFER, cube_vbo); - glVertexAttribPointer(0, 3, GL_FLOAT, false, sizeof(glm::fvec3), nullptr); - glDrawArrays(GL_LINES, 0, 24); -} - -void world::outline::line(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color) -{ - auto patch_cpos = cpos - entity::camera::position_chunk; - - glLineWidth(thickness); - - glUniform3fv(program.uniforms[u_worldpos].location, 1, glm::value_ptr(coord::to_fvec3(patch_cpos, fpos))); - glUniform4fv(program.uniforms[u_modulate].location, 1, glm::value_ptr(color)); - glUniform3fv(program.uniforms[u_scale].location, 1, glm::value_ptr(size)); - - glBindBuffer(GL_ARRAY_BUFFER, line_vbo); - glVertexAttribPointer(0, 3, GL_FLOAT, false, sizeof(glm::fvec3), nullptr); - glDrawArrays(GL_LINES, 0, 2); -} +#include "client/pch.hh"
+
+#include "client/world/outline.hh"
+
+#include "core/config/boolean.hh"
+#include "core/config/number.hh"
+
+#include "shared/coord.hh"
+
+#include "client/entity/camera.hh"
+
+#include "client/const.hh"
+#include "client/game.hh"
+#include "client/program.hh"
+
+// ONLY TOUCH THESE IF THE RESPECTIVE SHADER
+// VARIANT MACRO DECLARATIONS LAYOUT CHANGED AS WELL
+constexpr static unsigned int WORLD_CURVATURE = 0U;
+
+static GL_Program program;
+static std::size_t u_vpmatrix;
+static std::size_t u_worldpos;
+static std::size_t u_viewdist;
+static std::size_t u_modulate;
+static std::size_t u_scale;
+
+static GLuint vaobj;
+static GLuint cube_vbo;
+static GLuint line_vbo;
+
+void world::outline::init(void)
+{
+ if(!program.setup("shaders/outline.vert", "shaders/outline.frag")) {
+ spdlog::critical("outline: program setup failed");
+ std::terminate();
+ }
+
+ u_vpmatrix = program.add_uniform("u_ViewProjMatrix");
+ u_worldpos = program.add_uniform("u_WorldPosition");
+ u_viewdist = program.add_uniform("u_ViewDistance");
+ u_modulate = program.add_uniform("u_Modulate");
+ u_scale = program.add_uniform("u_Scale");
+
+ const glm::fvec3 cube_vertices[24] = {
+ glm::fvec3(0.0f, 0.0f, 0.0f),
+ glm::fvec3(0.0f, 1.0f, 0.0f),
+ glm::fvec3(0.0f, 1.0f, 0.0f),
+ glm::fvec3(1.0f, 1.0f, 0.0f),
+ glm::fvec3(1.0f, 1.0f, 0.0f),
+ glm::fvec3(1.0f, 0.0f, 0.0f),
+ glm::fvec3(1.0f, 0.0f, 0.0f),
+ glm::fvec3(0.0f, 0.0f, 0.0f),
+
+ glm::fvec3(0.0f, 0.0f, 1.0f),
+ glm::fvec3(0.0f, 1.0f, 1.0f),
+ glm::fvec3(0.0f, 1.0f, 1.0f),
+ glm::fvec3(1.0f, 1.0f, 1.0f),
+ glm::fvec3(1.0f, 1.0f, 1.0f),
+ glm::fvec3(1.0f, 0.0f, 1.0f),
+ glm::fvec3(1.0f, 0.0f, 1.0f),
+ glm::fvec3(0.0f, 0.0f, 1.0f),
+
+ glm::fvec3(0.0f, 0.0f, 0.0f),
+ glm::fvec3(0.0f, 0.0f, 1.0f),
+ glm::fvec3(0.0f, 1.0f, 0.0f),
+ glm::fvec3(0.0f, 1.0f, 1.0f),
+ glm::fvec3(1.0f, 0.0f, 0.0f),
+ glm::fvec3(1.0f, 0.0f, 1.0f),
+ glm::fvec3(1.0f, 1.0f, 0.0f),
+ glm::fvec3(1.0f, 1.0f, 1.0f),
+ };
+
+ glGenBuffers(1, &cube_vbo);
+ glBindBuffer(GL_ARRAY_BUFFER, cube_vbo);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(cube_vertices), cube_vertices, GL_STATIC_DRAW);
+
+ const glm::fvec3 line_vertices[2] = {
+ glm::fvec3(0.0f, 0.0f, 0.0f),
+ glm::fvec3(1.0f, 1.0f, 1.0f),
+ };
+
+ glGenBuffers(1, &line_vbo);
+ glBindBuffer(GL_ARRAY_BUFFER, line_vbo);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(line_vertices), line_vertices, GL_STATIC_DRAW);
+
+ glGenVertexArrays(1, &vaobj);
+
+ glBindVertexArray(vaobj);
+ glEnableVertexAttribArray(0);
+ glVertexAttribDivisor(0, 0);
+}
+
+void world::outline::shutdown(void)
+{
+ glDeleteVertexArrays(1, &vaobj);
+ glDeleteBuffers(1, &line_vbo);
+ glDeleteBuffers(1, &cube_vbo);
+ program.destroy();
+}
+
+void world::outline::prepare(void)
+{
+ program.set_variant_vert(WORLD_CURVATURE, client_game::world_curvature.get_value());
+
+ if(!program.update()) {
+ spdlog::critical("outline_renderer: program update failed");
+ std::terminate();
+ }
+
+ glDisable(GL_CULL_FACE);
+ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+
+ glUseProgram(program.handle);
+ glUniformMatrix4fv(program.uniforms[u_vpmatrix].location, 1, false, glm::value_ptr(entity::camera::matrix));
+ glUniform1f(program.uniforms[u_viewdist].location, CHUNK_SIZE * entity::camera::view_distance.get_value());
+
+ glBindVertexArray(vaobj);
+ glEnableVertexAttribArray(0);
+ glVertexAttribDivisor(0, 0);
+}
+
+void world::outline::cube(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color)
+{
+ auto patch_cpos = cpos - entity::camera::position_chunk;
+
+ glLineWidth(thickness);
+
+ glUniform3fv(program.uniforms[u_worldpos].location, 1, glm::value_ptr(coord::to_fvec3(patch_cpos, fpos)));
+ glUniform4fv(program.uniforms[u_modulate].location, 1, glm::value_ptr(color));
+ glUniform3fv(program.uniforms[u_scale].location, 1, glm::value_ptr(size));
+
+ glBindBuffer(GL_ARRAY_BUFFER, cube_vbo);
+ glVertexAttribPointer(0, 3, GL_FLOAT, false, sizeof(glm::fvec3), nullptr);
+ glDrawArrays(GL_LINES, 0, 24);
+}
+
+void world::outline::line(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color)
+{
+ auto patch_cpos = cpos - entity::camera::position_chunk;
+
+ glLineWidth(thickness);
+
+ glUniform3fv(program.uniforms[u_worldpos].location, 1, glm::value_ptr(coord::to_fvec3(patch_cpos, fpos)));
+ glUniform4fv(program.uniforms[u_modulate].location, 1, glm::value_ptr(color));
+ glUniform3fv(program.uniforms[u_scale].location, 1, glm::value_ptr(size));
+
+ glBindBuffer(GL_ARRAY_BUFFER, line_vbo);
+ glVertexAttribPointer(0, 3, GL_FLOAT, false, sizeof(glm::fvec3), nullptr);
+ glDrawArrays(GL_LINES, 0, 2);
+}
diff --git a/game/client/world/outline.hh b/game/client/world/outline.hh index 2456a32..bd69ecc 100644 --- a/game/client/world/outline.hh +++ b/game/client/world/outline.hh @@ -1,16 +1,16 @@ -#pragma once - -#include "shared/types.hh" - -namespace world::outline -{ -void init(void); -void shutdown(void); -void prepare(void); -} // namespace world::outline - -namespace world::outline -{ -void cube(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color); -void line(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color); -} // namespace world::outline +#pragma once
+
+#include "shared/types.hh"
+
+namespace world::outline
+{
+void init(void);
+void shutdown(void);
+void prepare(void);
+} // namespace world::outline
+
+namespace world::outline
+{
+void cube(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color);
+void line(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color);
+} // namespace world::outline
diff --git a/game/client/world/player_target.cc b/game/client/world/player_target.cc index a398eed..f0550c0 100644 --- a/game/client/world/player_target.cc +++ b/game/client/world/player_target.cc @@ -1,69 +1,69 @@ -#include "client/pch.hh" - -#include "client/world/player_target.hh" - -#include "shared/world/dimension.hh" -#include "shared/world/ray_dda.hh" - -#include "shared/coord.hh" - -#include "client/entity/camera.hh" -#include "client/world/outline.hh" - -#include "client/game.hh" -#include "client/globals.hh" -#include "client/session.hh" - -constexpr static float MAX_REACH = 16.0f; - -voxel_id world::player_target::voxel; -voxel_pos world::player_target::coord; -voxel_pos world::player_target::normal; -const world::VoxelInfo* world::player_target::info; - -void world::player_target::init(void) -{ - world::player_target::voxel = NULL_VOXEL_ID; - world::player_target::coord = voxel_pos(); - world::player_target::normal = voxel_pos(); - world::player_target::info = nullptr; -} - -void world::player_target::update(void) -{ - if(session::is_ingame()) { - RayDDA ray(globals::dimension, entity::camera::position_chunk, entity::camera::position_local, entity::camera::direction); - - do { - world::player_target::voxel = ray.step(); - - if(world::player_target::voxel != NULL_VOXEL_ID) { - world::player_target::coord = ray.vpos; - world::player_target::normal = ray.vnormal; - world::player_target::info = world::voxel_registry::find(world::player_target::voxel); - break; - } - - world::player_target::coord = voxel_pos(); - world::player_target::normal = voxel_pos(); - world::player_target::info = nullptr; - } while(ray.distance < MAX_REACH); - } - else { - world::player_target::voxel = NULL_VOXEL_ID; - world::player_target::coord = voxel_pos(); - world::player_target::normal = voxel_pos(); - world::player_target::info = nullptr; - } -} - -void world::player_target::render(void) -{ - if((world::player_target::voxel != NULL_VOXEL_ID) && !client_game::hide_hud) { - auto cpos = coord::to_chunk(world::player_target::coord); - auto fpos = coord::to_local(world::player_target::coord); - - world::outline::prepare(); - world::outline::cube(cpos, glm::fvec3(fpos), glm::fvec3(1.0f), 2.0f, glm::fvec4(0.0f, 0.0f, 0.0f, 1.0f)); - } -} +#include "client/pch.hh"
+
+#include "client/world/player_target.hh"
+
+#include "shared/world/dimension.hh"
+#include "shared/world/ray_dda.hh"
+
+#include "shared/coord.hh"
+
+#include "client/entity/camera.hh"
+#include "client/world/outline.hh"
+
+#include "client/game.hh"
+#include "client/globals.hh"
+#include "client/session.hh"
+
+constexpr static float MAX_REACH = 16.0f;
+
+voxel_id world::player_target::voxel;
+voxel_pos world::player_target::coord;
+voxel_pos world::player_target::normal;
+const world::VoxelInfo* world::player_target::info;
+
+void world::player_target::init(void)
+{
+ world::player_target::voxel = NULL_VOXEL_ID;
+ world::player_target::coord = voxel_pos();
+ world::player_target::normal = voxel_pos();
+ world::player_target::info = nullptr;
+}
+
+void world::player_target::update(void)
+{
+ if(session::is_ingame()) {
+ RayDDA ray(globals::dimension, entity::camera::position_chunk, entity::camera::position_local, entity::camera::direction);
+
+ do {
+ world::player_target::voxel = ray.step();
+
+ if(world::player_target::voxel != NULL_VOXEL_ID) {
+ world::player_target::coord = ray.vpos;
+ world::player_target::normal = ray.vnormal;
+ world::player_target::info = world::voxel_registry::find(world::player_target::voxel);
+ break;
+ }
+
+ world::player_target::coord = voxel_pos();
+ world::player_target::normal = voxel_pos();
+ world::player_target::info = nullptr;
+ } while(ray.distance < MAX_REACH);
+ }
+ else {
+ world::player_target::voxel = NULL_VOXEL_ID;
+ world::player_target::coord = voxel_pos();
+ world::player_target::normal = voxel_pos();
+ world::player_target::info = nullptr;
+ }
+}
+
+void world::player_target::render(void)
+{
+ if((world::player_target::voxel != NULL_VOXEL_ID) && !client_game::hide_hud) {
+ auto cpos = coord::to_chunk(world::player_target::coord);
+ auto fpos = coord::to_local(world::player_target::coord);
+
+ world::outline::prepare();
+ world::outline::cube(cpos, glm::fvec3(fpos), glm::fvec3(1.0f), 2.0f, glm::fvec4(0.0f, 0.0f, 0.0f, 1.0f));
+ }
+}
diff --git a/game/client/world/player_target.hh b/game/client/world/player_target.hh index f137a1b..f0db9be 100644 --- a/game/client/world/player_target.hh +++ b/game/client/world/player_target.hh @@ -1,18 +1,18 @@ -#pragma once - -#include "shared/world/voxel_registry.hh" - -namespace world::player_target -{ -extern voxel_id voxel; -extern voxel_pos coord; -extern voxel_pos normal; -extern const VoxelInfo* info; -} // namespace world::player_target - -namespace world::player_target -{ -void init(void); -void update(void); -void render(void); -} // namespace world::player_target +#pragma once
+
+#include "shared/world/voxel_registry.hh"
+
+namespace world::player_target
+{
+extern voxel_id voxel;
+extern voxel_pos coord;
+extern voxel_pos normal;
+extern const VoxelInfo* info;
+} // namespace world::player_target
+
+namespace world::player_target
+{
+void init(void);
+void update(void);
+void render(void);
+} // namespace world::player_target
diff --git a/game/client/world/skybox.cc b/game/client/world/skybox.cc index 5e52fa4..cfff141 100644 --- a/game/client/world/skybox.cc +++ b/game/client/world/skybox.cc @@ -1,11 +1,11 @@ -#include "client/pch.hh" - -#include "client/world/skybox.hh" - -glm::fvec3 world::skybox::fog_color; - -void world::skybox::init(void) -{ - // https://convertingcolors.com/hex-color-B1F3FF.html - world::skybox::fog_color = glm::fvec3(0.690f, 0.950f, 1.000f); -} +#include "client/pch.hh"
+
+#include "client/world/skybox.hh"
+
+glm::fvec3 world::skybox::fog_color;
+
+void world::skybox::init(void)
+{
+ // https://convertingcolors.com/hex-color-B1F3FF.html
+ world::skybox::fog_color = glm::fvec3(0.690f, 0.950f, 1.000f);
+}
diff --git a/game/client/world/skybox.hh b/game/client/world/skybox.hh index 40113cd..39a514b 100644 --- a/game/client/world/skybox.hh +++ b/game/client/world/skybox.hh @@ -1,11 +1,11 @@ -#pragma once - -namespace world::skybox -{ -extern glm::fvec3 fog_color; -} // namespace world::skybox - -namespace world::skybox -{ -void init(void); -} // namespace world::skybox +#pragma once
+
+namespace world::skybox
+{
+extern glm::fvec3 fog_color;
+} // namespace world::skybox
+
+namespace world::skybox
+{
+void init(void);
+} // namespace world::skybox
diff --git a/game/client/world/voxel_anims.cc b/game/client/world/voxel_anims.cc index e4d9cf6..185d463 100644 --- a/game/client/world/voxel_anims.cc +++ b/game/client/world/voxel_anims.cc @@ -1,33 +1,33 @@ -#include "client/pch.hh" - -#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" - -static config::Unsigned base_framerate(16U, 1U, 16U); - -std::uint64_t world::voxel_anims::nextframe = 0U; -std::uint32_t world::voxel_anims::frame = 0U; - -void world::voxel_anims::init(void) -{ - globals::client_config.add_value("voxel_anims.base_framerate", base_framerate); - - world::voxel_anims::nextframe = 0U; - world::voxel_anims::frame = 0U; -} - -void world::voxel_anims::update(void) -{ - if(globals::curtime >= world::voxel_anims::nextframe) { - world::voxel_anims::nextframe = globals::curtime - + static_cast<std::uint64_t>(1000000.0 / static_cast<float>(base_framerate.get_value())); - world::voxel_anims::frame += 1U; - } -} +#include "client/pch.hh"
+
+#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"
+
+static config::Unsigned base_framerate(16U, 1U, 16U);
+
+std::uint64_t world::voxel_anims::nextframe = 0U;
+std::uint32_t world::voxel_anims::frame = 0U;
+
+void world::voxel_anims::init(void)
+{
+ globals::client_config.add_value("voxel_anims.base_framerate", base_framerate);
+
+ world::voxel_anims::nextframe = 0U;
+ world::voxel_anims::frame = 0U;
+}
+
+void world::voxel_anims::update(void)
+{
+ if(globals::curtime >= world::voxel_anims::nextframe) {
+ world::voxel_anims::nextframe = globals::curtime
+ + static_cast<std::uint64_t>(1000000.0 / static_cast<float>(base_framerate.get_value()));
+ world::voxel_anims::frame += 1U;
+ }
+}
diff --git a/game/client/world/voxel_anims.hh b/game/client/world/voxel_anims.hh index 0d8a0d0..e4fe73e 100644 --- a/game/client/world/voxel_anims.hh +++ b/game/client/world/voxel_anims.hh @@ -1,13 +1,13 @@ -#pragma once - -namespace world::voxel_anims -{ -extern std::uint64_t nextframe; -extern std::uint32_t frame; -} // namespace world::voxel_anims - -namespace world::voxel_anims -{ -void init(void); -void update(void); -} // namespace world::voxel_anims +#pragma once
+
+namespace world::voxel_anims
+{
+extern std::uint64_t nextframe;
+extern std::uint32_t frame;
+} // namespace world::voxel_anims
+
+namespace world::voxel_anims
+{
+void init(void);
+void update(void);
+} // namespace world::voxel_anims
diff --git a/game/client/world/voxel_atlas.cc b/game/client/world/voxel_atlas.cc index 512a06a..a01db12 100644 --- a/game/client/world/voxel_atlas.cc +++ b/game/client/world/voxel_atlas.cc @@ -1,185 +1,185 @@ -#include "client/pch.hh" - -#include "client/world/voxel_atlas.hh" - -#include "core/math/constexpr.hh" -#include "core/math/crc64.hh" - -#include "core/resource/image.hh" -#include "core/resource/resource.hh" - -struct AtlasPlane final { - std::unordered_map<std::size_t, std::size_t> lookup; - std::vector<world::AtlasStrip> strips; - std::size_t layer_count_max; - std::size_t layer_count; - std::size_t plane_id; - GLuint gl_texture; -}; - -static int atlas_width; -static int atlas_height; -static std::size_t atlas_count; -static std::vector<AtlasPlane> planes; - -// Certain animated and varied voxels just double their -// textures (see the "default" texture part in VoxelInfoBuilder::build) -// so there could either be six UNIQUE atlas strips or only one -// https://crypto.stackexchange.com/questions/55162/best-way-to-hash-two-values-into-one -static std::size_t vector_hash(const std::vector<std::string>& strings) -{ - std::size_t source = 0; - for(const std::string& str : strings) - source += math::crc64(str); - return math::crc64(&source, sizeof(source)); -} - -static void plane_setup(AtlasPlane& plane) -{ - glGenTextures(1, &plane.gl_texture); - glBindTexture(GL_TEXTURE_2D_ARRAY, plane.gl_texture); - glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, atlas_width, atlas_height, plane.layer_count_max, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr); - glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR); - glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_REPEAT); -} - -static world::AtlasStrip* plane_lookup(AtlasPlane& plane, std::size_t hash_value) -{ - const auto it = plane.lookup.find(hash_value); - - if(it != plane.lookup.cend()) { - return &plane.strips[it->second]; - } - - return nullptr; -} - -static world::AtlasStrip* plane_new_strip(AtlasPlane& plane, const std::vector<std::string>& paths, std::size_t hash_value) -{ - world::AtlasStrip strip = {}; - strip.offset = plane.layer_count; - strip.plane = plane.plane_id; - - glBindTexture(GL_TEXTURE_2D_ARRAY, plane.gl_texture); - - for(std::size_t i = 0; i < paths.size(); ++i) { - if(auto image = resource::load<Image>(paths[i].c_str(), IMAGE_LOAD_FLIP)) { - if((image->size.x != atlas_width) || (image->size.y != atlas_height)) { - spdlog::warn("atlas: {}: size mismatch", paths[i]); - continue; - } - - const std::size_t offset = strip.offset + i; - glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, offset, image->size.x, image->size.y, 1, GL_RGBA, GL_UNSIGNED_BYTE, - image->pixels); - } - } - - plane.layer_count += paths.size(); - - const std::size_t index = plane.strips.size(); - plane.lookup.emplace(hash_value, index); - plane.strips.push_back(std::move(strip)); - return &plane.strips[index]; -} - -void world::voxel_atlas::create(int width, int height, std::size_t count) -{ - GLint max_plane_layers; - - atlas_width = 1 << math::log2(width); - atlas_height = 1 << math::log2(height); - - // Clipping this at OpenGL 4.5 limit of 2048 is important due to - // how voxel quad meshes are packed in memory: each texture index is - // confined in 11 bits so having bigger atlas planes makes no sense; - glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &max_plane_layers); - max_plane_layers = math::clamp(max_plane_layers, 256, 2048); - - for(long i = count; i > 0L; i -= max_plane_layers) { - AtlasPlane plane = {}; - plane.plane_id = planes.size(); - plane.layer_count_max = math::min<std::size_t>(max_plane_layers, i); - plane.layer_count = 0; - - const std::size_t save_id = plane.plane_id; - planes.push_back(std::move(plane)); - plane_setup(planes[save_id]); - } - - spdlog::debug("voxel_atlas: count={}", count); - spdlog::debug("voxel_atlas: atlas_size=[{}x{}]", atlas_width, atlas_height); - spdlog::debug("voxel_atlas: max_plane_layers={}", max_plane_layers); -} - -void world::voxel_atlas::destroy(void) -{ - for(const AtlasPlane& plane : planes) - glDeleteTextures(1, &plane.gl_texture); - atlas_width = 0; - atlas_height = 0; - planes.clear(); -} - -std::size_t world::voxel_atlas::plane_count(void) -{ - return planes.size(); -} - -GLuint world::voxel_atlas::plane_texture(std::size_t plane_id) -{ - if(plane_id < planes.size()) { - return planes[plane_id].gl_texture; - } - else { - return 0; - } -} - -void world::voxel_atlas::generate_mipmaps(void) -{ - for(const AtlasPlane& plane : planes) { - glBindTexture(GL_TEXTURE_2D_ARRAY, plane.gl_texture); - glGenerateMipmap(GL_TEXTURE_2D_ARRAY); - } -} - -world::AtlasStrip* world::voxel_atlas::find_or_load(const std::vector<std::string>& paths) -{ - const std::size_t hash_value = vector_hash(paths); - - for(AtlasPlane& plane : planes) { - if(AtlasStrip* strip = plane_lookup(plane, hash_value)) { - return strip; - } - - continue; - } - - for(AtlasPlane& plane : planes) { - if((plane.layer_count + paths.size()) <= plane.layer_count_max) { - return plane_new_strip(plane, paths, hash_value); - } - - continue; - } - - return nullptr; -} - -world::AtlasStrip* world::voxel_atlas::find(const std::vector<std::string>& paths) -{ - const std::size_t hash_value = vector_hash(paths); - - for(AtlasPlane& plane : planes) { - if(AtlasStrip* strip = plane_lookup(plane, hash_value)) { - return strip; - } - - continue; - } - - return nullptr; -} +#include "client/pch.hh"
+
+#include "client/world/voxel_atlas.hh"
+
+#include "core/math/constexpr.hh"
+#include "core/math/crc64.hh"
+
+#include "core/resource/image.hh"
+#include "core/resource/resource.hh"
+
+struct AtlasPlane final {
+ std::unordered_map<std::size_t, std::size_t> lookup;
+ std::vector<world::AtlasStrip> strips;
+ std::size_t layer_count_max;
+ std::size_t layer_count;
+ std::size_t plane_id;
+ GLuint gl_texture;
+};
+
+static int atlas_width;
+static int atlas_height;
+static std::size_t atlas_count;
+static std::vector<AtlasPlane> planes;
+
+// Certain animated and varied voxels just double their
+// textures (see the "default" texture part in VoxelInfoBuilder::build)
+// so there could either be six UNIQUE atlas strips or only one
+// https://crypto.stackexchange.com/questions/55162/best-way-to-hash-two-values-into-one
+static std::size_t vector_hash(const std::vector<std::string>& strings)
+{
+ std::size_t source = 0;
+ for(const std::string& str : strings)
+ source += math::crc64(str);
+ return math::crc64(&source, sizeof(source));
+}
+
+static void plane_setup(AtlasPlane& plane)
+{
+ glGenTextures(1, &plane.gl_texture);
+ glBindTexture(GL_TEXTURE_2D_ARRAY, plane.gl_texture);
+ glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, atlas_width, atlas_height, plane.layer_count_max, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+ glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_REPEAT);
+}
+
+static world::AtlasStrip* plane_lookup(AtlasPlane& plane, std::size_t hash_value)
+{
+ const auto it = plane.lookup.find(hash_value);
+
+ if(it != plane.lookup.cend()) {
+ return &plane.strips[it->second];
+ }
+
+ return nullptr;
+}
+
+static world::AtlasStrip* plane_new_strip(AtlasPlane& plane, const std::vector<std::string>& paths, std::size_t hash_value)
+{
+ world::AtlasStrip strip = {};
+ strip.offset = plane.layer_count;
+ strip.plane = plane.plane_id;
+
+ glBindTexture(GL_TEXTURE_2D_ARRAY, plane.gl_texture);
+
+ for(std::size_t i = 0; i < paths.size(); ++i) {
+ if(auto image = resource::load<Image>(paths[i].c_str(), IMAGE_LOAD_FLIP)) {
+ if((image->size.x != atlas_width) || (image->size.y != atlas_height)) {
+ spdlog::warn("atlas: {}: size mismatch", paths[i]);
+ continue;
+ }
+
+ const std::size_t offset = strip.offset + i;
+ glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, offset, image->size.x, image->size.y, 1, GL_RGBA, GL_UNSIGNED_BYTE,
+ image->pixels);
+ }
+ }
+
+ plane.layer_count += paths.size();
+
+ const std::size_t index = plane.strips.size();
+ plane.lookup.emplace(hash_value, index);
+ plane.strips.push_back(std::move(strip));
+ return &plane.strips[index];
+}
+
+void world::voxel_atlas::create(int width, int height, std::size_t count)
+{
+ GLint max_plane_layers;
+
+ atlas_width = 1 << math::log2(width);
+ atlas_height = 1 << math::log2(height);
+
+ // Clipping this at OpenGL 4.5 limit of 2048 is important due to
+ // how voxel quad meshes are packed in memory: each texture index is
+ // confined in 11 bits so having bigger atlas planes makes no sense;
+ glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &max_plane_layers);
+ max_plane_layers = math::clamp(max_plane_layers, 256, 2048);
+
+ for(long i = count; i > 0L; i -= max_plane_layers) {
+ AtlasPlane plane = {};
+ plane.plane_id = planes.size();
+ plane.layer_count_max = math::min<std::size_t>(max_plane_layers, i);
+ plane.layer_count = 0;
+
+ const std::size_t save_id = plane.plane_id;
+ planes.push_back(std::move(plane));
+ plane_setup(planes[save_id]);
+ }
+
+ spdlog::debug("voxel_atlas: count={}", count);
+ spdlog::debug("voxel_atlas: atlas_size=[{}x{}]", atlas_width, atlas_height);
+ spdlog::debug("voxel_atlas: max_plane_layers={}", max_plane_layers);
+}
+
+void world::voxel_atlas::destroy(void)
+{
+ for(const AtlasPlane& plane : planes)
+ glDeleteTextures(1, &plane.gl_texture);
+ atlas_width = 0;
+ atlas_height = 0;
+ planes.clear();
+}
+
+std::size_t world::voxel_atlas::plane_count(void)
+{
+ return planes.size();
+}
+
+GLuint world::voxel_atlas::plane_texture(std::size_t plane_id)
+{
+ if(plane_id < planes.size()) {
+ return planes[plane_id].gl_texture;
+ }
+ else {
+ return 0;
+ }
+}
+
+void world::voxel_atlas::generate_mipmaps(void)
+{
+ for(const AtlasPlane& plane : planes) {
+ glBindTexture(GL_TEXTURE_2D_ARRAY, plane.gl_texture);
+ glGenerateMipmap(GL_TEXTURE_2D_ARRAY);
+ }
+}
+
+world::AtlasStrip* world::voxel_atlas::find_or_load(const std::vector<std::string>& paths)
+{
+ const std::size_t hash_value = vector_hash(paths);
+
+ for(AtlasPlane& plane : planes) {
+ if(AtlasStrip* strip = plane_lookup(plane, hash_value)) {
+ return strip;
+ }
+
+ continue;
+ }
+
+ for(AtlasPlane& plane : planes) {
+ if((plane.layer_count + paths.size()) <= plane.layer_count_max) {
+ return plane_new_strip(plane, paths, hash_value);
+ }
+
+ continue;
+ }
+
+ return nullptr;
+}
+
+world::AtlasStrip* world::voxel_atlas::find(const std::vector<std::string>& paths)
+{
+ const std::size_t hash_value = vector_hash(paths);
+
+ for(AtlasPlane& plane : planes) {
+ if(AtlasStrip* strip = plane_lookup(plane, hash_value)) {
+ return strip;
+ }
+
+ continue;
+ }
+
+ return nullptr;
+}
diff --git a/game/client/world/voxel_atlas.hh b/game/client/world/voxel_atlas.hh index 70e8a1e..4ae6381 100644 --- a/game/client/world/voxel_atlas.hh +++ b/game/client/world/voxel_atlas.hh @@ -1,28 +1,28 @@ -#pragma once - -namespace world -{ -struct AtlasStrip final { - std::size_t offset; - std::size_t plane; -}; -} // namespace world - -namespace world::voxel_atlas -{ -void create(int width, int height, std::size_t count); -void destroy(void); -} // namespace world::voxel_atlas - -namespace world::voxel_atlas -{ -std::size_t plane_count(void); -GLuint plane_texture(std::size_t plane_id); -void generate_mipmaps(void); -} // namespace world::voxel_atlas - -namespace world::voxel_atlas -{ -AtlasStrip* find_or_load(const std::vector<std::string>& paths); -AtlasStrip* find(const std::vector<std::string>& paths); -} // namespace world::voxel_atlas +#pragma once
+
+namespace world
+{
+struct AtlasStrip final {
+ std::size_t offset;
+ std::size_t plane;
+};
+} // namespace world
+
+namespace world::voxel_atlas
+{
+void create(int width, int height, std::size_t count);
+void destroy(void);
+} // namespace world::voxel_atlas
+
+namespace world::voxel_atlas
+{
+std::size_t plane_count(void);
+GLuint plane_texture(std::size_t plane_id);
+void generate_mipmaps(void);
+} // namespace world::voxel_atlas
+
+namespace world::voxel_atlas
+{
+AtlasStrip* find_or_load(const std::vector<std::string>& paths);
+AtlasStrip* find(const std::vector<std::string>& paths);
+} // namespace world::voxel_atlas
diff --git a/game/client/world/voxel_sounds.cc b/game/client/world/voxel_sounds.cc index 71ea1fc..481e615 100644 --- a/game/client/world/voxel_sounds.cc +++ b/game/client/world/voxel_sounds.cc @@ -1,86 +1,86 @@ -#include "client/pch.hh" - -#include "client/world/voxel_sounds.hh" - -#include "client/resource/sound_effect.hh" - -constexpr static std::size_t NUM_SURFACES = static_cast<std::size_t>(world::voxel_surface::COUNT); - -static std::vector<resource_ptr<SoundEffect>> footsteps_sounds[NUM_SURFACES]; -static std::mt19937_64 randomizer; - -static void add_footsteps_effect(world::voxel_surface surface, std::string_view name) -{ - if(auto effect = resource::load<SoundEffect>(name)) { - auto surface_index = static_cast<std::size_t>(surface); - footsteps_sounds[surface_index].push_back(effect); - } -} - -static resource_ptr<SoundEffect> get_footsteps_effect(world::voxel_surface surface) -{ - auto surface_index = static_cast<std::size_t>(surface); - - if(surface_index >= NUM_SURFACES) { - // Surface index out of range - return nullptr; - } - - const auto& sounds = footsteps_sounds[surface_index]; - - if(sounds.empty()) { - // No sounds for this surface - return nullptr; - } - - auto dist = std::uniform_int_distribution<std::size_t>(0, sounds.size() - 1); - return sounds.at(dist(randomizer)); -} - -void world::voxel_sounds::init(void) -{ - add_footsteps_effect(voxel_surface::DEFAULT, "sounds/surface/default1.wav"); - add_footsteps_effect(voxel_surface::DEFAULT, "sounds/surface/default2.wav"); - add_footsteps_effect(voxel_surface::DEFAULT, "sounds/surface/default3.wav"); - add_footsteps_effect(voxel_surface::DEFAULT, "sounds/surface/default4.wav"); - - add_footsteps_effect(voxel_surface::DIRT, "sounds/surface/dirt1.wav"); - - add_footsteps_effect(voxel_surface::GRASS, "sounds/surface/grass1.wav"); - add_footsteps_effect(voxel_surface::GRASS, "sounds/surface/grass2.wav"); - add_footsteps_effect(voxel_surface::GRASS, "sounds/surface/grass3.wav"); - - add_footsteps_effect(voxel_surface::GRAVEL, "sounds/surface/gravel1.wav"); - - add_footsteps_effect(voxel_surface::SAND, "sounds/surface/sand1.wav"); - add_footsteps_effect(voxel_surface::SAND, "sounds/surface/sand2.wav"); - - add_footsteps_effect(voxel_surface::WOOD, "sounds/surface/wood1.wav"); - add_footsteps_effect(voxel_surface::WOOD, "sounds/surface/wood2.wav"); - add_footsteps_effect(voxel_surface::WOOD, "sounds/surface/wood3.wav"); -} - -void world::voxel_sounds::shutdown(void) -{ - for(std::size_t i = 0; i < NUM_SURFACES; ++i) { - footsteps_sounds[i].clear(); - } -} - -resource_ptr<SoundEffect> world::voxel_sounds::get_footsteps(voxel_surface surface) -{ - if(auto effect = get_footsteps_effect(surface)) { - return effect; - } - - if(auto effect = get_footsteps_effect(voxel_surface::DEFAULT)) { - return effect; - } - - return nullptr; -} - -resource_ptr<SoundEffect> world::voxel_sounds::get_placebreak(voxel_surface surface) -{ - return nullptr; -} +#include "client/pch.hh"
+
+#include "client/world/voxel_sounds.hh"
+
+#include "client/resource/sound_effect.hh"
+
+constexpr static std::size_t NUM_SURFACES = static_cast<std::size_t>(world::voxel_surface::COUNT);
+
+static std::vector<resource_ptr<SoundEffect>> footsteps_sounds[NUM_SURFACES];
+static std::mt19937_64 randomizer;
+
+static void add_footsteps_effect(world::voxel_surface surface, std::string_view name)
+{
+ if(auto effect = resource::load<SoundEffect>(name)) {
+ auto surface_index = static_cast<std::size_t>(surface);
+ footsteps_sounds[surface_index].push_back(effect);
+ }
+}
+
+static resource_ptr<SoundEffect> get_footsteps_effect(world::voxel_surface surface)
+{
+ auto surface_index = static_cast<std::size_t>(surface);
+
+ if(surface_index >= NUM_SURFACES) {
+ // Surface index out of range
+ return nullptr;
+ }
+
+ const auto& sounds = footsteps_sounds[surface_index];
+
+ if(sounds.empty()) {
+ // No sounds for this surface
+ return nullptr;
+ }
+
+ auto dist = std::uniform_int_distribution<std::size_t>(0, sounds.size() - 1);
+ return sounds.at(dist(randomizer));
+}
+
+void world::voxel_sounds::init(void)
+{
+ add_footsteps_effect(voxel_surface::DEFAULT, "sounds/surface/default1.wav");
+ add_footsteps_effect(voxel_surface::DEFAULT, "sounds/surface/default2.wav");
+ add_footsteps_effect(voxel_surface::DEFAULT, "sounds/surface/default3.wav");
+ add_footsteps_effect(voxel_surface::DEFAULT, "sounds/surface/default4.wav");
+
+ add_footsteps_effect(voxel_surface::DIRT, "sounds/surface/dirt1.wav");
+
+ add_footsteps_effect(voxel_surface::GRASS, "sounds/surface/grass1.wav");
+ add_footsteps_effect(voxel_surface::GRASS, "sounds/surface/grass2.wav");
+ add_footsteps_effect(voxel_surface::GRASS, "sounds/surface/grass3.wav");
+
+ add_footsteps_effect(voxel_surface::GRAVEL, "sounds/surface/gravel1.wav");
+
+ add_footsteps_effect(voxel_surface::SAND, "sounds/surface/sand1.wav");
+ add_footsteps_effect(voxel_surface::SAND, "sounds/surface/sand2.wav");
+
+ add_footsteps_effect(voxel_surface::WOOD, "sounds/surface/wood1.wav");
+ add_footsteps_effect(voxel_surface::WOOD, "sounds/surface/wood2.wav");
+ add_footsteps_effect(voxel_surface::WOOD, "sounds/surface/wood3.wav");
+}
+
+void world::voxel_sounds::shutdown(void)
+{
+ for(std::size_t i = 0; i < NUM_SURFACES; ++i) {
+ footsteps_sounds[i].clear();
+ }
+}
+
+resource_ptr<SoundEffect> world::voxel_sounds::get_footsteps(voxel_surface surface)
+{
+ if(auto effect = get_footsteps_effect(surface)) {
+ return effect;
+ }
+
+ if(auto effect = get_footsteps_effect(voxel_surface::DEFAULT)) {
+ return effect;
+ }
+
+ return nullptr;
+}
+
+resource_ptr<SoundEffect> world::voxel_sounds::get_placebreak(voxel_surface surface)
+{
+ return nullptr;
+}
diff --git a/game/client/world/voxel_sounds.hh b/game/client/world/voxel_sounds.hh index b09b475..09f5e2e 100644 --- a/game/client/world/voxel_sounds.hh +++ b/game/client/world/voxel_sounds.hh @@ -1,19 +1,19 @@ -#pragma once - -#include "core/resource/resource.hh" - -#include "shared/world/voxel_registry.hh" - -struct SoundEffect; - -namespace world::voxel_sounds -{ -void init(void); -void shutdown(void); -} // namespace world::voxel_sounds - -namespace world::voxel_sounds -{ -resource_ptr<SoundEffect> get_footsteps(voxel_surface surface); -resource_ptr<SoundEffect> get_placebreak(voxel_surface surface); -} // namespace world::voxel_sounds +#pragma once
+
+#include "core/resource/resource.hh"
+
+#include "shared/world/voxel_registry.hh"
+
+struct SoundEffect;
+
+namespace world::voxel_sounds
+{
+void init(void);
+void shutdown(void);
+} // namespace world::voxel_sounds
+
+namespace world::voxel_sounds
+{
+resource_ptr<SoundEffect> get_footsteps(voxel_surface surface);
+resource_ptr<SoundEffect> get_placebreak(voxel_surface surface);
+} // namespace world::voxel_sounds
|