Work on asset loading

Author: KredeGC

Mahakam/src/Mahakam/Asset/Asset.h

@@ -260,6 +260,7 @@ namespace Mahakam
 
 		block->Control.UseCount = 0;
 		block->Control.ID = 0;
+		block->Control.State = AssetDatabase::AssetState::Loaded;
 		block->Control.MoveData = mover;
 		block->Control.DeleteData = deleter;
 

Mahakam/src/Mahakam/Asset/AssetDatabase.cpp

@@ -103,6 +103,10 @@ namespace Mahakam
 
 			return asset;
 		};
+		serializer.Load = [](AssetDatabase::Reader& reader) -> Asset<void>
+		{
+			return nullptr;
+		};
 
 		return serializer;
 	}
@@ -281,16 +285,6 @@ namespace Mahakam
 		RecursiveCacheAssets(FileUtility::ASSET_PATH);
 	};
 
-	//const std::filesystem::path& AssetDatabase::GetAssetImportPath(AssetDatabase::AssetID id)
-	MH_DEFINE_FUNC(AssetDatabase::GetAssetImportPath, const std::filesystem::path&, AssetDatabase::AssetID id)
-	{
-		auto iter = s_AssetPaths.find(id);
-		if (iter != s_AssetPaths.end())
-			return iter->second;
-
-		return EmptyPath;
-	};
-
 	//const AssetDatabase::AssetMap& AssetDatabase::GetAssetHandles()
 	MH_DEFINE_FUNC(AssetDatabase::GetAssetHandles, const AssetDatabase::AssetMap&)
 	{

Mahakam/src/Mahakam/Asset/AssetDatabase.h

@@ -31,16 +31,24 @@ namespace Mahakam
 		// - A move function is used in the control block for moving another asset (of the same type) into this space
 		// - A delete function is used in the control block for deleting when no longer used
 
-        typedef uint64_t AssetID;
+        using AssetID = uint64_t;
 
 		// TODO: Remove
 		typedef std::string ExtensionType;
 
+		enum class AssetState
+		{
+			Loaded = 0,
+			Processing,
+			Streaming
+		};
+
 		struct ControlBlock
 		{
 			// ID 0 is guaranteed to be invalid
 			size_t UseCount;
 			AssetID ID;
+			AssetState State;
 			void (*MoveData)(void*, void*);
 			void (*DeleteData)(void*);
 		};
@@ -51,36 +59,31 @@ namespace Mahakam
 		struct StreamBlock
 		{
 			Reader File;
-			void (*Stream)(void*) = nullptr;
-			void (*Load)(void*) = nullptr;
 		};
 
 		struct AssetSerializer
 		{
 			bool (*Serialize)(Writer&, const std::filesystem::path& filepath, Asset<void>) = nullptr;
 			Asset<void> (*Deserialize)(Reader&, const std::filesystem::path& filepath) = nullptr;
+			Asset<void> (*Load)(Reader&) = nullptr;
 		};
 
 	private:
 		using AssetMap = UnorderedMap<AssetID, std::filesystem::path>;
-
-		using ImporterMap = UnorderedMap<ExtensionType, Ref<AssetImporter>>;
 		using LoadedMap = UnorderedMap<AssetID, ControlBlock*>;
 
-		// TODO: Use AssetInfo instead of filepath
+		// TODO: Remove since filepaths are the same as ID
 		inline static AssetMap s_AssetPaths;
-
-		inline static ImporterMap s_AssetImporters; // Legacy importers
 		inline static LoadedMap s_LoadedAssets;
 
-
-		// TODO: Move into own class
-		inline static const std::filesystem::path EmptyPath = "";
-
 		inline static UnorderedMap<std::string, AssetSerializer> s_Serializers;
 
+		// Legacy importers
+		using ImporterMap = UnorderedMap<ExtensionType, Ref<AssetImporter>>;
+		inline static ImporterMap s_AssetImporters;
 		template<const char* Extension, const char* LegacyExt>
 		static void LoadLegacySerializer();
+		// Legacy importers
 
 		static void LoadDefaultSerializers();
 
@@ -100,7 +103,6 @@ namespace Mahakam
 		MH_DECLARE_FUNC(RefreshAssetPaths, void); // Refreshes the asset paths, finding new assets and removing unused ones
 
 		// Various getters
-		MH_DECLARE_FUNC(GetAssetImportPath, const std::filesystem::path&, AssetID id); // Gets the import path of a given asset
 		MH_DECLARE_FUNC(GetAssetHandles, const AssetMap&); // Gets a reference to all assets, whether they're currently loaded or not
 		MH_DECLARE_FUNC(GetAssetReferences, size_t, AssetID id); // Gets the amount of references to this asset, if any
 

Mahakam/src/Mahakam/Asset/AssetLookup.h

@@ -22,18 +22,19 @@ namespace Mahakam
     template<fixed_string S>
     struct AssetLookup {};
 
-    template<AssetDatabase::AssetID I>
+    template<typename T, AssetDatabase::AssetID I>
     struct AssetBaseLookup
     {
         constexpr static AssetDatabase::AssetID ID = I;
 
-        template<typename T>
         operator Asset<T>()
         {
             return Asset<T>(ID);
         }
     };
 
+    class Material;
+
     template<>
-    struct AssetLookup<"test/assets/materials/skybox"> : AssetBaseLookup<1413214623375882268ULL> {};
+    struct AssetLookup<"test/assets/materials/skybox"> : AssetBaseLookup<Material, 1413214623375882268ULL> {};
 }

