From 5623115e29fbd39b4d4889ce3b8a61657fc578f3 Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Wed, 22 Feb 2023 16:43:49 +0800 Subject: [PATCH] Added asset id into compile function to facilitate event sending --- SHADE_Engine/src/Assets/SHAssetManager.cpp | 2 +- SHADE_Engine/src/Assets/SHAssetManager.h | 2 +- .../src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SHADE_Engine/src/Assets/SHAssetManager.cpp b/SHADE_Engine/src/Assets/SHAssetManager.cpp index 363b7829..93f313b4 100644 --- a/SHADE_Engine/src/Assets/SHAssetManager.cpp +++ b/SHADE_Engine/src/Assets/SHAssetManager.cpp @@ -383,7 +383,7 @@ namespace SHADE return result; } - void SHAssetManager::CompileAsset(AssetPath const& path, bool genMeta) noexcept + void SHAssetManager::CompileAsset(AssetPath const& path, bool genMeta, AssetID id) noexcept { if (!std::filesystem::exists(path)) { diff --git a/SHADE_Engine/src/Assets/SHAssetManager.h b/SHADE_Engine/src/Assets/SHAssetManager.h index 6cac6c71..29bfe329 100644 --- a/SHADE_Engine/src/Assets/SHAssetManager.h +++ b/SHADE_Engine/src/Assets/SHAssetManager.h @@ -90,7 +90,7 @@ namespace SHADE static std::vector GetAllDataOfType(AssetType type) noexcept; static std::vector GetAllRecordOfType(AssetType type) noexcept; - static void CompileAsset(AssetPath const& path, bool genMeta) noexcept; + static void CompileAsset(AssetPath const& path, bool genMeta, AssetID id = 0) noexcept; static FolderPointer GetRootFolder() noexcept; static void RefreshDirectory() noexcept; diff --git a/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp b/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp index 791396df..cf459a29 100644 --- a/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp +++ b/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp @@ -233,7 +233,7 @@ namespace SHADE { if(ImGui::Selectable("Compile")) { - SHAssetManager::CompileAsset(file.path, !file.compiled); + SHAssetManager::CompileAsset(file.path, !file.compiled, file.assetMeta->id); QueueRefresh(); } ImGui::EndPopup();