You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
santorac
a896ff11bc
Changed .material serialization to avoid loading the .materialtype file, since the .material builder doesn't declare a source dependency on the .materialtype. Otherwise there can be ambiguous edge cases where changes to the .materialtype might or might not impact the baked MaterialAsset. Note that another option would have been to add a the appropriate source dependency, but that would hurt iteration time as any change to the .materialtype file would cause every .material file and .fbx to rebuild.
...
These changes have the added benefit of simplifying some of the serialization code. MaterialSourceDataSerializer is no longer needed, as its main purpose was to pass the MaterialTypeSourceData down to the MaterialPropertyValueSerializer.
Before, the JSON serialization system gave a lot of data flexibility because it did best-effort conversions, like allowing a float to be loaded as an int for example. But now the material serialization code doesn't know target data type, so it has to assume the data type based on what's in the .material file, and then the MaterialAsset will convert the data to the appropriate type later when Finalize() is called.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
..
LuaMaterialFunctor.cpp
Changes call from AZ_TRACE to AZ_PROFILE. AZ_TRACE uses a driller bus that is going to be removed
4 years ago
MaterialAsset.cpp
Changed .material serialization to avoid loading the .materialtype file, since the .material builder doesn't declare a source dependency on the .materialtype. Otherwise there can be ambiguous edge cases where changes to the .materialtype might or might not impact the baked MaterialAsset. Note that another option would have been to add a the appropriate source dependency, but that would hurt iteration time as any change to the .materialtype file would cause every .material file and .fbx to rebuild.
4 years ago
MaterialAssetCreator.cpp
Switched back to making MaterialAsset::GetPropertyValues automatically finalize the material asset. I realized that it's too burdensome to expect client code to call Finalize on the MaterialAsset; every code that calls GetPropertyValues would have to call Finalize(). Instead of using const_cast in GetPropertyValues like I was doing before, I just changed GetPropertyValues to be a non-const function. There were a few places in Decal code I had to update to pass non-const MaterialAsset pointers. This isn't ideal, but I think it's better than the alternatives.
4 years ago
MaterialDynamicMetadata.cpp
Shorten copyright headers by splitting into 2 lines ( #2213 )
5 years ago
MaterialFunctor.cpp
LYN-6882 release builds are executing code in asserts ( #4305 )
4 years ago
MaterialPropertiesLayout.cpp
Updated the naming convention for material property "names" vs "IDs".
5 years ago
MaterialPropertyDescriptor.cpp
Got the unit tests working again.
4 years ago
MaterialPropertyValue.cpp
Fixed MaterialPropertyValue::FromAny to preserve the Hint string when converting Asset objects. This fixed an issue where the hint didn't show up in the Material Component's instance inspector.
4 years ago
MaterialTypeAsset.cpp
Moving material type asset PostInit call to be consistent with material asset
4 years ago
MaterialTypeAssetCreator.cpp
Merged MaterialAssetCreatorCommon class into MaterialTypeAssetCreator because it is no longer needed for MaterialAssetCreator.
4 years ago
MaterialVersionUpdate.cpp
First pass at reworking and formalizing the way deferred material asset baking works. The feature basically works but needs more testing.
4 years ago
ShaderCollection.cpp
cherry-pick 48f3bb7d
4 years ago