From f7cca42e59a54b3b8204488cf7250adb21b49e4f Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Tue, 15 Nov 2022 13:53:15 +0800 Subject: [PATCH 1/2] Added shlog information source --- .../Libraries/Loaders/SHModelLoader.cpp | 2 +- .../Libraries/Loaders/SHTextBasedLoader.cpp | 4 ++-- .../Libraries/Loaders/SHTextureLoader.cpp | 4 ++-- SHADE_Engine/src/Assets/SHAssetManager.cpp | 22 +++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp index 74aa5350..3978c02f 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp @@ -52,7 +52,7 @@ namespace SHADE std::ifstream file{ path.string(), std::ios::in | std::ios::binary }; if (!file.is_open()) { - SHLOG_ERROR("Unable to open SHMesh File: {}", path.string()); + SHLOG_ERROR("[Model Loader] Unable to open SHModel File: {}", path.string()); return; } diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHTextBasedLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHTextBasedLoader.cpp index b23130f3..4858e639 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHTextBasedLoader.cpp +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHTextBasedLoader.cpp @@ -26,7 +26,7 @@ namespace SHADE if (!file.is_open()) { - SHLOG_ERROR("Unable to open text File: {}", path.string()); + SHLOG_ERROR("[Text Loader] Unable to open text File: {}", path.string()); return nullptr; } std::stringstream stream; @@ -70,7 +70,7 @@ namespace SHADE if (!file.is_open()) { - SHLOG_ERROR("Unable to open text File: {}", path.string()); + SHLOG_ERROR("[Text Loader] Unable to open text File: {}", path.string()); return; } diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHTextureLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHTextureLoader.cpp index 423301dd..96dabf18 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHTextureLoader.cpp +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHTextureLoader.cpp @@ -22,7 +22,7 @@ namespace SHADE std::ifstream file{ path.string(), std::ios::in | std::ios::binary }; if (!file.is_open()) { - SHLOG_ERROR("Error opening SHTexture file: {}", path.string()); + SHLOG_ERROR("[Texture Loader] Error opening SHTexture file: {}", path.string()); } auto const intBytes{ sizeof(uint32_t) }; @@ -61,7 +61,7 @@ namespace SHADE std::ofstream file{ path, std::ios::out | std::ios::binary }; if (!file.is_open()) { - SHLOG_ERROR("Unable to open file for writing texture file: {}", path.string()); + SHLOG_ERROR("[Texture Loader] Unable to open file for writing texture file: {}", path.string()); } auto asset = *dynamic_cast(data); diff --git a/SHADE_Engine/src/Assets/SHAssetManager.cpp b/SHADE_Engine/src/Assets/SHAssetManager.cpp index b4ea7d35..40cf9df6 100644 --- a/SHADE_Engine/src/Assets/SHAssetManager.cpp +++ b/SHADE_Engine/src/Assets/SHAssetManager.cpp @@ -197,7 +197,7 @@ namespace SHADE break; default: - SHLOG_ERROR("Asset type of {} not an internal asset type, cannot be created", name); + SHLOG_ERROR("[Asset Manager] Asset type of {} not an internal asset type, cannot be created", name); return 0; } @@ -249,14 +249,14 @@ namespace SHADE return true; } - SHLOG_ERROR("Asset data has not been written into, cannot be saved: {}", + SHLOG_ERROR("[Asset Manager] Asset data has not been written into, cannot be saved: {}", asset.path.filename().string()); return false; } } - SHLOG_WARNING("Asset id: {} not an internal asset type, save cannot be triggered", id); + SHLOG_WARNING("[Asset Manager] Asset id: {} not an internal asset type, save cannot be triggered", id); return false; } @@ -274,10 +274,10 @@ namespace SHADE { return (DeleteLocalFile(asset.path) && DeleteLocalFile(asset.path.string() + META_EXTENSION.data())); } - SHLOG_WARNING("Asset id: {} not an internal asset type, file deletion not allowed", id); + SHLOG_WARNING("[Asset Manager] Asset id: {} not an internal asset type, file deletion not allowed", id); } - SHLOG_WARNING("Asset id does not exist, nothing was deleted: {}", id); + SHLOG_WARNING("[Asset Manager] Asset id does not exist, nothing was deleted: {}", id); return false; } @@ -311,7 +311,7 @@ namespace SHADE std::filesystem::path const newPath{ GenerateLocalPath(path) }; if (newPath.empty()) { - SHLOG_WARNING("Unsupported file format for asset: {}", path.string()); + SHLOG_WARNING("[Asset Manager] Unsupported file format for asset: {}", path.string()); return 0; } @@ -363,7 +363,7 @@ namespace SHADE { if (!std::filesystem::exists(path)) { - SHLOG_ERROR("Path provided does not point to a file: {}", path.string()); + SHLOG_ERROR("[Asset Manager] Path provided does not point to a file: {}", path.string()); return; } AssetPath newPath; @@ -387,14 +387,14 @@ namespace SHADE auto pathGen = SHTextureCompiler::CompileTextureAsset(path); if (!pathGen.has_value()) { - SHLOG_ERROR("Texture Compilation Failed for: {}", path.string()); + SHLOG_ERROR("[Asset Manager] Texture Compilation Failed for: {}", path.string()); return; } newPath = pathGen.value(); } else { - SHLOG_WARNING("File Type compilation not yet Implemented: {}", path.string()); + SHLOG_WARNING("[Asset Manager] File Type compilation not yet Implemented: {}", path.string()); return; } @@ -479,7 +479,7 @@ namespace SHADE SHAssetData* data = loaders[static_cast(asset.type)]->Load(asset.path); if (data == nullptr) { - SHLOG_ERROR("Unable to load asset into memory: {}\n", asset.path.string()); + SHLOG_ERROR("[Asset Manager] Unable to load asset into memory: {}\n", asset.path.string()); } else { @@ -496,7 +496,7 @@ namespace SHADE if (parentData == nullptr) { - SHLOG_ERROR("Unable to load asset into memory: {}\n", parent.path.string()); + SHLOG_ERROR("[Asset Manager] Unable to load asset into memory: {}\n", parent.path.string()); } else { -- 2.40.1 From cc2587a7bd2d8af2c2f6e94b1ead82e01984e490 Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Tue, 22 Nov 2022 21:54:51 +0800 Subject: [PATCH 2/2] Added recognition for material and prefab types when generating meta files --- SHADE_Engine/src/Assets/SHAssetManager.cpp | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/SHADE_Engine/src/Assets/SHAssetManager.cpp b/SHADE_Engine/src/Assets/SHAssetManager.cpp index 67924abf..2aaf226b 100644 --- a/SHADE_Engine/src/Assets/SHAssetManager.cpp +++ b/SHADE_Engine/src/Assets/SHAssetManager.cpp @@ -653,6 +653,34 @@ namespace SHADE return newAsset.id; } + else if(ext == MATERIAL_EXTENSION) + { + SHAsset newAsset{ + path.stem().string(), + GenerateAssetID(AssetType::MATERIAL), + AssetType::MATERIAL, + path, + false + }; + assetCollection.emplace(newAsset.id, newAsset); + SHAssetMetaHandler::WriteMetaData(newAsset); + + return newAsset.id; + } + else if (ext == PREFAB_EXTENSION) + { + SHAsset newAsset{ + path.stem().string(), + GenerateAssetID(AssetType::PREFAB), + AssetType::PREFAB, + path, + false + }; + assetCollection.emplace(newAsset.id, newAsset); + SHAssetMetaHandler::WriteMetaData(newAsset); + + return newAsset.id; + } else if (ext == FONT_EXTENSION) { SHAsset newAsset{ -- 2.40.1