f648cb1fd8
* Update the FileIOAlias naming to make the cache, project root and engine root paths more clear The alias of `@root@`, `@assets@`, and `@projectplatformcache@` has been collapsed to `@projectproductassets@` The alias of `@devroot@` and `@engroot@` has been collapsed to `@engroot@` The alias of `@devassets@` and `@projectroot@` has been collapsed to `@projectroot@` Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated use of devassets and devroot properties in python Those properties now use projectroot and engroot Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updating the alias @engroot@ alias path comment in each platform specific LocalFileIO_*.cpp file Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed hardcoded size of 9 for the product asset alias. The ResolvePath function now just appends the @projectproductassets@ alias with the input path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Remove duplicate @projectproductassets@ check in ProcessFileTreeRequest Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fix for typos in Hydra python test Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated LocalFileIO::Copy call on Windows to use the Unicode aware CopyFileW API Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the AWSMetreicsGemAllocatorFixture to properly suppress asset cache write errors for Test file creation. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed unneeded call to set the @projectproductasstes@ alias at the bottom of the AssetSeedManagerTest SetUp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Added a deprecated alias map to the FileIO System When a deprecated alias is accessed, the FileIO System logs an AZ_Error and indicates the alias that should be used Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated python test scripts to use the projectroot binding Retrieving the AutomatedTesting project path based on "<devroot>/AutomatedTesting" has been removed. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated references to devroot and devgame within the codebase The GetAbsoluteDevGameFolderPath functions has been replaced with direct call to AZ::Utils::GetProjectPath The GetAbsoluteDevRootFolderPath functions has been replaced with direct calls to AZ::Utils::GetEnginePath Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated <engroot>/AutomatedTesting references to projectroot Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced references that assumes the project path is <engroot>/AutomatedTesting with <projectroot> in the AutomatedTesting python test Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Correct casing in emfxworkspace file Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed newly added AppendPathParts function Removed the Path constructors which accepts a PathIterable instance The PathIterable isn't safe to return to a user of the Path class as it might be referencing temporary paths supplied via PathView arguments Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed unused parameter warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Undid change to the LexicallyProximate function to set the path result to the base path. It needs to return the *this path if the pathResult is empty Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Moved the LocalFileIO ConvertToAbsolutePath implementations to AZ::Utils Fixed the ConvertToAbsolutePath implementation for Unix platforms to use a buffer that is size PATH_MAX(4096 on all our supported Unix platforms). Because the buffer before was AZ::IO::MaxPathLength which as a size of 1024, this was resulting in the Unix `realpath` function smashing the stack when it converts a path to an absolute path that is longer than 1024 characters Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the EditorCore.Tests to attach the AZ Environment to the EditorCore shared library that is statically loaded on launch. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed for DeprecatedAlaisesKeyVisitor Visit function causing the non string_view overloads being hidden causing a hidden base class function warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Changed the AWSMetricsGemMock to use a temporary for writing test assets Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the LocalFileIO::ResolvePath function to use HasRootPath to determine if a path starts with a root path such as "D:", "D:/" or "/" IsAbsolute was not the corect check as the path of "D:" is a relative path. To be absolute according to the Windows the path must have a root directory. i.e "D:/" or "D:\" Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed absolute path comment from LocalFile_UnixLike.cpp and LocalFile_Android.cpp FindFiles implementations Updated the ConvertToAlias to supply an AZ::IO::FixedMaxPath Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced usage of the @projectproductassets@ alias with @engroot@ when referring to the LmbrCentral source folder in the CopyDependencyBuilderTest and the SeedBuilderTests Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the ScriptCanvas Upgrade Tool to output backed up files to the Project User Path instead of the engine root Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed whitespacing issues in Application.cpp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Remove unnecessary creation of a FixedMaxPath in the UpgradeTool.cpp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Modified testSeedFolder variable in the SeedBuilderTests to use the @engroot@ alias instead of @projectproductassets@/.. alias when referring to the LmbrCentral Gem source path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated references to the Project Asset Cache in the PythonTests. Those tests no longer use the logic `azlmbr.paths.projectroot / "Cache" / "pc"` to retrieve a path to the cache root but instead the `azlmbr.paths.projectproductassets` constant Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed the FileIO Deprecated Alias test on Windows Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removing @projectsourceassets@ alias, as it is only used once. Updated the PhysX EditorSystemComponent.cpp to query the ProjectPath form the SettingsRegistry. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced @projectproductassets@ alias with @products@ Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Rollback changes to the PhysX EditorSystemComponent.cpp The changes to use the ProjectPath from the SettingsRegistry has been implemented in PR #4497 Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
166 lines
6.8 KiB
C++
166 lines
6.8 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
|
|
*
|
|
*/
|
|
|
|
#include <AzCore/Utils/Utils.h>
|
|
|
|
#include <Integration/Assets/AnimGraphAsset.h>
|
|
#include <EMotionFX/Source/Allocators.h>
|
|
#include <EMotionFX/Source/AnimGraphManager.h>
|
|
#include <EMotionFX/Source/AnimGraphInstance.h>
|
|
#include <EMotionFX/Source/EMotionFXManager.h>
|
|
#include <EMotionFX/Source/Importer/Importer.h>
|
|
#include <EMotionFX/Source/AnimGraph.h>
|
|
|
|
namespace EMotionFX
|
|
{
|
|
namespace Integration
|
|
{
|
|
AZ_CLASS_ALLOCATOR_IMPL(AnimGraphAsset, EMotionFXAllocator, 0)
|
|
AZ_CLASS_ALLOCATOR_IMPL(AnimGraphAssetHandler, EMotionFXAllocator, 0)
|
|
|
|
AnimGraphAsset::AnimGraphAsset(AZ::Data::AssetId id)
|
|
: EMotionFXAsset(id)
|
|
{}
|
|
|
|
AnimGraphAsset::AnimGraphInstancePtr AnimGraphAsset::CreateInstance(
|
|
EMotionFX::ActorInstance* actorInstance,
|
|
EMotionFX::MotionSet* motionSet)
|
|
{
|
|
AZ_Assert(m_emfxAnimGraph, "Anim graph asset is not loaded");
|
|
auto animGraphInstance = EMotionFXPtr<EMotionFX::AnimGraphInstance>::MakeFromNew(
|
|
EMotionFX::AnimGraphInstance::Create(m_emfxAnimGraph.get(), actorInstance, motionSet));
|
|
|
|
if (animGraphInstance)
|
|
{
|
|
animGraphInstance->SetIsOwnedByRuntime(true);
|
|
}
|
|
|
|
return animGraphInstance;
|
|
}
|
|
|
|
void AnimGraphAsset::SetData(EMotionFX::AnimGraph* animGraph)
|
|
{
|
|
m_emfxAnimGraph.reset(animGraph);
|
|
m_status = AZ::Data::AssetData::AssetStatus::Ready;
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
bool AnimGraphAssetHandler::OnInitAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
|
|
{
|
|
AnimGraphAsset* assetData = asset.GetAs<AnimGraphAsset>();
|
|
assetData->m_emfxAnimGraph.reset(EMotionFX::GetImporter().LoadAnimGraph(
|
|
assetData->m_emfxNativeData.data(),
|
|
assetData->m_emfxNativeData.size()));
|
|
|
|
if (assetData->m_emfxAnimGraph)
|
|
{
|
|
assetData->m_emfxAnimGraph->SetIsOwnedByAsset(true);
|
|
assetData->m_emfxAnimGraph->SetIsOwnedByRuntime(true);
|
|
|
|
assetData->m_emfxAnimGraph->FindAndRemoveCycles();
|
|
|
|
// The following code is required to be set so the FileManager detects changes to the files loaded
|
|
// through this method. Once EMotionFX is integrated to the asset system this can go away.
|
|
AZStd::string assetFilename;
|
|
EBUS_EVENT_RESULT(assetFilename, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, asset.GetId());
|
|
AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
|
|
if (!projectPath.empty())
|
|
{
|
|
AZ::IO::FixedMaxPathString filename{ (projectPath / assetFilename).LexicallyNormal().FixedMaxPathStringAsPosix() };
|
|
|
|
assetData->m_emfxAnimGraph->SetFileName(filename.c_str());
|
|
}
|
|
else
|
|
{
|
|
if (GetEMotionFX().GetIsInEditorMode())
|
|
{
|
|
AZ_Warning("EMotionFX", false, "Failed to retrieve project root path . Cannot set absolute filename for '%s'", assetFilename.c_str());
|
|
}
|
|
assetData->m_emfxAnimGraph->SetFileName(assetFilename.c_str());
|
|
}
|
|
}
|
|
|
|
assetData->ReleaseEMotionFXData();
|
|
AZ_Error("EMotionFX", assetData->m_emfxAnimGraph, "Failed to initialize anim graph asset %s", asset.GetHint().c_str());
|
|
return static_cast<bool>(assetData->m_emfxAnimGraph);
|
|
}
|
|
|
|
|
|
void AnimGraphAssetHandler::DestroyAsset(AZ::Data::AssetPtr ptr)
|
|
{
|
|
AnimGraphAsset* animGraphAsset = static_cast<AnimGraphAsset*>(ptr);
|
|
EMotionFX::AnimGraph* animGraph = animGraphAsset->GetAnimGraph();
|
|
|
|
if (animGraph)
|
|
{
|
|
// Get rid of all anim graph instances that refer to the anim graph we're about to destroy.
|
|
EMotionFX::GetAnimGraphManager().RemoveAnimGraphInstances(animGraph);
|
|
}
|
|
|
|
delete ptr;
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
AZ::Data::AssetType AnimGraphAssetHandler::GetAssetType() const
|
|
{
|
|
return azrtti_typeid<AnimGraphAsset>();
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
void AnimGraphAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)
|
|
{
|
|
extensions.push_back("animgraph");
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
AZ::Uuid AnimGraphAssetHandler::GetComponentTypeId() const
|
|
{
|
|
// The system is not in place to allow for components to drive creation of required components
|
|
// Future work will enable this functionality which will allow dropping in viewport or Inspector panel
|
|
// EditorAnimGraphComponent
|
|
// return AZ::Uuid("{770F0A71-59EA-413B-8DAB-235FB0FF1384}");
|
|
|
|
// Returning null keeps the animgraph from being drag/dropped
|
|
return AZ::Uuid::CreateNull();
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
const char* AnimGraphAssetHandler::GetAssetTypeDisplayName() const
|
|
{
|
|
return "EMotion FX Anim Graph";
|
|
}
|
|
|
|
const char* AnimGraphAssetHandler::GetBrowserIcon() const
|
|
{
|
|
return "Editor/Images/AssetBrowser/AnimGraph_16.svg";
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
void AnimGraphAssetBuilderHandler::InitAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset, bool loadStageSucceeded, bool isReload)
|
|
{
|
|
// Don't need to load the referenced animpgraph asset since we only care about the product ID or relative path of the product dependency
|
|
AZ_UNUSED(asset);
|
|
AZ_UNUSED(loadStageSucceeded);
|
|
AZ_UNUSED(isReload);
|
|
}
|
|
|
|
AZ::Data::AssetHandler::LoadResult AnimGraphAssetBuilderHandler::LoadAssetData(
|
|
const AZ::Data::Asset<AZ::Data::AssetData>& asset,
|
|
AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
|
|
const AZ::Data::AssetFilterCB& assetLoadFilterCB)
|
|
{
|
|
AZ_UNUSED(asset);
|
|
AZ_UNUSED(stream);
|
|
AZ_UNUSED(assetLoadFilterCB);
|
|
|
|
return AZ::Data::AssetHandler::LoadResult::LoadComplete;
|
|
}
|
|
|
|
} // namespace Integration
|
|
} // namespace EMotionFX
|