From fc573b4c6ee838cb4ca13278f5874597642c91c5 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 9 Aug 2025 23:40:09 +0300
Subject: [PATCH] erase and forget

---
 src/graphics/render/WorldRenderer.cpp |  4 +++-
 src/objects/Entities.cpp              | 19 ++++++++++---------
 src/objects/Entities.hpp              |  3 ++-
 src/objects/Player.cpp                |  4 ----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index eef4c41e..099dd989 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -205,7 +205,9 @@ void WorldRenderer::renderOpaque(
         *modelBatch,
         culling ? frustumCulling.get() : nullptr,
         delta,
-        pause
+        pause,
+        player.currentCamera.get() == player.fpCamera.get() ? player.getEntity()
+                                                            : 0
     );
     modelBatch->render();
     particles->render(camera, delta * !pause);
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index 8f3d3cb1..8dcdecd4 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -328,13 +328,10 @@ static void debug_render_skeleton(
     size_t pindex = bone->getIndex();
     for (auto& sub : bone->getSubnodes()) {
         size_t sindex = sub->getIndex();
+        const auto& matrices = skeleton.calculated.matrices;
         batch.line(
-            glm::vec3(
-                skeleton.calculated.matrices[pindex] * glm::vec4(0, 0, 0, 1)
-            ),
-            glm::vec3(
-                skeleton.calculated.matrices[sindex] * glm::vec4(0, 0, 0, 1)
-            ),
+            glm::vec3(matrices[pindex] * glm::vec4(0, 0, 0, 1)),
+            glm::vec3(matrices[sindex] * glm::vec4(0, 0, 0, 1)),
             glm::vec4(0, 0.5f, 0, 1)
         );
         debug_render_skeleton(batch, sub.get(), skeleton);
@@ -391,10 +388,14 @@ void Entities::render(
     ModelBatch& batch,
     const Frustum* frustum,
     float delta,
-    bool pause
+    bool pause,
+    entityid_t fpsEntity
 ) {
-    auto view = registry.view<Transform, rigging::Skeleton>();
-    for (auto [entity, transform, skeleton] : view.each()) {
+    auto view = registry.view<EntityId, Transform, rigging::Skeleton>();
+    for (auto [entity, eid, transform, skeleton] : view.each()) {
+        if (eid.uid == fpsEntity) {
+            continue;
+        }
         if (transform.dirty) {
             transform.refresh();
         }
diff --git a/src/objects/Entities.hpp b/src/objects/Entities.hpp
index 99da0db3..03fcec8c 100644
--- a/src/objects/Entities.hpp
+++ b/src/objects/Entities.hpp
@@ -65,7 +65,8 @@ public:
         ModelBatch& batch,
         const Frustum* frustum,
         float delta,
-        bool pause
+        bool pause,
+        entityid_t fpsEntity
     );
 
     entityid_t spawn(
diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp
index 8f2b0d76..befdd0b3 100644
--- a/src/objects/Player.cpp
+++ b/src/objects/Player.cpp
@@ -186,10 +186,6 @@ void Player::postUpdate() {
             attemptToFindSpawnpoint();
         }
     }
-
-    // TODO: ERASE & FORGET
-    auto& skeleton = entity->getSkeleton();
-    skeleton.visible = currentCamera != fpCamera;
 }
 
 void Player::teleport(glm::vec3 position) {