Changed asset manager to a template instead of a void*

assets/models/DefaultMesh.obj

@@ -0,0 +1,46 @@
+# Blender v2.76 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib cube.mtl
+o Cube
+v 1.000000 -1.000000 -1.000000
+v 1.000000 -1.000000 1.000000
+v -1.000000 -1.000000 1.000000
+v -1.000000 -1.000000 -1.000000
+v 1.000000 1.000000 -0.999999
+v 0.999999 1.000000 1.000001
+v -1.000000 1.000000 1.000000
+v -1.000000 1.000000 -1.000000
+vt 1.000000 0.333333
+vt 1.000000 0.666667
+vt 0.666667 0.666667
+vt 0.666667 0.333333
+vt 0.666667 0.000000
+vt 0.000000 0.333333
+vt 0.000000 0.000000
+vt 0.333333 0.000000
+vt 0.333333 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.666667
+vt 0.333333 0.333333
+vt 0.333333 0.666667
+vt 1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn -0.000000 0.000000 1.000000
+vn -1.000000 -0.000000 -0.000000
+vn 0.000000 0.000000 -1.000000
+usemtl Material
+s off
+f 2/1/1 3/2/1 4/3/1
+f 8/1/2 7/4/2 6/5/2
+f 5/6/3 6/7/3 2/8/3
+f 6/8/4 7/5/4 3/4/4
+f 3/9/5 7/10/5 8/11/5
+f 1/12/6 4/13/6 8/11/6
+f 1/4/1 2/1/1 4/3/1
+f 5/14/2 8/1/2 6/5/2
+f 1/12/3 5/6/3 2/8/3
+f 2/12/4 6/8/4 3/4/4
+f 4/13/5 3/9/5 8/11/5
+f 5/6/6 1/12/6 8/11/6

assets/models/shopping-cart.mtl

@@ -0,0 +1,6 @@
+# Created by Kenney (www.kenney.nl)
+
+newmtl colormap
+Kd 1 1 1
+map_Kd variation-a.png
+

imgui.ini

@@ -44,6 +44,12 @@ Size=364,1142
 Collapsed=0
 DockId=0x00000009,0
 
+[Window][Editor]
+Pos=374,27
+Size=1212,770
+Collapsed=0
+DockId=0x00000003,0
+
 [Docking][Data]
 DockSpace         ID=0x14621557 Window=0x3DA2F1DE Pos=8,27 Size=1904,1142 Split=X Selected=0xF7365A5A
   DockNode        ID=0x00000009 Parent=0x14621557 SizeRef=364,1142 HiddenTabBar=1 Selected=0x3DC5AC3F
@@ -51,7 +57,7 @@ DockSpace         ID=0x14621557 Window=0x3DA2F1DE Pos=8,27 Size=1904,1142 Split=
     DockNode      ID=0x00000007 Parent=0x0000000A SizeRef=357,1142 Selected=0x7737E8B2
     DockNode      ID=0x00000008 Parent=0x0000000A SizeRef=1545,1142 Split=X
       DockNode    ID=0x00000001 Parent=0x00000008 SizeRef=1212,1142 Split=Y Selected=0xF7365A5A
-        DockNode  ID=0x00000003 Parent=0x00000001 SizeRef=1578,770 CentralNode=1 HiddenTabBar=1 Selected=0xF7365A5A
+        DockNode  ID=0x00000003 Parent=0x00000001 SizeRef=1578,770 CentralNode=1 HiddenTabBar=1 Selected=0xDF0EC458
         DockNode  ID=0x00000004 Parent=0x00000001 SizeRef=1578,370 HiddenTabBar=1 Selected=0x9DD4E196
       DockNode    ID=0x00000002 Parent=0x00000008 SizeRef=324,1142 Split=Y Selected=0x36DC96AB
         DockNode  ID=0x00000005 Parent=0x00000002 SizeRef=324,748 HiddenTabBar=1 Selected=0x36DC96AB

scenes/Cart.scene

