[Shell] rename (stage 1)

Author: MetsukiMio

…ell/renderer/entrypoint_testrenderer.hpp …necraft-shell/renderer/worldrenderer.hppinclude/openminecraft-shell/renderer/entrypoint_testrenderer.hpp renamed to include/openminecraft-shell/renderer/worldrenderer.hpp include/openminecraft-shell/renderer/entrypoint_testrenderer.hpp renamed to include/openminecraft-shell/renderer/worldrenderer.hpp

@@ -101,21 +101,13 @@ auto boot(std::vector<std::string> args) -> int
     logger->info("System: {}, version {}", os::fetchSystemName(), os::fetchSystemVersion());
     logger->info("Total memory: {} bytes", os::fetchMemoryTotal());
 
-    if (args.size() < 3)
+    renderer::OMBackend bk = renderer::Vulkan;
+    if (args.size() >= 2)
     {
-        args.resize(3);
-        args[1] = "3dtest";
-        args[2] = "gl";
+        bk = args[1] == "gl" ? renderer::OpenGL : renderer::Vulkan;
     }
 
-    switch (hash_compile_time(args[1].c_str()))
-    {
-    case "3dtest"_hash:
-        rendererLoop(args[2] == "gl" ? renderer::OpenGL : renderer::Vulkan);
-        break;
-    default:
-        return 1;
-    }
+    rendererLoop(bk);
 
     SDL_Quit();
 

src/openminecraft/entrypoint.cpp

@@ -1,12 +1,10 @@
-#include "openminecraft-shell/renderer/entrypoint_testrenderer.hpp"
+#include "openminecraft-shell/renderer/worldrenderer.hpp"
 
 #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.hpp"
-#include "openminecraft-shell/data/block/om_block_registery.hpp"
 #include "openminecraft-shell/data/block/om_blockstate_resolver.hpp"
 #include "openminecraft-shell/data/om_identifier.hpp"
 #include "openminecraft-shell/data/om_model_precompiler.hpp"
@@ -106,7 +104,7 @@ OMTestRenderer::OMTestRenderer(OMRenderer *renderer, std::function<OMRendererTex
                 cnk.setBlock(15, 1, 2, 6);
                 cnk.setBlock(15, 1, 0, 13);
                 cnk.setBlock(15, 2, 2, 16);
-                cnk.setBlock(15, 2, 1, 18);
+                cnk.setBlock(15, 2, 1, 17);
                 chunkManager->loadChunk(cnk);
             }
         }
@@ -146,18 +144,6 @@ OMTestRenderer::OMTestRenderer(OMRenderer *renderer, std::function<OMRendererTex
         {voxelHandler->loadModelPart(data::OMIdentifier("minecraft:block/cherry_fence_gate_open"))}, false);
     voxelHandler->composeBlock({voxelHandler->loadModelPart(data::OMIdentifier("minecraft:block/rail"))}, false);
 
-    data::block::OMBlock blk(data::OMIdentifier("minecraft:cherry_button"));
-    blk.isSoild(false);
-    blockstateResolver->resolve(blk);
-    data::block::OMBlock blk2(data::OMIdentifier("minecraft:cherry_fence"));
-    blk2.isSoild(false);
-    blockstateResolver->resolve(blk2);
-    data::block::OMBlock blk3(data::OMIdentifier("minecraft:cherry_shelf"));
-    blk3.isSoild(false);
-    blockstateResolver->resolve(blk3);
-
-    logger.debug("block model at {}", blockstateResolver->fetchModel(blk3, "facing=north,powered=false"));
-
     textureAtlas->build();
 
     voxelManager = new wrap::OMVoxelManager(

…aft/renderer/entrypoint_testrenderer.cpp …openminecraft/renderer/worldrenderer.cppsrc/openminecraft/renderer/entrypoint_testrenderer.cpp renamed to src/openminecraft/renderer/worldrenderer.cpp src/openminecraft/renderer/entrypoint_testrenderer.cpp renamed to src/openminecraft/renderer/worldrenderer.cpp

@@ -4,7 +4,7 @@
 #include "SDL3/SDL_mouse.h"
 #include "SDL3/SDL_video.h"
 #include "glm/ext/vector_float3.hpp"
-#include "openminecraft-shell/renderer/entrypoint_testrenderer.hpp"
+#include "openminecraft-shell/renderer/worldrenderer.hpp"
 #include "openminecraft/log/om_log_common.hpp"
 #include "openminecraft/renderer/common/basics/om_camera.hpp"
 #include "openminecraft/renderer/common/demiurge/node/om_demiurge_container.hpp"