[Shell] new entrypoint

Author: MetsukiMio

include/openminecraft-shell/application.hpp

@@ -0,0 +1,22 @@
+#ifndef APPLICATION_HPP
+#define APPLICATION_HPP
+
+#include "openminecraft/log/om_log_common.hpp"
+#include <vector>
+namespace openminecraftshell
+{
+class OMApplication
+{
+  public:
+    OMApplication(std::vector<std::string> args);
+    ~OMApplication();
+
+    auto entry() -> int;
+
+  private:
+    std::vector<std::string> args;
+    openminecraft::log::OMLogger logger;
+};
+}; // namespace openminecraftshell
+
+#endif

include/openminecraft-shell/renderer/worldrenderer.hpp

@@ -1,5 +1,5 @@
-#ifndef OM_RENDERER_LAYER_VK_TESTRENDERER
-#define OM_RENDERER_LAYER_VK_TESTRENDERER
+#ifndef WORLDRENDERER_HPP
+#define WORLDRENDERER_HPP
 #include "glm/ext/vector_float3.hpp"
 #include "glm/fwd.hpp"
 #include "openminecraft-shell/data/block/om_blockstate_resolver.hpp"

…clude/openminecraft-shell/entrypoint.hpp …ude/openminecraft-shell/rendererloop.hppinclude/openminecraft-shell/entrypoint.hpp renamed to include/openminecraft-shell/rendererloop.hpp include/openminecraft-shell/entrypoint.hpp renamed to include/openminecraft-shell/rendererloop.hpp

@@ -1,16 +1,12 @@
-#ifndef OM_BOOT_HPP
-#define OM_BOOT_HPP
+#ifndef RENDERERLOOP_HPP
+#define RENDERERLOOP_HPP
 
 #include "openminecraft/renderer/om_renderer_window.hpp"
-#include <string>
-#include <vector>
 
 using namespace openminecraft;
 
 namespace openminecraftshell
 {
-// INFO: the boot function for the app
-auto boot(std::vector<std::string> args) -> int;
 void rendererLoop(renderer::OMBackend);
 } // namespace openminecraftshell
 

src/openminecraft/application.cpp

@@ -0,0 +1,78 @@
+#include <SDL3/SDL_error.h>
+
+#include "openminecraft-shell/rendererloop.hpp"
+#include "openminecraft/i18n/om_i18n_res.hpp"
+#include "openminecraft/log/om_log_common.hpp"
+#include "openminecraft/log/om_log_threadname.hpp"
+#include "openminecraft/mem/om_mem_allocator.hpp"
+#include "openminecraft/renderer/om_renderer_window.hpp"
+#include "openminecraft/vm/os/om_hardware.hpp"
+#include <SDL3/SDL_init.h>
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_video.h>
+#include <boost/stacktrace/stacktrace.hpp>
+#include <memory>
+#include <string>
+
+#include <SDL3/SDL.h>
+#include <boost/stacktrace.hpp>
+#include <fmt/format.h>
+#include <vector>
+
+#include "openminecraft-shell/application.hpp"
+
+using namespace openminecraft;
+
+namespace openminecraftshell
+{
+OMApplication::OMApplication(std::vector<std::string> args) : logger("OMApplication", this), args(args)
+{
+}
+OMApplication::~OMApplication() = default;
+
+static void setupI18nEnv()
+{
+    i18n::res::registerModule("openminecraft-boot");
+    i18n::res::registerModule("openminecraft-renderer");
+    i18n::res::pushResourceRoot("/bootassets");
+    i18n::res::load();
+}
+
+auto OMApplication::entry() -> int
+{
+    log::multithread::registerCurrentThreadName("engineMain");
+    auto logger = std::make_shared<log::OMLogger>("boot");
+
+    SDL_SetMemoryFunctions(mem::allocator::tracedMallocSDL, mem::allocator::tracedCallocSDL,
+                           mem::allocator::tracedReallocSDL, mem::allocator::tracedFreeSDL);
+    setupI18nEnv();
+    if (!SDL_Init(SDL_INIT_EVENTS | SDL_INIT_VIDEO))
+    {
+        logger->info("SDL Status: {}", SDL_GetError());
+    }
+    logger->info(i18n::res::translate("openminecraft.boot.arg"));
+    for (auto a : args)
+    {
+        logger->info(a);
+    }
+
+    // INFO: hardware information
+    logger->info("hardware / software status");
+    logger->info("CPU Name: {}", openminecraft::vm::os::fetchCpuName());
+    logger->info("System: {}, version {}", openminecraft::vm::os::fetchSystemName(),
+                 openminecraft::vm::os::fetchSystemVersion());
+    logger->info("Total memory: {} bytes", openminecraft::vm::os::fetchMemoryTotal());
+
+    renderer::OMBackend bk = renderer::Vulkan;
+    if (args.size() >= 2)
+    {
+        bk = args[1] == "gl" ? renderer::OpenGL : renderer::Vulkan;
+    }
+
+    rendererLoop(bk);
+
+    SDL_Quit();
+
+    return 0;
+}
+} // namespace openminecraftshell

src/openminecraft/entrypoint.cpp

@@ -1,8 +1,10 @@
-#include "openminecraft-shell/entrypoint.hpp"
+#include "openminecraft-shell/application.hpp"
 #include "openminecraft/log/om_log_common.hpp"
 #include "openminecraft/log/om_log_threadname.hpp"
 #include "openminecraft/vfs/om_vfs_base.hpp"
 #include <csignal>
+#include <string>
+#include "openminecraft/log/om_log_common.hpp"
 
 extern "C"
 {
@@ -40,7 +42,8 @@ auto main(int argc, char **argv) -> int
     openminecraft::vfs::fsmountZipArchive(_binary_external_bundle_start,
                                           (uint32_t)(_binary_external_bundle_end - _binary_external_bundle_start),
                                           "/external");
-    int re = openminecraftshell::boot(a);
+    openminecraftshell::OMApplication app(a);
+    int re = app.entry();
     logger.info("Kernel exited with code {}", re);
 
     return re;