 gadams3
|
f2b942ea56
Addressing PR feedback, updating comments, removing unused functions
|
3 years ago |
|
gadams3
|
9f296f68d0
Materials: Fixing problems with material hot reloading after shader and material type changes
|
3 years ago |
 AMZN-stankowi
|
bb3bee9b23
Added an error when materials can't resolve texture paths. (#14276)
|
3 years ago |
 santorac
|
cb51f389e0
Fixed benign unit test failure.
|
3 years ago |
|
santorac
|
8d040facca
Refactored material property code in preparation for material pipeline functor support.
|
3 years ago |
|
santorac
|
48c7447855
Fixed unit tests
|
3 years ago |
|
santorac
|
afd3f29a2c
Made material pipelines use a lua script to select a shader with the lighting model indicated in the material type.
|
3 years ago |
|
gadams3
|
8b06ceb1ec
Fixing unit tests and updating other asset utilities to dealias paths.
|
3 years ago |
|
santorac
|
e0a9fcb608
Merge branch 'development' into Atom/santorac/FixFbxOcclusionWarnings
|
4 years ago |
|
santorac
|
8231aa7b6d
Generate AllProperties material files.
|
4 years ago |
|
santorac
|
ddab03d678
Reponse to code review feedback. The main change is making GetPropertyValues return by const ref.
|
4 years ago |
|
santorac
|
8a5e4e67fa
Fixed warning messages about material file version updates. The warning was always reporting the file was at version 1 even when it specified a different materialTypeVersion. I also made the warning message distinguish between a early version number and an unspecified version number.
|
4 years ago |
|
santorac
|
1daa9fbbed
Changed the .material file format to use a flat list for material property values, instead of a tree structure.
|
4 years ago |
|
santorac
|
4bb93e4c94
Removed unnecessary MaterialSourceData::Property class.
|
4 years ago |
|
santorac
|
c2e220ce49
Renamed property 'set' to property 'group' for consistency with the prior naming.
|
4 years ago |
|
santorac
|
906db920d0
Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes3
|
4 years ago |
 lumberyard-employee-dm
|
b9824ed172
Updated all array_view uses with the C++20 span. (#7157)
|
4 years ago |
|
santorac
|
4312c636af
Got the RPI unit tests building and working again after merge. There were some incorrectly resolved conflicts that I had to re-resolve, especially in MaterialTypeSourceData::CreateMaterialTypeAsset.
|
4 years ago |
|
santorac
|
b5c7869f14
Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3
|
4 years ago |
|
santorac
|
b9ba9f5ca8
Got RPI unit tests building and passing again.
|
4 years ago |
|
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.
|
4 years ago |
|
santorac
|
45429872d6
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 |
|
santorac
|
2d6d14abf7
Changed MaterialAsset::GetPropertyValues to not auto-finalize. Client code must call Finalize manually. It's better to avoid unexpected side-effects from a const getter function.
|
4 years ago |
|
santorac
|
1fa1eaad15
Added unit tests for the new functionality.
|
4 years ago |
|
santorac
|
a627cda5ae
Got the unit tests working again.
|
4 years ago |
|
santorac
|
d3de1689ad
Removed unused lambda function.
|
4 years ago |
|
santorac
|
7d48e8209c
Updated a failing unit test.
|
4 years ago |
|
santorac
|
0f60d37fec
Fixed a bug where material version updates didn't support moving a property from one group to another.
|
4 years ago |
|
santorac
|
f4d5a75574
Fixed an issue where the wrong version number was being reported in a warning message. It showed the latest version instead of the original version number.
|
4 years ago |
|
santorac
|
1633ced656
Reports warnings when a material version auto update is applied, notifying the user they should update their source data.
|
4 years ago |