@@ -0,0 +1,25 @@
+Entities:
+  - ID: 0
+    Name: Default
+    Components:
+      Mesh:
+        vao: 3
+        indexCount: 2304
+        textureID: 1
+        MeshPath: assets/models/DefaultMesh.obj
+      Transform:
+        Position: [0, 0.400000006, 3.5]
+        Rotation: [-179.5, -135.5, 0]
+        Scale: [1, 1, 1]
+  - ID: 1
+    Name: New GameObject 1
+    Components:
+      Mesh:
+        vao: 1
+        indexCount: 36
+        textureID: 5
+        MeshPath: assets/models/DefaultMesh.obj
+      Transform:
+        Position: [0, -2.9000001, -100]
+        Rotation: [0, 0, 0]
+        Scale: [100, 100, 400]

scenes/Default.scene

@@ -1,122 +1,121 @@
 Entities:
   - ID: 0
-    Name: Car
+    Name: Carrrrr Yeaaa
     Components:
-      Mesh:
-        vao: 2
-        indexCount: 200000
-        textureID: 1
       Transform:
         Position: [0, 2.79999995, -12.6000004]
         Rotation: [149.699997, -137.899994, -39.2999992]
         Scale: [1, 1, 1]
+      Mesh:
+        vao: 2
+        indexCount: 200000
+        textureID: 1
+        MeshPath: assets/models/DefaultMesh.obj
   - ID: 1
-    Name: Left Cube
+    Name: Cube Yay
     Components:
+      Transform:
+        Position: [-11.8999996, -2, -21.7999992]
+        Rotation: [-9, -18.6000004, -28.1000004]
+        Scale: [1, 1, 1]
       Mesh:
         vao: 1
         indexCount: 36
         textureID: 2
-      Transform:
+        MeshPath: assets/models/DefaultMesh.obj
-        Position: [-11.6999998, -2, -21.7999992]
-        Rotation: [-9, -18.6000004, -28.1000004]
-        Scale: [1, 1, 1]
   - ID: 2
-    Name: Right Cube Top
+    Name: Cube Yay 2
     Components:
+      Transform:
+        Position: [7.80000019, -8.10000038, -20.6000004]
+        Rotation: [-86.3000031, 0, -66]
+        Scale: [1, 1, 1]
       Mesh:
         vao: 1
         indexCount: 36
         textureID: 3
-      Transform:
+        MeshPath: assets/models/DefaultMesh.obj
-        Position: [8, -8.10000038, -20.6000004]
-        Rotation: [-86.3000031, 0, -66]
-        Scale: [1, 1, 1]
   - ID: 3
-    Name: Center Grass
+    Name: Cube Yay 3
     Components:
+      Transform:
+        Position: [-1.20000005, -3.4000001, -17.7000008]
+        Rotation: [-23.5, 15.8999996, -59.9000015]
+        Scale: [1, 1, 1]
       Mesh:
         vao: 1
         indexCount: 36
         textureID: 4
-      Transform:
+        MeshPath: assets/models/DefaultMesh.obj
-        Position: [-0.600000024, -3.4000001, -17.7000008]
-        Rotation: [-23.5, 15.8999996, -59.9000015]
-        Scale: [1, 1, 1]
   - ID: 4
-    Name: Right Most
+    Name: Cube Yay 4
     Components:
+      Transform:
+        Position: [8.10000038, 0.800000012, -12]
+        Rotation: [-17.2999992, -16.1000004, -19.2999992]
+        Scale: [1, 1, 1]
       Mesh:
         vao: 1
         indexCount: 36
         textureID: 5
-      Transform:
+        MeshPath: assets/models/DefaultMesh.obj
-        Position: [8.10000038, 0.5, -12]
-        Rotation: [-17.2999992, -16.1000004, -19.2999992]
-        Scale: [1, 1, 1]
   - ID: 5
-    Name: Left Screen Mirror
+    Name: Colormap
     Components:
-      Transform:
-        Position: [-6.80000019, 2.29999995, -13.8000002]
-        Rotation: [-39.7000008, 0, -33.2000008]
-        Scale: [1, 1, 1]
       Mesh:
         vao: 1
         indexCount: 36
         textureID: 6
+        MeshPath: assets/models/DefaultMesh.obj
+      Transform:
+        Position: [-6.80000019, 2.70000005, -13.8000002]
+        Rotation: [-39.7000008, 0, -33.2000008]
+        Scale: [1, 1, 1]
   - ID: 6
