From 7df989759821f3911beb19b3e5ac9cbd5571081b Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Thu, 9 Mar 2023 01:50:26 +0800 Subject: [PATCH] Fixed bug in binary loader where result from load was always nullptr, changed pointer to pointer reference --- SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp | 4 +++- SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp index ad2a7f2c..c1e73540 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp @@ -84,7 +84,7 @@ namespace SHADE } } - void SHBinaryLoader::LoadAnimClipContainer(std::ifstream& file, SHAssetData* result, AssetPath path) + void SHBinaryLoader::LoadAnimClipContainer(std::ifstream& file, SHAssetData*& result, AssetPath path) { auto const data = new SHAnimClipContainerAsset(); @@ -120,5 +120,7 @@ namespace SHADE sizeof(uint32_t) * 2 ); } + + result = data; } } diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h b/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h index 7cf50d51..5689901d 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h @@ -12,6 +12,6 @@ namespace SHADE private: //Individual functions to write files void WriteAnimClipContainer(std::ofstream& file,SHAssetData const* data, AssetPath path); - void LoadAnimClipContainer(std::ifstream& file,SHAssetData* result, AssetPath path); + void LoadAnimClipContainer(std::ifstream& file,SHAssetData*& result, AssetPath path); }; } \ No newline at end of file