e22235ec5b
Add OpenImageIO as runtime dependency in AtomLyIntegration. ( #4987 )
...
* Add OpenImageIO as runtime dependency in AtomLyIntegration.
Signed-off-by: rbarrand <rbarrand@amazon.com >
* Place 3rdparty import inside if block.
Signed-off-by: rbarrand <rbarrand@amazon.com >
* Add platform cmake files for other platforms to prevent compile errors.
Signed-off-by: rbarrand <rbarrand@amazon.com >
Co-authored-by: rbarrand <rbarrand@amazon.com >
2021-10-26 10:40:30 -07:00
fec1b2fda2
Merge branch 'development' into o3de_sdk/installer_configs
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
# cmake/Platform/Common/Install_common.cmake
2021-10-25 12:47:36 -07:00
a892181432
Minor updates in response to code review feedback.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-10-23 00:02:31 -07:00
3c331e00ff
Moved the Material Component property override renaming to EditorMaterialComponent via ApplyAutomaticPropertyUpdates.
...
MaterialAssignment::ApplyProperties() still reports warnings but does not update the m_propertyOverrides.
MaterialAssignment::ApplyProperties() will now skip the old name'd overrides if overrides are present for the new names. I'm not sure if this will ever happen, but it did happen while I had some intermediate changes, so I imagine it could happen again.
I had to update the Material::FindPropertyIndex function to expose information about renames when they occur. This should make it easier for other systems to get (somewhat) automatic benefit from the version update feature.
I also found that there was an issue with material inspector where it wouldn't be initialized the the right override values when renames were present. Now it applies the renames to whatever override data it gets from the Material Component.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-10-22 16:41:44 -07:00
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
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
19dee0e37c
Merge branch 'development' into Atom/rbarrand/MaterialVersionUpdate
2021-10-21 15:57:57 -07:00
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
bf2997f960
Merge remote-tracking branch 'upstream/development' into Atom/rbarrand/MaterialVersionUpdate
2021-10-21 11:14:03 -07:00
6566ff1fcb
Fixing material system component mac release build
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-20 16:22:34 -05:00
2e44d96b05
Merge pull request #4734 from aws-lumberyard-dev/Atom/mriegger/directionallightbias
...
Atom/mriegger/directionallightbias
2021-10-20 15:22:33 -05:00
132833238f
Fixing compilation error and bug with counter
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-19 13:46:23 -05:00
65dd97af48
Merge branch 'development' into Atom/guthadam/prevent_multiple_preview_renderers
2021-10-19 11:58:52 -05:00
f0bf0b6e9c
correcting const casing
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-19 11:57:40 -05:00
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
f271d3f91e
connected buses
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-18 18:26:13 -05:00
5b8a37a75b
Additional preview renderer checks
...
Preventing multiple preview renderers from being created with multiple catalog loaded notifications
Purging material preview images reaching a maximum number of stored images
Purging material previews if entity gets destroyed
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-18 18:21:50 -05:00
f1a38ded86
fixes warning in release
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-10-18 16:09:54 -07:00
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
a3d84b5098
Merge remote-tracking branch 'upstream/development' into Atom/rbarrand/MaterialVersionUpdate
2021-10-15 21:47:33 -07:00
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
a114fa5531
Merge branch 'development' into Atom/mriegger/directionallightbias
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-10-15 12:46:58 -07:00
c0e9a353a3
Merge pull request #4717 from aws-lumberyard-dev/Atom/guthadam/shared_preview_renderer_as_interface
...
Replace multiple PreviewRenderer instances with single instance and AZ::Interface
2021-10-15 13:48:53 -05:00
49f3393646
Removing unused softening boundary width controls ( #4647 )
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-10-15 11:26:19 -07:00
c8be25a9ce
Converted preview renderer to use AZ::Interface
...
Made some files private when exposing public interfaces
Updated a few comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-14 20:22:48 -05:00
c42d82386b
Refactor and resolve PR comments.
...
Signed-off-by: rbarrand <rbarrand@amazon.com >
2021-10-14 15:48:13 -07:00
8679f13bc2
Merge branch 'development' into Atom/guthadam/thumbnail_and_preview_refactor
2021-10-13 20:37:36 -05:00
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 >
2021-10-13 15:57:09 -07:00
8a8b74a6e9
Finalize shaper implementation. Refactor color grading functions.
...
Signed-off-by: rbarrand <rbarrand@amazon.com >
2021-10-13 15:57:06 -07:00
b00ee3ff75
Implement lut resolution.
...
Signed-off-by: rbarrand <rbarrand@amazon.com >
2021-10-13 15:57:05 -07:00
2313f912bc
Initial commit for editor LUT generation.
...
Signed-off-by: rbarrand <rbarrand@amazon.com >
2021-10-13 15:57:03 -07:00
0217f45f3f
Merge pull request #4673 from aws-lumberyard-dev/Atom/guthadam/update_material_editor_icons
...
updated material editor skybox and changed property icons
2021-10-13 16:29:42 -05:00
29b62c7b84
Various updates to get pak builds working ( #4552 )
...
* Various updates to get pak builds working
-Fix basing config file merges off engine root.
-Merge command-line in relelase to make sure they override defaults.
-Fix nullptrs.
-Exclude more paths from being sent to bootstrap setreg.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Reverting a change that caused some test failures.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Change tabs to spaces
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
2021-10-13 15:22:25 -05:00
d7ac1be726
Adding directional light shadow bias
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-10-13 11:46:29 -07:00
afdf35a925
updated material editor skybox and changed property icons
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-13 13:41:31 -05:00
7415277eed
fixing ME shutdown
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-13 13:35:46 -05:00
ea030d2890
Removing unused softening boundary width controls
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-10-12 17:48:12 -07:00
8487373b0c
Updated thumbnail notification bus to use const QPixmap&
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-12 14:41:26 -05:00
e8142fa403
Updated editor material component slots to support dynamic previews rendered with property overrides applied
...
Fixed scaling issues with labels used for images
Reduced updating previews and material component inspector to only apply after a value is committed
Storing cache of previously rendered material previews
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-12 13:19:38 -05:00
8aea92af29
renamed SharedThumbnailUtils to SharedPreviewUtils
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-10 02:10:15 -05:00
9f92bd2d33
Compile again after renaming and moving files
...
Cleaned up namespaces
Renamed a couple of functions and added comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-10 01:45:13 -05:00
3ee45d54bb
rename Common*.* Shared*.*
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-10 00:37:13 -05:00
7f4aae7089
renaming Previewer folder to SharedPreview
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-10 00:32:14 -05:00
78f4e0d0de
Combined common thumbnail classes
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-09 23:57:04 -05:00
2c6cfdd7dc
Implemented support for semi-live previews of materials in the material property inspector.
...
Changed thumbnailer bus to use const pixmap
Changed capture request call back to use const pixmap instead of image
Replaced scene and pipeline members with constructor parameters
Added material preview renderer to editor material system component with new requests and notifications
Changed material property inspector details group to persistent heading so the preview image widget would not get destroyed during refreshes. But this was also a backlog task.
Changed common preview render camera to use lookat
Moved default asset caching to thumbnail renderer
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-09 18:17:50 -05:00
56b7ee2bd4
Merge branch 'development' into Atom/guthadam/thumbnail_and_preview_refactor
2021-10-08 16:03:56 -05:00
4c3d7a7e04
Reorganized thumbnail and preview are files into common folder
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-08 16:02:57 -05:00
00b938b6a7
Merge pull request #4212 from ppinfel/component-doc-links
...
Fixes various component's help URL links to correct o3de.org page
2021-10-08 10:30:13 -05:00
76b4dafbb3
Everything compiling again after moving preview renderer to atom tools framework
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-08 04:33:45 -05:00
569318e9e1
Moved preview renderer files to atom tools framework
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-08 02:56:24 -05:00
hershey5045
Esteban Papp
santorac
mrieggeramzn
Guthrie Adams
Guthrie Adams
rbarrand
mrieggeramzn
amzn-phist
Terry Michaels