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

remove Player.hitbox (WIP)

Browse Source
This commit is contained in:
MihailRis
2024-07-08 03:51:46 +03:00
parent 2c7b5de50a
commit 7dfda981a8
11 changed files with 108 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/LevelController.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ LevelController::LevelController(EngineSettings& settings, std::unique_ptr<Level
}
void LevelController::update(float delta, bool input, bool pause) {
glm::vec3 position = player->getPlayer()->hitbox->position;
glm::vec3 position = player->getPlayer()->getPosition();
level->loadMatrix(position.x, position.z,
settings.chunks.loadDistance.get() +
settings.chunks.padding.get() * 2);
src/logic/PlayerController.cpp
+26 -26
View File
@@ -46,7 +46,7 @@ CameraControl::CameraControl(const std::shared_ptr<Player>& player, const Camera
}
void CameraControl::refresh() {
camera->position = player->hitbox->position + offset;
camera->position = player->getPosition() + offset;
}
void CameraControl::updateMouse(PlayerInput& input) {
@@ -77,20 +77,19 @@ void CameraControl::updateMouse(PlayerInput& input) {
camera->rotate(glm::radians(cam.y), glm::radians(cam.x), glm::radians(cam.z));
}
glm::vec3 CameraControl::updateCameraShaking(float delta) {
glm::vec3 CameraControl::updateCameraShaking(const Hitbox& hitbox, float delta) {
glm::vec3 offset {};
auto hitbox = player->hitbox.get();
const float k = CAM_SHAKE_DELTA_K;
const float ov = CAM_SHAKE_OFFSET_Y;
const glm::vec3& vel = hitbox->velocity;
const glm::vec3& vel = hitbox.velocity;
interpVel = interpVel * (1.0f - delta * 5) + vel * delta * 0.1f;
if (hitbox->grounded && interpVel.y < 0.0f){
if (hitbox.grounded && interpVel.y < 0.0f){
interpVel.y *= -30.0f;
}
shake = shake * (1.0f - delta * k);
float oh = CAM_SHAKE_OFFSET;
if (hitbox->grounded) {
if (hitbox.grounded) {
float f = glm::length(glm::vec2(vel.x, vel.z));
shakeTimer += delta * f * CAM_SHAKE_SPEED;
shake += f * delta * k;
@@ -103,9 +102,9 @@ glm::vec3 CameraControl::updateCameraShaking(float delta) {
return offset;
}
void CameraControl::updateFovEffects(const PlayerInput& input, float delta) {
auto hitbox = player->hitbox.get();
bool crouch = input.shift && hitbox->grounded && !input.sprint;
void CameraControl::updateFovEffects(const Hitbox& hitbox,
const PlayerInput& input, float delta) {
bool crouch = input.shift && hitbox.grounded && !input.sprint;
float dt = fmin(1.0f, delta * ZOOM_SPEED);
float zoomValue = 1.0f;
@@ -146,11 +145,13 @@ void CameraControl::switchCamera() {
void CameraControl::update(const PlayerInput& input, float delta, Chunks* chunks) {
offset = glm::vec3(0.0f, 0.7f, 0.0f);
if (settings.shaking.get() && !input.cheat) {
offset += updateCameraShaking(delta);
}
if (settings.fovEffects.get()){
updateFovEffects(input, delta);
if (auto hitbox = player->getHitbox()) {
if (settings.shaking.get() && !input.cheat) {
offset += updateCameraShaking(*hitbox, delta);
}
if (settings.fovEffects.get()){
updateFovEffects(*hitbox, input, delta);
}
}
if (input.cameraMode) {
switchCamera();
@@ -192,10 +193,9 @@ void PlayerController::onBlockInteraction(
}
}
void PlayerController::onFootstep() {
auto hitbox = player->hitbox.get();
glm::vec3 pos = hitbox->position;
glm::vec3 half = hitbox->halfsize;
void PlayerController::onFootstep(const Hitbox& hitbox) {
auto pos = hitbox.position;
auto half = hitbox.halfsize;
for (int offsetZ = -1; offsetZ <= 1; offsetZ++) {
for (int offsetX = -1; offsetX <= 1; offsetX++) {
@@ -218,15 +218,14 @@ void PlayerController::onFootstep() {
}
void PlayerController::updateFootsteps(float delta) {
auto hitbox = player->hitbox.get();
if (hitbox->grounded) {
auto hitbox = player->getHitbox();
if (hitbox && hitbox->grounded) {
const glm::vec3& vel = hitbox->velocity;
float f = glm::length(glm::vec2(vel.x, vel.z));
stepsTimer += delta * f * STEPS_SPEED;
if (stepsTimer >= M_PI) {
stepsTimer = fmod(stepsTimer, M_PI);
onFootstep();
onFootstep(*hitbox);
}
} else {
stepsTimer = M_PI;
@@ -289,8 +288,8 @@ void PlayerController::resetKeyboard() {
}
void PlayerController::updatePlayer(float delta) {
player->updateEntity(level);
player->updateInput(level, input, delta);
player->updateEntity();
player->updateInput(input, delta);
}
static int determine_rotation(Block* def, const glm::ivec3& norm, glm::vec3& camDir) {
@@ -395,8 +394,9 @@ void PlayerController::processRightClick(Block* def, Block* target) {
}
blockid_t chosenBlock = def->rt.id;
if (def->obstacle && level->physics->isBlockInside(
coord.x, coord.y, coord.z, def,state, player->hitbox.get())) {
auto hitbox = player->getHitbox();
if (hitbox && def->obstacle && level->physics->isBlockInside(
coord.x, coord.y, coord.z, def,state, hitbox)) {
return;
}
auto vox = chunks->get(coord);
src/logic/PlayerController.hpp
+7 -4
View File
@@ -13,6 +13,7 @@ class Level;
class Block;
class Chunks;
class BlocksController;
struct Hitbox;
struct CameraSettings;
class CameraControl {
@@ -27,17 +28,19 @@ class CameraControl {
/// @brief Update shaking timer and calculate camera offset
/// @param delta delta time
/// @return camera offset
glm::vec3 updateCameraShaking(float delta);
glm::vec3 updateCameraShaking(const Hitbox& hitbox, float delta);
/// @brief Update field-of-view effects
/// @param input player inputs
/// @param delta delta time
void updateFovEffects(const PlayerInput& input, float delta);
void updateFovEffects(const Hitbox& hitbox, const PlayerInput& input,
float delta);
/// @brief Switch active player camera
void switchCamera();
public:
CameraControl(const std::shared_ptr<Player>& player, const CameraSettings& settings);
CameraControl(const std::shared_ptr<Player>& player,
const CameraSettings& settings);
void updateMouse(PlayerInput& input);
void update(const PlayerInput& input, float delta, Chunks* chunks);
void refresh();
@@ -74,7 +77,7 @@ class PlayerController {
);
float stepsTimer = 0.0f;
void onFootstep();
void onFootstep(const Hitbox& hitbox);
void updateFootsteps(float delta);
void processRightClick(Block* def, Block* target);
src/logic/scripting/lua/libplayer.cpp
+9 -4
View File
@@ -2,6 +2,7 @@
#include "../../../world/Level.hpp"
#include "../../../objects/Player.hpp"
#include "../../../objects/Entities.hpp"
#include "../../../physics/Hitbox.hpp"
#include "../../../window/Camera.hpp"
#include "../../../items/Inventory.hpp"
@@ -16,7 +17,7 @@ inline std::shared_ptr<Player> get_player(lua::State* L, int idx) {
static int l_player_get_pos(lua::State* L) {
if (auto player = get_player(L, 1)) {
return lua::pushvec3(L, player->hitbox->position);
return lua::pushvec3(L, player->getPosition());
}
return 0;
}
@@ -29,13 +30,15 @@ static int l_player_set_pos(lua::State* L) {
auto x = lua::tonumber(L, 2);
auto y = lua::tonumber(L, 3);
auto z = lua::tonumber(L, 4);
player->hitbox->position = glm::vec3(x, y, z);
player->teleport(glm::vec3(x, y, z));
return 0;
}
static int l_player_get_vel(lua::State* L) {
if (auto player = get_player(L, 1)) {
return lua::pushvec3(L, player->hitbox->velocity);
if (auto hitbox = player->getHitbox()) {
return lua::pushvec3(L, hitbox->velocity);
}
}
return 0;
}
@@ -48,7 +51,9 @@ static int l_player_set_vel(lua::State* L) {
auto x = lua::tonumber(L, 2);
auto y = lua::tonumber(L, 3);
auto z = lua::tonumber(L, 4);
player->hitbox->velocity = glm::vec3(x, y, z);
if (auto hitbox = player->getHitbox()) {
hitbox->velocity = glm::vec3(x, y, z);
}
return 0;
}