zhenyan121/Cubed
1
0
Fork 0
mirror of https://github.com/zhenyan121/Cubed.git synced 2026-06-18 00:27:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add world and player tab item

Browse Source
This commit is contained in:
zhenyan121
2026-04-25 18:36:13 +08:00
parent 8b5717a655
commit a95ad796ce
10 changed files with 260 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
src/dev_panel.cpp
View File

@@ -2,6 +2,7 @@
#include <Cubed/app.hpp>
#include <Cubed/gameplay/player.hpp>
#include <Cubed/tools/log.hpp>
#include <Cubed/tools/perlin_noise.hpp>
#include <imgui.h>
#include <imgui_impl_glfw.h>
@@ -9,6 +10,21 @@
namespace Cubed {
static constexpr const char* THEMES[] = {"Dark", "Light"};
static constexpr const char* GAITS[] = {"Walk", "Run"};
static constexpr const char* GAME_MODES[] = {"Creative", "Spectator"};
static char perlin_noise_input_buffer[64];
static int filter_unsigned(ImGuiInputTextCallbackData* data) {
if (data->EventFlag == ImGuiInputTextFlags_CallbackCharFilter) {
char c = data->EventChar;
if (c < '0' || c > '9') {
return 1;
}
}
return 0;
}
DevPanel::DevPanel(App& app) :
m_app(app)
{
@@ -29,6 +45,7 @@ void DevPanel::init() {
if (m_theme != 1 && m_theme != 0) {
m_theme = 0;
}
update_player_profile();
}
void DevPanel::render() {
@@ -51,6 +68,8 @@ void DevPanel::render() {
ImGui::Text("This is a DevPanel to control the game\n");
if (ImGui::BeginTabBar("Bar")) {
show_settings_tab_item();
show_world_tab_item();
show_player_tab_item();
ImGui::EndTabBar();
}
ImGui::End();
@@ -67,7 +86,7 @@ void DevPanel::show_settings_tab_item() {
}
ImGui::SameLine();
if (ImGui::Button("default##1")) {
m_config.fov = NORMAL_FOV;
m_config.fov = DEFAULT_FOV;
Config::get().set("player.fov", static_cast<double>(m_config.fov));
m_app.renderer().hot_reload();
}
@@ -94,7 +113,7 @@ void DevPanel::show_settings_tab_item() {
Config::get().set("window.V-Sync", m_config.v_sync);
m_app.window().hot_reload();
}
constexpr const char* THEMES[] = {"Dark", "Light"};
if (ImGui::Combo("Theme", &m_theme, THEMES, IM_ARRAYSIZE(THEMES))) {
if (m_theme == 0) {
ImGui::StyleColorsDark();
@@ -112,4 +131,99 @@ void DevPanel::show_settings_tab_item() {
}
void DevPanel::show_world_tab_item() {
if (ImGui::BeginTabItem("world")) {
if (m_text_editing.perlin_seed) {
if (ImGui::InputText("Perlin Noise Seed", perlin_noise_input_buffer, sizeof(perlin_noise_input_buffer),
ImGuiInputTextFlags_CallbackCharFilter |
ImGuiInputTextFlags_EnterReturnsTrue,
filter_unsigned))
{
PerlinNoise::seed(static_cast<unsigned int>(std::strtoul(perlin_noise_input_buffer, nullptr, 10)));
m_text_editing.perlin_seed = false;
}
}
if (!m_text_editing.perlin_seed) {
ImGui::Text("Perlin Noise Seed: %u", PerlinNoise::seed());
if (ImGui::IsItemClicked()) {
m_text_editing.perlin_seed = true;
}
}
if (ImGui::Button("Rebuild World")) {
m_app.world().rebuild_world();
}
ImGui::EndTabItem();
}
}
void DevPanel::show_player_tab_item() {
if (!m_player) {
Logger::error("Player is Nullptr");
return;
}
if (ImGui::BeginTabItem("player")) {
if (ImGui::Combo("GameMode", &m_player_profile.game_mode, GAME_MODES, IM_ARRAYSIZE(GAME_MODES))) {
if (m_player_profile.game_mode == 0) {
m_player->change_mode(GameMode::CREATIVE);
} else if (m_player_profile.game_mode == 1) {
m_player->change_mode(GameMode::SPECTATOR);
} else {
ASSERT_MSG(false, "Unknown GameMode");
}
}
if (m_player->game_mode() == GameMode::CREATIVE) {
if (ImGui::Combo("Gait", &m_player_profile.gait, GAITS, IM_ARRAYSIZE(GAITS))) {
if (m_player_profile.gait == 0) {
m_player->gait() = Gait::WALK;
} else if (m_player_profile.gait == 1) {
m_player->gait() = Gait::RUN;
} else {
ASSERT_MSG(false, "Unknown Gait");
}
}
}
ImGui::SliderFloat("Acceleration", &m_player->acceleration(), 1.0f, 200.0f);
ImGui::SliderFloat("Deceleration", &m_player->deceleration(), 1.0f, 200.0f);
if (m_player->game_mode() == GameMode::CREATIVE) {
m_player_profile.game_mode = 0;
ImGui::SliderFloat("MaxWalkSpeed", &m_player->max_walk_speed(), 1.0f, 200.0f);
ImGui::SliderFloat("MaxRunSpeed", &m_player->max_run_speed(), 1.0f, 500.0f);
ImGui::SliderFloat("G", &m_player->g(), 1.0f, 200.0f);
} else if (m_player->game_mode() == GameMode::SPECTATOR) {
m_player_profile.game_mode = 1;
ImGui::SliderFloat("MaxSpeed", &m_player->max_speed(), 1.0f, 500.0f);
}
if (ImGui::Button("reset")) {
m_player->max_walk_speed() = DEFAULT_MAX_WALK_SPEED;
m_player->max_run_speed() = DEFAULT_MAX_RUN_SPEED;
m_player->acceleration() = DEFAULT_ACCELERATION;
m_player->deceleration() = DEFAULT_DECELERATION;
m_player->g() = DEFAULT_G;
m_player->change_mode(GameMode::CREATIVE);
m_player->gait() = Gait::WALK;
m_player_profile.game_mode = 0;
m_player_profile.gait = 0;
}
if (m_player->gait() == Gait::WALK) {
m_player_profile.gait = 0;
} else {
m_player_profile.gait = 1;
}
ImGui::EndTabItem();
}
}
void DevPanel::update_player_profile() {
if (!m_player) {
Logger::error("Player is Nullptr");
ASSERT(false);
return;
}
m_player_profile.gait = std::to_underlying(m_player->gait());
m_player_profile.game_mode = std::to_underlying(m_player->game_mode());
}
}

69
src/gameplay/player.cpp
View File

@@ -141,6 +141,7 @@ void Player::change_mode(GameMode mode) {
} else if (mode == SPECTATOR) {
is_fly = true;
m_gait = Gait::RUN;
m_max_speed = m_max_run_speed;
}
}
@@ -165,7 +166,7 @@ void Player::update(float delta_time) {
m_player_pos.x, m_player_pos.y, m_player_pos.z
));
DebugCollector::get().report("speed", std::format("Speed: {:.2} m/s", speed));
DebugCollector::get().report("speed", std::format("Speed: {:.2} m/s", m_xz_speed));
}
void Player::update_player_move_state(int key, int action) {
@@ -212,7 +213,7 @@ void Player::update_player_move_state(int key, int action) {
if (space_on) {
if (m_game_mode == CREATIVE) {
is_fly = !is_fly ? true : false;
y_speed = 0.0f;
m_y_speed = 0.0f;
}
space_on = false;
space_on_time = 0.0f;
@@ -356,10 +357,10 @@ void Player::update_move(float delta_time) {
}
if (m_game_mode != SPECTATOR) {
if (m_gait == Gait::RUN) {
max_speed = RUN_SPEED;
m_max_speed = m_max_run_speed;
}
if (m_gait == Gait::WALK) {
max_speed = WALK_SPEED;
m_max_speed = m_max_walk_speed;
}
}
@@ -374,45 +375,45 @@ void Player::update_move(float delta_time) {
// calculate speed
if (m_move_state.forward || m_move_state.back || m_move_state.left || m_move_state.right || m_move_state.up) {
direction = glm::vec3(0.0f, 0.0f, 0.0f);
speed += ACCELERATION * delta_time;
if (speed > max_speed) {
speed = max_speed;
m_xz_speed += m_acceleration * delta_time;
if (m_xz_speed > m_max_speed) {
m_xz_speed = m_max_speed;
}
} else {
speed += -DECELERATION * delta_time;
if (speed < 0) {
speed = 0;
m_xz_speed += -m_deceleration * delta_time;
if (m_xz_speed < 0) {
m_xz_speed = 0;
direction = glm::vec3(0.0f, 0.0f, 0.0f);
}
}
update_direction();
move_distance = {direction.x * speed * delta_time, 0.0f, direction.z * speed * delta_time};
move_distance = {direction.x * m_xz_speed * delta_time, 0.0f, direction.z * m_xz_speed * delta_time};
if (is_fly) {
if (m_move_state.up) {
y_speed = 7.5f;
m_y_speed = 7.5f;
}
if (m_move_state.down) {
y_speed = -7.5f;
m_y_speed = -7.5f;
}
if (!m_move_state.down && !m_move_state.up) {
y_speed = 0.0f;
m_y_speed = 0.0f;
}
} else {
if (m_move_state.up && can_up) {
y_speed = 7.5;
m_y_speed = 7.5;
can_up = false;
}
y_speed += -G * delta_time;
m_y_speed += -m_g * delta_time;
}
move_distance.y = y_speed * delta_time;
move_distance.y = m_y_speed * delta_time;
// y
update_y_move();
// x
@@ -482,7 +483,7 @@ void Player::update_y_move() {
};
if (player_box.intersects(block_box)) {
m_player_pos.y -= move_distance.y;
y_speed = 0.0f;
m_y_speed = 0.0f;
if (move_distance.y < 0) {
can_up = true;
is_fly = false;
@@ -530,14 +531,40 @@ void Player::update_z_move() {
void Player::update_scroll(double yoffset) {
if (m_game_mode == SPECTATOR) {
if (yoffset > 0) {
max_speed += 1.0f;
if (m_max_speed < 500.0f) {
m_max_speed += 1.0f;
}
} else {
if (max_speed > WALK_SPEED) {
max_speed -= 1.0f;
if (m_max_speed > 1.0f) {
m_max_speed -= 1.0f;
}
}
}
}
float& Player::max_walk_speed() {
return m_max_walk_speed;
}
float& Player::max_run_speed() {
return m_max_run_speed;
}
float& Player::max_speed() {
return m_max_speed;
}
float& Player::acceleration() {
return m_acceleration;
}
float& Player::deceleration() {
return m_deceleration;
}
float& Player::g() {
return m_g;
}
Gait& Player::gait() {
return m_gait;
}
GameMode& Player::game_mode() {
return m_game_mode;
}
}

24
src/gameplay/world.cpp
View File

@@ -6,6 +6,7 @@
#include <Cubed/tools/cubed_assert.hpp>
#include <Cubed/tools/cubed_hash.hpp>
#include <Cubed/tools/math_tools.hpp>
#include <Cubed/tools/perlin_noise.hpp>
#include <execution>
@@ -671,4 +672,27 @@ void World::hot_reload() {
need_gen();
}
void World::rebuild_world() {
if (m_is_rebuilding) {
return;
}
m_is_rebuilding = true;
stop_gen_thread();
{
std::scoped_lock lk(m_chunks_mutex, m_new_chunk_queue_mutex);
m_chunks.clear();
m_new_chunk_queue.clear();
}
m_could_gen = true;
PerlinNoise::reload();
start_gen_thread();
need_gen();
m_is_rebuilding = false;
for (auto& player : m_players) {
player.second.set_player_pos({0.0f, 255.0f, 0.0f});
}
}
}

24
src/tools/perlin_noise.cpp
View File

@@ -19,6 +19,7 @@ void PerlinNoise::init() {
p.insert(p.end(), p.begin(), p.end());
is_init = true;
m_seed = seed;
}
float PerlinNoise::noise(float x, float y, float z) {
@@ -73,4 +74,27 @@ float PerlinNoise::grad(int hash, float x, float y, float z) {
return ((h & 1) == 0 ? u : -u) + ((h & 2) == 0 ? v : -v);
}
void PerlinNoise::reload() {
if (!is_seed_change) {
Logger::warn("Seed Not Change");
return;
}
is_init = false;
p.resize(256);
std::iota(p.begin(), p.end(), 0);
Logger::info("Reload Perlin Noise With Seed {}", m_seed);
std::shuffle(p.begin(), p.end(), std::mt19937(m_seed));
p.insert(p.end(), p.begin(), p.end());
is_init = true;
is_seed_change = false;
}
const unsigned& PerlinNoise::seed() {
return m_seed;
}
void PerlinNoise::seed(unsigned seed) {
m_seed = seed;
is_seed_change = true;
}
}