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
AMZN-Phil
95c8398c79
Merge pull request #5673 from aws-lumberyard-dev/Prism/AddEditGemsButton
...
Adds Configure Gems Options to Project Dropdown + Misc. Project Manager Fixes
2021-11-17 12:14:24 -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
John Jones-Steele
6b1fb04a1c
Terrain Supports Physics test ( #5706 )
...
* Terrain Supports Physics test
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
2021-11-17 19:16:30 +00:00
jonawals
a1cf76ec65
Merge pull request #5652 from aws-lumberyard-dev/viewport/EditorModeUIBackButton
...
Viewport/editor mode UI back button
2021-11-17 18:32:46 +00:00
Chris Galvan
33abae1008
Merge pull request #5710 from aws-lumberyard-dev/cgalvan/FixSlowScriptCanvasLoading
...
Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem.
2021-11-17 12:31:45 -06: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
Chris Galvan
21c3aba7da
Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-17 11:13:38 -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
jromnoa
ef16207ac5
Merge pull request #5684 from aws-lumberyard-dev/Atom/jromnoa/cherrypick-dev-asset-gpu-test-fixes
...
Cherrypick GPU test changes (that also fix issues) to stabilization
2021-11-17 09:06:46 -08: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
Steve Pham
a051bdeeb0
Enably QtForPython for Linux ( #5667 )
...
- Fix PALification and include Linux for the QtForPython gem
- Add Linux-only module loader for Pyside2 related modules
- Remove (unnecessary) #if !defined(Q_OS_WIN)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-11-17 08:28:33 -08: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
123b422709
Updated shared preview fit to camera logic and viewing angle
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-17 10:12:07 -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
Chris Burel
9f9aa8f2a6
[Linux] Avoid duplicating inotify watches in forked AssetBuilder processes ( #5683 )
...
The AssetProcessor on Linux uses `inotify` to monitor for file updates.
The AssetProcessor also uses a `ProcessWatcher` to launch child
AssetBuilder processes. `ProcessWatcher` accomplishes this by calling
`fork()`, which duplicates the current process, then calling `exec()`.
The `fork()` call also appears to duplicate any inotify fds. This
results in the subprocess consuming duplicate inotify watches, which is
a limited system resource (Ubunut 20 defaults
`/proc/sys/fs/inotify/max_user_watches` to 65536). The AssetProcessor
still has issues with this max, but this should free up at least half of
the uses.
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-17 07:34:56 -08:00
greerdv
823b5bde0b
Merge pull request #5645 from aws-lumberyard-dev/avoid-bad-mass-ratios
...
Avoid bad mass ratios
2021-11-17 14:15:25 +00: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
John
8ee6f1a7f4
Fix back icon scaling.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-17 11:08:22 +00:00
AMZN-Igarri
68a2561dc1
Fixed - Current Camera Reset - When making a new Entity, or add a new Component, you are immediately taken out of current Camera View. ( #5650 )
...
* Fixed Camera getting out of view when adding new entity
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Reformatted File
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* fixed case formatting
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Namespace comments
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Addressed review comments
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* More feedback
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-11-17 09:58:31 +00: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
Mike Balfour
551e6010dd
Add support for getting the level entity when prefabs are enabled. ( #5680 )
...
* Add support for getting the level entity when prefabs are enabled.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Made a little prettier.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Addressed PR feedback plus fixed the crash when the level component failed to add.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-11-16 19:23:53 -06: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
nggieber
c2308de8ee
Added in missed suggestions from previous PR
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 16:29:12 -08:00
nggieber
a3d3423ff7
Merge branch 'stabilization/2110' into Prism/AddEditGemsButton
2021-11-16 16:04:06 -08:00
jromnoa
a38c59372c
improve docstring descriptions for FOV degrees and Asset.id not asset paths for diff asset properties
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:02:46 -08:00
jromnoa
b36ad7aaff
move component descriptions above the property param in the docstrings
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:02:23 -08:00
jromnoa
d07cbb7af6
add AtomComponentProperties.grid('Secondary Grid Spacing') direct call, remove fmt:on comment
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:02:15 -08:00
jromnoa
222581318d
add some docstring descriptions for Cubemap Texture, Material Asset, Secondary Grid Spacing, & Field of View component properties
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:02:06 -08:00
jromnoa
e27e6cc5ef
update asset called in global skylight test as well
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:01:58 -08:00
jromnoa
3b0e3a5d52
update golden images for spot light and area light tests, update asset used
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:01:49 -08:00
jromnoa
bbbcc94634
saving progress on test fixes to swap branches
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:01:39 -08:00
jromnoa
53275fcb70
add new golden image that uses smaller asset file
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:01:30 -08:00
nggieber
de67bb70c9
Added comment why GemRepos isn't included in ContainsScreen
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 16:01:25 -08:00
jromnoa
33493b5c8e
add new component property paths to mesh, material, camera, hdri_skybox, and global_skylight components
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:01:17 -08:00
jromnoa
0efb8847aa
drop the 'as helper' for TestHelper and re-factor the helper. calls to TestHelper.
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:01:06 -08:00
jromnoa
9c2a50d686
use smaller asset files, fix asset to use asset.id for tests
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:00:55 -08:00
jromnoa
c83d0432dd
saving initial round of edits for the using the Asset class
...
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com >
2021-11-16 16:00:41 -08:00
nggieber
95da89d0cc
Merge branch 'stabilization/2110' into Prism/AddEditGemsButton
2021-11-16 15:58:14 -08:00
AMZN-nggieber
0d17e575a7
Fix: Display Repo Gems on Repo Screen Correctly ( #5638 )
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 15:53:51 -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