From e824c174056f008cf4fe56f9bc08a29e4fb23c85 Mon Sep 17 00:00:00 2001
From: Xiao Qi <xiaoqi.loh@digipen.edu>
Date: Fri, 11 Nov 2022 10:06:26 +0800
Subject: [PATCH] Fixed asset type conversion bug when loading from meta files
 Removed compile all function Set parent id to 0 for non sub assets

---
 SHADE_Engine/src/Assets/SHAssetMacros.h       |  3 +-
 SHADE_Engine/src/Assets/SHAssetManager.cpp    | 45 -------------------
 SHADE_Engine/src/Assets/SHAssetManager.h      |  2 -
 .../src/Assets/SHAssetMetaHandler.cpp         |  1 +
 4 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/SHADE_Engine/src/Assets/SHAssetMacros.h b/SHADE_Engine/src/Assets/SHAssetMacros.h
index e0551262..7ffdb5f1 100644
--- a/SHADE_Engine/src/Assets/SHAssetMacros.h
+++ b/SHADE_Engine/src/Assets/SHAssetMacros.h
@@ -51,8 +51,8 @@ enum class AssetType : AssetTypeMeta
   SCENE,
   PREFAB,
   MATERIAL,
-  SCRIPT,
   MESH,
+  SCRIPT,
 	MAX_COUNT
 };
 constexpr size_t TYPE_COUNT{ static_cast<size_t>(AssetType::MAX_COUNT) };
@@ -97,6 +97,7 @@ constexpr std::string_view EXTENSIONS[] = {
   SCENE_EXTENSION,
 	PREFAB_EXTENSION,
   MATERIAL_EXTENSION,
+  "dummy",
   SCRIPT_EXTENSION,
 	AUDIO_WAV_EXTENSION,
 };
diff --git a/SHADE_Engine/src/Assets/SHAssetManager.cpp b/SHADE_Engine/src/Assets/SHAssetManager.cpp
index f4727417..5a1bd5db 100644
--- a/SHADE_Engine/src/Assets/SHAssetManager.cpp
+++ b/SHADE_Engine/src/Assets/SHAssetManager.cpp
@@ -405,51 +405,6 @@ namespace SHADE
 		return result;
 	}
 
-	void SHAssetManager::CompileAll() noexcept
-	{
-		std::vector<AssetPath> paths;
-
-		for (auto const& dir : std::filesystem::recursive_directory_iterator{ ASSET_ROOT })
-		{
-			if (dir.is_regular_file())
-			{
-				for (auto const& ext : EXTERNALS)
-				{
-					if (dir.path().extension().string() == ext.data())
-					{
-						paths.push_back(dir.path());
-					}
-				}
-			}
-		}
-
-		for (auto const& path : paths)
-		{
-      AssetPath newPath;
-			auto const ext{ path.extension().string() };
-			if (ext == GLSL_EXTENSION.data())
-			{
-        newPath = SHShaderSourceCompiler::LoadAndCompileShader(path).value();
-			}
-			else if (ext == DDS_EXTENSION.data())
-			{
-				newPath = SHTextureCompiler::CompileTextureAsset(path).value();
-			}
-			else if (ext == GLTF_EXTENSION.data() || ext == FBX_EXTENSION.data())
-			{
-        std::string command = MODEL_COMPILER_EXE.data();
-        command += " " + path.string();
-        std::system(command.c_str());
-
-        std::string modelPath = path.string().substr(0, path.string().find_last_of('.'));
-        modelPath += MODEL_EXTENSION;
-        newPath = modelPath;
-			}
-
-      GenerateNewMeta(newPath);
-		}
-	}
-
   bool SHAssetManager::DeleteLocalFile(AssetPath path) noexcept
   {
     //TODO Move this to dedicated library
diff --git a/SHADE_Engine/src/Assets/SHAssetManager.h b/SHADE_Engine/src/Assets/SHAssetManager.h
index a891ec23..5af648e4 100644
--- a/SHADE_Engine/src/Assets/SHAssetManager.h
+++ b/SHADE_Engine/src/Assets/SHAssetManager.h
@@ -107,8 +107,6 @@ namespace SHADE
 		
 		static SHAsset CreateAssetFromPath(AssetPath	path) noexcept;
 
-    static void CompileAll() noexcept;
-
     static bool DeleteLocalFile(AssetPath path) noexcept;
 
     //TODO use this function to create asset data internall at all calls to generate id
diff --git a/SHADE_Engine/src/Assets/SHAssetMetaHandler.cpp b/SHADE_Engine/src/Assets/SHAssetMetaHandler.cpp
index 9ae8cde2..b75ee1ad 100644
--- a/SHADE_Engine/src/Assets/SHAssetMetaHandler.cpp
+++ b/SHADE_Engine/src/Assets/SHAssetMetaHandler.cpp
@@ -98,6 +98,7 @@ namespace SHADE
 		meta.type = static_cast<AssetType>(type);
     
     meta.isSubAsset = false;
+    meta.parent = 0;
 
     // Burn Line
     if (std::getline(metaFile, line))