mirror of
https://github.com/zhenyan121/Cubed.git
synced 2026-08-08 17:57:02 +08:00
refactor: window (#34)
* build: add SDL3 dependency * refactor(window): migrate from GLFW to SDL3 for window and input * refactor: remove unused GLFW includes and commented-out code * refactor(input): use relative mouse motion and simplify camera mouse update * refactor(event-handling): guard input events with imgui state Move mouse enable/disable logic into set_imgui_enabled and check imgui_enable before forwarding non-ImGui events to handlers. This prevents duplicate processing and ensures proper mouse state when toggling ImGui. * fix(camera): reset camera on resize events and fix input handling on imgui toggle - Add Camera::player() accessor. - Handle WindowResizeEvent and FrameBufferResizeEvent to reset camera. - Fix escape key handling to disable mouse before toggling imgui. - Fix left alt handling to toggle mouse state correctly. - Reset player key status when toggling imgui. * fix(client_world): add direct exit flag to break connection error loop * refactor(debug): add d_rep template and remove widget ID * feat(debug_collector): add video driver display to debug UI * fix: invert debug flag logic and rename to no_debug The previous 'debug_on' field was never set to true by default, causing debug mode to never be enabled. Now renamed to 'no_debug' and the renderer initializes with debug enabled unless the --no-debug flag is given. * feat(window): add video driver selection via config and --video-driver argument * ci: add vcpkg cache * fix: mscv cpp version show * fix: context delete too early * fix: ci build fail * fix: opengl resource delete error * fix: add // NOLINT for NvOptimusEnablement and AmdPowerXpressRequestHighPerformance * fix: windows ime fail on fullscreen * feat(ui): update text input area on field changes and window resize * fix(ui): initialize m_app pointer to nullptr * feat(window): add exclusive fullscreen support with WM detection * refactor: simplify WM detection and exclusive fullscreen default Removed WindowManager enum; detect_wm() now returns string directly. Default exclusive fullscreen based on platform (true on Linux). Added WM info to debug overlay. * feat: add Alt key to close ImGui; clarify debug log * refactor(dev-panel): remove direct settings UI from settings tab
This commit is contained in:
@@ -9,8 +9,8 @@
|
||||
#include "Cubed/tools/log.hpp"
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui_impl_glfw.h>
|
||||
#include <imgui_impl_opengl3.h>
|
||||
#include <imgui_impl_sdl3.h>
|
||||
|
||||
namespace Cubed {
|
||||
|
||||
@@ -59,17 +59,10 @@ void DevPanel::init() {
|
||||
|
||||
void DevPanel::render() {
|
||||
ASSERT_MSG(m_player, "Player Is Null");
|
||||
/*
|
||||
if (glfwGetWindowAttrib(window, GLFW_ICONIFIED) != 0)
|
||||
{
|
||||
ImGui_ImplGlfw_Sleep(10);
|
||||
continue;
|
||||
}
|
||||
*/
|
||||
|
||||
// Start the Dear ImGui frame
|
||||
ImGui_ImplOpenGL3_NewFrame();
|
||||
ImGui_ImplGlfw_NewFrame();
|
||||
ImGui_ImplSDL3_NewFrame();
|
||||
ImGui::NewFrame();
|
||||
|
||||
ImGui::Begin("DevPanel");
|
||||
@@ -323,97 +316,13 @@ void DevPanel::show_chunk_table_bar() {
|
||||
|
||||
void DevPanel::show_settings_tab_item() {
|
||||
if (ImGui::BeginTabItem("settings")) {
|
||||
if (ImGui::SliderFloat("FOV", &m_config_view.fov, 1.0f, 140.0f)) {
|
||||
m_config.set("player.fov", static_cast<double>(m_config_view.fov));
|
||||
m_app.renderer().reload_config();
|
||||
}
|
||||
ImGui::SameLine();
|
||||
if (ImGui::Button("default##1")) {
|
||||
m_config_view.fov = DEFAULT_FOV;
|
||||
m_config.set("player.fov", static_cast<double>(m_config_view.fov));
|
||||
m_app.renderer().reload_config();
|
||||
}
|
||||
if (ImGui::SliderFloat("Sensitivity", &m_config_view.mouse_sensitivity,
|
||||
0.01f, 1.0f)) {
|
||||
m_config.set("player.mouse_sensitivity",
|
||||
static_cast<double>(m_config_view.mouse_sensitivity));
|
||||
m_player->reload_config();
|
||||
}
|
||||
ImGui::SameLine();
|
||||
if (ImGui::Button("default##2")) {
|
||||
m_config_view.mouse_sensitivity = 0.15f;
|
||||
m_config.set("player.mouse_sensitivity",
|
||||
static_cast<double>(m_config_view.mouse_sensitivity));
|
||||
m_player->reload_config();
|
||||
}
|
||||
|
||||
if (ImGui::SliderInt("Distance", &m_config_view.rendering_distance, 2,
|
||||
128)) {
|
||||
m_config.set("world.rendering_distance",
|
||||
m_config_view.rendering_distance);
|
||||
m_world_scene.client_world().reload_config();
|
||||
}
|
||||
if (ImGui::Checkbox("Fullscreen", &m_config_view.fullscreen)) {
|
||||
m_config.set("window.fullscreen", m_config_view.fullscreen);
|
||||
m_app.window().reload_config();
|
||||
}
|
||||
ImGui::SameLine();
|
||||
if (ImGui::Checkbox("V-Sync", &m_config_view.v_sync)) {
|
||||
m_config.set("window.V-Sync", m_config_view.v_sync);
|
||||
m_app.window().reload_config();
|
||||
}
|
||||
if (ImGui::Checkbox("Aniso", &m_config_view.is_enable_aniso)) {
|
||||
m_config_view.is_reload = false;
|
||||
if (m_config_view.is_enable_aniso) {
|
||||
m_config_view.max_aniso = m_app.texture_manager().max_aniso();
|
||||
if (m_config_view.max_aniso < 2) {
|
||||
m_config_view.is_support_aniso = false;
|
||||
} else {
|
||||
m_config_view.aniso = 2;
|
||||
}
|
||||
} else {
|
||||
m_config_view.aniso = 1;
|
||||
}
|
||||
}
|
||||
if (m_config_view.is_enable_aniso) {
|
||||
ImGui::SameLine();
|
||||
if (!m_config_view.is_support_aniso) {
|
||||
ImGui::Text("Not Support\n");
|
||||
} else {
|
||||
if (ImGui::SliderInt("##aniso", &m_config_view.aniso, 2,
|
||||
m_config_view.max_aniso)) {
|
||||
m_config_view.is_reload = false;
|
||||
int log =
|
||||
static_cast<int>(std::log2(m_config_view.aniso) + 0.5f);
|
||||
m_config_view.aniso = static_cast<int>(std::pow(2, log));
|
||||
if (m_config_view.aniso < 2) {
|
||||
m_config_view.aniso = 2;
|
||||
}
|
||||
if (m_config_view.aniso > m_config_view.max_aniso) {
|
||||
m_config_view.aniso = m_config_view.max_aniso;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ImGui::Button("ReloadTexture")) {
|
||||
m_config.set("texture.aniso", m_config_view.aniso);
|
||||
m_app.texture_manager().need_reload();
|
||||
m_config_view.is_reload = true;
|
||||
}
|
||||
if (!m_config_view.is_reload) {
|
||||
ImGui::SameLine();
|
||||
ImGui::Text("Your need to click this button to apply config\n");
|
||||
}
|
||||
|
||||
if (ImGui::SliderFloat("Music", &m_config_view.volume_music, 0.0f,
|
||||
1.0f)) {
|
||||
m_config.set("volume.music", m_config_view.volume_music);
|
||||
m_app.audio().reload_config();
|
||||
}
|
||||
if (ImGui::SliderFloat("SFX", &m_config_view.volume_sfx, 0.0f, 1.0f)) {
|
||||
m_config.set("volume.SFX", m_config_view.volume_sfx);
|
||||
m_app.audio().reload_config();
|
||||
}
|
||||
if (ImGui::Combo("Theme", &m_theme, THEMES, IM_ARRAYSIZE(THEMES))) {
|
||||
if (m_theme == 0) {
|
||||
ImGui::StyleColorsDark();
|
||||
|
||||
Reference in New Issue
Block a user