-    Name: Top Left
+    Name: Cube Yay 6
     Components:
+      Transform:
+        Position: [-6.5, -6, -18]
+        Rotation: [15.8000002, -18.2000008, -11.1000004]
+        Scale: [1, 1, 1]
       Mesh:
         vao: 1
         indexCount: 36
         textureID: 3
-      Transform:
+        MeshPath: assets/models/DefaultMesh.obj
-        Position: [-6.9000001, -6, -18]
-        Rotation: [15.8000002, -18.2000008, -11.1000004]
-        Scale: [1, 1, 1]
   - ID: 7
-    Name: Bottom Grass
+    Name: Cube Yay 7
     Components:
-      Mesh:
-        vao: 1
-        indexCount: 36
-        textureID: 4
       Transform:
         Position: [6.5, 1.79999995, -23.8999996]
         Rotation: [-16.1000004, -15.8999996, -35]
         Scale: [1, 1, 1]
+      Mesh:
+        vao: 1
+        indexCount: 36
+        textureID: 4
+        MeshPath: assets/models/DefaultMesh.obj
   - ID: 8
-    Name: Back Wood
+    Name: Cube Yay 8
     Components:
+      Transform:
+        Position: [-7.80000019, 0.200000003, -29.7999992]
+        Rotation: [22.5, -32.7999992, 0]
+        Scale: [1, 1, 1]
       Mesh:
         vao: 1
         indexCount: 36
         textureID: 1
-      Transform:
+        MeshPath: assets/models/DefaultMesh.obj
-        Position: [-7.80000019, -1, -29.7999992]
-        Rotation: [22.5, -34.2999992, 0]
-        Scale: [1, 1, 1]
   - ID: 9
-    Name: Right Brick
+    Name: Cube Yay 9
     Components:
+      Transform:
+        Position: [5.5, -2.9000001, -19.5]
+        Rotation: [-41.4000015, -22.6000004, -52.2999992]
+        Scale: [1, 1, 1]
       Mesh:
         vao: 1
         indexCount: 36
         textureID: 2
-      Transform:
+        MeshPath: assets/models/DefaultMesh.obj
-        Position: [5.5, -3.20000005, -19.5]
-        Rotation: [-41.4000015, -24.8999996, -52.2999992]
-        Scale: [1, 1, 1]
-  - ID: 10
-    Name: Plant
-    Components:
-      Mesh:
-        vao: 3
-        indexCount: 589632
-        textureID: 5
-      Transform:
-        Position: [0, 1.29999995, -2]
-        Rotation: [-180, -58.5999985, 0]
-        Scale: [0.5, 0.5, 0.5]

src/Componenets/GameObject.cpp

@@ -103,6 +103,7 @@ void GameObject::Deserialize(const YAML::Node &node)
 
 
 
+
 //}
 //else if (compName == MeshComponent::GetStaticName())
 //{

src/Componenets/Mesh.cpp

@@ -1,5 +1,12 @@
 
 #include "Mesh.h"
+#include "Engine/AssetManager.h"
+#include "gcml.h"
+
+#include "../Engine/AssetManager.h"
+
+
+extern AssetManager *g_AssetManager;
 
 //TODO: Make this have a OBJ path, make indexCount derive from AssetManager
 //TODO: and make texture id also get from AssetManager
@@ -8,7 +15,7 @@
 const std::string MeshComponent::name = "Mesh";
 
 MeshComponent::MeshComponent()
-    : vao(0), indexCount(0), textureID(0)
+    : vao(0), indexCount(0), textureID(0), MeshPath("assets/models/DefaultMesh.obj")
 {
 }
 
@@ -30,6 +37,12 @@ YAML::Node MeshComponent::Serialize()
     node["indexCount"] = static_cast<int>(indexCount);
     node["textureID"] = static_cast<int>(textureID);
 
+    node["MeshPath"] = static_cast<std::string>(MeshPath);
+
+
+
+
+
 
 
     return node;
@@ -49,4 +62,24 @@ void MeshComponent::Deserialize(const YAML::Node& node)
     {
         textureID = static_cast<int>(node["textureID"].as<int>());
     }
