Commit Graph

869 Commits

Author SHA1 Message Date
IgnacioMartinezGarrido e4e22879b8 LYN-1767: Search View Crash Fix (#1430)
* Fixed crash in tableView when the filter goes empty and there is a selected entry.

* fixed consts

* Code Review Changes

* more minor fixes
2021-06-21 10:49:01 +02:00
Hasareej 4ad97342c2 Hasareej fix whitebox and physx cluster icons (#1398)
Fixing the issue with the icons not appearing & deleting duplicate icons.
2021-06-18 11:45:48 +01:00
John e4d4f8555b Merge branch 'development' into TIF/Runtime 2021-06-18 10:15:04 +01:00
Hasareej 75e640b908 Hasareej lyn 4389 fix cluster overlap with ImGui (#1329)
Fixing the cluster overlap with ImGui & a ViewportDisplayLayout alignment issue.
2021-06-18 09:50:02 +01:00
Tom Hulton-Harrop 8ffd16b0be Ensure SnapToGrid only appears when GridSnapping is enabled LYN-2302 (#1362)
* updates to better support showing/hiding viewport ui when grid snapping is enabled/disabled

* connect up editor settings callbacks

* minor polish changes

* api rename

* updates following review feedback
2021-06-17 18:31:56 +01:00
amzn-sean 9f62d631fb Physics joints updated to the new API (#1361)
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
2021-06-17 15:52:27 +01:00
John 22093f46fc Merge branch 'development' into TIF/Runtime 2021-06-17 11:34:31 +01:00
John Jones-Steele 127ad7f833 Merge branch 'development' into LYN-4195 2021-06-17 09:20:22 +01:00
John 15bf2d20ed Merge branch 'development' into TIF/Runtime 2021-06-16 17:23:18 +01:00
IgnacioMartinezGarrido d86e8b63c1 Merge pull request #781 from aws-lumberyard-dev/LYN-1767-AB
LYN-1767 : Asset Browser Search View
2021-06-16 17:05:40 +01:00
Olex Lozitskiy fff7cc0e10 Merge pull request #1344 from aws-lumberyard-dev/Network/olexl/redcode_bullet_code_use
[sig/network] Redcoding parts of old Networking that used Bullet external physics code
2021-06-16 09:55:06 -04:00
Tom Hulton-Harrop d9b1ccd323 Add align grid button to Viewport UI (#1311)
* first pass of adding grid snapping button

* update to request current grid size

* show/hide snapping option based on selection

* small tidy-up changes

* small updates following review feedback

* added some unit tests for snapping functionality and some small tidy-up/refactoring

* small refactor to ensure snap to grid ui only appears with snapping enabled

* add missing include to resolve build error

* fixes for build

* add & to make compiler happy
2021-06-16 12:58:01 +01:00
igarri 3ed6b318ab Merge branch 'develop' into LYN-1767-AB 2021-06-16 12:30:10 +01:00
John Jones-Steele 0983d1ba45 Changes made to address comments. 2021-06-16 11:22:59 +01:00
AMZN-Olex 04f045bfd2 Recoding parts of old Networking that used Bullet external physics code 2021-06-15 15:58:16 -04:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
sconel bd2a2ebcf5 Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
Fix nested container entities not getting editor info removed during prefab processing
2021-06-15 10:36:13 -07:00
John 58ad67dc44 Disable EntityIdGeneration test 2021-06-15 17:44:00 +01:00
John baab0cb43b Disable EntityIdGeneration test 2021-06-15 17:33:57 +01:00
John Jones-Steele c7a6f3e7e6 Merge branch 'development' into LYN-4195 2021-06-15 09:16:26 +01:00
Alex Peterson ecded991b5 Display error when unable to start Python
Added AzFramework Application, logging, unit tests
2021-06-14 17:02:22 -07:00
yuriy0 12c7391bd7 Bug fix: correct RTTI for AttributeInvocable (#1004)
* Bug fix: correct RTTI for AttributeInvocable

* Allow test case to crash if RTTI is wrong

* Revert "Allow test case to crash if RTTI is wrong"

Based on PR feedback, this change adds no value to the test and is confusing.

This reverts commit 6c36065c3759d857cc16ab011d09167261181141.

* Remove perhaps confusing comments and add a more to the point comment

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-14 17:29:19 -05:00
John Jones-Steele a306d9bf47 Merge branch 'development' into LYN-4195 2021-06-14 15:41:05 +01:00
Hasareej aee7fc72cc Hiding the 2 Clusters during Gameplay mode (#1211)
Hiding the 2 Clusters during Gameplay mode.
2021-06-14 12:53:58 +01:00
Tom Hulton-Harrop 0f09a6d8bf Move new camera settings to the Settings Registry and connect them to viewport border elements (#1267)
* ensure the new camera respects changing ui values and move camera settings to the settings registry

* factor out creation of modular camera controller

* small updates before posting PR

* updates following review feedback

* updates following review feedback
2021-06-14 12:32:35 +01:00
greerdv d72d988195 Merge pull request #1280 from aws-lumberyard-dev/simd-division-by-zero
avoid some divisions by zero in simd math types
2021-06-14 11:48:32 +01:00
John Jones-Steele 746c57373b Merge branch 'development' into LYN-4195 2021-06-14 09:42:01 +01:00
John Jones-Steele 8a6975131d Modified the link.svg 2021-06-14 09:26:28 +01:00
SJ 6fdbce01eb Fix build and link errors in monolithic builds
Merge pull request #1288 from aws-lumberyard-dev/SPEC-7273
2021-06-11 18:40:52 -07:00
sconel e4921c8d0a Fix nested container entities not getting editor info removed during prefab processing 2021-06-11 17:45:46 -07:00
Danilo Aimini f32590d241 LYN-4042 | No UI Indication that Level is Modified (#1277)
* Restore the code that display the dirty marker on the Level container. Ensure the dirty marker is cleared on level save.

* Moving call one level up to allow usage of the SaveTemplateToString function without clearing the dirty flag.
2021-06-11 16:43:53 -07:00
Chris Burel d7ec767ebc Enable -Wnon-pod-varargs (#1278) 2021-06-11 15:43:09 -07:00
cgalvan b08245a7f5 Merge pull request #1276 from aws-lumberyard-dev/cgalvan/FixInstantiatePrefabPopup
[LYN-4160] Fixed intermittent crash by changing instantiate prefab dialog to use the AzToolsFramework::GetActiveWindow() helper which always gives a valid active window.
2021-06-11 16:52:58 -05:00
amzn-sj e6b8dc2ce1 Disable AzTest and AzTestRunner in monolithic builds 2021-06-11 14:37:12 -07:00
greerdv 3895c93e04 avoid some divisions by zero in simd math types 2021-06-11 22:05:37 +01:00
carlitosan 43e157035e Merge pull request #1272 from aws-lumberyard-dev/carlito/stabilization/2106
Carlito/stabilization/2106  Fix for AP errors on graph, and Lua properties table fix
2021-06-11 13:51:08 -07:00
Chris Galvan 015f85db20 [LYN-4160] Fixed intermittent crash by changing instantiate prefab dialog to use the AzToolsFramework::GetActiveWindow() helper which always gives a valid active window. 2021-06-11 15:15:45 -05:00
jackalbe 4818d1ce80 {LYN-4224} Fix for the file scan slowdown (#1252)
* {LYN-4224} Fix for the file scan slowdown (#1183)

* {LYN-4224} Fix for the file scan slowdown

* Fixed a slowdown in the file scanning logic
* Improved the file scanning logic from previous code by 40%

Tests:
Using Testing\Pytest\AutomatedTesting_BlastTest

old code:
=== 7 passed in 96.13s (0:01:36) ===

current code:
=== 7 passed in 160.45s (0:02:40) ====

newest code:
=== 7 passed in 52.91s ===

* fixing a unit test compile error

* unit test fixes

* another file improvement

* fix for legacy level loading taking too long

* making an enum for the search types

* switched the enum to "allow" types to make the input more clear

* got rid of orphaned const variables
2021-06-11 12:25:45 -05:00
Eric Phister 0c7605c9b6 Update minimum required CMake version to 3.20 (#1253)
* Update the minimum CMake version to 3.20

Sets the cmake_minimum_required calls to version 3.20 and updates the
README.md to point at the general CMake download page instead of a stale
link.

* Remove unnecessary cmake minimum version

It was using an old 3.0 version and can be removed.

* Additional updates to CMake 3.20, build scripts

Updates the version and remove logic to find a CMake in 3rdParty.

* Removing backup path to ninja path in the build_ninja_windows.cmd

The backup path for finding ninja was coming from the Perforce depot which isn't available for o3de builds.

* Removing reference to 3rdParty Android SDK 29 from the build and run unit test script

The Android SDK is not part of the new 3rdParty system and users are expected to install the Android SDK on their own in order to build the engine for Android.

* Update the get_python scripts and README

No longer try to append a CMake path to LY_3RDPARTY_PATH, but do still
support LY_CMAKE_PATH because there are still uses of it.  Remove
mention of an LY_3RDPARTY_PATH-relative CMake path from the README.md.

* Removing LY_NINJA_PATH from the build_ninja_windows.cmd

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-11 12:00:55 -05:00
chcurran a995aee35a Properties__Index and Properties__NewIndex upvalue counts no reflect removal of net binding component 2021-06-11 09:47:44 -07:00
John Jones-Steele ed47bb07ab Menu icon behaviour fixed. 2021-06-11 14:52:01 +01:00
galibzon cc615a8f32 [ATOM-15472] Shader Build Pipeline: Remove Deprecated Files And Funct… (#1079)
* [ATOM-15472] Shader Build Pipeline: Remove Deprecated Files And Functions That
Predate The Shader Supervariants

These are the essential impactful changes as a result of deprecating the
ShaderResourceGroupAsset.

* Addressed feedback by @moudgils. Better comments in header files.

* More updates related with deprecation of ShaderResourceGroupAsset

* Deleted the temporary version 2 classes.

* Updated version of the shader asset builders.

* Updated version of all the shader related classes impacted
by the Supervariant concept and deprecation of ShaderResourceGroupAsset

* Changes to *.pass and DGI, Reflections and RayTracing.

* changes to material related assets

* changes to core lights

* Changes to auxgeom/dynamic draw.

* changes to decals, lyshine, imguipass

* changes to RPI Pass classes

* Shader for SceneSrg, ViewSrg and ForwardPass Srgs.

* changes to mesh, skinned mesh, Morphtarget.

* Fixes to RayTracingPass.cpp & now allow empty srg in shaders.

* Updated Atom_RPI.Tests

* Simplified InstanceDatabase by removing AddHandler

------------------------------------------------------------------------------------
* Updated DiffuseGI precompiled shaders.
Added RayTracingSceneSrg and RayTracingMaterialSrg shader asset.
Updated ShaderAssetCreator::Clone to handle the supervariant when processing root variants.
Co-authored-by: Doug McDiarmid <dmcdiar@amazon.com>
------------------------------------------------------------------------------------

* Changed semantics for some PassSrg to SRG_PerPass_WithFallback.

AuxGeom/FixedShapeProcessor.cpp requires SRG_PerDraw on ObjectSrg.

Removed names of SceneSrg and ViewSrg from RPISystemDescriptor.cpp

* Moved ShaderLib/Atom/Features/DummyEntryFunctions.azsli
To  Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/DummyEntryFunctions.azsli

Removed redundant checking for finalization in
ShaderResourceGroupLayout.cpp

* Fixed race condition bug for Shader::FindOrCreate.
InstanceDatabase<>::CreateInstance() needs to be atomic
for instance creation and initialization.

Added optional InstanceHandler::CreateFunctionWithParams to accomodate
to the needs of Instances that need more than an asset reference
to be able to be created an initialzed.

Removed ShaderResourceGroup::FindOrCreate() only ::Create is available
now.

* Renamed scene_and_view_srgs.* as SceneAndViewSrgs.*

Changed GetAzslFileOfOrigin for GetUniqueId

* Fixed unit tests.

* Reverted the serialization name of m_uniqueId back to
"m_azslFileOfOrigin" so precompiled shaders don't fail
in layout comparison.

* Fixed AtomCore.Tests
Removed non-applicable test. InstanceDatabase.AddHandler() is not
available anymore.

* The Null rhi is re-enabled for shader compilation.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-06-11 07:48:23 -05:00
Tom Hulton-Harrop 1435982330 Merge pull request #1265 from aws-lumberyard-dev/tomhh_stabilization-to-development
Stabilization/2106 to Development (for 2021/06/11)
2021-06-11 11:20:05 +01:00
Hasareej 0cee5150c7 Hasareej cluster tooltips (#1181)
EditorTransformComponent Cluster Tooltips
2021-06-11 10:07:17 +01:00
hultonha 2d41a701af Merge branch 'stabilization/2106' into tomhh_stabilization-to-development 2021-06-11 09:43:11 +01:00
sconel 38b1a89631 Merge pull request #1233 from aws-lumberyard-dev/Prefabs/NestedContainerExport
Fix issue involving missing parent container entities in spawnables
2021-06-10 16:28:56 -07:00
Mike Balfour ffe913a2d6 Added ability to convert multiply-nested slices (#1239) (#1245)
* Addressed feedback from previous PR
* Change missing entity aliases to be deterministic.
When converting slices, this helps produce the same results on multiple reconversions of the same data.
* Exposed the asset filter callback.
This allows the slice converter to specifically load nested slices as opposed to not loading *any* referenced assets.
* Added support for multiply-nested slice instance conversion.

(cherry picked from commit 86136ddfa6)
2021-06-10 16:16:03 -05:00
sconel 40fa0a3a46 Remove optimization pragma 2021-06-10 13:53:25 -07:00
sconel 9efcc3a6b5 Fix compilation error and failing unit test 2021-06-10 13:15:53 -07:00
Danilo Aimini d3be5600c3 Increase rotation step for Transform (#1244)
Using the spinbox on the Transform Component is made very cumbersome by the low rotation step. Increased it to make it more usable.
2021-06-10 12:30:17 -07:00