1807 Commits

Author SHA1 Message Date
Chris Galvan c7284a781e Merge pull request #6365 from aws-lumberyard-dev/Atom/guthadam/materialcomponent/workaround_for_lost_image_overrides_with_prefabs
Temporary fix for material component losing image overrides with prefabs
2022-01-04 11:28:39 -06:00
Qing Tao 94ddafc7a2 Atom/qingtao/image builder fixes (#6432)
* LYN-8837 o3de Material Editor - Texture Settings Editor - Hangs when converting texture (#6359)

Fixed a editor hanging issue when preview texture with astc format (starts multiple job threads inside a job thread)
Fixed an issue of changing texture setting didn't trigger image re-process.
Fixed an issue with image asset which has texture setting may have dependency with wrong preset
Added a EIF_HDR for source image in hdr format.
Fixed astc compression issue which may wrongly compress image to HDR astc format

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
(cherry picked from commit d9f0a3012d)

* ATOM-16958 [Image Builder] Alpha data would be removed for source image with alpha content (#6412)

Fixed a regression issue with image builder which it can choose proper preset for images with alpha content.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
(cherry picked from commit b640f6d691)
2021-12-16 09:19:44 -08:00
moudgils fb36145e2e Rte fixes for stability (#6434)
* Fixed SRG updated related crash

Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com>

* Fixed SRG compile issue with metal which leads to multiple gpu crashes inlucde ImGuiPass render crash (#6315)

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>

Co-authored-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-12-15 18:35:17 -08:00
rgba16f 2d13b648da Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-12-13 13:16:02 -06:00
Guthrie Adams 3bca63bb71 Temporary fix for material component losing image overrides with prefabs
The bug reported that overridden texture properties would be lost whenever an entity was created, destroyed, or a prefab was created. Initially, it seemed like there was a problem with the custom JSON serializer for material properties. Debugging proved this to be incorrect because all of the data was converted to JSON values in the serializer on multiple passes. At some point during prefab patching, the data for the asset properties is lost while other values like colors and floats serialize correctly. Converting the asset data values into asset IDs resolves the immediate problem for the material component but the underlying issue is still under investigation by the prefab team. This change is being posted for review in case the underlying issue cannot be resolved in time for the next release.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

Fixing unittests and moving texture conversion into material component controller

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-12-13 11:35:05 -06:00
Steve Pham ba32937867 Cherry pick release unused warning error into Stabilization/2110 (#5845)
* Fixed unused variable warning in Release configuration in Linux. (#5830)

Signed-off-by: moraaar <moraaar@amazon.com>

* Fix unused variable errors (#5843)

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: moraaar <moraaar@amazon.com>
2021-11-22 15:32:54 -08:00
Qing Tao 8fd9cbfb64 ATOM-16854 Texture Settings dialog box crashes in the Editor (#5777)
Changes include:
-Fixed image preview issue which was trying to convert a compressed texture directly to QImage.
-Fixed texture resolution display for cubemap in texture setting editor.
-Sort the preset names in preset combo box
-Fixed a crash when showing IBLSkybox preset info in texture setting editor

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-19 09:02:11 -08:00
dmcdiarmid-ly 2321afecfb Merge pull request #5760 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16762
Fix for SSR initialization and visual quality improvements
2021-11-18 17:31:27 -07:00
antonmic cf4ef5e73b Addressed feedback from previous PR plus some cleanup
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-11-18 13:37:06 -08:00
dmcdiar 7f4ab7a1c2 Added a frame delay before activating SSR, several visual quality improvements
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-11-18 13:10:07 -07:00
antonmic 12e3a652d7 Merge pull request #5737 from aws-lumberyard-dev/Atom/antonmic/FixForCapsuleAuxGeom
Fixed capsule auxgeom draw for lights and other aux geom issues
2021-11-18 10:16:31 -08:00
moudgils 44d693a444 Fix DOF flickering on Vk due to missing LDS sync (#5723) (#5732)
* Fix DOF flickering on Vk due to missing LDS sync

Signed-off-by: moudgils <moudgils@amazon.com>

* Added another sync

Signed-off-by: moudgils <moudgils@amazon.com>
2021-11-18 09:11:58 -08:00
Tom Hulton-Harrop ca6b7d1d1f Add test for ViewportInteractionImpl use of ViewportInteractionRequestBus (#5741)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-18 13:09:06 +00:00
Tom Hulton-Harrop b533a9566a Fix for viewport not updating correctly when switching camera views (#5719)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-18 09:11:46 +00:00
antonmic 8587c8e033 Fixed capsule auxgeom draw for lights and other aux geom issues
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-11-17 22:55:29 -08:00
santorac 9a887bd690 Removed unused lambda function.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-17 15:11:05 -08:00
santorac d3de1689ad Removed unused lambda function.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-17 13:53:11 -08:00
santorac 2774ac1811 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 13:24:56 -08:00
Guthrie Adams 713a3916f5 Merge pull request #5691 from aws-lumberyard-dev/Atom/guthadam/material_editor_viewport_settings_previews_uses_thumbnail_widget
Replacing material editor lighting preset selection dialog exr previews with lighting preset thumbnails
2021-11-17 14:57:52 -06:00
santorac be9db80f99 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 12:15:57 -08:00
santorac 2ae7a5ef9f Added a unit test for the MaterialPropertyValue bug fix.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-17 12:04:46 -08:00
Qing Tao d0ebe4ee10 Follow up fix for ATOM-13512 (#5689)
* Follow up fix for ATOM-13512
Update the file mask mapping in ImageBuilder.settings.
Change Reflectance.preset to use BC4 format since it only needs once channel.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-17 10:00:31 -08:00
Guthrie Adams 1457ef6ee9 Merge pull request #5692 from aws-lumberyard-dev/Atom/guthadam/throttle_material_editor_updates_when_inactive
Reduce material editor update interval when inactive
2021-11-17 11:47:37 -06:00
Tom Hulton-Harrop e34ea3bcaa Fixes for viewport selection issues (#5494)
* improvements to editor selection in the viewport

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix issue with being able to select icons that are not showing for entities inside entity containers

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update comment after review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates to viewport picking code to simplify the api

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test to replicate near clip intersection issue

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small tidy-up changes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates to how we perform world to screen and screen to world calculations, added test coverage and some tidy-up

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add some more tests for ViewportInteractionImpl

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* minor tweaks before PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix typo in fix

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for manipulator test framework tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates to RPI::View and RenderPipeline after review feedback from VickyAtAZ

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add constexpr to ScreenPoint, ScreenVector and ScreenSize initializing constructors

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add PrintTo functions for Screen* types

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* downgrade error to warning temporarily

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* check incoming view is null

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove pragma optimize off

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 17:12:21 +00:00
Guthrie Adams 72de78bb83 Reduce material editor update interval when inactive
Reduce the application update interval when it’s not in focus to reduce power consumption and interference with other applications

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-17 11:02:36 -06:00
Guthrie Adams cb552256f8 Moved asynchronous image loading function to atom tools framework
Moved settings registry wrapper function to atom tools framework
Created registry settings with default values for preview configurations based on asset type
Changed lighting preset previews and thumbnails to use reflective material
Created registry settings for preset selection dialog borders, padding, sizes
Updated shared preview utility functions to compare against registered asset types instead of passing them in individually

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-17 10:55:14 -06:00
Tom Hulton-Harrop 593f03efb4 Camera fixes follow-up (#5703)
* allow unconstrained camera when tracking transform and fix some camera interpolation issues

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* tests for interpolation fixes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test for camera constraints change

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following review feeedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 16:23:01 +00:00
Guthrie Adams 6dcbc64cd6 Removed preview image setting from model presets
It’s no longer needed because we use the thumbnail renderer

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-17 10:12:10 -06:00
Guthrie Adams 88569948e3 Changed preset selection dialog widget headings to not overlap preview images
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-17 10:12:05 -06:00
Guthrie Adams 5311878e87 Replacing preset preview images with thumbnail widget to improve load times
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-17 10:12:02 -06:00
Tom Hulton-Harrop a6164ca2cd Fix for camera roll behavior when in 'Be this camera' mode (#5658)
* fix for camera roll behavior when in 'Be this camera' mode

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates for camera tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for failing unit test - require default function

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 12:27:23 +00:00
galibzon 155fe77f5d ShaderMetricsSystem spawns a lot of warnings (#5661)
* ShaderMetricsSystem spawns a lot of warnings
when run Atom_RPI.Tests

Added @user@ path alias definition.

* When running unit tests, using AZ::Utils::GetProjectPath() will resolve
to something like:
"/data/workspace/o3de/build/linux/External/Atom-9a4d112b/RPI/Code/Cache"
The ShaderMetricSystem.cpp writes to the @user@ folder and the following
runtime error occurs:
"You may not alter data inside the asset cache.  Please check the call
stack and consider writing into the source asset folder instead."
"Attempted write location:
/data/workspace/o3de/build/linux/External/Atom-9a4d112b/RPI/Code/Cache/user/shadermetrics.json"
To avoid the error We use AZ::Test::GetEngineRootPath();

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
2021-11-17 05:47:25 -06:00
santorac 8b82452a1b Updated ResolvePathReference to also early-return when the path is empty. @gadams3 said this would be helpful to him.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 17:30:33 -08:00
santorac 7d48e8209c Updated a failing unit test.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 17:28:57 -08:00
santorac cdb38251d8 Fixed an issue that prevented saving child materials with explicitly empty texture properties.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 17:19:44 -08:00
Alex Peterson 92510df373 Fix missing clip to world matrix data (#5677)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-16 16:34:43 -08:00
Qing Tao 2ae8477683 ATOM-13512 Altering IBL ImageProcessor .preset Does Not Force Assets to Rebuild (#5639)
Changes include:
- Move config files from ImageProcessingAtom/Config/ folder to ImageProcessingAtom/Assets/Config/ folder so it can be watched as source depencies.
- Change GetSuggestedPreset function so it can return certain preset for certain file name.
- Move file mask mappings from preset to ImageBuilder.settings. But the file masks in preset can still be used.
- Changed from using project config folder's imageBuilder.Settings for override to using it as json merge patch.
- Expose GetFileHash function in AssetBuilderSDK api.


Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-16 15:25:13 -08:00
mrieggeramzn 6c1eefe605 Fix for two viewports not computing the right camera matrices (#5672)
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-11-16 15:08:28 -08:00
amzn-phist 6651ae3d78 Fix for python load errors on Linux (#5627)
* Explicitly load libpython on Linux

Downstream loads of python modules that weren't linked to libpython would
fail to load because libraries were loaded using the RTLD_LOCAL flag.  This
adds a function that will explicitly load libpython on Linux using the
RTLD_GLOBAL flag.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix misspelled function name

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Addressing PR feedback

- Updates naming and location of things.
- Adds load code to a Gem template.
- Updates error checking.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address further feedback

Removes the api function in favor of just having modules inherit off a
PythonLoader class, that way we get RAAI behavior and lifetime management
for free.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-11-16 15:32:24 -06:00
santorac 5cf65012b1 Updated RPI.Edit's AssetUtils to use the same TraceLevel enum as RPI.Reflect's AssetUtils. This is now used in GetImageAssetReference to remove a redundant error message since the error is also reported in MaterialSourceData and MaterialTypeSourceData.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 12:31:33 -08:00
santorac 284a44d74c Updated AssetUtils::ResolvePathReference to avoid "The second join parameter is an absolute path" warnings from StringFunc::Path::Join.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 11:45:26 -08:00
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
santorac ebc92c5b08 Restored a bit of error checking that appears to have been removed by mistake, in MaterialPropertyUtil ConvertToExportFormat(). This is important for the missing texture use cases, because this error checking is what will prevent the Material Editor from silently replacing a broken texture reference with no texture reference.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 10:52:03 -08:00
santorac 9f7815fa04 Fixed up a couple incorrectly or incompletely resolved merge conflicts.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 10:35:49 -08:00
santorac db3d41ad9d Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-16 10:06:28 -08:00
antonmic 34921d680a Merge pull request #5656 from aws-lumberyard-dev/stab/Atom-16694
upgraded capture_displaymapper util and some cleanup
2021-11-16 10:03:27 -08:00
Jonny Gallowy 6cc98f1802 upgraded capture_displaymapper util and some cleanup
Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
2021-11-16 10:04:03 -06:00
bosnichd b20a9b5f39 Some modifications required for restricted platforms: (#5624)
- Replace AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS with AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS that allows the number of threads created by the job manager to be set directly.
- Add AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS that allows the number of threads created by the task graph to be set directly.
- Add a define that forces the AsyncUploadQueue to use the primary copy queue instead of creating a secondary copy queue.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-11-16 08:27:32 -07:00
santorac 224e0bd20f Removed the 'data-warnings' concept for checking before saving a material document. It's no longer necessary since we no longer replace the original data with placeholders.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 00:02:20 -08:00
santorac a789d7b762 Minor code cleanup.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 00:00:10 -08:00