Mahakam/src/Mahakam/BinarySerialization/FileStream.h

@@ -18,6 +18,9 @@ namespace Mahakam::Serialization
         FileReader(const std::filesystem::path& filepath) :
             m_File(std::fopen(filepath.string().c_str(), "rb")) {}
 
+        FileReader(const FileReader&) = delete;
+        FileReader(FileReader&&) = delete;
+
         ~FileReader()
         {
             if (m_File)
@@ -83,6 +86,9 @@ namespace Mahakam::Serialization
         FileWriter(const std::filesystem::path& filepath) :
             m_File(std::fopen(filepath.string().c_str(), "wb")) {}
 
+        FileWriter(const FileWriter&) = delete;
+        FileWriter(FileWriter&&) = delete;
+
         ~FileWriter()
         {
             if (m_File)

Mahakam/src/Mahakam/Core/Random.cpp

@@ -5,13 +5,10 @@ namespace Mahakam
 {
 	std::random_device Random::rd;
 	std::default_random_engine Random::generator(rd());
-	std::uniform_int_distribution<uint64_t> Random::distribution(0, 0xFFFFFFFFFFFFFFFF);
+	std::uniform_int_distribution<uint64_t> Random::distribution(1, 0xFFFFFFFFFFFFFFFF);
 
 	uint64_t Random::GetRandomID64()
 	{
-		uint64_t id = 0;
-		while (id == 0)
-			id = distribution(generator);
-		return id;
+		return distribution(generator);
 	}
 }

Sandbox/imgui.ini

@@ -33,7 +33,7 @@ DockId=0x00000009,0
 
 [Window][Scene Hierarchy]
 Pos=0,22
-Size=381,643
+Size=370,643
 Collapsed=0
 DockId=0x00000002,0
 
@@ -44,8 +44,8 @@ Collapsed=0
 DockId=0x00000003,0
 
 [Window][Scene View]
-Pos=383,22
-Size=1026,643
+Pos=372,22
+Size=1037,643
 Collapsed=0
 DockId=0x00000007,0
 
@@ -250,8 +250,8 @@ Column 2  Width=75
 DockSpace         ID=0x3FC20BEE Window=0x9A404470 Pos=0,45 Size=1920,995 Split=X
   DockNode        ID=0x00000001 Parent=0x3FC20BEE SizeRef=1409,995 Split=Y
     DockNode      ID=0x00000005 Parent=0x00000001 SizeRef=1920,643 Split=X
-      DockNode    ID=0x00000002 Parent=0x00000005 SizeRef=381,993 Selected=0x2E9237F7
-      DockNode    ID=0x00000009 Parent=0x00000005 SizeRef=1026,993 Split=Y
+      DockNode    ID=0x00000002 Parent=0x00000005 SizeRef=370,993 Selected=0x2E9237F7
+      DockNode    ID=0x00000009 Parent=0x00000005 SizeRef=1037,993 Split=Y
         DockNode  ID=0x00000004 Parent=0x00000009 SizeRef=727,150 Selected=0x968648AE
         DockNode  ID=0x00000007 Parent=0x00000009 SizeRef=727,748 CentralNode=1 Selected=0x08AA43A5
     DockNode      ID=0x0000000A Parent=0x00000001 SizeRef=1920,350 Split=X Selected=0xBF096F38