[General] fix

Author: MetsukiMio

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

@@ -23,7 +23,7 @@ class OMRendererTempTarget
         delete target;
     }
 
-    void construct(glm::vec2 ext, uint64_t samples = 1)
+    void construct(glm::vec2 ext, uint64_t samples = 1, bool flt = false)
     {
         if (target)
         {
@@ -38,13 +38,14 @@ class OMRendererTempTarget
 
         if (samples <= 1)
         {
-            colorTexture = renderer->allocateTexture(ext.x, ext.y, 0, Dim2, ColorRgbaF16);
+            colorTexture = renderer->allocateTexture(ext.x, ext.y, 0, Dim2, flt ? ColorRgbaF16 : ColorRgba);
             colorTexture->setupSampler();
             depthTexture = renderer->allocateTexture(ext.x, ext.y, 0, Dim2, Depth);
         }
         else
         {
-            colorTexture = renderer->allocateTexture(ext.x, ext.y, samples, 0, Dim2Multisample, ColorRgbaF16);
+            colorTexture =
+                renderer->allocateTexture(ext.x, ext.y, samples, 0, Dim2Multisample, flt ? ColorRgbaF16 : ColorRgba);
             colorTexture->setupSampler();
             depthTexture = renderer->allocateTexture(ext.x, ext.y, samples, 0, Dim2Multisample, Depth);
         }
@@ -65,7 +66,7 @@ class OMRendererTempTarget
         }
     }
 
-    void constructWithDepth(OMRendererTexture *depth, glm::vec2 ext, uint64_t samples = 1)
+    void constructWithDepth(OMRendererTexture *depth, glm::vec2 ext, uint64_t samples = 1, bool flt = false)
     {
         if (target)
         {
@@ -81,12 +82,13 @@ class OMRendererTempTarget
 
         if (samples <= 1)
         {
-            colorTexture = renderer->allocateTexture(ext.x, ext.y, 0, Dim2, ColorRgbaF16);
+            colorTexture = renderer->allocateTexture(ext.x, ext.y, 0, Dim2, flt ? ColorRgbaF16 : ColorRgba);
             colorTexture->setupSampler();
         }
         else
         {
-            colorTexture = renderer->allocateTexture(ext.x, ext.y, samples, 0, Dim2Multisample, ColorRgbaF16);
+            colorTexture =
+                renderer->allocateTexture(ext.x, ext.y, samples, 0, Dim2Multisample, flt ? ColorRgbaF16 : ColorRgba);
             colorTexture->setupSampler();
         }
 

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

@@ -43,7 +43,7 @@ OMVoxelManager::OMVoxelManager(OMRenderer *renderer, OMRendererRenderTarget *res
 
     translucentTargetMS = new OMRendererTempTarget(renderer);
     translucentTargetMS->clearDepth = false;
-    translucentTargetMS->construct(renderer->getExtent(), 4);
+    translucentTargetMS->construct(renderer->getExtent(), 4, true);
 
     cutoutTarget = new OMRendererTempTarget(renderer);
     cutoutTarget->construct(renderer->getExtent());
@@ -385,13 +385,15 @@ auto OMVoxelManager::submit(OMRendererTask *task, OMRendererTempTarget *resolveT
 {
     cutoutTargetMS->construct(renderer->getExtent(), 4);
     translucentTargetMS->clearDepth = false;
-    translucentTargetMS->constructWithDepth(cutoutTargetMS->depthTexture, renderer->getExtent(), 4);
+    translucentTargetMS->constructWithDepth(cutoutTargetMS->depthTexture, renderer->getExtent(), 4, true);
     cutoutTarget->construct(renderer->getExtent());
-    translucentTarget->construct(renderer->getExtent());
+    translucentTarget->construct(renderer->getExtent(), 1, true);
     composePipeline->bindInput(0, cutoutTarget->colorTexture);
     composePipeline->bindInput(1, translucentTarget->colorTexture);
 
-    return task->target(cutoutTargetMS->target)
+    return task->clearColor({0.198f, 0.371f, 1.0f, 1.0f})
+        ->clearDepth(0.0f)
+        ->target(cutoutTargetMS->target)
         ->pipeline(pipeline)
         ->vertexBuffer({voxelLayer->buf()->buffer})
         ->drawInstanceN(6, voxelLayer->buf()->totalSize / sizeof(OMVoxel))

src/openminecraft/application.cpp

@@ -105,11 +105,11 @@ void OMApplication::mainLoop(OMBackend backend)
         auto camera = std::make_shared<basics::OMCamera>(win(), glm::vec3{-1.0f, 5.0f, -1.0f}, 45.0f, -45.0f);
 
         auto chunkManager = std::make_shared<world::OMChunkManager<16>>();
-        for (int cx = -1; cx < 8; ++cx)
+        for (int cx = -1; cx < 4; ++cx)
         {
-            for (int cy = 0; cy < 8; ++cy)
+            for (int cy = 0; cy < 4; ++cy)
             {
-                for (int cz = -1; cz < 8; ++cz)
+                for (int cz = -1; cz < 4; ++cz)
                 {
                     using data::block::blockstateRegistry;
                     world::OMChunk<16> cnk(cx, cy, cz);
@@ -304,4 +304,4 @@ void OMApplication::mainLoop(OMBackend backend)
         logger->fatal(e.what());
     }
 }
-} // namespace openminecraftshell
+} // namespace openminecraftshell

src/openminecraft/renderer/composerenderer.cpp

@@ -62,4 +62,4 @@ void OMComposeRenderer::beforeFrame()
 void OMComposeRenderer::afterFrame()
 {
 }
-} // namespace openminecraftshell::renderer
+} // namespace openminecraftshell::renderer

src/openminecraft/renderer/worldrenderer.cpp

@@ -121,8 +121,7 @@ void OMWorldRenderer::beforeFrame()
 
 void OMWorldRenderer::record()
 {
-    voxelManager->submit(renderer->fetchTask("voxel")->clearColor({0.198f, 0.371f, 1.0f, 1.0f})->clearDepth(0.0f),
-                         tempTarget);
+    voxelManager->submit(renderer->fetchTask("voxel"), tempTarget);
 }
 
 void OMWorldRenderer::afterFrame()