+
+
+    if (node["MeshPath"])
+    {
+        MeshPath = static_cast<std::string>(node["MeshPath"].as<std::string>());
+        g_AssetManager->DebugAssetMap();
+
+        #if 1
+
+        DEBUG_PRINT("Loading Mesh: >%s<", MeshPath.c_str());
+
+        Model* model = g_AssetManager->loadAsset<Model*>(AssetType::MODEL, MeshPath.c_str());
+        DEBUG_PRINT("Model loaded successfully with %lld vertices and %lld indices.", model->vertices.size(),  model->indices.size());
+        
+        #else
+
+        DEBUG_PRINT("Automatic Mesh Loading Disabled.");
+
+        #endif
+    }
 }

src/Componenets/Mesh.h

@@ -15,6 +15,9 @@ public:
     GLuint indexCount = 0;    // Number of indices to draw
     GLuint textureID = 0;     // The texture handle
 
+
+    std::string MeshPath;
+
     MeshComponent();
     virtual const std::string& GetName() const override;
     static const std::string& GetStaticName();

src/Engine.cpp

@@ -150,7 +150,7 @@ void MyEngine::Run()
         // printf("Got Valid Mesh Component\n");
         mesh->vao = CreateCubeVAO();
         mesh->indexCount = 36;
-        mesh->textureID = static_cast<GLuint>(reinterpret_cast<uintptr_t>(g_AssetManager.loadAsset(AssetType::TEXTURE, "assets/textures/wood.png")));
+        mesh->textureID = g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/wood.png");
     }
     else
     {
@@ -171,12 +171,14 @@ void MyEngine::Run()
         DEBUG_PRINT("Could not find Transform Component");
     }
 
-    g_AssetManager.loadAsset(AssetType::TEXTURE, "assets/textures/bricks.png");
+    g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/bricks.png");
-    g_AssetManager.loadAsset(AssetType::TEXTURE, "assets/textures/default.png");
+    g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/default.png");
-    g_AssetManager.loadAsset(AssetType::TEXTURE, "assets/textures/lush_grass.png");
+    g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/lush_grass.png");
+    g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/vegetation_tree_bark_40.png");
+
 
     // Load a model
-    void* modelPtr = g_AssetManager.loadAsset(AssetType::MODEL, "assets/models/LowPolyFiatUNO.obj");
+    Model* modelPtr = g_AssetManager.loadAsset<Model*>(AssetType::MODEL, "assets/models/LowPolyFiatUNO.obj");
     if (modelPtr == nullptr)
     {
         DEBUG_PRINT("Failed to load model.");
@@ -188,18 +190,11 @@ void MyEngine::Run()
     }
 
 
-// Load a model
+    Model* modelPtr4 = g_AssetManager.loadAsset<Model*>(AssetType::MODEL, "assets/models/shopping-cart.obj");
-    void* modelPtr2 = g_AssetManager.loadAsset(AssetType::MODEL, "assets/models/OutSidePlant.obj");
-    if (modelPtr2 == nullptr)
-    {
-        DEBUG_PRINT("Failed to load model.");
-    }
-    else
-    {
-        Model* model2 = reinterpret_cast<Model*>(modelPtr2);
-        DEBUG_PRINT("Model loaded successfully with %lld vertices and %lld indices.", model2->vertices.size(),  model2->indices.size());
-    }
 
+    Model* model4 = reinterpret_cast<Model*>(modelPtr4);
+
+    DEBUG_PRINT("Model loaded successfully with %lld vertices and %lld indices.", model4->vertices.size(),  model4->indices.size());
 
 
     g_GameObjects.push_back(newGameObject);

src/Engine/AssetManager.cpp

@@ -6,66 +6,65 @@
 #include <cstring>
 #include <GL/glew.h>
 #include <vector>
+
+#include <filesystem>
+#include <variant>
+
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb/stb_image.h"
 
 #include "imgui.h"
+#include "gcml.h"
 
 #include "Windows/LoggerWindow.h"
 #include "Rendering/Shader.h"
 
