256564a3e0
* Added a ModelReloader class that handles reloading the hierarchy of assets in the correct order. A ModelReloaderSystem that is used to make sure there is only one ModelReloader at a time for a given asset. Modified the Model, ModelLodAsset, and Buffer assets to not automatically reload, and instead handle reloads manually via AssetCatalog events. Modified the MeshLoader to kick off a reload via the ModelReloaderSystem whenever a model asset is added or changed. Signed-off-by: amzn-tommy <waltont@amazon.com> * Comment updates Signed-off-by: amzn-tommy <waltont@amazon.com> * Minor naming and comment updates based on PR feedback Signed-off-by: amzn-tommy <waltont@amazon.com> * Correcting previous commit. I flipped == to != when switching from count to find, when it should have stayed == Signed-off-by: amzn-tommy <waltont@amazon.com> * Updating RenderCommon header Signed-off-by: amzn-tommy <waltont@amazon.com> * Removing unneeded headers Signed-off-by: amzn-tommy <waltont@amazon.com> * Reverting RayTracingFeatureProcessor change following Doug's guidance. This logic was tricky to get right initially, and leads to TDR when incorrect, so leaving as is. Signed-off-by: amzn-tommy <waltont@amazon.com> * Removing a tab Signed-off-by: amzn-tommy <waltont@amazon.com> * Added missing #include for AssetId Signed-off-by: amzn-tommy <waltont@amazon.com> * Adding missing RTTI header Signed-off-by: amzn-tommy <waltont@amazon.com> * Include ModelAsset definition intead of forward declaring it to avoid a static assert on Linux Signed-off-by: amzn-tommy <waltont@amazon.com>
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <Atom/Feature/Mesh/ModelReloaderSystemInterface.h>
|
|
|
|
#include <AzCore/Asset/AssetCommon.h>
|
|
#include <AzCore/RTTI/RTTI.h>
|
|
#include <AzCore/std/containers/unordered_map.h>
|
|
|
|
namespace AZ
|
|
{
|
|
namespace Render
|
|
{
|
|
class ModelReloader;
|
|
|
|
using RemoveModelFromReloaderSystemEvent = Event<const Data::AssetId&>;
|
|
|
|
class ModelReloaderSystem
|
|
: public ModelReloaderSystemInterface
|
|
{
|
|
public:
|
|
AZ_RTTI(Render::ModelReloaderSystem, "{8C85ECCD-B6C8-4949-B26C-9C4F1020F2B8}", Render::ModelReloaderSystemInterface);
|
|
|
|
void ReloadModel(Data::Asset<RPI::ModelAsset> modelAsset, ModelReloadedEvent::Handler& onReloadedEventHandler) override;
|
|
|
|
private:
|
|
void RemoveReloader(const Data::AssetId& assetId);
|
|
|
|
// Keep track of all the pending reloads so there are no duplicates
|
|
AZStd::unordered_map<Data::AssetId, ModelReloader*> m_pendingReloads;
|
|
AZStd::mutex m_pendingReloadMutex;
|
|
|
|
RemoveModelFromReloaderSystemEvent::Handler m_removeModelHandler{
|
|
[&](const Data::AssetId& assetId)
|
|
{
|
|
RemoveReloader(assetId);
|
|
} };
|
|
|
|
friend class ModelReloader;
|
|
};
|
|
|
|
} // namespace Render
|
|
} // namespace AZ
|