[General] fix

Author: MetsukiMio

include/openminecraft-shell/renderer/worldrenderer.hpp

@@ -34,19 +34,6 @@ using namespace openminecraft::renderer::common;
 // INFO: The renderer test definition, behaves like a renderer handler (and it should be)
 namespace openminecraftshell::renderer
 {
-// INFO: The uniform buffer data structure used for the renderer
-// INFO: model, view, proj for object rendering
-#pragma pack(1)
-struct LightingUniform
-{
-    glm::vec3 lightDirection;
-    float _pad1;
-    glm::vec3 lightColor;
-    float _pad2;
-    glm::vec3 ambientColor;
-    float _pad3;
-};
-#pragma pack()
 // INFO: simple vertex structure
 using VertexStruct = basics::OMVertex<glm::vec3, glm::vec2>;
 
@@ -65,7 +52,7 @@ class OMWorldRenderer : public OMRendererHandler
     void record();
 
     // INFO: these are the resource handles used for rendering
-    OMRendererBuffer *uniformBuffer, *voxelModelBuffer, *lightingBuffer, *cameraBuffer;
+    OMRendererBuffer *uniformBuffer, *voxelModelBuffer, *cameraBuffer;
     wrap::OMRendererTempTarget *tempTarget;
     wrap::OMVoxelManager *voxelManager;
     data::OMTextureAtlas *textureAtlas;
@@ -83,9 +70,6 @@ class OMWorldRenderer : public OMRendererHandler
 
     std::shared_ptr<OMShader> outputVtx;
     std::shared_ptr<OMShader> outputFrg;
-
-    std::chrono::high_resolution_clock::time_point tp;
-    bool timing = false;
 };
 } // namespace openminecraftshell::renderer
 

src/openminecraft-core/renderer/vk/om_renderer_layer_vk.cpp

@@ -19,11 +19,13 @@
 #include "vulkan/vulkan_enums.hpp"
 #include "vulkan/vulkan_structs.hpp"
 #include <SDL3/SDL_vulkan.h>
+#include <chrono>
 #include <cstdlib>
 #include <cstring>
 #include <memory>
 #include <string>
 #include <system_error>
+#include <thread>
 #include <utility>
 #include <vector>
 

src/openminecraft/application.cpp

@@ -115,7 +115,7 @@ void OMApplication::mainLoop(OMBackend backend)
                 {
                     using data::block::blockstateRegistry;
                     world::OMChunk<16> cnk(cx, cy, cz);
-                    cnk.setBlock(0, 0, 0, blockstateRegistry.id(data::OMIdentifier("minecraft:blue_stained_glass[]")));
+                    cnk.setBlock(0, 0, 0, blockstateRegistry.id(data::OMIdentifier("minecraft:white_stained_glass[]")));
                     cnk.setBlock(0, 1, 1, blockstateRegistry.id(data::OMIdentifier("minecraft:copper_ore[]")));
                     cnk.setBlock(2, 0, 0,
                                  blockstateRegistry.id(data::OMIdentifier("minecraft:grass_block[snowy=false]")));

src/openminecraft/data/block/om_block_registry.cpp

@@ -42,7 +42,7 @@ void registerBlocks()
         OMBlock().isSoild(false).prop("shape", {"ascending_east", "ascending_north", "ascending_east", "ascending_west",
                                                 "east_west", "north_east", "north_south", "north_west", "south_east",
                                                 "south_west"}));
-    blockRegistery.registerItem(OMIdentifier("minecraft:blue_stained_glass"),
+    blockRegistery.registerItem(OMIdentifier("minecraft:white_stained_glass"),
                                 OMBlock().isSoild(false).isTranslucent(true));
 }
 } // namespace openminecraftshell::data::block

src/openminecraft/renderer/worldrenderer.cpp

@@ -3,8 +3,6 @@
 #include "glm/ext/matrix_float4x4.hpp"
 #include "glm/ext/matrix_transform.hpp"
 #include "glm/ext/vector_float3.hpp"
-#include "glm/ext/vector_float4.hpp"
-#include "glm/geometric.hpp"
 #include "openminecraft-shell/data/block/om_block_registery.hpp"
 #include "openminecraft-shell/data/block/om_blockstate_registry.hpp"
 #include "openminecraft-shell/data/block/om_blockstate_resolver.hpp"
@@ -22,7 +20,6 @@
 #include "openminecraft/renderer/common/wrap/om_renderer_voxel.hpp"
 #include "openminecraft/world/om_world_chunkmanager.hpp"
 
-#include <chrono>
 #include <functional>
 #include <glm/glm.hpp>
 #include <memory>
@@ -41,11 +38,7 @@ OMWorldRenderer::OMWorldRenderer(OMRenderer *renderer, std::shared_ptr<basics::O
     uniformBuffer = renderer->allocateBuffer(Uniform, sizeof(glm::mat4));
     auto model = glm::rotate(glm::mat4(1.0f), glm::radians(-90.0f), glm::vec3(1.0f, 0.0f, 0.0f));
     uniformBuffer->updateData(&model);
-    voxelModelBuffer = renderer->allocateBuffer(Uniform, sizeof(glm::mat4));
-    glm::mat4 m(1.0f);
-    voxelModelBuffer->updateData(&m);
     cameraBuffer = renderer->allocateBuffer(Uniform, sizeof(glm::mat4));
-    lightingBuffer = renderer->allocateBuffer(Uniform, sizeof(LightingUniform));
 
     outputFrg = renderer->shaderManager.preprocess("core/bilt.frag.glsl", Fragment, GLSLSource, format);
     outputVtx = renderer->shaderManager.preprocess("core/bilt.vert.glsl", Vertex, GLSLSource, format);
@@ -92,26 +85,8 @@ OMWorldRenderer::OMWorldRenderer(OMRenderer *renderer, std::shared_ptr<basics::O
     voxelManager->bindCameraBuffer(cameraBuffer);
 }
 
-static float ang = 0.0f;
-
 void OMWorldRenderer::beforeFrame()
 {
-    if (!timing)
-    {
-        tp = std::chrono::high_resolution_clock::now();
-        timing = true;
-    }
-    LightingUniform li;
-    li.lightDirection = glm::normalize(glm::vec3(0.5, 0.5, 0.5));
-    li.lightColor = glm::vec3(1.0);
-    li.ambientColor = glm::vec3(0.05);
-
-    auto cam = camera->fetchProjMat() * camera->fetchViewMat();
-
-    cameraBuffer->updateData(&cam);
-    lightingBuffer->updateData(&li);
-    ang += 0.001f;
-
     voxelManager->update(*camera);
 }
 
@@ -122,6 +97,9 @@ void OMWorldRenderer::record()
 
 void OMWorldRenderer::afterFrame()
 {
+    auto cam = camera->fetchProjMat() * camera->fetchViewMat();
+
+    cameraBuffer->updateData(&cam);
 }
 
 void OMWorldRenderer::submitTasks()
@@ -134,10 +112,8 @@ void OMWorldRenderer::submitTasks()
 }
 OMWorldRenderer::~OMWorldRenderer()
 {
-    delete voxelModelBuffer;
     delete uniformBuffer;
     delete cameraBuffer;
-    delete lightingBuffer;
     delete voxelManager;
     delete blockstateResolver;
     delete textureAtlas;