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:
@@ -1,17 +1,23 @@
|
||||
#include "Cubed/debug_collector.hpp"
|
||||
|
||||
#include "Cubed/tools/system_info.hpp"
|
||||
#include "Cubed/tools/system_window_manager.hpp"
|
||||
#include "version.hpp"
|
||||
|
||||
#include <SDL3/SDL_video.h>
|
||||
#include <memory>
|
||||
|
||||
namespace Cubed {
|
||||
|
||||
DebugCollector::DebugCollector() : m_widget(nullptr) {}
|
||||
|
||||
DebugCollector& DebugCollector::get() {
|
||||
static DebugCollector instance;
|
||||
DebugCollector& DebugCollector::get() { return *get_ptr(); }
|
||||
std::unique_ptr<DebugCollector>& DebugCollector::get_ptr() {
|
||||
static std::unique_ptr<DebugCollector> instance =
|
||||
std::make_unique<DebugCollector>();
|
||||
return instance;
|
||||
}
|
||||
|
||||
void DebugCollector::distory() { get_ptr().reset(); }
|
||||
void DebugCollector::init(int width, int height) {
|
||||
constexpr float SCALE = 0.6f;
|
||||
|
||||
@@ -21,7 +27,7 @@ void DebugCollector::init(int width, int height) {
|
||||
m_widget.set_offset({0, 5});
|
||||
m_widget.set_child_anchor(ColumnLayoutAnchor::LEFT);
|
||||
// version_text
|
||||
auto& version_text = m_widget.add_child<Label>("version");
|
||||
auto& version_text = m_widget.add_child<Label>();
|
||||
std::string version{"Version: " CUBED_VERSION};
|
||||
|
||||
#ifdef DEBUG_MODE
|
||||
@@ -31,70 +37,86 @@ void DebugCollector::init(int width, int height) {
|
||||
#endif
|
||||
|
||||
version_text.set_color(Color::WHITE).set_text(version).set_scale(SCALE);
|
||||
m_component.try_emplace(version_text.id(), &version_text);
|
||||
|
||||
{
|
||||
auto& compiler = m_widget.add_child<Label>();
|
||||
compiler.set_text(Tools::get_compiler_info()).set_scale(SCALE);
|
||||
}
|
||||
|
||||
// fps
|
||||
auto& fps_text = m_widget.add_child<Label>("fps");
|
||||
auto& fps_text = m_widget.add_child<Label>();
|
||||
fps_text.set_text("FPS: 0").set_scale(SCALE);
|
||||
m_component.try_emplace(fps_text.id(), &fps_text);
|
||||
m_component.try_emplace("fps", &fps_text);
|
||||
|
||||
// player_pos
|
||||
auto& player_pos_text = m_widget.add_child<Label>("player_pos");
|
||||
auto& player_pos_text = m_widget.add_child<Label>();
|
||||
player_pos_text.set_text("x: 0.00 y: 0.00 z: 0.00").set_scale(SCALE);
|
||||
m_component.try_emplace(player_pos_text.id(), &player_pos_text);
|
||||
m_component.try_emplace("player_pos", &player_pos_text);
|
||||
|
||||
// rendered_chunk
|
||||
auto& rendered_chunk_text = m_widget.add_child<Label>("rendered_chunk");
|
||||
auto& rendered_chunk_text = m_widget.add_child<Label>();
|
||||
rendered_chunk_text.set_text("Rendered Chunk: 0").set_scale(SCALE);
|
||||
m_component.try_emplace(rendered_chunk_text.id(), &rendered_chunk_text);
|
||||
m_component.try_emplace("rendered_chunk", &rendered_chunk_text);
|
||||
|
||||
// rss
|
||||
auto& rss_text = m_widget.add_child<Label>("rss");
|
||||
auto& rss_text = m_widget.add_child<Label>();
|
||||
rss_text.set_text("RSS: 0mb").set_scale(SCALE);
|
||||
m_component.try_emplace(rss_text.id(), &rss_text);
|
||||
m_component.try_emplace("rss", &rss_text);
|
||||
|
||||
// os
|
||||
std::string os;
|
||||
auto& os_text = m_widget.add_child<Label>("os");
|
||||
auto& os_text = m_widget.add_child<Label>();
|
||||
os_text.set_scale(SCALE);
|
||||
if (Tools::get_os_version(os)) {
|
||||
os_text.set_text("OS: " + os);
|
||||
Logger::info("System: {}", os);
|
||||
Logger::info("OS System: {}", os);
|
||||
} else {
|
||||
os_text.set_text("OS: Unknown");
|
||||
}
|
||||
m_component.try_emplace(os_text.id(), &os_text);
|
||||
|
||||
{
|
||||
std::string wm{"WM: "};
|
||||
wm.append(Tools::detect_wm());
|
||||
auto& wm_label = m_widget.add_child<Label>();
|
||||
wm_label.set_text(wm).set_scale(SCALE);
|
||||
}
|
||||
// cpu
|
||||
auto& cpu_text = m_widget.add_child<Label>("cpu");
|
||||
auto& cpu_text = m_widget.add_child<Label>();
|
||||
cpu_text.set_text("CPU: " + Tools::get_cpu_info()).set_scale(SCALE);
|
||||
m_component.try_emplace(cpu_text.id(), &cpu_text);
|
||||
|
||||
// gpu
|
||||
auto& gpu_text = m_widget.add_child<Label>("gpu");
|
||||
auto& gpu_text = m_widget.add_child<Label>();
|
||||
gpu_text
|
||||
.set_text(std::string{"GPU: "} +
|
||||
reinterpret_cast<const char*>(glGetString(GL_RENDERER)))
|
||||
.set_scale(SCALE);
|
||||
m_component.try_emplace(gpu_text.id(), &gpu_text);
|
||||
|
||||
// opengl_version
|
||||
auto& opengl_version_text = m_widget.add_child<Label>("opengl_version");
|
||||
auto& opengl_version_text = m_widget.add_child<Label>();
|
||||
opengl_version_text
|
||||
.set_text("OpenGL: " + std::to_string(GLVersion.major) + "." +
|
||||
std::to_string(GLVersion.minor))
|
||||
.set_scale(SCALE);
|
||||
m_component.try_emplace(opengl_version_text.id(), &opengl_version_text);
|
||||
|
||||
// biome
|
||||
auto& biome_text = m_widget.add_child<Label>("biome");
|
||||
biome_text.set_text("Biome: ").set_scale(SCALE);
|
||||
m_component.try_emplace(biome_text.id(), &biome_text);
|
||||
|
||||
{
|
||||
auto& video_driver = m_widget.add_child<Label>();
|
||||
video_driver
|
||||
.set_text(
|
||||
std::format("VideoDiver: {}", SDL_GetCurrentVideoDriver()))
|
||||
.set_scale(SCALE);
|
||||
}
|
||||
// speed
|
||||
auto& speed_text = m_widget.add_child<Label>("speed");
|
||||
auto& speed_text = m_widget.add_child<Label>();
|
||||
speed_text.set_text("Speed: 0 m/s").set_scale(SCALE);
|
||||
m_component.try_emplace(speed_text.id(), &speed_text);
|
||||
m_component.try_emplace("speed", &speed_text);
|
||||
{
|
||||
auto& window_size = m_widget.add_child<Label>();
|
||||
window_size.set_text("Window W: {} H: {}").set_scale(SCALE);
|
||||
m_component.try_emplace("window_size", &window_size);
|
||||
}
|
||||
{
|
||||
auto& frame_size = m_widget.add_child<Label>();
|
||||
frame_size.set_text("FrameBuffer W: {} H: {}").set_scale(SCALE);
|
||||
m_component.try_emplace("frame_buffer", &frame_size);
|
||||
}
|
||||
}
|
||||
|
||||
Widget& DebugCollector::get_widget() { return m_widget; }
|
||||
@@ -139,6 +161,7 @@ bool DebugCollector::handle_event(const Event& e) {
|
||||
void DebugCollector::report(const std::string& name, std::string_view content) {
|
||||
auto t = m_component.find(name);
|
||||
if (t == m_component.end()) {
|
||||
Logger::error("DebugCollector: Can't Find {}", name);
|
||||
return;
|
||||
}
|
||||
if (!t->second) {
|
||||
|
||||
Reference in New Issue
Block a user