From 652763483903a888340111242af7caa41ba32d1d Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Mon, 20 Mar 2023 16:28:08 +0800 Subject: [PATCH] Fixed nav data load bug --- SHADE_Engine/src/Assets/Asset Types/SHNavDataAsset.h | 1 - SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp | 2 +- SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/SHADE_Engine/src/Assets/Asset Types/SHNavDataAsset.h b/SHADE_Engine/src/Assets/Asset Types/SHNavDataAsset.h index 798852db..650c6136 100644 --- a/SHADE_Engine/src/Assets/Asset Types/SHNavDataAsset.h +++ b/SHADE_Engine/src/Assets/Asset Types/SHNavDataAsset.h @@ -15,7 +15,6 @@ #include #include "Math/Vector/SHVec3.h" -#include "Assets/SHAssetMacros.h" #include "SHAssetData.h" namespace SHADE diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp index 4ad81ffe..b1ccde87 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp @@ -164,7 +164,7 @@ namespace SHADE ); } - void SHBinaryLoader::LoadNavData(std::ifstream& file, SHAssetData* result) + void SHBinaryLoader::LoadNavData(std::ifstream& file, SHAssetData*& result) { auto const data = new SHNavDataAsset(); diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h b/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h index 9cc79b6d..fa3daf64 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h @@ -15,6 +15,6 @@ namespace SHADE void LoadAnimClipContainer(std::ifstream& file,SHAssetData*& result); void WriteNavData(std::ofstream& file, SHAssetData const* data); - void LoadNavData(std::ifstream& file, SHAssetData* result); + void LoadNavData(std::ifstream& file, SHAssetData*& result); }; } \ No newline at end of file