ADD: Forest Tiles

src/game/GameLayer.cpp

@@ -27,7 +27,8 @@ void GameLayer::onAttach()
     mousePicker = std::make_unique<MousePicker>(renderer->getProjectionMatrix(), MathUtils::createViewMatrix(*camera));
 
     //Map Generation
-    hexModel = std::make_shared<TexturedModel>(HexModelFactory::createTexturedHexModel(loader));
+    hexModelDefault = std::make_shared<TexturedModel>(HexModelFactory::createTexturedHexModel(loader, 1.0f, RessourceType::NONE));
+    hexModelWood = std::make_shared<TexturedModel>(HexModelFactory::createTexturedHexModel(loader, 1.0f, RessourceType::WOOD));
     map = std::make_unique<Map>();
     MapGenerator::generateHexMap(*map, 10,10,1.f);
     printf("Generated Terrain with %lu Tiles!\n", map->tiles.size());
@@ -61,7 +62,7 @@ void GameLayer::onUpdate()
         tile.isHighlighted = highlight;
     }
 
-    std::vector<HexRenderData> terrainRenderData = map->getTerrainRenderData(hexModel);
+    std::vector<HexRenderData> terrainRenderData = map->getTerrainRenderData(hexModelDefault, hexModelWood);
 
 
     for (auto& renderData : terrainRenderData) {

src/game/GameLayer.h

@@ -32,7 +32,8 @@ private:
     std::unique_ptr<MousePicker> mousePicker;
     std::unique_ptr<MasterRenderer> renderer = std::make_unique<MasterRenderer>();
 
-    std::shared_ptr<TexturedModel> hexModel;
+    std::shared_ptr<TexturedModel> hexModelDefault;
+    std::shared_ptr<TexturedModel> hexModelWood;
     std::unique_ptr<Map> map;
 };
 

src/game/hexWorld/HexModelFactory.cpp

@@ -48,8 +48,15 @@ RawModel HexModelFactory::createHexRawModel(Loader &loader, float radius) {
     return loader.loadToVAO(vertices, normals, uvs, indices);
 }
 
-TexturedModel HexModelFactory::createTexturedHexModel(Loader &loader, float radius) {
+TexturedModel HexModelFactory::createTexturedHexModel(Loader &loader, float radius, RessourceType ressourceType = RessourceType::NONE) {
     RawModel rawModel = createHexRawModel(loader, radius);
-    ModelTexture modelTexture = loader.loadTextureFromFile("assets/hex/white.png");
+
-    return {std::make_shared<RawModel>(rawModel), std::make_shared<ModelTexture>(modelTexture)};
+    std::shared_ptr<ModelTexture> modelTexture;
+    if (ressourceType == RessourceType::NONE) {
+        modelTexture = std::make_shared<ModelTexture>(loader.loadTextureFromFile("assets/hex/white.png"));
+    } else {
+        modelTexture = std::make_shared<ModelTexture>(loader.loadTextureFromFile("assets/hex/wood/Ground053_1K-JPG_Color.jpg"));
+    }
+
+    return {std::make_shared<RawModel>(rawModel), std::move(modelTexture)};
 }

src/game/hexWorld/HexModelFactory.h

@@ -4,6 +4,7 @@
 
 #ifndef HEXMODELFACTORY_H
 #define HEXMODELFACTORY_H
+#include "HexTile.h"
 #include "../../engine/renderer/model/RawModel.h"
 #include "../../engine/renderer/model/TexturedModel.h"
 
@@ -13,7 +14,7 @@ class Loader;
 class HexModelFactory {
 public:
 
-    static TexturedModel createTexturedHexModel(Loader& loader, float radius = 1.0f);
+    static TexturedModel createTexturedHexModel(Loader& loader, float radius, RessourceType ressourceType);
 private:
     static RawModel createHexRawModel(Loader& loader, float radius = 1.0f);
 };

src/game/hexWorld/HexTile.h

@@ -11,11 +11,16 @@
 #include "glm/vec3.hpp"
 #include "glm/ext/quaternion_geometric.hpp"
 
+enum class RessourceType {
+    NONE,
+    WOOD
+};
+
 struct HexTile {
     glm::vec3 worldPos;
     int q, r; //Axiale Koordinaten (hex-Koordinaten)
     int ownerID = -1;
-    //Later: ResourceType
+    RessourceType resourceType = RessourceType::NONE;
     float radius;
     bool isHighlighted = false;
 

src/game/hexWorld/Map.cpp

@@ -4,11 +4,16 @@
 
 #include "Map.h"
 
-std::vector<HexRenderData> Map::getTerrainRenderData(const std::shared_ptr<TexturedModel>& hexModel) {
+std::vector<HexRenderData> Map::getTerrainRenderData(const std::shared_ptr<TexturedModel>& hexModel, const std::shared_ptr<TexturedModel>& woodModel) {
     std::vector<HexRenderData> renderData;
     renderData.reserve(tiles.size());
     for (auto& tile : tiles) {
-        HexRenderData data = HexRenderData(hexModel, tile.worldPos, tile.isHighlighted);
+        HexRenderData data;
+        if (tile.resourceType == RessourceType::WOOD) {
+            data = HexRenderData(woodModel, tile.worldPos, tile.isHighlighted);
+        } else {
+            data = HexRenderData(hexModel, tile.worldPos, tile.isHighlighted);
+        }
         renderData.push_back(data);
     }
     return renderData;

src/game/hexWorld/Map.h

@@ -16,7 +16,7 @@ public:
     std::vector<Area> areas;
     std::vector<HexTile> tiles;
 
-    std::vector<HexRenderData> getTerrainRenderData(const std::shared_ptr<TexturedModel>& hexModel);
+    std::vector<HexRenderData> getTerrainRenderData(const std::shared_ptr<TexturedModel> &hexModel, const std::shared_ptr<TexturedModel> &woodModel);
 };
 
 

src/game/hexWorld/MapGenerator.h

@@ -5,6 +5,7 @@
 #ifndef MAPGENERATOR_H
 #define MAPGENERATOR_H
 #include <cmath>
+#include <random>
 
 #include "HexTile.h"
 #include "Map.h"
@@ -12,6 +13,12 @@
 class MapGenerator {
 public:
     static void generateHexMap(Map& map, int width, int height, float hexRadius) {
+        // Zufallsgenerator initialisieren (einmal)
+        std::random_device rd;  // Zufälliger Seed
+        std::mt19937 gen(rd()); // Mersenne Twister Generator
+
+        // Verteilung definieren: hier z.B. 0 bis 9
+        std::uniform_real_distribution<float> dis(0.0f, 1.0f);
         map.tiles.clear();
 
         float xOffset = hexRadius * std::sqrt(3.0f);
@@ -29,6 +36,11 @@ public:
                 tile.worldPos = glm::vec3(x, 0.0f, z);
                 tile.radius = hexRadius;
 
+                float randomValue = dis(gen);
+                if (randomValue < 0.5f) {
+                    tile.resourceType = RessourceType::WOOD;
+                }
+
                 map.tiles.push_back(tile);
             }
         }