Fix issue with asset loading to be properly canceled when reimporting file

#1894

Source/Engine/Audio/AudioClip.cpp

@@ -225,6 +225,7 @@ bool AudioClip::ExtractDataRaw(Array<byte>& resultData, AudioDataInfo& resultDat
 
 void AudioClip::CancelStreaming()
 {
+    Asset::CancelStreaming();
     CancelStreamingTasks();
 }
 

Source/Engine/Content/Asset.cpp

@@ -522,6 +522,14 @@ void Asset::InitAsVirtual()
 
 void Asset::CancelStreaming()
 {
+    // Cancel loading task but go over asset locker to prevent case if other load threads still loads asset while it's reimported on other thread
+    Locker.Lock();
+    ContentLoadTask* loadTask = _loadingTask;
+    Locker.Unlock();
+    if (loadTask)
+    {
+        loadTask->Cancel();
+    }
 }
 
 #if USE_EDITOR

Source/Engine/Content/Assets/Model.cpp

@@ -783,6 +783,7 @@ void Model::InitAsVirtual()
 
 void Model::CancelStreaming()
 {
+    Asset::CancelStreaming();
     CancelStreamingTasks();
 }
 

Source/Engine/Content/Assets/SkinnedModel.cpp

@@ -969,6 +969,7 @@ void SkinnedModel::InitAsVirtual()
 
 void SkinnedModel::CancelStreaming()
 {
+    Asset::CancelStreaming();
     CancelStreamingTasks();
 }
 

Source/Engine/Content/Loading/Tasks/LoadAssetDataTask.h

@@ -48,6 +48,8 @@ protected:
     // [ContentLoadTask]
     Result run() override
     {
+        if (IsCancelRequested())
+            return Result::Ok;
         PROFILE_CPU();
 
         AssetReference<BinaryAsset> ref = _asset.Get();
@@ -67,8 +69,6 @@ protected:
                 {
                     if (IsCancelRequested())
                         return Result::Ok;
-
-                    // Load it
 #if TRACY_ENABLE
                     ZoneScoped;
                     ZoneName(*name, name.Length());

Source/Engine/Content/Storage/FlaxStorage.cpp

@@ -1302,15 +1302,15 @@ void FlaxStorage::CloseFileHandles()
     // In those situations all the async tasks using this storage should be cancelled externally
 
     // Ensure that no one is using this resource
-    int32 waitTime = 10;
+    int32 waitTime = 100;
     while (Platform::AtomicRead(&_chunksLock) != 0 && waitTime-- > 0)
-        Platform::Sleep(10);
+        Platform::Sleep(1);
     if (Platform::AtomicRead(&_chunksLock) != 0)
     {
         // File can be locked by some streaming tasks (eg. AudioClip::StreamingTask or StreamModelLODTask)
+        Entry e;
         for (int32 i = 0; i < GetEntriesCount(); i++)
         {
-            Entry e;
             GetEntry(i, e);
             Asset* asset = Content::GetAsset(e.ID);
             if (asset)
@@ -1320,8 +1320,12 @@ void FlaxStorage::CloseFileHandles()
             }
         }
     }
+    waitTime = 100;
+    while (Platform::AtomicRead(&_chunksLock) != 0 && waitTime-- > 0)
+        Platform::Sleep(1);
     ASSERT(_chunksLock == 0);
 
+    // Close file handles (from all threads)
     _file.DeleteAll();
 }
 

Source/Engine/Graphics/Textures/TextureBase.cpp

@@ -660,6 +660,7 @@ uint64 TextureBase::GetMemoryUsage() const
 
 void TextureBase::CancelStreaming()
 {
+    Asset::CancelStreaming();
     _texture.CancelStreamingTasks();
 }