From 7dfda981a8aa4fbf0fb7f50d05e23bebaf0c6532 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 8 Jul 2024 03:51:46 +0300
Subject: [PATCH] remove Player.hitbox (WIP)

---
 res/entities/player.json              |  2 +-
 src/frontend/debug_panel.cpp          |  8 +--
 src/frontend/screens/LevelScreen.cpp  |  6 +-
 src/logic/LevelController.cpp         |  2 +-
 src/logic/PlayerController.cpp        | 52 ++++++++---------
 src/logic/PlayerController.hpp        | 11 ++--
 src/logic/scripting/lua/libplayer.cpp | 13 +++--
 src/objects/Player.cpp                | 84 +++++++++++++--------------
 src/objects/Player.hpp                | 21 ++++---
 src/world/Level.cpp                   |  2 +-
 src/world/World.cpp                   |  1 +
 11 files changed, 108 insertions(+), 94 deletions(-)

diff --git a/res/entities/player.json b/res/entities/player.json
index 25076e0b..36be7bab 100644
--- a/res/entities/player.json
+++ b/res/entities/player.json
@@ -1,3 +1,3 @@
 {
-    "hitbox": [0.5, 1.8, 0.5]
+    "hitbox": [0.6, 1.8, 0.6]
 }
diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp
index 663670ac..d6c8ae30 100644
--- a/src/frontend/debug_panel.cpp
+++ b/src/frontend/debug_panel.cpp
@@ -129,20 +129,18 @@ std::shared_ptr<UINode> create_debug_panel(
         auto box = std::make_shared<TextBox>(L"");
         auto boxRef = box.get();
         box->setTextSupplier([=]() {
-            Hitbox* hitbox = player->hitbox.get();
-            return util::to_wstring(hitbox->position[ax], 2);
+            return util::to_wstring(player->getPosition()[ax], 2);
         });
         box->setTextConsumer([=](const std::wstring& text) {
             try {
-                glm::vec3 position = player->hitbox->position;
+                glm::vec3 position = player->getPosition();
                 position[ax] = std::stoi(text);
                 player->teleport(position);
             } catch (std::exception& _){
             }
         });
         box->setOnEditStart([=](){
-            Hitbox* hitbox = player->hitbox.get();
-            boxRef->setText(std::to_wstring(int(hitbox->position[ax])));
+            boxRef->setText(std::to_wstring(static_cast<int>(player->getPosition()[ax])));
         });
         box->setSize(glm::vec2(230, 27));
 
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index d740ce19..f22edcc9 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -136,9 +136,13 @@ void LevelScreen::update(float delta) {
     bool paused = hud->isPause();
     audio::get_channel("regular")->setPaused(paused);
     audio::get_channel("ambient")->setPaused(paused);
+    glm::vec3 velocity {};
+    if (auto hitbox = player->getHitbox())  {
+        velocity = hitbox->velocity;
+    }
     audio::set_listener(
         camera->position-camera->dir, 
-        player->hitbox->velocity,
+        velocity,
         camera->dir, 
         glm::vec3(0, 1, 0)
     );
diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp
index 20daeb00..cd460c19 100644
--- a/src/logic/LevelController.cpp
+++ b/src/logic/LevelController.cpp
@@ -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);
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index cd17948c..a929381e 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -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);
diff --git a/src/logic/PlayerController.hpp b/src/logic/PlayerController.hpp
index ff16285b..7c3fc112 100644
--- a/src/logic/PlayerController.hpp
+++ b/src/logic/PlayerController.hpp
@@ -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);
 
diff --git a/src/logic/scripting/lua/libplayer.cpp b/src/logic/scripting/lua/libplayer.cpp
index 20640fd4..392870c8 100644
--- a/src/logic/scripting/lua/libplayer.cpp
+++ b/src/logic/scripting/lua/libplayer.cpp
@@ -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;
 }
 
diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp
index d52e8b67..0be5c970 100644
--- a/src/objects/Player.cpp
+++ b/src/objects/Player.cpp
@@ -21,33 +21,46 @@ const float FLIGHT_SPEED_MUL = 4.0f;
 const float CHEAT_SPEED_MUL = 5.0f;
 const float JUMP_FORCE = 8.0f;
 
-Player::Player(glm::vec3 position, float speed, std::shared_ptr<Inventory> inv,
-               entityid_t eid) :
+Player::Player(Level* level, glm::vec3 position, float speed, 
+               std::shared_ptr<Inventory> inv, entityid_t eid) :
+    level(level),
     speed(speed),
     chosenSlot(0),
     position(position),
     inventory(std::move(inv)),