-#include "gcml.h"
+GLuint LoadTextureFromList(const std::string &path);
+Shader *LoadShaderFromList(const std::string &path);
+Model *LoadModelFromList(const std::string &path);
 
-#include <filesystem> 
+int LoadedAssets = 0;
-
-int LoaddedAssets = 0;
 
 extern LoggerWindow *g_LoggerWindow;
 
-
+std::string getDirectoryPath(const std::string &fullPath)
-std::string getDirectoryPath(const std::string& fullPath) {
+{
     std::filesystem::path pathObj(fullPath);
     std::filesystem::path dir = pathObj.parent_path();
     return dir.string();
 }
 
-
+void AssetManager::DebugAssetMap()
-
-void *AssetManager::loadAsset(AssetType type, const std::string &path)
 {
-    // 1) Create a unique key for cache lookup
+    std::cout << "[AssetManager] Debugging m_AssetMap:" << std::endl;
-    std::string key = generateKey(type, path);
+    int i = 0;
-
+    for (const auto &[key, value] : m_AssetMap)
-    // 2) Check if it’s already loaded
-    auto it = m_AssetMap.find(key);
-    if (it != m_AssetMap.end())
     {
-        // Return existing pointer
+        std::cout << "  Key: " << key << ", Type Index: " << value.index() << std::endl;
-        return it->second.data;
+        i++;
+    }
+    if (i == 0)
+    {
+        DEBUG_PRINT("No Cashed Assets");
+    }
 }
 
-    // 3) Not loaded yet, load from disk
+// Implementation of AssetManager::loadAssetFromDisk
-    void *assetData = loadAssetFromDisk(type, path);
+AssetManager::AssetVariant AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
-    if (!assetData)
 {
-
+    switch (type)
-        DEBUG_PRINT("[AssetManager] Failed to load asset: %s", path.c_str());
+    {
-        g_LoggerWindow->AddLog("[AsseetManager] Failed to load asset: %s", ImVec4(1.0f, 0.0f, 0.0f, 1.0f), path.c_str());
+    case AssetType::TEXTURE:
-
+        return LoadTextureFromList(path); // Returns GLuint
-        return nullptr;
+    case AssetType::SHADER:
+        return LoadShaderFromList(path); // Returns Shader*
+    case AssetType::SOUND:
+        return std::string("Loaded sound: " + path); // Example placeholder for sound
+    case AssetType::MODEL:
+        return LoadModelFromList(path); // Returns Model*
+    default:
+        throw std::invalid_argument("Unknown AssetType");
     }
-
-    // 4) Store in cache
-    GenericAsset newAsset;
-    newAsset.data = assetData;
-    m_AssetMap[key] = newAsset;
-
-    LoaddedAssets += 1;
-
-    g_LoggerWindow->AddLog("[AsseetManager] Loadded Asset: %s", path.c_str());
-
-    // 5) Return pointer
-    return assetData;
 }
 
 std::string AssetManager::generateKey(AssetType type, const std::string &path)
@@ -73,11 +72,7 @@ std::string AssetManager::generateKey(AssetType type, const std::string &path)
     return std::to_string(static_cast<int>(type)) + ":" + path;
 }
 
