birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,122 Commits 3 Branches 3 Tags
e1cb40fa33a97b9fefe2cfd4a7cdff80e46d38cb
Commit Graph

291 Commits

Author SHA1 Message Date
Chris Galvan 8d0dce2613 Merge pull request #7101 from siretty/fix_build_linux_clang_13 
Fix Build on Linux with Clang 13 with Debug, Profile and Release Configuration
 2022-01-24 12:24:33 -06:00
Chris Galvan 71640c1c82 Merge pull request #6376 from nemerle/compiletime_filerequest_code2 
Compile time reduction - FileRequest & related changes
 2022-01-24 11:43:27 -06:00
greerdv 8d7500f9c3 merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-24 12:39:08 +00:00
greerdv d412f3cc50 update with feedback from PR 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-24 12:38:15 +00:00
SergeyAMZN a623e52331 Merge pull request #7040 from aws-lumberyard-dev/TerrainMaterialsFix 
LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX
 2022-01-24 10:25:51 +00:00
Daniel Edwards 0a5f472f43 Clang 13: Fix build errors ... 
... due to local variables only being written to (but never read).

Signed-off-by: Daniel Edwards <dev@danieledwards.de>
 2022-01-23 22:29:03 +01:00
Sergey Pereslavtsev b21878d04e Removed unused variable 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2022-01-21 19:57:28 +00:00
Sergey Pereslavtsev 56c6f81627 PR addressing. Removed RTTI from HeightMaterialPoint since it's just a struct of data with no intention being a part of class hierarchy 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2022-01-21 13:21:57 +00:00
Steve Pham 59e43813f0 GCC Support for Linux 
Updates and fixes to support GCC for Linux

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

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-20 13:00:02 -08:00
greerdv 6a700e6b95 add test for runtime behaviour of single sided quad collider 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-20 19:46:31 +00:00
greerdv f61011f5ac add editor side tests for quad colliders 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-20 19:45:59 +00:00
greerdv a8eb5be2e6 fix order of triangle indices for single-sided quad collider 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-20 19:45:41 +00:00
greerdv cc50a18fe9 add support for quad shapes in shape collider component 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-20 19:45:28 +00:00
Sergey Pereslavtsev c31e3c0208 LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2022-01-20 19:36:33 +00:00
T.J. McGrath-Daly 1036226bd0 Merge branch 'development' into bug-physX-wind-72 2022-01-18 15:54:49 +00:00
AMZN-byrcolin c778606c89 Templates restricted (#6498) 
* Templates/Restricted upgrade/fixes:
Fixed template storage format: templates now only store true relative paths and no longer save "origin" paths and "optional" has been removed, it was never used.
Upgraded all templates to new standard
Template system now correctly handles child objects: Child objects no longer have to specify restricted they inherit from parent
Restricted now operates at the object level and makes no assumptions about parent
Restricted templates can now be combined and seperated on creation
ly_get_list_relative_filename has been deprecated for o3de_pal_dir
All Gems/Projects/Templates updated to use new code

Signed-off-by: byrcolin <byrcolin@amazon.com>
 2022-01-14 10:27:20 -08:00
lumberyard-employee-dm 18ea4ba6a8 Added a CriticalAssetsCompiled Lifecycle event (#6469) 
The CriticalAssetsCompiled event can be handled to detect when the
AssetProcessor has finished processing Critical Assets

Also with the new event, an audit has been performed over all the
locations where the AssetCatalogEventBus OnCatalogLoaded event was being
handle to make sure it was the proper event to use.
If the handler was actually examing the enumerating over the full
catalog or querying all assets within the catalog, then it was a proper
use.
For handlers that were interested in a particular asset it was not

Moreover added implementations of `OnCatalogAssetChanged` and
`OnCatalogAssetAdded` to the FileTagComponent and the MaterialViewportComponent.

Any applications which uses the AtomToolsApplication
class(MaterialEditor, AtomSampleViewerStandalone,
ShaderMangementConsole) now signals a "CriticalAssetsCompiled" lifecycle
event as well as loads the "assetcatalog.xml" if it exists.

The Launcher application signals the "CrticalAssetsCompiled" event and
reloads the "assetcatalog.xml" for the ${project}.GameLauncher and
${project}.ServerLauncher in Launcher.cpp

Finally the Editor signals the "CriticalAssetsCompiled" and reloads the
"assetcatalog.xml" in CryEdit.cpp

resolves #6093

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-10 15:21:04 -06:00
nemerle f1f81c3789 Merge remote-tracking branch 'upstream/development' into compiletime_filerequest_code2 2022-01-08 21:25:48 +01:00
Mikhail Naumov 8668fac564 Fixing character controller triggering collision on creation (#6546) 
* Fixing character controller triggering collision on creation

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

* PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2022-01-06 17:09:27 -08:00
Tobias Alexander Franke 4245bf7ac9 Notify relative component to acquire wind information when the tag of 
global wind and local wind in PhysX configuration changes.

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-20 09:54:06 +00:00
T.J. McGrath-Daly 15c6f6a4a8 When the tag of Region Force component changed，the AABB of the 
component should be appended to  m_pendingAabbUpdates of local wind
handler in wind bus after the wind provider delete the Force Region
entity.

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-20 09:48:46 +00:00
Nemerle d8e06d9d95 Apply reviewer suggestions 
Signed-off-by: Nemerle <nemerle5+git@gmail.com>
 2021-12-17 16:02:33 +01:00
Tom Hulton-Harrop d065eb9498 Initial improvements to fix viewport icon selection and draw order (#6284) 
* wip fixes for entity viewport icons displaying in the correct order and handling selection correctly

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

* add additional comment about z value

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

* move manual sorting and some small tidy-up

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

* update comment

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

* updates following initial round of PR feedback

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

* additional changes to support tests for entity icon intersection

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

* add support to enable/disable icons separately from helpers

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

* final tests added and small tidy-up to display EntityId correctly

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

* update some manipulator test framework calls after utility functions were moved

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

* fix for implicit cast

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

* move icon scale values to AZ_CVARS

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

* fix failing tests caught in AR and update some naming conventions for tests

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

* update naming convention for members of ProjectedViewportRay

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

* update other references to ProjectedViewportRay

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

* update more references to ProjectedViewportRay change

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

* update menus for python tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-16 09:35:23 +00:00
nemerle 5ff65be314 This reduces non-unity build time by ~2% and build size by ~0.5%. 
This PR is a 'clean' version of #6199 updated to latest development

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-12-12 23:48:47 +01:00
Artur K 53b88d4752 Preapre codebase for FileRequest compiletime improvements (#6192) 
* Preapre codebase for FileRequest compiletime improvements

This is preparing grounds for the next PR that will contain the 'meat'
of the changes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove spurious newline.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-12-10 13:08:24 +00:00
moraaar 5eb058f679 Use LegacySystemInterfaceCreated to initialize physics material library. (#6168) 
* Use LegacySystemInterfaceCreated to initialize physics material library. OnCatalogLoaded was used before but it's not called when running the editor without assets processed yet.

Signed-off-by: moraaar <moraaar@amazon.com>
 2021-12-08 12:23:19 +00:00
Tom Hulton-Harrop 969dbf407a Add tests for planar manipulator draw when dealing with scaling (#6164) 
* add support to add a custom debug display request interface for manipulator test framework

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

* wip changes to support tests for manipulator view drawing

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

* add test for planar manipulator draw when dealing with scaling

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

* additional comments for added context

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

* small updates/fixes after PR feedback

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

* fix for missing NullDebugDisplayRequests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-06 14:53:45 +00:00
Tom Hulton-Harrop 8344539ab6 Manipulator Bounds updates (#5959) 
* first pass updates to improve manipulators

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

* add setting to enable/disable manipulator axis flipping

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

* update manipulator cvar to use ed_ naming convention

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

* wip updates to add AzToolsFramework values to the SettingsRegistry

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

* expose a number of manipulator settings for configuration

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

* add setting for manipulator base scale to change size of all manipulators together

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

* minor updates before posting PR

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

* add manipulator section for settings registry paths

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

* fix for failing unit test after manipulator changes

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

* fix total scale

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

* fix for polygon prism component shape tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-03 14:46:15 +00:00
moraaar 8f4ff91915 Merge pull request #6050 from aws-lumberyard-dev/daimini/physicsMaterialNameCrash 
Add additional check to ensure material library is loaded when trying to retrieve names.
 2021-12-03 11:25:25 +00:00
sphrose e64df3c141 Merge pull request #5695 from aws-lumberyard-dev/terrain/sphrose/heightfield_debugdraw 
LYN-6430 Add debug draw for heightfields.
 2021-12-01 16:50:22 +00:00
Esteban Papp fb6e6e339f Add CRC validator (#5857) 
* Adds crc validation checks

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

* Fixes invalid CRCs

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

* Changes test to smoke suite

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

* excludes some test data from the validator

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

* uses pathlib instead of os.path

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

* fixes wrong path to test scripts

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

* Escape not needed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-30 15:07:57 -08:00
Danilo Aimini 7d611c1f8a Add additional check to ensure material library is loaded when trying to retrieve names. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-11-30 13:00:42 -08:00
sphrose 9ebb7f5c22 review changes. 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-11-30 11:54:21 +00:00
sphrose 9f03e4f4fb LYN-6430 Add debug draw for heightfields. 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-11-30 08:55:57 +00:00
Artur K eca2e36687 Fix clang 13 compilation problems (#5791) 
* Fix clang 13 compilation problems

Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* apply review suggestions

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix type in assert message

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-11-25 09:24:39 +00:00
greerdv f32bf3db8a fix typo in include 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-24 09:39:50 +00:00
greerdv 8c7e3c090c merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-23 21:26:52 +00:00
greerdv 75d7c61ba1 fix variable capitalization 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-23 21:25:50 +00:00
greerdv 23750b8c81 fix direction of manipulator scaling for asset collider when axes are flipped 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-23 11:34:31 +00:00
greerdv 706987cbf4 Merge pull request #5790 from aws-lumberyard-dev/collider-cluster-ui-reorder 
Collider cluster UI reorder
 2021-11-23 11:31:27 +00:00
amzn-sean e52557ee76 restoring physx joint typed tests on all platforms (#5836) 
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-11-23 10:54:00 +00:00
greerdv f3347f56db remove variable only used in assert 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-23 09:40:13 +00:00
greerdv 9513ab8d1e switch back to vector for button ids since there may not be a 1 to 1 mapping to modes in future 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-22 21:54:00 +00:00
greerdv 03e5fd213c feedback from PR 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-22 18:46:29 +00:00
greerdv bd4e012eeb run clang format 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-22 17:59:43 +00:00
greerdv 52846b146e merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-22 17:51:24 +00:00
moraaar bcce0678c4 Fix collider component validation function by checking if the asset is ready (#5795) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-11-22 09:57:51 +00:00
greerdv e2f7893f84 fix collider component mode tests and mapping of number keys to component modes 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-19 15:23:09 +00:00
greerdv 3199cb9777 set initial collider component sub mode to translation 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-19 15:00:58 +00:00
greerdv fd6bbf2872 merge from development 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-11-19 14:01:44 +00:00