Merge pull request #572 from MihailRis/hand-skeleton

Hand skeleton

src/graphics/render/HandsRenderer.cpp

@@ -0,0 +1,34 @@
+#include "HandsRenderer.hpp"
+
+#include <glm/ext.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+
+#include "ModelBatch.hpp"
+#include "content/Content.hpp"
+#include "graphics/commons/Model.hpp"
+#include "objects/rigging.hpp"
+#include "window/Camera.hpp"
+
+using namespace rigging;
+
+HandsRenderer::HandsRenderer(
+    const Assets& assets,
+    ModelBatch& modelBatch,
+    std::shared_ptr<Skeleton> skeleton
+)
+    : assets(assets),
+      modelBatch(modelBatch),
+      skeleton(std::move(skeleton)) {
+}
+
+void HandsRenderer::renderHands(
+    const Camera& camera, float delta
+) {
+    auto& skeleton = *this->skeleton;
+    const auto& config = *skeleton.config;
+
+    // render
+    modelBatch.setLightsOffset(camera.position);
+    config.update(skeleton, glm::mat4(1.0f), glm::vec3());
+    config.render(assets, modelBatch, skeleton, glm::mat4(1.0f), glm::vec3());
+}

src/graphics/render/HandsRenderer.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <memory>
+
+class Assets;
+class Camera;
+class ModelBatch;
+
+namespace rigging {
+    struct Skeleton;
+}
+
+class HandsRenderer {
+public:
+    HandsRenderer(
+        const Assets& assets,
+        ModelBatch& modelBatch,
+        std::shared_ptr<rigging::Skeleton> skeleton
+    );
+
+    void renderHands(const Camera& camera, float delta);
+private:
+    const Assets& assets;
+    ModelBatch& modelBatch;
+    std::shared_ptr<rigging::Skeleton> skeleton;
+};

src/graphics/render/NamedSkeletons.cpp

@@ -0,0 +1,23 @@
+#include "NamedSkeletons.hpp"
+
+#include "objects/rigging.hpp"
+
+using namespace rigging;
+
+NamedSkeletons::NamedSkeletons() = default;
+
+std::shared_ptr<rigging::Skeleton> NamedSkeletons::createSkeleton(
+    const std::string& name, const SkeletonConfig* config
+) {
+    auto skeleton = std::make_shared<Skeleton>(config);
+    skeletons[name] = skeleton;
+    return skeleton;
+}
+
+rigging::Skeleton* NamedSkeletons::getSkeleton(const std::string& name) {
+    const auto& found = skeletons.find(name);
+    if (found == skeletons.end()) {
+        return nullptr;
+    }
+    return found->second.get();
+}

src/graphics/render/NamedSkeletons.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+namespace rigging {
+    struct Skeleton;
+    class SkeletonConfig;
+}
+
+class NamedSkeletons {
+public:
+    NamedSkeletons();
+
+    std::shared_ptr<rigging::Skeleton> createSkeleton(
+        const std::string& name, const rigging::SkeletonConfig* config
+    );
+
+    rigging::Skeleton* getSkeleton(const std::string& name);
+private:
+    std::unordered_map<std::string, std::shared_ptr<rigging::Skeleton>> skeletons;
+};

src/graphics/render/WorldRenderer.cpp

@@ -47,6 +47,8 @@
 #include "BlockWrapsRenderer.hpp"
 #include "ParticlesRenderer.hpp"
 #include "PrecipitationRenderer.hpp"
+#include "HandsRenderer.hpp"
+#include "NamedSkeletons.hpp"
 #include "TextsRenderer.hpp"
 #include "ChunksRenderer.hpp"
 #include "GuidesRenderer.hpp"
@@ -107,6 +109,15 @@ WorldRenderer::WorldRenderer(
         settings.graphics.skyboxResolution.get(),
         assets->require<Shader>("skybox_gen")
     );
+
+    const auto& content = level.content;
+    skeletons = std::make_unique<NamedSkeletons>();
+    const auto& skeletonConfig = content.requireSkeleton(
+        content.getDefaults()["hand-skeleton"].asString()
+    );
+    hands = std::make_unique<HandsRenderer>(
+        *assets, *modelBatch, skeletons->createSkeleton("hand", &skeletonConfig)
+    );
 }
 
 WorldRenderer::~WorldRenderer() = default;
@@ -273,70 +284,6 @@ void WorldRenderer::renderLines(
     }
 }
 