-void *AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
+GLuint LoadTextureFromList(const std::string &path)
-{
-    switch (type)
-    {
-    case AssetType::TEXTURE:
 {
     // --------------------------------------------
     // Load a texture with stb_image
@@ -89,7 +84,7 @@ void *AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
     if (!data)
     {
         std::cerr << "[AssetManager] stb_image failed for: " << path << std::endl;
-            return nullptr;
+        return 0;
     }
 
     GLenum format = GL_RGBA;
@@ -118,10 +113,10 @@ void *AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
     stbi_image_free(data);
 
     // Return as void*
-        return reinterpret_cast<void *>(static_cast<uintptr_t>(texID));
+    return texID;
 }
 
-    case AssetType::SHADER:
+Shader *LoadShaderFromList(const std::string &path)
 {
     // --------------------------------------------
     // Load a shader using your existing "Shader" class
@@ -147,16 +142,17 @@ void *AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
     }
 
     // Return as void*
-        return reinterpret_cast<void *>(newShader);
+    return newShader;
 }
 
-    case AssetType::SOUND:
+// case AssetType::SOUND:
-    {
+//{
-        std::cout << "[AssetManager] Loading SOUND from: " << path << std::endl;
+//     std::cout << "[AssetManager] Loading SOUND from: " << path << std::endl;
-        // Stub or real code to load .wav / .ogg
+//     // Stub or real code to load .wav / .ogg
-        return (void *)0xAAAA8888; // placeholder
+//     return (void *)0xAAAA8888; // placeholder
-    }
+// }
-    case AssetType::MODEL:
+
+Model *LoadModelFromList(const std::string &path)
 {
     // --------------------------------------------
     // Load an OBJ model
@@ -182,7 +178,6 @@ void *AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
     else
         directory = "";
 
-
     DEBUG_PRINT("[AssetManager] Asset Directory: %s", directory.c_str());
 
     std::string line;
@@ -307,12 +302,10 @@ void *AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
     if (texturePath.empty())
     {
         DEBUG_PRINT("[AssetManager] No texture found for OBJ:  %s", path.c_str());
-
     }
     else
     {
         DEBUG_PRINT("[AssetManager] Texture for OBJ:  %s%s", directory.c_str(), texturePath.c_str());
-
     }
 
     // Create Model object
@@ -435,13 +428,5 @@ void *AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
     }
 
     // Return the Model pointer as void*
-        return reinterpret_cast<void *>(model);
+    return model;
-    }
-
-    default:
-    {
-        std::cerr << "[AssetManager] Unknown asset type for: " << path << std::endl;
-        return nullptr;
-    }
-    }
 }

src/Engine/AssetManager.h

@@ -4,6 +4,10 @@
 #include <unordered_map>
 #include <GL/glew.h>
 #include <vector>
+#include <variant>
+#include "gcml.h"
+#include "stdexcept"
+#include <iostream>
 
 // Forward-declare your Shader class
 class Shader;
@@ -23,15 +27,15 @@ struct GenericAsset
     void *data = nullptr;
 };
 
-
+struct Vertex
-struct Vertex {
+{
     float position[3];
     float texCoord[2];
     float normal[3];
 };
 
-
+struct Model
-struct Model {
+{
     std::vector<Vertex> vertices;
     std::vector<unsigned int> indices;
     GLuint vao;
@@ -50,20 +54,71 @@ public:
     AssetManager() = default;
     ~AssetManager() = default;
 
+    using AssetVariant = std::variant<GLuint, Shader *, std::string, Model *>;
+
     // Load an asset from disk (texture, shader, etc.)
     // Returns a void* pointer to the loaded resource.
     //   - For TEXTURE, cast to (GLuint)
     //   - For SHADER, cast to (Shader*)
     //   - For SOUND, cast to whatever you store
-    void* loadAsset(AssetType type, const std::string& path);
+
+    // Template function to load an asset
+    // Template function to load an asset
+    template <typename T>
+    T loadAsset(AssetType type, const std::string &path)
+    {
+        // 1) Create a unique key for cache lookup
+        std::string key = generateKey(type, path);
+
+        // 2) Check if it’s already loaded
+        auto it = m_AssetMap.find(key);
+        if (it != m_AssetMap.end())
+        {
+            // Debug: Log the variant type
+            std::cout << "[AssetManager] Found asset in map." << std::endl;
+            if (std::holds_alternative<T>(it->second))
+            {
+                return std::get<T>(it->second);
+            }
+            else
+            {
+                throw std::runtime_error("Asset type mismatch for key: " + key);
+            }
+        }
+
+        // 3) Not loaded yet, load from disk
+        AssetVariant assetData = loadAssetFromDisk(type, path);
+
+        if (assetData.index() == std::variant_npos)
+        {
+            DEBUG_PRINT("[AssetManager] Failed to load asset: %s", path.c_str());
+            // Replace NULL with 0 for non-pointer types
+            if constexpr (std::is_pointer_v<T>)
+            {
+                return nullptr; // For pointers
+            }
+            else
+            {
+                return 0; // For non-pointer types
+            }
+        }
+
+        // 4) Store in cache
+        m_AssetMap[key] = assetData;
+
+        DEBUG_PRINT("[AssetManager] Loaded Asset: %s", path.c_str());
+
+        // 5) Return the loaded asset
+        return std::get<T>(assetData);
+    }
+
+    void DebugAssetMap();
 
 private:
     // Cache of already loaded assets: key = "type + path"
-    std::unordered_map<std::string, GenericAsset> m_AssetMap;
+    std::unordered_map<std::string, AssetVariant> m_AssetMap;
 
+    AssetVariant loadAssetFromDisk(AssetType type, const std::string &path);
     // Generate the unique key
     std::string generateKey(AssetType type, const std::string &path);
-
-    // Actual loading from disk
-    void* loadAssetFromDisk(AssetType type, const std::string& path);
 };

src/Windows/InspectorWindow.cpp

@@ -320,6 +320,18 @@ void InspectorWindow::Show()
                     {
                         mesh->textureID = static_cast<GLuint>(textureID);
                     }
+                    //    Define a maximum buffer size
+                    const size_t BUFFER_SIZE = 256;
+                    // Allocate a buffer and initialize it with the current string
+                    char buffer[BUFFER_SIZE];
+                    strncpy(buffer, mesh->MeshPath.c_str(), BUFFER_SIZE - 1);
+                    buffer[BUFFER_SIZE - 1] = '\0'; // Ensure null-termination
+                    // Render the InputText widget
+                    if (ImGui::InputText(mesh->MeshPath.c_str(), buffer, BUFFER_SIZE))
+                    {
+                        // Update the string if user made changes
+                        mesh->MeshPath = buffer;
+                    }
                 }
             }
             ImGui::Spacing();

