Commit Graph

8611 Commits

Author SHA1 Message Date
allisaurus e1fb2ad368 Update resource mapping schema to make default account ID optional (#5475)
Signed-off-by: Stanko <stankoa@amazon.com>
2021-11-15 14:48:32 -08:00
amzn-mike 8b7e538dd3 Cherry Pick: [LYN-7463] Fix insert streaming request failure (#5604) (#5622)
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable disabled test which was failing for the same reason.

Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Instead of using a mutex, re-order the statements to remove the streamer request first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 0cea59d669)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-11-15 14:14:43 -08:00
carlitosan 82c83b2c5a Merge pull request #5600 from aws-lumberyard-dev/carlito_fix_sc_rt_asset_load
Move SC runtime asset static initialization out of data loading threads
2021-11-15 12:19:22 -08:00
amzn-sj fc547d902c Add message to indicate Json serialization of bitset is not supported (#5590)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-11-15 14:09:43 -06:00
Guthrie Adams bc82afa87a Merge pull request #5606 from aws-lumberyard-dev/Atom/guthadam/fixing_double_registration_of_hair_asset
Fixing double registration of hair asset
2021-11-15 13:27:31 -06:00
Guthrie Adams 3d84876e87 Merge pull request #5615 from aws-lumberyard-dev/Atom/guthadam/material_editor_taking_focus_when_opening_new_document
Bug fix for material editor not taking focus when opening a new docum…
2021-11-15 13:26:57 -06:00
Mikhail Naumov b3e2c3f075 SetComponentProperty is now supported by undo operation (#5599)
* Adding undo support to SetComponentProperty to make it function with prefab system

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Renaming a variable

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-11-15 11:01:42 -08:00
mrieggeramzn 5c0fe6a54f Fix for CSM shimmering (#5607)
* Fix for CSM shimmering

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* removing debug code

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-11-15 10:16:25 -08:00
mrieggeramzn 533b80095b Fix for cascade shadow map clipping out too close to the camera (#5509)
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-11-15 10:16:06 -08:00
AMZN-stankowi c44d03a40d Asset bundler test fixes (#5548)
* Cleaning up errors with default assets, used in bundled release builds

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated simple asset references to be to the product, not source assets

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed test_WindowsAndMac_FilesMarkedSkip_FilesAreSkipped to pass again.

Updated the test to verify the assets are actually skipped and not just missing, by having it first run without the skip command and verify they are in the first run. Also updated logging to print out sorted lists, to make it easier to debug failures on Jenkins in the future.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test marked skip for legacy levels that featured a lot of assets that are no longer valid.

I don't think we need this specific test anymore in the future because prefabs replace the level system, and prefabs should have their own tests for product dependencies.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated project path to use absolute path (#5459)

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Updated project path to work with latest project path changes

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Changed to workspace.paths.project() for getting full path to projects

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

Co-authored-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-11-15 09:10:04 -08:00
Guthrie Adams d9746647e1 Bug fix for material editor not taking focus when opening a new document from the main editor or outside of the material editor
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-15 10:54:34 -06:00
AMZN-Igarri f2068397fa CameraRigComponent - Disable Component Checkbox when the two others are toggled (#5546)
* Disable component checkbox when the other two components are already ignored.

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed EditContext Indents

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Header file

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Spaces

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* fixed new line

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
2021-11-15 10:51:16 +00:00
Guthrie Adams 1925d08f41 Fixing double registration of hair asset
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-13 13:52:56 -06:00
AMZN-nggieber 76b7e73f6f Fully Replaces Remote Gems in Model and Selects Them When Downloading and Deleting (#5593)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-12 16:23:04 -08:00
carlitosan d0cf18e778 remove test code artifact
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-12 14:56:27 -08:00
carlitosan c140b882d2 Fix mis-spelled comment
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-12 14:19:22 -08:00
Danilo Aimini 5ec5824849 Hide the "up one level" button temporarily. (#5595)
Signed-off-by: Danilo Aimini <daimini@amazon.com>
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-12 14:16:44 -08:00
carlitosan 9898b6ee45 Move SC runtime asset static initialization out of data loading threads
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-11-12 13:47:30 -08:00
Guthrie Adams 4d3c977d58 Merge pull request #5585 from aws-lumberyard-dev/Atom/guthadam/cherrypick_material_relative_paths_to_stab
Cherry pick material editor saves relative paths to external references and test support to stabilization
2021-11-12 14:54:36 -06:00
galibzon b0dfe26232 The Build Time Stamp of ShaderAsset And (#5373)
* The Build Time Stamp of ShaderAsset And
ShaderVariantAsset Should Be Based On
GetTimeUTCMilliSecond()

GetTimeNowMicroseconds() is useful to measure time stamp differences.
GetTimeUTCMilliSecond() is for time stamps based on absolute clock/wall time.

* Updated DiffuseGlobalIllumination precompiled shaders

Co-authored-by: dmcdiar <dmcdiar@amazon.com>
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
2021-11-12 13:51:07 -06:00
Guthrie Adams 520c2b52d4 Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references
Removing references and builders for legacy MTL assets
2021-11-12 13:47:50 -06:00
kberg-amzn cb1a45f9ec Merge pull request #5578 from aws-lumberyard-dev/LYN-7816_FixNoParamRPCCompilation
RPCs Without Parameters Compile
2021-11-12 11:37:04 -08:00
Alex Peterson c0df1846f4 Create desktop shortcut functionality (#5536)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-12 11:03:43 -08:00
Esteban Papp b44ce82435 Private dependencies are not propagated to other targets in generated install layout (#5581)
* transfering private dependencies as runtime dependencies for the generated targets in the install layout

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Update cmake/Platform/Common/Install_common.cmake

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Update cmake/Platform/Common/Install_common.cmake

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-12 08:40:56 -08:00
Esteban Papp bceadf7597 Fixes for CMake 3.22rc (#5314) (#5580)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-12 08:40:10 -08:00
Guthrie Adams 198f225bbe Updating parent path usage has part of cherry picked from stabilization combining source data changes with relative path changes
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:48:47 -06:00
Guthrie Adams 172ec938cc moved AssetSystemStub to TestUtils folder
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:47:21 -06:00
Guthrie Adams 01ce02ffec Added basic unit test for relative path function
Moved asset system stub to RPI utils

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:46:40 -06:00
Guthrie Adams 7d51912a6e updated comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:46:17 -06:00
Guthrie Adams 1689b880fe added version to material component exporter
deleted unnecessary checks

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:45:53 -06:00
Guthrie Adams b3f3a4245b updated image paths to use new function
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:45:32 -06:00
Guthrie Adams b379c489b5 updated comment
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:45:04 -06:00
Guthrie Adams ed4f7965da Created function to get relative paths to referenced files that will fall back to asset folder relative paths under certain conditions
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:44:25 -06:00
Guthrie Adams f18f838da6 material editor and exporter save source materials with relative paths
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 21:43:51 -06:00
Danilo Aimini a544800536 LYN-4946 | Merge Game Mode buttons in the Play Controls toolbar (#5557)
* LYN-4946 Double play buttons - Tranformer style into one.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* compile fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Changes as per review.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Address minor confusion points.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix rename operation missing some matches...

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Remove extra newline.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

Co-authored-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-11-11 17:36:12 -08:00
Guthrie Adams 320ae45989 Removing material type asset info
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 19:20:09 -06:00
Guthrie Adams 44f2cbae47 Removing material builder and related tests
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 19:20:07 -06:00
Guthrie Adams 92c0e598d5 Starting to remove MTL asset references
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-11 19:20:04 -06:00
Alex Peterson 2fa3c134e0 Terrain depends on SurfaceData and GradientSignal (#5476)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-11 17:18:36 -08:00
Gene Walters 2cd732de6c Fixing RPC autogen so that RPCs without parameters compile (and function).
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-11 16:43:49 -08:00
Junbo Liang b8f7767cd6 [Resource Mapping Tool] make top-level Account id optional in ResourceMapping tool schema (#5569)
* [Resource Mapping Tool] make top-level Account id optional in ResourceMapping tool schema

Signed-off-by: junbo75 <68558268+junbo75@users.noreply.github.com>
2021-11-11 16:11:52 -08:00
rgba16f e4ca568433 cherry pick atom optimizations
Pull over the changes to move some expensive validation to debug builds only, and use finer grained jobs for the frame scheduler work.
2021-11-11 17:22:08 -06:00
Allen Jackson 6ffee4b0a8 {lyn7352} adding more logging around mock_asset_builder.py (#5103) (#5566)
o3de\AutomatedTesting\Gem\PythonTests\PythonAssetBuilder\mock_asset_builder.py
- adding more logging
- updated keys for platforms (pc, server)

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
2021-11-11 16:07:02 -06:00
galibzon e0d736dd84 Fixed the other call to CreateVariable (#5561)
in favor of CreateVariableEx

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
2021-11-11 16:04:22 -06:00
AMZN-Phil 0b211d3743 Merge pull request #5513 from aws-lumberyard-dev/Prism/DeleteUpdateGemsUI
Adds Update and Uninstall Options for Downloaded Remote Gems to Gem Catalog
2021-11-11 14:01:42 -08:00
Tommy Walton e3c3db4ba6 In Atom_Feature_Common.static, get cvar values from cvar system instead of reading directly (#5350)
Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-11 12:55:23 -08:00
Tommy Walton f1d9e7ae28 Skybox hot reloading - fix black screen when running the editor for the first time with a clean cache (#5529)
* Add a default fallback image when a StreamingImageAsset fails to load

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Don't release a missing/invalid texture reference in the skybox component. Hold on to the reference so that it can hot-reload

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Don't release a missing/invalid texture reference in the ibl component. Hold on to the reference so that it can hot-reload

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Use a different fallback image depending on the status of the asset. Including a setting to use a friendly image that is less obnoxious for anything that might have been missed in a release build

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Adding the stubbed in fallback textures

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Updated the seedlist for the RPI to include the fallback images. It only needs the default and the missing asset images, since the AP doesn't run in release builds, the asset status will always be unknown, not processing or failed to process, so if an asset is not bundled, it is just missing.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Switched to GetAssetIdByPath and removed some tabs

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-11 12:55:06 -08:00
rgba16f 394ba9a8bc Atom CPU threading optimization (#5481)
* Small change to make the RasterPass Scope jobs split the work more evenly over the cores

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update with PR feedback. Remove scale of EstimatedItemCount, modify the command list cost threshold instead

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-11-11 14:32:42 -06:00
rgba16f 71eedb895d Move PipelineStateCache validation of set uniqeness to only be active in debug builds (#5472)
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-11-11 14:32:30 -06:00
nggieber 2b248ac485 Fix merge issue and validation issue
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-11 12:09:24 -08:00