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

fix: unable to move when in corner

Browse Source
This commit is contained in:
zhenyan121
2026-03-21 16:14:09 +08:00
parent 3b839ad630
commit 3298dde600
1 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/gameplay/player.cpp
View File

@@ -126,31 +126,74 @@ void Player::update(float delta_time) {
} }
m_right = glm::normalize(glm::cross(m_front, glm::vec3(0.0f, 1.0f, 0.0f))); m_right = glm::normalize(glm::cross(m_front, glm::vec3(0.0f, 1.0f, 0.0f)));
glm::vec3 move_dir_front = glm::vec3(0.0f);
glm::vec3 move_dir_right = glm::vec3(0.0f);
glm::vec3 move_dir = glm::vec3(0.0f); glm::vec3 move_dir = glm::vec3(0.0f);
if (m_move_state.forward) { if (m_move_state.forward) {
move_dir += glm::normalize(glm::vec3(m_front.x, 0.0f, m_front.z)); move_dir_front += glm::normalize(glm::vec3(m_front.x, 0.0f, m_front.z));
} }
if (m_move_state.back) { if (m_move_state.back) {
move_dir -= glm::normalize(glm::vec3(m_front.x, 0.0f, m_front.z)); move_dir_front -= glm::normalize(glm::vec3(m_front.x, 0.0f, m_front.z));
} }
if (m_move_state.left) { if (m_move_state.left) {
move_dir -= glm::normalize(glm::vec3(m_right.x, 0.0f, m_right.z)); move_dir_right -= glm::normalize(glm::vec3(m_right.x, 0.0f, m_right.z));
} }
if (m_move_state.right) { if (m_move_state.right) {
move_dir += glm::normalize(glm::vec3(m_right.x, 0.0f, m_right.z)); move_dir_right += glm::normalize(glm::vec3(m_right.x, 0.0f, m_right.z));
} }
move_dir = move_dir_front + move_dir_right;
if (glm::length(move_dir) > 0.001f) { if (glm::length(move_dir) > 0.001f) {
direction = glm::normalize(move_dir); direction = glm::normalize(move_dir);
} }
auto new_pos = m_player_pos + direction * speed * delta_time;
new_pos.y += 1.0f; if (glm::length(direction) > 0.001f) {
if (m_world.can_move(new_pos)) { auto new_pos = m_player_pos + direction * speed * delta_time;
new_pos.y -= 1.0f; new_pos.y += 1.0f;
m_player_pos = new_pos; if (m_world.can_move(new_pos)) {
new_pos.y -= 1.0f;
m_player_pos = new_pos;
} else {
if (glm::length(move_dir_front) > 0.001f) {
if (std::abs(move_dir_front.x) > std::abs(move_dir_front.z)) {
move_dir_front.z = 0.0f;
} else {
move_dir_front.x = 0.0f;
}
direction = glm::normalize(move_dir_front);
auto new_pos = m_player_pos + direction * speed * delta_time;
new_pos.y += 1.0f;
if (m_world.can_move(new_pos)) {
new_pos.y -= 1.0f;
m_player_pos = new_pos;
} else {
direction = glm::vec3(0.0f, 0.0f, 0.0f);
}
}
if (glm::length(move_dir_right) > 0.001f) {
if (std::abs(move_dir_right.x) > std::abs(move_dir_right.z)) {
move_dir_right.z = 0.0f;
} else {
move_dir_right.x = 0.0f;
}
direction = glm::normalize(move_dir_right);
auto new_pos = m_player_pos + direction * speed * delta_time;
new_pos.y += 1.0f;
if (m_world.can_move(new_pos)) {
new_pos.y -= 1.0f;
m_player_pos = new_pos;
} else {
direction = glm::vec3(0.0f, 0.0f, 0.0f);
}
}
}
} }
if (m_move_state.up) { if (m_move_state.up) {
auto new_pos = m_player_pos + glm::vec3(0.0f, 1.0f, 0.0f) * speed * 2.0f * delta_time; auto new_pos = m_player_pos + glm::vec3(0.0f, 1.0f, 0.0f) * speed * 2.0f * delta_time;