Tommy Walton
fab0326188
Creating default seedList.seed files for Atom gems ( #5147 )
...
Signed-off-by: Tommy Walton <waltont@amazon.com>
4 years ago
dmcdiar
b744734719
Merge branch 'stabilization/2110' into Atom/dmcdiar/ATOM-16056
4 years ago
dmcdiar
05c374768e
Added missing passes to the ReflectionProbe baking pipeline
...
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
4 years ago
Adi Bar-Lev
bd6153f471
Material - enbale/disable metallic scale according to texture selection
...
Remark: resolves GitHub issue https://github.com/o3de/o3de/issues/2647 - ATOM-15614
Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>
4 years ago
santorac
049112d8fa
Merge pull request #5027 from aws-lumberyard-dev/Atom/santorac/MoveDoubleSided
...
Removed reference to opacity.doubleSided property that no longer exists.
4 years ago
galibzon
42a14079f2
Fix naming for DisableOptimizations vs DxcDisableOptimizations ( #5016 )
...
Signed-off-by: garrieta <garrieta@amazon.com>
4 years ago
santorac
8fd3461863
Removed reference to opacity.doubleSided property that no longer exists.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac
59da09c68b
Now that we have material version auto update support, I remove the old opacity.doubleSided property and added a rename versionUpdate step to rename it to general.doubleSided.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac
c05b900b55
Merge branch 'development' into Atom/santorac/MoveDoubleSided
4 years ago
antonmic
45701a9972
buildfix: adding .aszl to shader references
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
antonmic
6bd1b3980c
Merge pull request #4865 from aws-lumberyard-dev/Atom/antonmic/DepthOfField01
...
Atom/antonmic/depth of field01
4 years ago
santorac
a27738317b
Merge pull request #4918 from aws-lumberyard-dev/Atom/santorac/RequireAzslExtensionInShaderFile
...
The .shader file must now include the .azsl extension when referencing a .azsl file
4 years ago
antonmic
ea1284c581
fixing up atom_feature_common_asset_files.cmake
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
antonmic
972a501851
merging to resolve conflicts
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
santorac
7ba9926202
The .shader file must now include the .azsl extension when referencing a .azsl file. It will no longer be automatically appended.
...
Fixed an issue where the shader builder would incorrectly succeed when the .azsl file is missing.
Also renamed some variables for more consistency.
Updated all .shader files accordingly.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
hershey5045
f962f3d816
White Balance Updates ( #4887 )
...
* Implement simple tint for white balance color grading. Adjust temperature slider to feel linear.
Signed-off-by: rbarrand <rbarrand@amazon.com>
* Change white balance luminance preservation equation and remove unused code.
Signed-off-by: rbarrand <rbarrand@amazon.com>
Co-authored-by: rbarrand <rbarrand@amazon.com>
4 years ago
mrieggeramzn
8c6900eb06
Atom/mriegger/normaloffsetbias ( #4841 )
...
* Adding directional light shadow bias
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
* Adding normal offset bias to the directional shadow maps
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
* not time yet for this
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
* small comment fix
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
* fixing tabs
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
Adi Bar-Lev
d5431653aa
Hair and Tools Pipeline bug fixes ( #4902 )
...
- Fixed fallback connections for hair pipeline to allow disabling the parent pass hierarchy when not required
- Renamed the Thumbnail pipeline to be used as generic minimal tools pipeline
- Reused the Tools pipeline for the preview renderer - minimal FPs and passes
Remark:
- The tools pipeline should have folloup submits for reducing passes to minimal required render passes
Signed-off-by: Adi-Amazon <Adi Bar-Lev barlev@amazon.com>
Co-authored-by: Adi-Amazon <Adi Bar-Lev barlev@amazon.com>
4 years ago
galibzon
63140dc247
Atom/galibzon/atom 4608/inline to root constant ( #4897 )
...
* Changed references to "InlineConstant" to "RootConstant".
Updated AZSLC to version 1.7.34 for mac, linux & windows
Signed-off-by: garrieta <garrieta@amazon.com>
4 years ago
antonmic
4b7eac0b40
merging dev
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
antonmic
e5c7703aa7
Addressing review feedback
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
santorac
19dee0e37c
Merge branch 'development' into Atom/rbarrand/MaterialVersionUpdate
4 years ago
santorac
b32a6a1369
Reverted accidental change to StandardPBR.material type's color property name.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
hershey5045
68b585102e
Re-order some color grading operations. Increase values for SMH to account for HDR colors. ( #4856 )
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
Co-authored-by: rbarrand <rbarrand@amazon.com>
4 years ago
santorac
bf2997f960
Merge remote-tracking branch 'upstream/development' into Atom/rbarrand/MaterialVersionUpdate
4 years ago
santorac
f83b6594c9
Updated MaterialTypeSourceData to force users to move the "version" indicator to the new location at the top level of the json document.
...
(It's a simple enough change to make manually, and making .materialtype is an uncommon workflow, so not worth doing this automatically).
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
antonmic
58a518ce69
removing accidental file
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
antonmic
6642850c02
Cleaned up new Depth of Field, ready for PR
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
antonmic
60148ccc39
New Depth of Field - Minor improvements, optimizations, and now works with auto focus
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
antonmic
d04d9883bc
New Depth Of Field working quite well with a small amount of artefacts
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
antonmic
9e8e08a815
Throwing up Depth of Field WIP so Galib can investigate AP crash with shader processing
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
Guthrie Adams
2e44d96b05
Merge pull request #4734 from aws-lumberyard-dev/Atom/mriegger/directionallightbias
...
Atom/mriegger/directionallightbias
4 years ago
Guthrie Adams
fa3f3e4285
Merge pull request #4618 from aws-lumberyard-dev/Atom/EditorColorGrading
...
Implement LUT Generation Pass and hook up into Editor
4 years ago
hershey5045
85183f5936
Add weights for the remaining color grading operation. Refactor editor hdr color grading property texts. ( #266 )
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
Co-authored-by: rbarrand <rbarrand@amazon.com>
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
rbarrand
a8b6c1e77b
Add cmake file for editor scripts. Add constexpr keyword to constants. Use AZ_CRC_CE for LookModificationComponent.
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
mrieggeramzn
a114fa5531
Merge branch 'development' into Atom/mriegger/directionallightbias
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
mrieggeramzn
49f3393646
Removing unused softening boundary width controls ( #4647 )
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
mrieggeramzn
d6596ebeb6
Merge branch 'development' of https://github.com/aws-lumberyard/o3de into development
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
rbarrand
67c14c21cc
Remove lut identity assets and code, simply calculate base coordinates for LUT programmatically.
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
rbarrand
c42d82386b
Refactor and resolve PR comments.
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
Tommy Walton
2dd00e2983
Move wrinkle mask data out of default object srg ( #4578 )
...
* Refactored depth, shadow, and motion vector shaders to support custom object srgs. Added a new skin object srg and moved wrinklemask data out of the default object srg. Added a new minimal morph target asset for testing wrinkle masks to AutomatedTesting.
Signed-off-by: Tommy Walton <waltont@amazon.com>
* Fix copyright header
Signed-off-by: Tommy Walton <waltont@amazon.com>
4 years ago
rbarrand
579236ecf6
Add SPDX header for python script. Update path aliases. Re-order HDRColorGradingParams.inl to order editor properties appropriately.
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
rbarrand
2ac006a468
Add HDRColorGradingCommon.azsl.
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
rbarrand
8a8b74a6e9
Finalize shaper implementation. Refactor color grading functions.
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
Robin
b00ee3ff75
Implement lut resolution.
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
Robin
2313f912bc
Initial commit for editor LUT generation.
...
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
hershey5045
4a133f1251
Editor HDR Color Grading Component implemented under the PostFx stack ( #219 )
...
Signed-off-by: Robin <rbarrand@amazon.com>
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
Robin
580716bef6
Correct case for file.
...
Signed-off-by: Robin <rbarrand@amazon.com>
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
Robin
22dd71739f
Remove color grading pass from light adaptation parent pass due to failing ASV tests. This will be added back later on.
...
Signed-off-by: Robin <rbarrand@amazon.com>
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
Robin
ddbba7d37c
Code refactor.
...
Signed-off-by: Robin <rbarrand@amazon.com>
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago