Commit Graph

363 Commits

Author SHA1 Message Date
mrieggeramzn dd1d515e37 Atom/mriegger/normaloffsetbiasarealight (#4917)
* Adding directional light shadow bias
* Adding normal offset bias for projected shadows

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-11-16 11:08:25 -08:00
mrieggeramzn 533b80095b Fix for cascade shadow map clipping out too close to the camera (#5509)
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-11-15 10:16:06 -08:00
galibzon b0dfe26232 The Build Time Stamp of ShaderAsset And (#5373)
* The Build Time Stamp of ShaderAsset And
ShaderVariantAsset Should Be Based On
GetTimeUTCMilliSecond()

GetTimeNowMicroseconds() is useful to measure time stamp differences.
GetTimeUTCMilliSecond() is for time stamps based on absolute clock/wall time.

* Updated DiffuseGlobalIllumination precompiled shaders

Co-authored-by: dmcdiar <dmcdiar@amazon.com>
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
2021-11-12 13:51:07 -06:00
dmcdiar eb60dd404b Moved probe exposure to specular only, since it's not used by the diffuse
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-11-09 12:17:58 -07:00
dmcdiar be934a4b32 Merge branch 'stabilization/2110' into Atom/dmcdiar/ATOM-16247 2021-11-08 16:44:35 -07:00
dmcdiar fe005c9c50 Added exposure controls to the ReflectionProbe component
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-11-08 16:11:30 -07:00
santorac 2b4537febf Merge branch 'stabilization/2110' into Atom/santorac/FixedThinObjectTransmission 2021-11-08 10:18:18 -08:00
galibzon 621194e593 StandardMultilayerPBR_ForwardPass.azsl. the type of input.m_normal is (#5385)
float

Github issue: https://github.com/o3de/o3de/issues/2522

Change to float3. The current ASV tests are not affected but
using the RPI/Mesh example with Mesh: objects/suzanne.azmodel
and the material:
StandardMultilayerPbrTestCases/005_UseDisplacement.material

Showed a clear improvement.

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
2021-11-06 07:25:42 -05:00
santorac fbc35a8169 Applied a fix from @jeremyong-az to get ThinObject transmission working.
Also added a new test material for ThinObject transmission.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-04 22:09:11 -07:00
antonmic 4e9b9067e0 merging to re-try failed AR
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-11-02 17:17:56 -07:00
antonmic 0900f5075f Removed unused SsaoHalfRes pass
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-11-02 14:40:18 -07:00
Tommy Walton fab0326188 Creating default seedList.seed files for Atom gems (#5147)
Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-02 13:42:11 -07:00
dmcdiar b744734719 Merge branch 'stabilization/2110' into Atom/dmcdiar/ATOM-16056 2021-11-01 21:18:33 -07:00
dmcdiar 05c374768e Added missing passes to the ReflectionProbe baking pipeline
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-11-01 20:13:00 -07:00
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>
2021-10-28 13:24:49 -04:00
santorac 049112d8fa Merge pull request #5027 from aws-lumberyard-dev/Atom/santorac/MoveDoubleSided
Removed reference to opacity.doubleSided property that no longer exists.
2021-10-26 18:54:12 -07:00
galibzon 42a14079f2 Fix naming for DisableOptimizations vs DxcDisableOptimizations (#5016)
Signed-off-by: garrieta <garrieta@amazon.com>
2021-10-26 17:48:28 -05:00
santorac 8fd3461863 Removed reference to opacity.doubleSided property that no longer exists.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-26 15:38:09 -07:00
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>
2021-10-25 13:35:00 -07:00
santorac c05b900b55 Merge branch 'development' into Atom/santorac/MoveDoubleSided 2021-10-25 09:45:39 -07:00
antonmic 45701a9972 buildfix: adding .aszl to shader references
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-10-22 14:48:15 -07:00
antonmic 6bd1b3980c Merge pull request #4865 from aws-lumberyard-dev/Atom/antonmic/DepthOfField01
Atom/antonmic/depth of field01
2021-10-22 13:41:36 -07:00
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
2021-10-22 12:45:04 -07:00
antonmic ea1284c581 fixing up atom_feature_common_asset_files.cmake
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-10-22 12:14:35 -07:00
antonmic 972a501851 merging to resolve conflicts
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-10-22 12:11:49 -07:00
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>
2021-10-22 11:10:37 -07:00
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>
2021-10-22 09:53:48 -07:00
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>
2021-10-22 11:48:04 -05:00
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>
2021-10-22 09:21:06 -04:00
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>
2021-10-22 05:52:50 -05:00
antonmic 4b7eac0b40 merging dev
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-10-21 22:37:12 -07:00
antonmic e5c7703aa7 Addressing review feedback
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-10-21 20:15:39 -07:00
santorac 19dee0e37c Merge branch 'development' into Atom/rbarrand/MaterialVersionUpdate 2021-10-21 15:57:57 -07:00
santorac b32a6a1369 Reverted accidental change to StandardPBR.material type's color property name.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-21 12:52:28 -07:00
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>
2021-10-21 12:06:46 -07:00
santorac bf2997f960 Merge remote-tracking branch 'upstream/development' into Atom/rbarrand/MaterialVersionUpdate 2021-10-21 11:14:03 -07:00
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>
2021-10-21 11:05:47 -07:00
antonmic 58a518ce69 removing accidental file
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-10-21 04:52:46 -07:00
antonmic 6642850c02 Cleaned up new Depth of Field, ready for PR
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-10-21 04:44:26 -07:00
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>
2021-10-21 01:23:43 -07:00
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>
2021-10-21 00:42:48 -07:00
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>
2021-10-20 14:10:11 -07:00
Guthrie Adams 2e44d96b05 Merge pull request #4734 from aws-lumberyard-dev/Atom/mriegger/directionallightbias
Atom/mriegger/directionallightbias
2021-10-20 15:22:33 -05:00
Guthrie Adams fa3f3e4285 Merge pull request #4618 from aws-lumberyard-dev/Atom/EditorColorGrading
Implement LUT Generation Pass and hook up into Editor
2021-10-19 11:00:46 -05:00
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>
2021-10-18 13:25:39 -07:00
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>
2021-10-15 12:56:19 -07:00
mrieggeramzn a114fa5531 Merge branch 'development' into Atom/mriegger/directionallightbias
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-10-15 12:46:58 -07:00
mrieggeramzn 49f3393646 Removing unused softening boundary width controls (#4647)
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-10-15 11:26:19 -07:00
mrieggeramzn d6596ebeb6 Merge branch 'development' of https://github.com/aws-lumberyard/o3de into development
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-10-14 17:48:38 -07:00
rbarrand 67c14c21cc Remove lut identity assets and code, simply calculate base coordinates for LUT programmatically.
Signed-off-by: rbarrand <rbarrand@amazon.com>
2021-10-14 17:19:22 -07:00