fix duplicate load of first mesh

goopey7 · Dec 30, 2023 · d50349c · d50349c
1 parent 1645c37
commit d50349c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/goop/sys/ResourceManager.cpp b/goop/sys/ResourceManager.cpp
@@ -32,14 +32,16 @@ int ResourceManager::initialize()
 
 bool ResourceManager::loadMesh(MeshComponent& mesh)
 {
-	if (loadedMeshes[mesh.path] != 0)
+	if (numLoadedMeshes[mesh.path] > 0)
 	{
 		std::cout << "Mesh " << mesh.path << " already loaded" << std::endl;
 		mesh.id = loadedMeshes[mesh.path];
+		numLoadedMeshes[mesh.path]++;
 		return true;
 	}
 	mesh.id = meshLoader->load(mesh.path);
 	loadedMeshes[mesh.path] = mesh.id;
+	numLoadedMeshes[mesh.path]++;
 	std::cout << "Loaded mesh " << mesh.path << " with id " << mesh.id << std::endl;
 	return true;
 }

diff --git a/goop/sys/ResourceManager.h b/goop/sys/ResourceManager.h
@@ -28,5 +28,6 @@ class ResourceManager : public Subsystem
 	std::unique_ptr<MeshLoader> meshLoader;
 	std::unique_ptr<Sfx> sfx;
 	std::map<std::string, uint32_t> loadedMeshes;
+	std::map<std::string, uint32_t> numLoadedMeshes;
 };
 } // namespace goop::sys