[Renderer] block model

Author: MetsukiMio

include/openminecraft/renderer/common/wrap/om_renderer_voxel.hpp

@@ -271,7 +271,7 @@ class OMVoxelCompiler
                  std::function<void(OMVoxel)>, std::function<void(OMVoxelComplex)>) -> void;
 
     OMVoxelHandler *handler = new OMVoxelHandlerDummy();
-    std::function<uint32_t(uint32_t)> converter;
+    std::function<uint32_t(uint32_t, uint64_t, uint64_t, uint64_t, int, int, int)> converter;
 
   private:
     log::OMLogger logger;
@@ -327,7 +327,7 @@ class OMVoxelManager
   public:
     OMVoxelManager(OMRenderer *renderer, OMRendererTexture *, OMRendererTexture *,
                    std::shared_ptr<world::OMChunkManager<16>>, std::function<void()>, OMVoxelHandler *,
-                   std::function<uint32_t(uint32_t)>);
+                   std::function<uint32_t(uint32_t, uint64_t, uint64_t, uint64_t, int, int, int)>);
     ~OMVoxelManager();
 
     auto submit(OMRendererTask *, OMRendererTempTarget *) -> OMRendererTask *;
@@ -350,7 +350,7 @@ class OMVoxelManager
     log::OMLogger logger;
     OMVoxelCompiler compiler;
 
-    std::function<uint32_t(uint32_t)> converter;
+    std::function<uint32_t(uint32_t, uint64_t, uint64_t, uint64_t, int, int, int)> converter;
     std::shared_ptr<world::OMChunkManager<16>> chunkManager;
     OMVoxelLayer<OMVoxel> *voxelLayer, *voxelTranslucentLayer;
     OMVoxelLayer<OMVoxelComplex> *voxelComplexLayer, *voxelTranslucentComplexLayer;

src/openminecraft-core/renderer/common/wrap/om_renderer_voxel_compiler.cpp

@@ -2,7 +2,6 @@
 #include "openminecraft/renderer/common/wrap/om_renderer_voxel.hpp"
 #include <array>
 #include <cstdint>
-#include <iostream>
 #include <tuple>
 
 namespace openminecraft::renderer::common::wrap
@@ -130,9 +129,10 @@ auto OMVoxelCompiler::existSoild(const world::OMChunk<16> &chunk,
 {
     if (x < 0 || y < 0 || z < 0 || x > 15 || y > 15 || z > 15)
         return handler->querySoild(
-            converter(externalAccessor(glm::ivec3(x, y, z), chunk.chunkx, chunk.chunky, chunk.chunkz)));
+            converter(externalAccessor(glm::ivec3(x, y, z), chunk.chunkx, chunk.chunky, chunk.chunkz), chunk.chunkx,
+                      chunk.chunky, chunk.chunkz, x, y, z));
 
-    return handler->querySoild(converter(chunk.fetch(x, y, z)));
+    return handler->querySoild(converter(chunk.fetch(x, y, z), chunk.chunkx, chunk.chunky, chunk.chunkz, x, y, z));
 }
 
 auto OMVoxelCompiler::queryBlockstate(const world::OMChunk<16> &chunk,
@@ -166,7 +166,7 @@ auto OMVoxelCompiler::computeAO(const world::OMChunk<16> &chunk,
             glm::mix(currentAabb.offset, currentAabb.offset + currentAabb.size, glm::vec3(pos.x, pos.y, pos.z)) -
             (glm::vec3(dx, dy, dz) * 16.0f);
 
-        auto occ = handler->queryOcclusionShape(converter(tgbs));
+        auto occ = handler->queryOcclusionShape(converter(tgbs, chunk.chunkx, chunk.chunky, chunk.chunkz, x, y, z));
         if (occ.contains(currentPos))
         {
             return 1;
@@ -288,7 +288,7 @@ auto OMVoxelCompiler::compile(const world::OMChunk<16> &chunk,
 {
     for (const auto &v : chunk)
     {
-        auto bsid = converter(v.second);
+        auto bsid = converter(v.second, chunk.chunkx, chunk.chunky, chunk.chunkz, v.first.x, v.first.y, v.first.z);
         if (handler->queryNumParts(bsid) == 0)
         {
             continue;

src/openminecraft-core/renderer/common/wrap/om_renderer_voxel_manager.cpp

@@ -24,7 +24,8 @@ namespace openminecraft::renderer::common::wrap
 uint64_t cx = 0, cy = 0, cz = 0;
 OMVoxelManager::OMVoxelManager(OMRenderer *renderer, OMRendererTexture *tex, OMRendererTexture *texSec,
                                std::shared_ptr<world::OMChunkManager<16>> man, std::function<void()> rec,
-                               OMVoxelHandler *handler, std::function<uint32_t(uint32_t)> converter)
+                               OMVoxelHandler *handler,
+                               std::function<uint32_t(uint32_t, uint64_t, uint64_t, uint64_t, int, int, int)> converter)
     : logger("OMVoxelManager", this)
 {
     this->rec = rec;

src/openminecraft/renderer/worldrenderer.cpp

@@ -82,9 +82,11 @@ OMWorldRenderer::OMWorldRenderer(OMRenderer *renderer, std::shared_ptr<basics::O
     voxelManager = new wrap::OMVoxelManager(
         renderer, textureAtlas->texture, textureAtlas->textureSecondary, chunkManager, [&]() { record(); },
         this->voxelHandler,
-        [&](uint32_t v) -> uint32_t {
+        [&](uint32_t v, uint64_t cx, uint64_t cy, uint64_t cz, int x, int y, int z) -> uint32_t {
             const auto &reg = data::block::blockstateRegistry.idToRegistry[v];
-            return blockstateResolver->fetchModel(reg.block, reg.state);
+            uint64_t h = (cx * 16 + x) * 341873128712L + (cy * 16 + y) * 132897987541L + cz * 16 + z + 1L;
+            h ^= h >> 16;
+            return blockstateResolver->fetchModel(reg.block, reg.state, h);
         });
 
     voxelManager->pipeline->bindInput(0, cameraBuffer);