Temporary remove temporary workaround for chunk mesh stitching

CMakeLists.txt

@@ -3,5 +3,7 @@ project(Everland LANGUAGES CXX)
 
 include(FetchContent)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 add_subdirectory(lib)
 add_subdirectory(src)

src/Application.cpp

@@ -2,10 +2,12 @@
 
 #include <raylib-cpp.hpp>
 
+namespace everland {
+
 Application::Application(const ApplicationOptions &options) : options{options}
 {
     window.Init(GetScreenWidth(), GetScreenHeight(), "Everland", FLAG_FULLSCREEN_MODE);
-    window.SetTargetFPS(144);
+    window.SetTargetFPS(0);
 
     worlds = World::discoverLocalWorlds();
     appLoop();
@@ -53,4 +55,6 @@ void Application::appLoop()
         draw();
     }
     CloseWindow();
-}
+}
+
+} // namespace everland

src/Application.hpp

@@ -10,6 +10,8 @@
 
 namespace rl = raylib;
 
+namespace everland {
+
 struct ApplicationOptions
 {
     bool debugModeEnabled{false};
@@ -37,3 +39,5 @@ class Application
     std::unique_ptr<Game> game;
     std::vector<std::unique_ptr<World>> worlds;
 };
+
+} // namespace everland

src/CMakeLists.txt

@@ -1,5 +1,3 @@
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
 set(SOURCES
     Application.cpp
     logic/Game.cpp
@@ -22,7 +20,4 @@ add_executable(Everland)
 target_sources(Everland PRIVATE main.cpp)
 target_link_libraries(Everland PRIVATE EverlandLib)
 
-add_custom_target(run
-    COMMAND Everland
-    DEPENDS Everland
-)
+add_custom_target(run COMMAND Everland DEPENDS Everland)

src/logic/Game.cpp

@@ -1,4 +1,5 @@
 #include "Game.hpp"
+#include "raylib.h"
 
 #include <format>
 #include <raylib-cpp.hpp>
@@ -15,6 +16,10 @@ void Game::processInput()
 {
     if (IsKeyPressed(KEY_F3))
         options.debugModeEnabled = !options.debugModeEnabled;
+    if (IsKeyPressed(KEY_MINUS))
+        options.renderDistance = std::max(1, options.renderDistance - 1);
+    if (IsKeyPressed(KEY_EQUAL))
+        ++options.renderDistance;
 
     player.processInput();
 }

src/logic/Game.hpp

@@ -7,11 +7,9 @@
 
 #include <memory>
 
-namespace rl = raylib;
-
 struct GameOptions
 {
-    int renderDistance{2};
+    int renderDistance{4};
     bool debugModeEnabled{false};
 };
 

src/main.cpp

@@ -1,10 +1,10 @@
-#include <Application.hpp>
-#include <utility/Parser.hpp>
+#include "Application.hpp"
+#include "utils/Parser.hpp"
 
 int main(int argc, char **argv)
 {
-    auto options{parseCommandLineInput(argc, argv)};
-    std::make_unique<Application>(options);
+    auto options{everland::parseCommandLineInput(argc, argv)};
+    std::make_unique<everland::Application>(options);
 
     return 0;
 }

src/utility/Parser.hpp → src/utils/Parser.hpp

@@ -1,9 +1,15 @@
+#pragma once
+
+#include "Application.hpp"
+
 #include <algorithm>
 #include <iomanip>
 #include <iostream>
 #include <optional>
 #include <string>
 
+namespace everland {
+
 std::optional<std::string> getOption(char **begin, char **end, const std::string &option)
 {
     char **itr = std::find(begin, end, option);
@@ -22,12 +28,8 @@ void printHelp()
     static constexpr int optionWidth = 16;
     std::cout << "Usage: Everland [options]\n"
               << "Options:\n"
-              << std::left << std::setw(optionWidth)
-              << "  -h, --help"
-              << " - Show this help message\n"
-              << std::left << std::setw(optionWidth)
-              << "  -d, --debug"
-              << " - Enable debug mode\n";
+              << std::left << std::setw(optionWidth) << "  -h, --help" << " - Show this help message\n"
+              << std::left << std::setw(optionWidth) << "  -d, --debug" << " - Enable debug mode\n";
 }
 
 ApplicationOptions parseCommandLineInput(int argc, char **argv)
@@ -44,4 +46,6 @@ ApplicationOptions parseCommandLineInput(int argc, char **argv)
         options.debugModeEnabled = true;
 
     return options;
-}
+}
+
+} // namespace everland

src/world/Generator.cpp

@@ -36,7 +36,7 @@ void Chunk::buildMesh()
         return shader;
     }();
 
-    auto mesh = MeshBuilder::buildMesh(*this);
+    auto mesh{MeshBuilder::buildMesh(*this)};
     model = std::make_unique<rl::Model>(mesh);
     model->materials[0].shader = shader;
 }

src/world/World.cpp

@@ -55,8 +55,8 @@ World::World(const fs::directory_entry &worldDirectory)
 
 void World::update(const rl::Vector2 &playerChunk, int renderDistance)
 {
-    if (previousPlayerChunk.Equals(playerChunk))
-        return;
+    // if (previousPlayerChunk.Equals(playerChunk))
+    //     return;
 
     generateChunks(playerChunk, renderDistance);
     unloadChunks(playerChunk, renderDistance);
@@ -93,8 +93,8 @@ void World::addNeighbors(Chunk &chunk)
             {
                 chunk.neighbors[x + 1][z + 1] = neighbor;
                 neighbor->neighbors[-x + 1][-z + 1] = &chunk;
-                chunk.buildMesh();
-                neighbor->buildMesh();
+                // chunk.buildMesh();
+                // neighbor->buildMesh();
             }
         }
 }