-void WorldRenderer::renderHands(
-    const Camera& camera, float delta
-) {
-    auto& entityShader = assets.require<Shader>("entity");
-    auto indices = level.content.getIndices();
-
-    // get current chosen item
-    const auto& inventory = player.getInventory();
-    int slot = player.getChosenSlot();
-    const ItemStack& stack = inventory->getSlot(slot);
-    const auto& def = indices->items.require(stack.getItemId());
-
-    // prepare modified HUD camera
-    Camera hudcam = camera;
-    hudcam.far = 10.0f;
-    hudcam.setFov(0.9f);
-    hudcam.position = {};
-
-    // configure model matrix
-    const glm::vec3 itemOffset(0.06f, 0.035f, -0.1);
-
-    static glm::mat4 prevRotation(1.0f);
-
-    const float speed = 24.0f;
-    glm::mat4 matrix = glm::translate(glm::mat4(1.0f), itemOffset);
-    matrix = glm::scale(matrix, glm::vec3(0.1f));
-    glm::mat4 rotation = camera.rotation;
-    glm::quat rot0 = glm::quat_cast(prevRotation);
-    glm::quat rot1 = glm::quat_cast(rotation);
-    glm::quat finalRot =
-        glm::slerp(rot0, rot1, static_cast<float>(delta * speed));
-    rotation = glm::mat4_cast(finalRot);
-    matrix = rotation * matrix *
-             glm::rotate(
-                 glm::mat4(1.0f), -glm::pi<float>() * 0.5f, glm::vec3(0, 1, 0)
-             );
-    prevRotation = rotation;
-    glm::vec3 cameraRotation = player.getRotation();
-    auto offset = -(camera.position - player.getPosition());
-    float angle = glm::radians(cameraRotation.x - 90);
-    float cos = glm::cos(angle);
-    float sin = glm::sin(angle);
-
-    float newX = offset.x * cos - offset.z * sin;
-    float newZ = offset.x * sin + offset.z * cos;
-    offset = glm::vec3(newX, offset.y, newZ);
-    matrix = matrix * glm::translate(glm::mat4(1.0f), offset);
-
-    // render
-    modelBatch->setLightsOffset(camera.position);
-    modelBatch->draw(
-        matrix,
-        glm::vec3(1.0f),
-        assets.get<model::Model>(def.modelName),
-        nullptr
-    );
-    display::clearDepth();
-    setupWorldShader(entityShader, hudcam, engine.getSettings(), 0.0f);
-    skybox->bind();
-    modelBatch->render();
-    modelBatch->setLightsOffset(glm::vec3());
-    skybox->unbind();
-}
-
 void WorldRenderer::generateShadowsMap(
     const Camera& camera,
     const DrawContext& pctx,
@@ -568,7 +515,22 @@ void WorldRenderer::draw(
         DrawContext ctx = pctx.sub();
         ctx.setDepthTest(true);
         ctx.setCullFace(true);
-        renderHands(camera, delta);
+
+        // prepare modified HUD camera
+        Camera hudcam = camera;
+        hudcam.far = 10.0f;
+        hudcam.setFov(0.9f);
+        hudcam.position = {};
+        
+        hands->renderHands(camera, delta);
+
+        display::clearDepth();
+        setupWorldShader(entityShader, hudcam, engine.getSettings(), 0.0f);
+
+        skybox->bind();
+        modelBatch->render();
+        modelBatch->setLightsOffset(glm::vec3());
+        skybox->unbind();
     }
     renderBlockOverlay(pctx);
 

src/graphics/render/WorldRenderer.hpp

@@ -20,6 +20,8 @@ class ChunksRenderer;
 class ParticlesRenderer;
 class BlockWrapsRenderer;
 class PrecipitationRenderer;
+class HandsRenderer;
+class NamedSkeletons;
 class GuidesRenderer;
 class TextsRenderer;
 class Shader;
@@ -52,6 +54,7 @@ class WorldRenderer {
     std::unique_ptr<ModelBatch> modelBatch;
     std::unique_ptr<GuidesRenderer> guides;
     std::unique_ptr<ChunksRenderer> chunks;
+    std::unique_ptr<HandsRenderer> hands;
     std::unique_ptr<Skybox> skybox;
     std::unique_ptr<ShadowMap> shadowMap;
     std::unique_ptr<ShadowMap> wideShadowMap;
@@ -69,8 +72,6 @@ class WorldRenderer {
 
     /// @brief Render block selection lines
     void renderBlockSelection();
-
-    void renderHands(const Camera& camera, float delta);
     
     /// @brief Render lines (selection and debug)
     /// @param camera active camera
@@ -100,6 +101,7 @@ public:
     std::unique_ptr<TextsRenderer> texts;
     std::unique_ptr<BlockWrapsRenderer> blockWraps;
     std::unique_ptr<PrecipitationRenderer> precipitation;
+    std::unique_ptr<NamedSkeletons> skeletons;
 
     static bool showChunkBorders;
     static bool showEntitiesDebug;