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: jump fails in certain cases

Browse Source
This commit is contained in:
zhenyan121
2026-03-14 18:00:02 +08:00
parent cf423c7db4
commit 7012e5f9fe
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Cubed/gameplay/player.hpp
View File

@@ -20,7 +20,7 @@ private:
float m_speed = 10.0f; float m_speed = 10.0f;
// player is tow block tall, the pos is the lower pos // player is tow block tall, the pos is the lower pos
glm::vec3 m_player_pos = glm::vec3(0.0f, 5.0f, 0.0f); glm::vec3 m_player_pos = glm::vec3(0.0f, 15.0f, 0.0f);
glm::vec3 m_front = glm::vec3(0, 0, -1); glm::vec3 m_front = glm::vec3(0, 0, -1);
glm::vec3 m_right; glm::vec3 m_right;
MoveState m_move_state; MoveState m_move_state;

2
src/gameplay/chunk.cpp
View File

@@ -75,7 +75,7 @@ const std::vector<Vertex>& Chunk::get_vertex_data() const{
void Chunk::init_chunk() { void Chunk::init_chunk() {
m_blocks.assign(CHUCK_SIZE * CHUCK_SIZE * CHUCK_SIZE, 0); m_blocks.assign(CHUCK_SIZE * CHUCK_SIZE * CHUCK_SIZE, 0);
for (int x = 0; x < CHUCK_SIZE; x++) { for (int x = 0; x < CHUCK_SIZE; x++) {
for (int y = 0; y < 2; y++) { for (int y = 0; y < 5; y++) {
for (int z = 0; z < CHUCK_SIZE; z++) { for (int z = 0; z < CHUCK_SIZE; z++) {
m_blocks[get_index(x, y, z)] = 1; m_blocks[get_index(x, y, z)] = 1;
} }

4
src/gameplay/player.cpp
View File

@@ -147,7 +147,7 @@ void Player::update(float delta_time) {
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; auto new_pos = m_player_pos + glm::vec3(0.0f, 1.0f, 0.0f) * speed * 2.0f;
new_pos.y += 2.0f; new_pos.y += 2.0f;
if (!m_world.is_block(new_pos)) { if (!m_world.is_block(glm::floor(new_pos))) {
new_pos.y -= 2.0f; new_pos.y -= 2.0f;
m_player_pos = new_pos; m_player_pos = new_pos;
} }
@@ -185,7 +185,7 @@ void Player::update(float delta_time) {
static bool should_ceil = true; static bool should_ceil = true;
if (!m_world.is_block(glm::floor(m_player_pos))) { if (!m_world.is_block(glm::floor(m_player_pos)) && !m_move_state.up) {
m_player_pos -= glm::vec3(0.0f, 1.0f, 0.0f) * speed * 0.7f; m_player_pos -= glm::vec3(0.0f, 1.0f, 0.0f) * speed * 0.7f;
} else if (should_ceil) { } else if (should_ceil) {

3
src/main.cpp
View File

@@ -244,8 +244,9 @@ int main() {
glfwSwapInterval(1); glfwSwapInterval(1);
glfwSetWindowSizeCallback(window, window_reshape_callback); glfwSetWindowSizeCallback(window, window_reshape_callback);
glfwSetKeyCallback(window, key_callback); glfwSetKeyCallback(window, key_callback);
glfwSetMouseButtonCallback(window, mouse_button_callback);
glfwSetCursorPosCallback(window, cursor_position_callback); glfwSetCursorPosCallback(window, cursor_position_callback);
glfwSetMouseButtonCallback(window, mouse_button_callback);
MapTable::init_map(); MapTable::init_map();
texture_manager.init_texture(); texture_manager.init_texture();
world.init_world(); world.init_world();