Next step done; random movement

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.24)
 project(Genesis)
 
-if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} )
+if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
     message(FATAL_ERROR "In-source builds not allowed. Please make a new directory and run CMake from there, or use the -B argument.")
 endif()
 

src/core/CMakeLists.txt

@@ -30,7 +30,6 @@ set (SOURCE_FILES
 
     # Environment {{{
     genesis/core/game/chunks/ZLayer.cpp
-    genesis/core/game/chunks/MapArea.cpp
     genesis/core/game/chunks/Tile.cpp
 
     genesis/core/game/chunks/TileGenerator.cpp

src/core/genesis/core/game/World.hpp

@@ -25,7 +25,6 @@ class World : public Scene {
     // Game state
     std::string civilisationName;
 
-    MapLayers layers;
     //std::vector<std::shared_ptr<GameCreature>> gameEntities;
 
     /**
@@ -48,6 +47,7 @@ class World : public Scene {
     }
 public:
     CreatureController creatures;
+    MapLayers layers;
 
     World(int width, int height);
 

src/core/genesis/core/game/ai/AIEngine.cpp

@@ -3,6 +3,7 @@
 #include "CreatureController.hpp"
 #include "genesis/Context.hpp"
 #include "genesis/core/game/World.hpp"
+#include "genesis/core/game/generation/RNGesus.hpp"
 
 namespace genesis {
 
@@ -12,7 +13,12 @@ void AIEngine::simulateColony(CreatureController& cc, World& world) {
     for (auto& [groupId, group] : entities) {
         if (groupId == 0) {
             for (auto& entity : group.getEntities()) {
-                entity->getPosition().x += 1;
+                auto newPosition = entity->getPosition();
+                newPosition.x += util::randInt(-1, 1);
+                newPosition.y += util::randInt(-1, 1);
+                if (world.layers.canMove(entity->getPosition(), newPosition)) {
+                    entity->setPosition(newPosition);
+                }
             }
         }
     }

src/core/genesis/core/game/chunks/MapLayers.cpp

@@ -115,4 +115,31 @@ void MapLayers::regenerateLayerGraphics() {
     glBindVertexArray(0);
 }
 
+bool MapLayers::canMove(const glm::vec3& from, const glm::vec3& to) {
+    // This function disregards there being multiple z layers for now, as it's convenient to do so
+    // This needs to be addressed when the game has multiple layers
+
+    // Trivial; if the x or y exceeds the map size, discard
+    if (to.x < 0 || to.x >= width
+        || to.y < 0 || to.y >= height) {
+        return false;
+    }
+
+    // TODO: error checking
+    auto layer = layers.at(from.z);
+
+    auto tile = layer.layer.at(to.x).at(to.y);
+
+    // Again, this is a very primitive check, but I need to do this iteratively if I want to
+    // get anywhere with this game
+    return 
+        // Ensure there isn't a block in the way
+        tile.block == nullptr
+        // and ensure the floor exists. can't jump into a void. Whether or not it's valid to go up
+        // or down a missing floor requires more of the game to be implemented.
+        && tile.floor != nullptr;
+
+
+}
+
 }

src/core/genesis/core/game/chunks/MapLayers.hpp

@@ -31,6 +31,8 @@ class MapLayers : public Entity {
     // TODO: this is probably going to have to act as the interface for the contained ZLayers to update specific tiles.
     // glSubData will at least increase the performance of on-layer updates.
 
+    bool canMove(const glm::vec3& from, const glm::vec3& to);
+
     friend class WorldGenerator;
 };
 

src/core/genesis/core/game/generation/RNGesus.cpp

@@ -56,4 +56,8 @@ std::shared_ptr<GameCreature> RNGesus::genCreature(
     }
 }
 
+int util::randInt(int min, int max) {
+    return std::uniform_int_distribution<>(min, max)(_random::engine);
+}
+
 }

src/core/genesis/core/game/generation/RNGesus.hpp

@@ -44,6 +44,13 @@ extern std::shared_ptr<GameCreature> genCreature(
     std::shared_ptr<SpeciesInfo> overrideSpecies
 );
 
+}
+
+namespace util {
+// I'm sure this will backfire wonderfully some day, and I look forward to future me roasting me for being stupid :)
+using namespace RNGesus;
+
+extern int randInt(int min, int max);
 
 }
 

src/core/genesis/logging/Loggers.cpp

@@ -1,6 +1,5 @@
 #include "genesis/core/data/DataLoader.hpp"
 #include "genesis/rendering/Renderer.hpp"
-#include "genesis/core/game/chunks/MapArea.hpp"
 
 #include "spdlog/common.h"
 #include "spdlog/logger.h"
@@ -28,7 +27,6 @@ static std::vector<spdlog::sink_ptr> sinks = {
 };
 
 std::shared_ptr<spdlog::logger> Renderer::logger = std::make_shared<spdlog::logger>("renderer", sinks.begin(), sinks.end());
-std::shared_ptr<spdlog::logger> MapArea::logger = std::make_shared<spdlog::logger>("map", sinks.begin(), sinks.end());
 std::shared_ptr<spdlog::logger> DataLoader::logger = std::make_shared<spdlog::logger>("DataLoader", sinks.begin(), sinks.end());
 
 }

src/render-engine/genesis/rendering/Renderer.cpp

@@ -149,7 +149,7 @@ void Renderer::render() {
 }
 
 void Renderer::run() {
-    auto targetTime = std::chrono::duration<double, std::milli>(1000.0 / 120.0);
+    //auto targetTime = std::chrono::duration<double, std::milli>(1000.0 / 120.0);
 
     auto lastTime = std::chrono::high_resolution_clock::now();
     auto counter = lastTime;
@@ -162,10 +162,10 @@ void Renderer::run() {
 
         auto end = std::chrono::high_resolution_clock::now();
         lastTime = now;
-        auto sleepFor = targetTime - (now - end);
-        if (sleepFor > std::chrono::milliseconds(0)) {
-            std::this_thread::sleep_for(sleepFor);
-        }
+        //auto sleepFor = targetTime - (now - end);
+        //if (sleepFor > std::chrono::milliseconds(0)) {
+            //std::this_thread::sleep_for(sleepFor);
+        //}
         ++frames;
         if (std::chrono::high_resolution_clock::now() - counter > std::chrono::seconds(1)) {
             counter = std::chrono::high_resolution_clock::now();