santorac
c5b128bec4
Before, the material builder was loading the MaterialTypeAsset and doing some processing with it, but was avoiding declaring job dependencies that would cause reprocessing lots of assets when a shader or .materialtype file changes. Reading the asset data isn't safe when not declaring a job dependency (or when declaring a weak job dependency like OrderOnce which is the case here). This caused to several known bugs. The main change here is it no longer loads the MaterialTypeAsset at all; all other changes flow from there. The biggest changes (when deferred material processing is enabled) are ... 1) MaterialSourceData no longer loads MaterialTypeAsset. All it really needs is to determine whether a string is an image file reference or an enum value, which is easy to do by just looking for the "." for the extension. 2) MaterialAssetCreator no longer produces a finalized material asset. It no longer uses MaterialAssetCreatorCommon because that only produces a non-finalized MaterialAsset, which has very different needs for the SetPropertyValue function. (We could consider merging MaterialAssetCreatorCommon into MaterialTypeAssetCreator since that's the only subclass at this point). And it doesn't do any validation against the properties layout since that can be done at runtime. 3) Moved processing of enum property values from MaterialSourceData to MaterialAsset::Finalize (this was the only thing being done in the builder that actually needed to read the material type asset data). Also... - Updated the MaterialAsset class mostly to clarify and formalize the two different modes it can be in: whether it is finalized or not. - Merged the separate "IncludeMaterialPropertyNames" registry settings from MaterialConverterSystemComponent and MaterialBuilder into one "FinalizeMaterialAssets" setting used for both. - Removed MaterialSourceData::ApplyVersionUpdates. Now the flow of data is the same regardless of whether the materials are finalized by the AP or at runtime. Version updates are always applied on the MaterialAsset. - Added a validation check to MaterialTypeAssetCreator ensuring that once a property is renamed, the old name can never be used again for a new property. This assumption was already made previously, but not formalized, in that Material::FindPropertyIndex does not expect every caller to provide a version number for the material property name, also the material asset's list of raw property names was never versioned. The only way for this to be a safe assumption is to prevent reuse of old names. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
102 lines
3.1 KiB
C++
102 lines
3.1 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 <Atom/RPI.Reflect/Material/MaterialVersionUpdate.h>
|
|
#include <Atom/RPI.Reflect/Material/MaterialAsset.h>
|
|
#include <AzCore/Serialization/SerializeContext.h>
|
|
|
|
namespace AZ
|
|
{
|
|
namespace RPI
|
|
{
|
|
void MaterialVersionUpdate::RenamePropertyAction::Reflect(ReflectContext* context)
|
|
{
|
|
if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
|
|
{
|
|
serializeContext->Class<RenamePropertyAction>()
|
|
->Version(1)
|
|
->Field("From", &RenamePropertyAction::m_fromPropertyId)
|
|
->Field("To", &RenamePropertyAction::m_toPropertyId)
|
|
;
|
|
}
|
|
}
|
|
|
|
void MaterialVersionUpdate::Reflect(ReflectContext* context)
|
|
{
|
|
MaterialVersionUpdate::RenamePropertyAction::Reflect(context);
|
|
|
|
if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
|
|
{
|
|
serializeContext->RegisterGenericType<MaterialVersionUpdate::Actions>();
|
|
|
|
serializeContext->Class<MaterialVersionUpdate>()
|
|
->Version(1)
|
|
->Field("ToVersion", &MaterialVersionUpdate::m_toVersion)
|
|
->Field("Actions", &MaterialVersionUpdate::m_actions)
|
|
;
|
|
}
|
|
}
|
|
|
|
MaterialVersionUpdate::MaterialVersionUpdate(uint32_t toVersion)
|
|
: m_toVersion(toVersion)
|
|
{
|
|
}
|
|
|
|
uint32_t MaterialVersionUpdate::GetVersion() const
|
|
{
|
|
return m_toVersion;
|
|
}
|
|
|
|
void MaterialVersionUpdate::SetVersion(uint32_t toVersion)
|
|
{
|
|
m_toVersion = toVersion;
|
|
}
|
|
|
|
bool MaterialVersionUpdate::ApplyPropertyRenames(AZ::Name& propertyId) const
|
|
{
|
|
bool renamed = false;
|
|
|
|
for (const auto& action : m_actions)
|
|
{
|
|
if (action.m_fromPropertyId == propertyId)
|
|
{
|
|
propertyId = action.m_toPropertyId;
|
|
renamed = true;
|
|
}
|
|
}
|
|
|
|
return renamed;
|
|
}
|
|
|
|
bool MaterialVersionUpdate::ApplyVersionUpdates(MaterialAsset& materialAsset) const
|
|
{
|
|
bool changesWereApplied = false;
|
|
|
|
for (auto& [name, value] : materialAsset.m_rawPropertyValues)
|
|
{
|
|
if (ApplyPropertyRenames(name))
|
|
{
|
|
changesWereApplied = true;
|
|
}
|
|
}
|
|
|
|
return changesWereApplied;
|
|
}
|
|
|
|
const AZ::RPI::MaterialVersionUpdate::Actions& MaterialVersionUpdate::GetActions() const
|
|
{
|
|
return m_actions;
|
|
}
|
|
|
|
void MaterialVersionUpdate::AddAction(const RenamePropertyAction& action)
|
|
{
|
|
m_actions.push_back(action);
|
|
}
|
|
} // namespace RPI
|
|
} // namespace AZ
|