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

feat(player): split max speed into horizontal/vertical, set spawn pos

Browse Source
This commit is contained in:
zhenyan121
2026-07-28 10:10:01 +08:00
parent a5c1c7d4aa
commit 831569cec6
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dev_panel.cpp
View File

@@ -502,7 +502,11 @@ void DevPanel::show_player_tab_item() {
} else if (m_player->game_mode() == GameMode::SPECTATOR) { } else if (m_player->game_mode() == GameMode::SPECTATOR) {
m_player_profile.game_mode = 1; m_player_profile.game_mode = 1;
ImGui::SliderFloat("MaxSpeed", &m_player->max_speed(), 1.0f, ImGui::SliderFloat("MaxSpeed x", &m_player->max_speed().x, 1.0f,
500.0f);
ImGui::SliderFloat("MaxSpeed y", &m_player->max_speed().y, 1.0f,
500.0f);
ImGui::SliderFloat("MaxSpeed z", &m_player->max_speed().z, 1.0f,
500.0f); 500.0f);
} }
if (ImGui::Button("reset")) { if (ImGui::Button("reset")) {

27
src/gameplay/client_player.cpp
View File

@@ -109,10 +109,12 @@ void ClientPlayer::change_mode(GameMode mode) {
Logger::info("Change GameMode to {}", to_str(mode)); Logger::info("Change GameMode to {}", to_str(mode));
if (mode == CREATIVE) { if (mode == CREATIVE) {
is_fly = false; is_fly = false;
m_velocity.max = glm::vec3{m_max_walk_speed}; m_max_run_speed = DEFAULT_MAX_RUN_SPEED;
m_velocity.max = glm::vec3{m_max_walk_speed, 0.0f, m_max_walk_speed};
} else if (mode == SPECTATOR) { } else if (mode == SPECTATOR) {
is_fly = true; is_fly = true;
m_velocity.max = glm::vec3{m_max_run_speed}; m_walk_pos.gait = Gait::RUN;
m_velocity.max = glm::vec3{m_max_run_speed, 0.0f, m_max_run_speed};
} }
} }
void ClientPlayer::reload_config() { void ClientPlayer::reload_config() {
@@ -350,11 +352,12 @@ void ClientPlayer::update_move(float delta_time) {
} }
if (m_game_mode != SPECTATOR) { if (m_game_mode != SPECTATOR) {
m_velocity.max = (m_walk_pos.gait == Gait::RUN) m_velocity.max =
? glm::vec3{m_max_run_speed} (m_walk_pos.gait == Gait::RUN)
: glm::vec3{m_max_walk_speed}; ? glm::vec3{m_max_run_speed, 0.0f, m_max_run_speed}
: glm::vec3{m_max_walk_speed, 0.0f, m_max_walk_speed};
} else { } else {
m_velocity.max = glm::vec3{m_max_run_speed}; m_velocity.max = glm::vec3{m_max_run_speed, 0.0f, m_max_run_speed};
} }
if (space_on) { if (space_on) {
@@ -582,12 +585,12 @@ Gait ClientPlayer::compute_gait() const {
bool ClientPlayer::update_scroll(float yoffset) { bool ClientPlayer::update_scroll(float yoffset) {
if (m_game_mode == SPECTATOR) { if (m_game_mode == SPECTATOR) {
if (yoffset > 0) { if (yoffset > 0) {
if (m_velocity.max.x < 500.0f || m_velocity.max.z < 500.0f) { if (m_max_run_speed < 500.0f) {
m_velocity.max += glm::vec3(1.0f, 0.0f, 1.0f); m_max_run_speed += 1.0f;
} }
} else { } else {
if (m_velocity.max.x > 1.0f || m_velocity.max.z > 1.0f) { if (m_max_run_speed > 1.0f) {
m_velocity.max -= glm::vec3(1.0f, 0.0f, 1.0f); m_max_run_speed -= 1.0f;
} }
} }
} }
@@ -697,6 +700,10 @@ void ClientPlayer::reset_key_status() {
} }
void ClientPlayer::init(std::string_view name) { void ClientPlayer::init(std::string_view name) {
{
std::lock_guard lock(m_player_pos_mutex);
m_pos.value = {0.0f, 255.0f, 0.0f};
}
m_name = name; m_name = name;