-    entity(eid),
+    eid(eid),
     camera(std::make_shared<Camera>(position, glm::radians(90.0f))),
     spCamera(std::make_shared<Camera>(position, glm::radians(90.0f))),
     tpCamera(std::make_shared<Camera>(position, glm::radians(90.0f))),
-    currentCamera(camera),
-    hitbox(std::make_unique<Hitbox>(position, glm::vec3(0.3f,0.9f,0.3f)))
+    currentCamera(camera)
 {
 }
 
 Player::~Player() {
 }
 
-void Player::updateEntity(Level* level) {
-    if (entity == 0) {
+void Player::updateEntity() {
+    if (eid == 0) {
         // spawn entity
+    } else if (auto entity = level->entities->get(eid)) {
+        position = entity->getTransform().pos;
     } else {
-        // check entity, respawn if despawned
+        // check if chunk loaded
     }
 }
 
-void Player::updateInput(Level* level, PlayerInput& input, float delta) {
+Hitbox* Player::getHitbox() {
+    if (auto entity = level->entities->get(eid)) {
+        return &entity->getRigidbody().hitbox;
+    }
+    return nullptr;
+}
+
+void Player::updateInput(PlayerInput& input, float delta) {
+    auto hitbox = getHitbox();
+    if (hitbox == nullptr) {
+        return;
+    }
     bool crouch = input.shift && hitbox->grounded && !input.sprint;
     float speed = this->speed;
     if (flight){
@@ -65,40 +78,23 @@ void Player::updateInput(Level* level, PlayerInput& input, float delta) {
 
     glm::vec3 dir(0,0,0);
     if (input.moveForward){
-        dir.x += camera->dir.x;
-        dir.z += camera->dir.z;
+        dir += camera->dir;
     }
     if (input.moveBack){
-        dir.x -= camera->dir.x;
-        dir.z -= camera->dir.z;
+        dir -= camera->dir;
     }
     if (input.moveRight){
-        dir.x += camera->right.x;
-        dir.z += camera->right.z;
+        dir += camera->right;
     }
     if (input.moveLeft){
-        dir.x -= camera->right.x;
-        dir.z -= camera->right.z;
+        dir -= camera->right;
     }
     if (glm::length(dir) > 0.0f){
         dir = glm::normalize(dir);
-        hitbox->velocity.x += dir.x * speed * delta * 9;
-        hitbox->velocity.z += dir.z * speed * delta * 9;
+        hitbox->velocity += dir * speed * delta * 9.0f;
     }
 
-    float vel = glm::length(hitbox->velocity);
-    int substeps = int(delta * vel * 20);
-    substeps = std::min(100, std::max(2, substeps));
-    level->physics->step(
-        level->chunks.get(), 
-        hitbox.get(), 
-        delta, 
-        substeps, 
-        crouch, 
-        flight ? 0.0f : 1.0f, 
-        !noclip,
-        0
-    );
+    // physics calculation was here
                          
     if (flight && hitbox->grounded) {
         flight = false;
@@ -138,20 +134,22 @@ void Player::updateInput(Level* level, PlayerInput& input, float delta) {
     input.flight = false;
 
     if (spawnpoint.y <= 0.1) {
-        attemptToFindSpawnpoint(level);
+        attemptToFindSpawnpoint();
     }
 }
 
 void Player::teleport(glm::vec3 position) {
-    hitbox->position = position;
+    this->position = position;
+    if (auto hitbox = getHitbox()) {
+        hitbox->position = position;
+    }
 }
 
-void Player::attemptToFindSpawnpoint(Level* level) {
-    glm::vec3 ppos = hitbox->position;
+void Player::attemptToFindSpawnpoint() {
     glm::vec3 newpos (
-        ppos.x + (rand() % 200 - 100),
+        position.x + (rand() % 200 - 100),
         rand() % 80 + 100,
-        ppos.z + (rand() % 200 - 100)
+        position.z + (rand() % 200 - 100)
     );
     while (newpos.y > 0 && !level->chunks->isObstacleBlock(newpos.x, newpos.y-2, newpos.z)) {
         newpos.y--;
@@ -194,11 +192,11 @@ void Player::setNoclip(bool flag) {
 }
 
 entityid_t Player::getEntity() const {
-    return entity;
+    return eid;
 }
 
 void Player::setEntity(entityid_t eid) {
-    entity = eid;
+    this->eid = eid;
 }
 
 std::shared_ptr<Inventory> Player::getInventory() const {
@@ -214,7 +212,6 @@ glm::vec3 Player::getSpawnPoint() const {
 }
 
 std::unique_ptr<dynamic::Map> Player::serialize() const {
-    glm::vec3 position = hitbox->position;
     auto root = std::make_unique<dynamic::Map>();
     auto& posarr = root->putList("position");
     posarr.put(position.x);
@@ -234,14 +231,13 @@ std::unique_ptr<dynamic::Map> Player::serialize() const {
     root->put("flight", flight);
     root->put("noclip", noclip);
     root->put("chosen-slot", chosenSlot);
-    root->put("entity", entity);
+    root->put("entity", eid);
     root->put("inventory", inventory->serialize());
     return root;
 }
 
 void Player::deserialize(dynamic::Map *src) {
     auto posarr = src->list("position");
-    glm::vec3& position = hitbox->position;
     position.x = posarr->num(0);
     position.y = posarr->num(1);
     position.z = posarr->num(2);
@@ -268,7 +264,7 @@ void Player::deserialize(dynamic::Map *src) {
     src->flag("flight", flight);
     src->flag("noclip", noclip);
     setChosenSlot(src->get("chosen-slot", getChosenSlot()));
-    src->num("enitity", entity);
+    src->num("enitity", eid);
     
     if (auto invmap = src->map("inventory")) {
         getInventory()->deserialize(invmap.get());
diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp
index 4bdf57af..b136b45f 100644
--- a/src/objects/Player.hpp
+++ b/src/objects/Player.hpp
@@ -8,6 +8,7 @@
 #include "../interfaces/Object.hpp"
 
 #include <memory>
+#include <optional>
 #include <glm/glm.hpp>
 
 class Camera;
@@ -41,6 +42,7 @@ struct BlockSelection {
 };
 
 class Player : public Object, public Serializable {
+    Level* level;
     float speed;
     int chosenSlot;
     glm::vec3 position;
@@ -48,24 +50,23 @@ class Player : public Object, public Serializable {
     std::shared_ptr<Inventory> inventory;
     bool flight = false;
     bool noclip = false;
-    entityid_t entity;
+    entityid_t eid;
 public:
     std::shared_ptr<Camera> camera, spCamera, tpCamera;
     std::shared_ptr<Camera> currentCamera;
-    std::unique_ptr<Hitbox> hitbox;
     bool debug = false;
     glm::vec3 cam {};
     BlockSelection selection {};
 
-    Player(glm::vec3 position, float speed, std::shared_ptr<Inventory> inv,
-           entityid_t eid);
+    Player(Level* level, glm::vec3 position, float speed, 
+           std::shared_ptr<Inventory> inv, entityid_t eid);
     ~Player();
 
     void teleport(glm::vec3 position);
-    void updateEntity(Level* level);
-    void updateInput(Level* level, PlayerInput& input, float delta);
+    void updateEntity();
+    void updateInput(PlayerInput& input, float delta);
 
-    void attemptToFindSpawnpoint(Level* level);
+    void attemptToFindSpawnpoint();
 
     void setChosenSlot(int index);
 
@@ -83,6 +84,12 @@ public:
     
     std::shared_ptr<Inventory> getInventory() const;
 
+    glm::vec3 getPosition() const {
+        return position;
+    }
+
+    Hitbox* getHitbox();
+
     void setSpawnPoint(glm::vec3 point);
     glm::vec3 getSpawnPoint() const;
 
diff --git a/src/world/Level.cpp b/src/world/Level.cpp
index 130f90b5..72cb5d44 100644
--- a/src/world/Level.cpp
+++ b/src/world/Level.cpp
@@ -31,7 +31,7 @@ Level::Level(
         this->world->getNextInventoryId(), DEF_PLAYER_INVENTORY_SIZE
     );
 	auto player = spawnObject<Player>(
-        glm::vec3(0, DEF_PLAYER_Y, 0), DEF_PLAYER_SPEED, inv, 0
+        this, glm::vec3(0, DEF_PLAYER_Y, 0), DEF_PLAYER_SPEED, inv, 0
     );
 
     uint matrixSize = (
diff --git a/src/world/World.cpp b/src/world/World.cpp
index 71b64878..704262cf 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -109,6 +109,7 @@ std::unique_ptr<Level> World::load(
                 auto players = playerFile->list("players");
                 for (size_t i = 0; i < players->size(); i++) {
                     auto player = level->spawnObject<Player>(
+                        level.get(),
                         glm::vec3(0, DEF_PLAYER_Y, 0), 
                         DEF_PLAYER_SPEED, 
                         level->inventories->create(DEF_PLAYER_INVENTORY_SIZE),