Commit Graph

8448 Commits

Author SHA1 Message Date
John 0e3df14ea2 Add missing bus connection/disconnection.
Signed-off-by: John <jonawals@amazon.com>
2021-11-10 11:59:28 +00:00
John Jones-Steele 938899a495 Minor fixups for terrain physics collide lyn 7692 (#5413)
* First commit

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* completed changes

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2021-11-09 13:24:10 +00:00
lumberyard-employee-dm 1998c53882 Non MSVC Release build fix (#5428)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-09 10:19:04 +00:00
Guthrie Adams dcc2890da3 Merge pull request #5382 from aws-lumberyard-dev/Atom/TechArt/FixUp
Fixed .bat chain for launching maya for AtomContent gems
2021-11-08 14:57:00 -06:00
santorac 885fa35dcc Merge pull request #5360 from aws-lumberyard-dev/Atom/santorac/FixedThinObjectTransmission
Fixed PBR Material Transmission ThinObject Mode
2021-11-08 12:32:49 -08:00
Alex Peterson 431f80510f Merge pull request #5414 from aws-lumberyard-dev/Prism/DisplayAddGemInfo
Fix Additional Gem Info Handling and Display
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-08 12:20:18 -08:00
Alex Peterson 79f8edce14 Allow using gem repos page without losing changes #5317
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-08 12:17:16 -08:00
Guthrie Adams fa3d2ab15f Merge pull request #5416 from aws-lumberyard-dev/Atom/guthadam/adding_atomtoolsframework_runtime_dependency_to_atomlyintegration
Add missing runtime dependency to atom ly integration
2021-11-08 13:21:33 -06:00
Guthrie Adams 5958bb090c Merge pull request #5417 from aws-lumberyard-dev/Atom/guthadam/material_editor_inspector_performance
Queuing inspector invalidation to remove stall opening/closing several documents
2021-11-08 13:21:11 -06:00
hershey5045 18847fb3cc Improve handling of cached data limits. (#5232)
* Remove size limit on cached profile regions.

Signed-off-by: rbarrand <43485729+hershey5045@users.noreply.github.com>

* Discard excess profiling data once limit has been reached. Warn users only the first time the limit is reached.

Signed-off-by: rbarrand <43485729+hershey5045@users.noreply.github.com>

* Fix bug that was clearing cached time regions instead of the cached time regions map.

Signed-off-by: rbarrand <43485729+hershey5045@users.noreply.github.com>
2021-11-08 11:09:07 -08:00
santorac 2b4537febf Merge branch 'stabilization/2110' into Atom/santorac/FixedThinObjectTransmission 2021-11-08 10:18:18 -08:00
Nicholas Van Sickle 16f5980983 Fix Prefab builder test (#5377)
We were destructively moving the DOM template into the builder, leaving the Prefab system with an invalid DOM when teardown occurs. For now, this just copies the document to fix this specific test failure, but we may want to consider making `FindTemplateDom` return a const document and requiring that mutations get routed through the prefab system component to avoid similar situations in the future.

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-11-08 09:11:13 -08:00
Guthrie Adams 97bb01122f Add missing runtime dependency to atom ly integration
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-08 11:01:02 -06:00
nggieber 14a1206274 Add additional info handling and proper display for gems
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-08 08:17:28 -08:00
srikappa-amzn 652e35b0ca Fix camera transforms being reset when switching to default editor camera (#5326)
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-11-08 08:01:57 -08:00
Qing Tao 5a39361f77 ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene crea… (#5153) (#5389)
* ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene created by PreviewRenderer but not the Main Scene
Deprecate GetDefaultScene() function.
Update all the places which use GetDefaultScene to use Scene::GetFeatureProcessorFromEntityId or GetMainScene.
Tested with Editor, UI Editor, Material Editor, game launcher.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
(cherry picked from commit 8da6bea073)
2021-11-08 07:49:30 -08:00
Tom Hulton-Harrop c0d36399db Improvements to feedback for default camera orbit point (when no entity is selected) (#5397)
* improvements to camera orbit feedback

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

* minor tidy-up before publishing PR

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

* updates following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-08 13:37:35 +00:00
AMZN-Igarri a1d9a2cc58 Asset Browser Tests (#4948)
* Added AssetBrowser Tests

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

* Added Entries to test AssetBrowser

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

* Added Print info.

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

* Added more folders

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

* Added Asset Browser Tests for the Search View

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

* Fixed Entry creation

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

* Removed optimize

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

* Cleanup AssetBrowserModel

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

* RowCount made public

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

* Delegated entry creation to RootAssetBrowserEntry and added Code review feedback

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

* removed unused helper class and fixed demo tests

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

* Fixed bus connections

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

* Refactored test environment and added basic tests

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

* Applied some code review feedback and added basic tests

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

* fixed naming

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

* Refactored Tests

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

* removed pointer reset, now handled by the AssetBrowserComponent

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

* Fixed conversion unsigned-signed

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

* Cleaned includes

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

* fixed test setup

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

* Fixed unused variables

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

* Added printer function

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

* cleaned up code

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

* Added Test to check the correctness of the setup

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

* Fixed basic tests

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

* Fixed Tests

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
2021-11-08 09:56:51 +00:00
Tom Hulton-Harrop 783186fa7e Update default camera orbit behavior (#5301)
* add new default orbit point behavior

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

* add default orbit distance to settings registry

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

* add new default orbit point behavior

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

* add default orbit distance to settings registry

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

* expose default orbit distance to editor settings menu and update how we display default camera position

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

* add improve orbit changes for focus

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-08 09:19:40 +00:00
moraaar 425e172079 Cloth automated tests only check for cloth gem errors and warnings (#5374)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-11-08 09:14:26 +00:00
moraaar 803039c302 Fixed casing of .fbx.asset info files in cloth to match the fbx (#5371)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-11-08 09:14:01 +00:00
Guthrie Adams 00cf9ebfd8 Queuing inspector invalidate all to boost performance opening/closing several documents
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-07 18:36:38 -06:00
galibzon 621194e593 StandardMultilayerPBR_ForwardPass.azsl. the type of input.m_normal is (#5385)
float

Github issue: https://github.com/o3de/o3de/issues/2522

Change to float3. The current ASV tests are not affected but
using the RPI/Mesh example with Mesh: objects/suzanne.azmodel
and the material:
StandardMultilayerPbrTestCases/005_UseDisplacement.material

Showed a clear improvement.

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
2021-11-06 07:25:42 -05:00
Alex Peterson a297ceece4 Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/show-gem-repos-update
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-05 17:38:45 -07:00
Alex Peterson 0295aa7070 revert change to cancel label href
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-05 17:31:01 -07:00
Alex Peterson 21c02b195f Update signals/slots to match upstream changes
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-05 17:24:08 -07:00
Alex Peterson 4ce39ea167 Fix tags, downloads, and several vector copies
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-05 17:17:11 -07:00
Jonny Gallowy 5138170d8c fixed typo
Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
2021-11-05 15:54:57 -05:00
Jonny Gallowy 7d1e1474b5 fixed typo
Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
2021-11-05 15:50:54 -05:00
Ken Pruiksma a2efc587cc Rendered World Size in the Terrain World Render component set to invisible (#5378)
It's not currently hooked up, so setting invisible for now until it does something.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-11-05 15:31:31 -05:00
Jonny Gallowy 060c217852 Fixed .bat chain for launching maya for AtomContent gems
Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
2021-11-05 15:00:35 -05:00
amzn-mike 1399159908 Fix Assert Absorber being leaked due to one of the tests setting m_errorAbsorber to nullptr without deleting the object (#5176) (#5348)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 916fb413c9)
2021-11-05 12:39:11 -07:00
rgba16f [Amazon] d484d358d1 Modify AtomDebugDisplayViewportInterface::DrawWireCircle2d to account for viewport aspect ratio (#5375)
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-11-05 14:00:40 -05:00
amzn-phist 6cba64f226 Fix issue with Server Launcher debug console not accepting keystrokes (#5325)
* Fix issue with debug console ignoring some keys

This problem was reported for Server only, the Enter/Backspace keys were
being ignored in the ImGui Debug Console.
This wasn't an issue if the Server had loaded a map.
The problem was with XConsole explicitly setting a bool in dedicated
server mode.  This caused text input to be processed by XConsole code
and not passed further along to DebugConsole where it should have been
handling it via ImGui.

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

* Fix missing runtime dependency of ServerLauncher

ServerLauncher in non-monolithic config was missing a runtime dependency
on Legacy::CrySystem.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-11-05 13:47:24 -05:00
Ken Pruiksma 0b061d2e00 GHI-5338 - Fixing incorrect calculation of sector bounds for negative values (#5352)
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-11-05 12:39:58 -05:00
Qing Tao f8f9fb96d1 ATOM-15086 Image Pipeline Unexpectedly Pre-Multiplying Alpha into Color Channels (#5358)
Applied the discard alpha in the begining of converting.

Also deleted some unused processing settings and steps.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-05 10:20:21 -07:00
Mike Balfour 6a21d4f50d Merge pull request #5351 from aws-lumberyard-dev/terrain/mbalfour/use_ground_plane_non_functional
Use Ground Plane non functional
Added functionality to the "Use Ground Plane" toggle. Now, when it's enabled, the Terrain Layer Spawner will always provide valid terrain data at the minimum height of the spawner box, even if no Terrain Height Gradient List exists. If it's disabled, it won't provide any terrain data unless the Terrain Height Gradient List exists.
2021-11-05 12:14:24 -05:00
Ken Pruiksma 9c28d134db Fix for alignment issue with terrain heights. (#5274)
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-11-05 10:40:34 -05:00
moraaar 356fec5490 bugfix: resolve crash with FBX Settings (#4813) (#4944) (#5365)
-prevent export of ModuleInitISystem and ModuleShutdownISystem

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Co-authored-by: Michael Pollind <mpollind@gmail.com>
2021-11-05 15:17:00 +00:00
santorac fbc35a8169 Applied a fix from @jeremyong-az to get ThinObject transmission working.
Also added a new test material for ThinObject transmission.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-04 22:09:11 -07:00
Chris Galvan fdc56b4a57 Merge pull request #5337 from aws-lumberyard-dev/cgalvan/MakeProcessingOverlayWidgetAlwaysOnTop
Set window flags so the processing overlay widget always appears on top.
2021-11-04 20:59:21 -05:00
Alex Peterson c69142b73b Merge branch upstream/stabilization/2110
* Conflict GemModel.h

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-04 17:02:00 -07:00
Mike Balfour df0403a5e6 Merge pull request #5333 from aws-lumberyard-dev/terrain/mbalfour/debugger_wireframe_refresh_bug
Fix terrain wireframe refresh.
2021-11-04 18:59:24 -05:00
Alex Peterson d582715321 Merge pull request #5318 from aws-lumberyard-dev/StablizationMacPMLaunchEditor
[MacOS] Launching Editor from ProjectManager and other misc. fixes
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-04 16:46:24 -07:00
Mike Balfour b0abb8dbc3 Merge branch 'stabilization/2110' into terrain/mbalfour/use_ground_plane_non_functional
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

# Conflicts:
#	Gems/Terrain/Code/Source/Components/TerrainHeightGradientListComponent.cpp
2021-11-04 18:00:17 -05:00
Mike Balfour 97b0eddcb4 Hook up the "Use Ground Plane" toggle.
The "Use Ground Plane" toggle is now functional.  When disabled, the terrain layer spawner will say "terrain exists = false" for any point in its bounds unless there's also a Terrain Height Gradient List component with a valid entry.  When enabled, it will always say "terrain exists = true", and it will return the min height of the spawner box as the ground plane if there's no valid Terrain Height Gradient List height provider.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-11-04 17:56:55 -05:00
Mike Balfour 0478da621d Merge pull request #5328 from aws-lumberyard-dev/terrain/mbalfour/altitude_gradient_infinite_recursion_bug
Prevent infinite recursion with Altitude Gradient.
2021-11-04 17:39:23 -05:00
Chris Galvan c37767f92a Set window flags so the processing overlay widget always appears on top.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-04 16:30:44 -05:00
Mike Balfour e32e1ce572 Fix terrain wireframe refresh.
If a terrain layer spawner went outside the world bounds, the debug wireframe wouldn't update correctly because the heights were outside the wireframe sector AABBs.  Adjusted the logic to account for this.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-11-04 15:55:37 -05:00
amzn-mike 20edb35cdc [LYN-7245] Fix test thread being created multiple times (#5267) (#5315)
* Fix test thread being created multiple times

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

* Update test to not use a callback

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

* Add some more comments

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

* Add back the callback, remove the use of a thread/sleep

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 73202c2091)
2021-11-04 13:29:39 -07:00