src/Windows/PerformanceWindow.cpp

@@ -6,7 +6,7 @@
 
 
 
-extern int LoaddedAssets;
+extern int LoadedAssets;
 extern int g_GPU_Triangles_drawn_to_screen;
 
 const char* polygonModeOptions[] = { "Fill", "Wireframe", "Points" };
@@ -160,7 +160,7 @@ void PerformanceWindow::Show(float fps, float ms)
     ImGui::Separator();
 
     // Show asset count
-    ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.4f, 1.0f), "Assets: %d", LoaddedAssets);
+    ImGui::TextColored(ImVec4(0.4f, 1.0f, 0.4f, 1.0f), "Assets: %d", LoadedAssets);
 
     ImGui::Separator();
 

src/Windows/RenderWindow.cpp

@@ -231,7 +231,7 @@ void RenderWindow::InitGLResources()
     // ----------------------------------------------------
 
     {
-        void *shaderAsset = g_AssetManager.loadAsset(AssetType::SHADER, "assets/shaders/UnlitMaterial");
+        Shader* shaderAsset = g_AssetManager.loadAsset<Shader*>(AssetType::SHADER, "assets/shaders/UnlitMaterial");
         if (!shaderAsset)
         {
             fprintf(stderr, "[RenderWindow] Failed to load shader via AssetManager.\n");
@@ -270,7 +270,7 @@ void RenderWindow::InitGLResources()
     // 3) Load TEXTURE from the asset manager
     // ----------------------------------------------------
     {
-        void *texAsset = g_AssetManager.loadAsset(AssetType::TEXTURE, "assets/textures/wood.png");
+        GLuint texAsset = g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/wood.png");
         if (!texAsset)
         {
             fprintf(stderr, "[RenderWindow] Failed to load texture.\n");
@@ -278,7 +278,7 @@ void RenderWindow::InitGLResources()
         else
         {
             // Cast from void* to GLuint
-            m_TextureID = static_cast<GLuint>(reinterpret_cast<uintptr_t>(texAsset));
+            m_TextureID = texAsset;
         }
     }
 

src/Windows/SceneWindow.cpp

@@ -31,7 +31,7 @@ std::shared_ptr<GameObject> CreateDefaultCube()
 
     mesh->vao = CreateCubeVAO();
     mesh->indexCount = 36;
-    mesh->textureID = static_cast<GLuint>(reinterpret_cast<uintptr_t>(g_AssetManager.loadAsset(AssetType::TEXTURE, "assets/textures/wood.png")));
+    mesh->textureID = g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/wood.png");
 
     return newGameObject;
 }