Commit Graph

264 Commits

Author SHA1 Message Date
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
puvvadar 868cac6d47 Merge commit '1b63ca3bc0924a143b2952cdf88cca0e8a57dc57' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:46 -08:00
puvvadar de6c1213a7 Merge commit 'cf540b6f44c7e439505a29d8d2ce4989c4ae8232' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:03 -08:00
puvvadar da15731fd3 Merge commit '823b5bde0b14c33a16a9993e43106eeaf442adae' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:59 -08:00
Mike Balfour 1b63ca3bc0 Terrain component icon updates. (#5722)
* Terrain component icon updates.
Refreshed using latest icons from UX.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Revised icons from UX.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-11-18 11:30:03 -06:00
greerdv d05d304fe8 highlight the button corresponding to the currently selected collider component mode
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-18 13:49:18 +00:00
amzn-sean cf540b6f44 Defaulting the joint setup display to ON instead of OFF (#5696)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-11-18 09:57:29 +00:00
greerdv 1aae3d5619 reorder cluster UI for collider component mode to match order in entity UI
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-17 19:10:48 +00:00
Tommy Walton b522d15bb7 Merge commit '7da0913900b6c93a0dfaa77f6880316ac70e7852' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:55:10 -08:00
greerdv 5594a61ece apply feedback from PR
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-16 15:56:56 +00:00
greerdv ced217a96b merge from stabilization/2110
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-16 12:51:29 +00:00
greerdv 23d752e07d add option to clamp ragdoll joint masses to avoid bad mass ratios
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-16 12:50:11 +00:00
amzn-sean 7da0913900 Fixed empty cluster UI appearing in joints component mode. (#5547)
Happens if 'limits' or 'breakable' settings are off on the joint when entering component mode.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-11-16 10:57:32 +00:00
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2021-11-11 10:15:52 -08:00
greerdv 5054cfe9b5 fix typo
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-10 22:04:40 +00:00
greerdv d945a031c1 prevent twist limits being created with equal lower and upper limits
Signed-off-by: greerdv <greerdv@amazon.com>
2021-11-10 19:30:12 +00:00
lumberyard-employee-dm 5fc4551ac0 [LYN-8041] Enable relocation of the Project Game Release Layout (#5380)
* Enable relocation of the Project Game Release Layout

Relocating the Project Game Release Layout to another directory on the file system failed due to the querying of the engine root failing due to the ComponentApplication::m_engineRoot not using the project path stored in the SettingsRegisry if the engine root cannot be detected

Removed the ApplicationRequestBus GetEngineRoot function.
The ComponentApplicationRequestBus has a function of the same name that returns the same path.

Removed the deprecated GetAppRoot function.
The path it returns has no defined value. It was not the engine root or the project root.
Removed unused CFileUtil and CFileUtil_impl functions that were invoking the ApplicationREquestBus GetEngineRoot function.
On the way to update the functions it was discovered that they aren't called

Added a CalculateBranchToken overload that can populate a fixed_string to avoid heap allocations

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

* Protect against an empty list of artifacts to remove when generating the
engine.pak

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-09 12:03:52 -06:00
John Jones-Steele c35f74e9ce Physics/test axis aligned box shape configuration works #7378a (#5366)
* Safety commit before merging

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

* Moved from Physics to Terrain

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

* Changes from PR + AR fix

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

* Fixed another AR bug

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

* Fixed another AR compilation bug

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

* More PR changes

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

* Added virtual destructor

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

* Added TestSuite_main_Optimized.py

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>

* Further fixes for PR

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

* Fix to editor_test.py

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

* Testing prefab level

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

* Testing slice level

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

* Testing prefab level

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

* Disabled orefab loading for the time being.

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2021-11-09 14:11:33 +00:00
Yuriy Toporovskyy e43d60583c Fix a bug where a rigid body with multiple shapes would ignore all shapes except the first
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-11-04 14:43:05 -04:00
AMZN-ScottR 9b39c63bba Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-11-01 11:43:19 -07:00
Esteban Papp 43563060bc Making trait variable consistent and fixing warning (#5118)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-01 08:44:22 -07:00
AMZN-ScottR 2d7c6af97c Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-29 17:21:29 -07:00
AMZN-ScottR eb713fb3a8 Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-28 12:19:50 -07:00
John Jones-Steele 35467b63d9 Unit tests for Heightfield collider (#5042)
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-10-27 19:31:30 +01:00
moraaar a29623e5f0 Fixed editor crash using cylinder shape component (#5037)
Fixed cylinder shape by considering shape config list to be empty.

The crash came from clearing shape config list when cylinder height is zero, but when the height is restored to zero it was expecting an element in the list.

The code to set the shape configuration was the same for many shape types, so it has been refactored to a helper function.

Fixes #4999
2021-10-27 13:34:43 +01:00
AMZN-ScottR a2c42ab072 [profiler_capture_api] started migration of ProfilerRequests EBus to AZ::Interface
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-26 15:15:52 -07:00
moraaar 057c8e0d4e Fixed error: unused variable 'physxMaximumMaterialIndex' (#4989)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-10-26 13:58:21 +01:00
Mike Balfour 243532c5de Addressed feedback from PR 4874. (#4915)
* Addressed feedback from PR 4874.
* Removed second copy of HeightfieldProviderBus.h from cmake file
* Changed CookedMeshShapeConfiguration and HeightfieldShapeConfiguration to have less messy implementations, instead opting for the slightly less messy const_cast inside of Utils.cpp and DebugDraw.cpp.
* Changed InitHeightfieldShapeConfiguraiton to CreateHeightfieldShapeConfiguration with a better API signature.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed indentation

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-10-22 14:33:36 -05:00