From 4b20487c58d97b32d871a162d5be263644dc75be Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 24 Jun 2024 15:39:40 +0300
Subject: [PATCH] add drop test

---
 res/config/bindings.toml           |  1 +
 res/content/base/models/cube.obj   |  2 +-
 src/graphics/render/ModelBatch.cpp |  2 +-
 src/logic/PlayerController.cpp     |  4 ++++
 src/objects/Entities.cpp           | 20 ++++++++++++--------
 src/objects/Entities.hpp           |  2 ++
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/res/config/bindings.toml b/res/config/bindings.toml
index e13be068..2d373cb9 100644
--- a/res/config/bindings.toml
+++ b/res/config/bindings.toml
@@ -15,4 +15,5 @@ player.flight="key:f"
 player.attack="mouse:left"
 player.build="mouse:right"
 player.pick="mouse:middle"
+player.drop="key:q"
 hud.inventory="key:tab"
diff --git a/res/content/base/models/cube.obj b/res/content/base/models/cube.obj
index 26a621ff..c0daf3e8 100644
--- a/res/content/base/models/cube.obj
+++ b/res/content/base/models/cube.obj
@@ -36,7 +36,7 @@ vn 1.0000 0.0000 0.0000
 vn -0.0000 -0.0000 1.0000
 vn -1.0000 -0.0000 -0.0000
 vn 0.0000 0.0000 -1.0000
-usemtl blocks/stone
+usemtl blocks/leaves
 s off
 f 1/1/1 2/2/1 3/3/1 4/4/1
 f 5/5/2 8/6/2 7/7/2 6/8/2
diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp
index 67be92e5..2d7c1e9d 100644
--- a/src/graphics/render/ModelBatch.cpp
+++ b/src/graphics/render/ModelBatch.cpp
@@ -54,7 +54,7 @@ ModelBatch::~ModelBatch() {
 
 void ModelBatch::draw(const model::Mesh& mesh, const glm::mat4& matrix, const glm::mat3& rotation) {
     glm::vec3 gpos = matrix * glm::vec4(glm::vec3(), 1.0f);
-    light_t light = chunks->getLight(gpos.x, gpos.y, gpos.z);
+    light_t light = chunks->getLight(floor(gpos.x), floor(gpos.y), floor(gpos.z));
     glm::vec4 lights (
         Lightmap::extract(light, 0) / 15.0f,
         Lightmap::extract(light, 1) / 15.0f,
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index 583be194..5885b728 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -6,6 +6,7 @@
 #include "scripting/scripting.hpp"
 
 #include "../objects/Player.hpp"
+#include "../objects/Entities.hpp"
 #include "../physics/PhysicsSolver.hpp"
 #include "../physics/Hitbox.hpp"
 #include "../lighting/Lighting.hpp"
@@ -246,6 +247,9 @@ void PlayerController::update(float delta, bool input, bool pause) {
     camControl.refresh();
     if (input) {
         updateInteraction();
+        if (Events::jactive("player.drop")) {
+            level->entities->drop(player->camera->position, player->camera->front*10.0f+player->hitbox->velocity);
+        }
     } else {
         player->selection.vox.id = BLOCK_VOID;
         player->selection.vox.state.rotation = 0;
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index bdc59ad6..0c450aa9 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -18,14 +18,17 @@ void Transform::refresh() {
 }
 
 Entities::Entities(Level* level) : level(level) {
-    for (int i = 0; i < 1000; i++) {
-        auto entity = registry.create();
-        glm::vec3 pos(0.5f+rand()%50, 100+i, 0.5f+rand()%50);
-        glm::vec3 size(1);
-        registry.emplace<EntityId>(entity, 1);
-        registry.emplace<Transform>(entity, pos, size/4.0f, glm::mat3(1.0f));
-        registry.emplace<Hitbox>(entity, pos, size/2.0f);
-    }
+}
+
+void Entities::drop(glm::vec3 pos, glm::vec3 vel) {
+    auto entity = registry.create();
+    glm::vec3 size(1);
+    registry.emplace<EntityId>(entity, 1);
+    registry.emplace<Transform>(entity, pos, size/4.0f, glm::mat3(1.0f));
+    registry.emplace<Hitbox>(entity, pos, size/2.0f);
+
+    auto& hitbox = registry.get<Hitbox>(entity);
+    hitbox.velocity = vel;
 }
 
 void Entities::updatePhysics(float delta){
@@ -41,6 +44,7 @@ void Entities::updatePhysics(float delta){
             1.0f,
             true
         );
+        hitbox.linear_damping = hitbox.grounded * 5;
         transform.pos = hitbox.position;
         transform.rot = glm::rotate(glm::mat4(transform.rot), delta, glm::vec3(0, 1, 0));
         if (hitbox.grounded) {
diff --git a/src/objects/Entities.hpp b/src/objects/Entities.hpp
index b203cfa6..0a05bfba 100644
--- a/src/objects/Entities.hpp
+++ b/src/objects/Entities.hpp
@@ -53,6 +53,8 @@ public:
     Entities(Level* level);
     void updatePhysics(float delta);
     void render(Assets* assets, ModelBatch& batch, Frustum& frustum);
+
+    void drop(glm::vec3 pos, glm::vec3 vel);
 };
 
 #endif // OBJECTS_ENTITIES_HPP_