PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix fragment rotation bits & increase player spawn attempts number

Browse Source
This commit is contained in:
MihailRis 2024-10-15 03:32:16 +03:00
parent f87bb960a9
commit 3146499433
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/objects/Player.cpp
View File

@ -16,13 +16,14 @@
#include "world/Level.hpp" #include "world/Level.hpp"
#include "data/dv_util.hpp" #include "data/dv_util.hpp"
const float CROUCH_SPEED_MUL = 0.35f; constexpr float CROUCH_SPEED_MUL = 0.35f;
const float RUN_SPEED_MUL = 1.5f; constexpr float RUN_SPEED_MUL = 1.5f;
const float PLAYER_GROUND_DAMPING = 10.0f; constexpr float PLAYER_GROUND_DAMPING = 10.0f;
const float PLAYER_AIR_DAMPING = 7.0f; constexpr float PLAYER_AIR_DAMPING = 7.0f;
const float FLIGHT_SPEED_MUL = 4.0f; constexpr float FLIGHT_SPEED_MUL = 4.0f;
const float CHEAT_SPEED_MUL = 5.0f; constexpr float CHEAT_SPEED_MUL = 5.0f;
const float JUMP_FORCE = 8.0f; constexpr float JUMP_FORCE = 8.0f;
constexpr int SPAWN_ATTEMPTS_PER_UPDATE = 64;
Player::Player( Player::Player(
Level* level, Level* level,
@ -156,7 +157,9 @@ void Player::postUpdate() {
flight = false; flight = false;
} }
if (spawnpoint.y <= 0.1) { if (spawnpoint.y <= 0.1) {
attemptToFindSpawnpoint(); for (int i = 0; i < SPAWN_ATTEMPTS_PER_UPDATE; i++) {
attemptToFindSpawnpoint();
}
} }
auto& skeleton = entity->getSkeleton(); auto& skeleton = entity->getSkeleton();

2
src/world/generator/VoxelFragment.cpp
View File

@ -183,7 +183,7 @@ std::unique_ptr<VoxelFragment> VoxelFragment::rotated(const Content& content) co
if (def.rotations.name == BlockRotProfile::PANE_NAME || if (def.rotations.name == BlockRotProfile::PANE_NAME ||
def.rotations.name == BlockRotProfile::PIPE_NAME){ def.rotations.name == BlockRotProfile::PIPE_NAME){
if (voxel.state.rotation < 4) { if (voxel.state.rotation < 4) {
voxel.state.rotation = (voxel.state.rotation + 1) & 0b11; voxel.state.rotation = (voxel.state.rotation + 3) & 0b11;
} }
} }
} }