Commit Graph

587 Commits

Author SHA1 Message Date
Esteban Papp 5d7aae9bd8 SPEC-2513 Fixes to enable w4459 (#1107)
* fixing w4459

* Fixes for nounity

* putting OLD_APARAM_USER in a common place to avoid duplicated declarations
2021-06-03 11:12:54 -07:00
Qing Tao c009e7d50b ATOM-4782 [Material] Transparent pass is using StandardPBR_Forwardpass shader with incorrect SRG (#1103)
Removed TransparentPassSrg until we have pbr shaders TransparentPassSrg
2021-06-03 10:42:20 -07:00
Tommy Walton d56688e6cd Adding a file that was missed when merging PR 481 from 1.0->main. Also, updated the comment a bit (#912) 2021-06-03 09:41:31 -07:00
Esteban Papp 29c71b4e53 SPEC-2513 Fixes to enable w4701 (#1105)
* Some fixes

* more fixes

* fixes for debug
2021-06-03 09:30:33 -07:00
Tom Hulton-Harrop cf08f4dab1 Improve camera orbit behavior (#1060) 2021-06-03 15:48:44 +01:00
Qing Tao 312c704ba6 ATOM-15352 Find a solution to modify a render pipeline when enable a feature gem (#960)
* Added atom_rpi_tools python module in Atom_RPI gem.
The tool includes functions to modify pass template data and some utility functions.
* Added pytest tests for atom_rpi_tools
2021-06-02 17:39:50 -07:00
Qing Tao 7631cdc11e ATOM-15659 Add changing StencilState support to DynamicDrawContext (#1009) 2021-06-02 14:06:04 -07:00
guthadam 25a114d324 updating includes 2021-06-02 11:35:40 -05:00
guthadam d7fffe1d80 Merge branch 'main' into Atom/guthadam/LYN-3871_LYN-3872_material_assignment_json_serializer_for_prefabs 2021-06-02 11:21:57 -05:00
Nicholas Lawson 01f69acc5f Cleans up remaining 3p package todos (#1080)
Removes Clang
Adds a required LICENSE.TXT to the folder of glad in atom.
2021-06-02 07:38:39 -07:00
Tom Hulton-Harrop 4a5b7edbfe Updates to kd-tree ray intersection - ATOM-15673 (#1026)
* updates to kd-tree ray intersection

* update tests for kd-tree

* add one more test for kd-tree intersection

* updates to ModelKdTree following review feedback

* improve api doc comment for RayIntersection in ModelKdTree

* updates following review feedback

* update .clang-format to stack parameters if they do not all fit on one line
2021-06-02 09:20:45 +01:00
guthadam b37145589d Merge branch 'main' into Atom/guthadam/LYN-3871_LYN-3872_material_assignment_json_serializer_for_prefabs 2021-06-01 19:38:57 -05:00
hershey5045 9e3b7b45d9 Fix window handle retrieval in frame capture system. (#1073)
Capturing screenshots via hydra should work now.
2021-06-01 14:21:02 -07:00
Chris Santora 092720a527 Merge remote-tracking branch 'upstream/main' into Atom/santorac/RemoveSubsurfaceFromStandard-PBR-ATOM-4120 2021-06-01 09:53:08 -07:00
guthadam d115eae84a LYN-3871/3872 Added JSON serializer for MaterialAssignment property overrides 2021-06-01 11:43:05 -05:00
Tom Hulton-Harrop 3947dcf213 Add some extra cvars to control orbit point appearance and remove unused ones (#1032) 2021-06-01 09:36:00 +01:00
Chris Santora 79f00b3c81 Merge remote-tracking branch 'upstream/main' into Atom/santorac/RemoveSubsurfaceFromStandard-PBR-ATOM-4120 2021-05-29 15:03:01 -07:00
Jonny Galloway 9c5ea5026f Merge pull request #1023 from aws-lumberyard-dev/gallowj/main/AssetLegalAudit
removing folder with image data we don't own, can't license.
2021-05-29 14:19:55 -05:00
Chris Santora c34f508d7f Merge remote-tracking branch 'upstream/main' into Atom/santorac/RemoveSubsurfaceFromStandard-PBR-ATOM-4120 2021-05-29 11:18:09 -07:00
Esteban Papp 50a9e94eca Fix old method call (#1049) 2021-05-28 18:28:29 -07:00
Chris Santora 9e5c6f6851 Merge remote-tracking branch 'upstream/main' into Atom/santorac/RemoveSubsurfaceFromStandard-PBR-ATOM-4120 2021-05-28 16:56:22 -07:00
Chris Santora e690c0e626 Merge pull request #1046 from aws-lumberyard-dev/Atom/santorac/MaterialLayoutCleanup-ATOM-14002
Updated Material Property Layouts Per Design

- Renamed "Details" group to "Overview".
- Renamed "UV Names" group to "UV Sets".
- Renamed "General" group to "General Settings".
- Renamed "Parallax" group to "Displacement".
- Renamed "Texture Map" properties to just "Texture". In cases where a specific type of texture is mentioned like "roughness texture map" I called this "roughness map" (which is more common according to google).
- Renamed "Heightmap" to "Height map" (which is more common according to google).
- Reordered material property groups according to design review.
  - Base Color
  - Metallic
  - Roughness
  - Specular Reflectance F0
  - Normal
  - Occlusion
  - Emissive
  - Subsurface
  - Clear Coat
  - Displacement
  - Opacity
  - UVs
  - Irradiance
  - General Settings

ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
2021-05-28 16:55:35 -07:00
hershey5045 75cb293b2a Png fix for vulkan rhi (#962)
* Add supported formats for pngs in frame capture system. Add conversion logic from bgra to rgba.
2021-05-28 16:40:44 -07:00
dmcdiarmid-ly b20f3bc72f Merge pull request #946 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15555
[ATOM-15555] Data-Driven RayTracingPass
2021-05-28 16:38:00 -07:00
Chris Santora 147f0084a8 Removed subsurface scattering and transmission features from StandardPBR.materialtype.
ATOM-4120 Stabilize Standard PBR Regarding Subsurface and Translucency
2021-05-28 15:47:25 -07:00
Chris Santora bc687530e8 Merge remote-tracking branch 'upstream/main' into Atom/santorac/MaterialLayoutCleanup-ATOM-14002 2021-05-28 14:37:41 -07:00
Chris Santora 2112da5f85 Reordered material property groups according to design review.
- Base Color
- Metallic
- Roughness
- Specular Reflectance F0
- Normal
- Occlusion
- Emissive
- Subsurface
- Clear Coat
- Displacement
- Opacity
- UVs
- Irradiance
- General Settings

ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
2021-05-28 14:34:07 -07:00
Chris Santora de4e6957e8 Made a bunch of display name and description updates to core material types.
- Renamed "Details" group to "Overview".
- Renamed "UV Names" group to "UV Sets".
- Renamed "General" group to "General Settings".
- Renamed "Parallax" group to "Displacement".
- Renamed "Texture Map" properties to just "Texture". In cases where a specific type of texture is mentioned like "roughness texture map" I called this "roughness map" (which is more common according to google).
- Renamed "Heightmap" to "Height map" (which is more common according to google).

ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
2021-05-28 13:38:56 -07:00
Chris Santora 0fd69d6d0c Merge pull request #1031 from aws-lumberyard-dev/Atom/santorac/RemoveParallaxInvertFlag-ATOM-15653
ATOM-15653 Remove Unnecessary Parallax Map Invert Flag

Removed the parallax invert flags and instead all the materials assume displacement is always specified as heightmaps.
Updated property naming, tooltips, and shader variable names to reflect this.
Updated ParallaxMapping.azsli to treat depthOffset as an offset in depth value rather than an offset in height value, so it matches the fact that ParallaxMapping.azsli always operates in depth values rather than height values.

Corresponding ASV changes: aws-lumberyard/o3de-atom-sampleviewer#83
2021-05-28 13:29:41 -07:00
Esteban Papp ff9a052ce6 Merge pull request #1011 from aws-lumberyard-dev/ly-as-sdk/LYN-2948
Integration of the LY as an SDK work
2021-05-28 11:30:13 -07:00
Chris Santora da5a77925a Merge branch 'main' into Atom/santorac/MaterialLayoutCleanup-ATOM-14002 2021-05-28 11:02:46 -07:00
Chris Santora 34f0515e35 Merge branch 'main' into Atom/santorac/RemoveParallaxInvertFlag-ATOM-15653 2021-05-28 10:33:00 -07:00
Qing Tao c630ece43a Add m_linearDepthTexture as input for transparent pass.
This is required by popcornfx and it doesn't add extra cost to the render pipeline.
2021-05-28 09:42:11 -07:00
gallowj bdf9da820d removing folder with image data we don't own, can't license. 2021-05-28 09:49:44 -05:00
pappeste 8b9f5230f6 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-28 00:16:26 -07:00
Doug McDiarmid 9ec4278f86 Added TLAS dependency 2021-05-28 00:09:00 -07:00
Doug McDiarmid fdc57cdaff Added TLAS dependency 2021-05-28 00:08:13 -07:00
Guthrie Adams fffbd242c1 Merge pull request #999 from aws-lumberyard-dev/Atom/guthadam/ATOM-15649
ATOM-15649 sorting material types in create material dialog
2021-05-28 00:01:31 -05:00
galibzon 25dc42e298 [ATOM-15600] Fix cpu over usage when loading shader variant assets. (#1014)
This is a temporary fix, in the future ShaderVariantAsyncLoader will use
OnCatalogAssetRemoved()/ OnCatalogAssetAdded().

Signed-off-by: garrieta <garrieta@amazon.com>
2021-05-27 21:45:19 -05:00
Doug McDiarmid c0c9e5e90d Merge branch 'main' into Atom/dmcdiar/ATOM-15555 2021-05-27 19:24:16 -07:00
guthadam a11c4e9106 Merge branch 'main' into Atom/guthadam/ATOM-15649 2021-05-27 19:02:29 -05:00
Chris Santora b8578a4dc5 Merge pull request #979 from aws-lumberyard-dev/Atom/santorac/MaterialTypeCleanup
Various Cleanup of Core Material Types

Did a bunch of general cleanup on Atom's core material types. This gives us much better alignment of configuration between StandardPBR, EnhancedPBR, and Skin material types where they have common functionality. Also made some quality of life improvements for the user like making parallax mapping and UV transforms easier to set up.

ATOM-14838 Make Parallax Look Decent By Default
ATOM-13828 UV Transform Center Default Middle
ATOM-15133 Clean Up EnhancedPBR
ATOM-13216 Delete Deprecated Functors
ATOM-14037 StandardPBR TintedTransparent Opacity
ATOM-15295 Remove Unnecessary Enable Material Properties
2021-05-27 17:01:35 -07:00
Nicholas Van Sickle 5e87250f67 Fix viewport icon rendering on high DPI devices (#1006)
* Clarify ViewportWorldToScreen being in widget space and add DeviceScalingFactor

* -Fix viewport icons being draw wrong on high DPI displays
-Fix loading viewport icons from absolute paths, which

* Address review feedback, fix build
2021-05-27 16:31:30 -07:00
guthadam a4e128b5b6 Merge branch 'main' into Atom/guthadam/ATOM-15649 2021-05-27 17:52:10 -05:00
Chris Santora ed56635c3e Merge remote-tracking branch 'upstream/main' into Atom/santorac/MaterialTypeCleanup 2021-05-27 15:12:56 -07:00
AMZN-tpeng 16286fb43b Merge pull request #869 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-15576
Atom/tonypeng/atom-15576
2021-05-27 15:01:43 -07:00
Steve Pham 0d7c23641a Fix missing space betweek arguments causing dxc commands with additional args to fail (#1003) 2021-05-27 14:12:29 -07:00
Qing Tao 85222130d4 LYN-4007 Editor crashes when entering the Game Mode with two Box Shape entities with Game View enabled (#974)
The crash was caused by using gpu query across command lists.
2021-05-27 13:56:19 -07:00
guthadam c2822a4063 ATOM-15649 sorting material types in create material dialog 2021-05-27 13:17:51 -05:00
Chris Santora 05654ea152 ATOM-15653 Remove Unnecessary Parallax Map Invert Flag
Removed the parallax invert flags and instead all the materials assume displacement is always specified as heightmaps.
Updated property naming, tooltips, and shader variable names to reflect this.
Updated ParallaxMapping.azsli to treat depthOffset as an offset in depth value rather than an offset in height value, so it matches the fact that ParallaxMapping.azsli always operates in depth values rather than height values.
2021-05-27 11:09:10 -07:00