Commit Graph

96 Commits

Author SHA1 Message Date
mnaumov 44601b7a38 Some refactoring 2021-05-18 22:45:43 -07:00
mnaumov db7afee383 Adding parameters to ACES tone mapping 2021-05-18 22:38:27 -07:00
guthadam d85e0500d5 PR feedback 2021-05-13 00:55:29 -05:00
guthadam 488e3b5da5 Merge branch 'main' into Atom/guthadam/ATOM-15223 2021-05-13 00:33:28 -05:00
mriegger 9b1f4c04e6 Removing the old hack code 2021-05-12 14:54:33 -07:00
guthadam 931a127b7b ATOM-15223 updating material assignment ID to be portable to other models
The bug was reported that copy and paste did not work with the material component.
Copy and paste to take the worked fine.
All of the material assignments/overrides get mapped using the LOD and asset ID of materials provided with the model.
The asset IDs of materials exported by atom builders, using the scene API, are the combination of the same UUID as the model asset ID and the unique sub ID that is now hashed from the material name provided by the DCC tool.
If we map material assignments using the entire asset ID that was generated in the model builder then the mapping will only work with that specific model.
This change updates the material assignment ID equality operators and hash function to only use the sub ID portion of the asset ID.
As long as the sub IDs are generated consistently the material assignment mappings will be portable to models with the same material names.

Also moved material assignment structures to atom common features static library so this was to be moved to cpp files
2021-05-12 13:47:47 -05:00
Terry Michaels 8ddfcabae7 Removed unneeded comments (#673) 2021-05-10 22:02:30 -05:00
mrieggeramzn d7c72a249c Merge pull request #395 from aws-lumberyard-dev/Atom/mriegger/PLS
Atom/mriegger/pls
2021-05-10 17:13:39 -07:00
dmcdiarmid-ly 2406da9b67 Merge pull request #655 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14933
[ATOM-14933] Minor improvement to reflection probe scale handling
2021-05-10 13:09:51 -07:00
dmcdiar f240e3576e Checked for the ReflectiveCubeMap view type when updating the shadow Srg data 2021-05-08 02:21:30 -07:00
dmcdiar 071ecb7db7 Merge branch 'main' into Atom/dmcdiar/ATOM-14933 2021-05-07 17:12:27 -07:00
mriegger f22a67f8cc remove tabs 2021-05-06 18:09:12 -07:00
mriegger e3cca11ed3 Fix for heatmap not disabling 2021-05-06 18:01:28 -07:00
greerdv 578cd47a0a replacing virtual function with default parameter with overloaded function 2021-05-06 15:11:11 +01:00
greerdv 26ab8c8a25 merging from main 2021-05-05 19:07:04 +01:00
Michael Riegger 19e28b18a0 Merge branch 'main' into Atom/mriegger/PLS 2021-05-04 17:15:41 -07:00
Michael Riegger c58089d35a Merge branch 'main' into Atom/mriegger/PLS 2021-05-04 15:57:20 -07:00
dmcdiar 3c4889b929 Merge branch 'main' into Atom/dmcdiar/ATOM-15438 2021-05-04 14:11:12 -07:00
Michael Riegger a2d2a37220 Better commenting and readability fixes 2021-05-04 10:38:21 -07:00
dmcdiar 64f42ba1cb Removed the asset callback from the EditorReflectionProbeComponent, since the component may have been destroyed and recreated between the bake and the asset load.
Replaced with an OnTick handler that polls the ReflectionProbeFeatureProcessor to determine when the asset is ready.
2021-05-04 01:24:14 -07:00
dmcdiar 009ecbc152 Relocated RayTracingSceneSrg and converted to .azsli 2021-05-01 15:53:24 -07:00
dmcdiar 2e1c4e52d3 Improvements to reflection probe scaling 2021-05-01 01:51:13 -07:00
dmcdiarmid-ly dd3f032480 Merge pull request #488 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14933
[ATOM-14933] Reflection probes do not show mesh reflections if the entity's transform is scaled up
2021-04-30 16:33:15 -07:00
Guthrie Adams b7a087948f Merge pull request #413 from aws-lumberyard-dev/Atom/guthadam/ATOM-4849
ATOM-4849 Update default lighting preset values
2021-04-30 16:04:21 -05:00
dmcdiar 95e9fe4e11 Fixed AR issue 2021-04-30 13:18:00 -07:00
Michael Riegger cff730b4b8 Merge branch 'main' into Atom/mriegger/PLS 2021-04-30 11:46:08 -07:00
Michael Riegger 738883a9b0 Kens feedback 2021-04-30 11:43:32 -07:00
dmcdiar 0e8e33dedf Merge branch 'main' into Atom/dmcdiar/ATOM-14933 2021-04-30 00:36:13 -07:00
pruiksma 109605a733 Cherry pick 06044522763512b78ae504f658a3e7cb5f99996c from 1.0 to main.
[ATOM-15427] Fixing crash in DirectionalLightFeatureProcessor caused by incorrect use of a container.
2021-04-29 16:44:24 -05:00
dmcdiar ef79dfb359 Added scale handling to the ReflectionProbe 2021-04-29 13:10:07 -07:00
hershey5045 a746223c65 Change AtomSampleViewer screenshots to use png (#336)
Add functionality to capture png screenshots.
2021-04-29 12:01:32 -07:00
greerdv 1222286e30 removing URL 2021-04-29 14:36:47 +01:00
greerdv d35adce246 adding support for non-uniform scale for decals 2021-04-29 11:46:08 +01:00
dmcdiar f65ef56654 Added maybe_unsed to result codes that are only used in Asserts. 2021-04-29 01:02:47 -07:00
guthadam 6821ce41e5 ATOM-4849 Update default lighting preset values
This is an effort to produce a decent looking lighting preset and shadow with the default settings

https://jira.agscollab.com/browse/ATOM-4849
2021-04-28 21:33:34 -05:00
Michael Riegger 9dd3fe49df fixing spelling and increasing angle so that the borders are not visible at 256 res 2021-04-28 17:27:20 -07:00
Michael Riegger 37fd8d43ed Tabs to space and better naming and comments 2021-04-28 10:40:31 -07:00
Michael Riegger c729c72034 Switching to XYZ instead of ZYX 2021-04-28 09:35:56 -07:00
kberg-amzn 409489e938 Merge pull request #365 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
2021-04-27 18:59:41 -07:00
Michael Riegger 2eed8684b5 Adding full shadowmap support 2021-04-27 14:08:54 -07:00
karlberg 16c31cde3e Fix issue found in PR 2021-04-27 13:53:18 -07:00
karlberg 901428668c Merging latest origin 2021-04-27 13:03:31 -07:00
karlberg 8cb1edb7d7 Updates ImGui to release version 1.82, builds out some better initial multiplayer metrics 2021-04-27 11:37:56 -07:00
dmcdiar 73f3ec66b5 Set non-uniform scale in SetMesh. 2021-04-27 02:05:06 -07:00
Michael Riegger bbae3b6d48 Slight improvements 2021-04-26 16:16:05 -07:00
Michael Riegger 569c831532 Working PLS 2021-04-26 14:53:31 -07:00
Michael Riegger f508c4a4b5 Initial pointlight shadow work 2021-04-24 00:28:43 -07:00
Chris Burel 61fe298319 Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
mrieggeramzn 0629e20b35 Merge pull request #269 from aws-lumberyard-dev/Atom/mriegger/LCR
Removing unneeded function
2021-04-23 11:05:03 -07:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00