35406e27e1
Merge branch 'development' into math_string_converters
2022-02-14 10:42:48 -08:00
4e6bd3d25c
Consolidate various to_string implementations for math classes
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2022-02-11 17:58:28 -08:00
7a63d33f92
extract reused manipulator scaling logic
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-11 12:01:22 +00:00
773336d388
refactor and tidy up
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 10:39:20 +00:00
8ca4dbf2da
refactor and tidy up
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 10:39:18 +00:00
a4d5587183
fix scaling manipulator for sphere collider with non-uniform scale
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 10:39:16 +00:00
bb4c896311
fix scaling issue with collider offset manipulators
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 10:39:15 +00:00
08eb115e26
fix various issues with collider manipulators and non-uniform scale
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 10:39:11 +00:00
8f48e4fcb6
Moved if section to the top
...
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com >
2022-01-31 11:04:13 +00:00
fc02783200
Fixed crash and asserts when heightfield is used without Terrain World
...
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com >
2022-01-28 17:14:21 +00:00
601858978f
The default android platform settings refer to lumberyard #3881 ( #7073 )
...
* WIP
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Commit before merging
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Added new pngs
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 >
* Fixed CRC errors
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
2022-01-25 11:49:05 +00:00
d8e06d9d95
Apply reviewer suggestions
...
Signed-off-by: Nemerle <nemerle5+git@gmail.com >
2021-12-17 16:02:33 +01:00
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
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
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
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
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
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
9ebb7f5c22
review changes.
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-11-30 11:54:21 +00:00
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
8c7e3c090c
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-23 21:26:52 +00:00
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
f3347f56db
remove variable only used in assert
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-23 09:40:13 +00:00
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
03e5fd213c
feedback from PR
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-22 18:46:29 +00:00
bd4e012eeb
run clang format
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-22 17:59:43 +00:00
52846b146e
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-22 17:51:24 +00:00
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
3199cb9777
set initial collider component sub mode to translation
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-19 15:00:58 +00:00
fd6bbf2872
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-19 14:01:44 +00:00
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
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
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
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
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
3d67be162c
Terrain Physics Heightfield support
...
* New Heightfield Components
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Misc PR fixes
* Fixed linux build failure from bad #include
* Renamed "Terrain Physics Collider" to "Terrain Physics Heightfield Collider" per physics team feedback
* Fixed 1/5 -> 1/4 typo in a comment
* Added missing member copies in HeightfieldShapeConfiguration
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Addressed PR feedback
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Changes from review
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Remove tabs accidently added
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Fixed overly complicated scaling math.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Added comments to make it more obvious what's happening on CreateEnd / DestroyBegin.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Moved Heightfield CreatePxGeometryFromConfig into its own function
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
Co-authored-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-10-22 10:19:36 -05:00
cff2315654
small correction to wording
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-10-14 16:55:07 +01:00
ec10bb078e
improve wording for all PhysX gem tooltips apart from pipeline, fixes 3898
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-10-14 16:06:13 +01:00
606ba45cf2
Fixed PhysX and Blast creation of default config files ( #4497 )
...
- Avoid saving blast global configuration unnecessarily every time the editor is opened.
- Fixed how to obtain the default physics material library. The relative path needs to be from the project folder, not the asset folder inside the project. It was also missing saving the physx configuration after a the default library is assigned to it.
- Fixed asset id for physics material asset 'assets/physics/surfacetypemateriallibrary.physmaterial'
Signed-off-by: moraaar moraaar@amazon.com
2021-10-06 09:46:04 +01:00
43748c37fd
update joints to use cluster viewport ui. ( #4352 )
...
also some joints Component mode cleanup.
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-09-30 13:39:22 +01:00
f44169f7fa
Cleanup SerializeContext.h pt.1 ( #4264 )
...
* Remove AssetSerializer inclusion from SerializeContext header
Moved a few Reflect methods to new cpp files.
In addition, some preparations for further header dependency reductions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix smoke test lua failures.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Windows build fixes.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Missing license headers
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix white-space issues.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix inheritance list wrapping broken by older clang-format
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-09-29 11:31:01 -05:00
28d45891f2
Remove redundant API calls from EditorViewportWidget and use new WorldToScreen call ( #4022 )
...
* remove redundant API calls from EditorViewportWidget and use new WorldToScreen call
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* remove additional pre/post widget render calls that are no longer required
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-09-13 09:36:34 +01:00
2a2847b15d
Legacy code cleanup - part 3 ( #3903 )
...
* Legacy cleanup - part 3
Not much is left that can be easily removed,
so I think this will be last cleanup before the legacy functionality is replaced.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* fix windows build, remove a few more things, re-add one file
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Remove legacy RenderBus + more cleanups
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Remove MaterialOwnerBus.h
Clean-up in Cry_Matrix34/33
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-09-07 12:14:16 -06:00
a374ea29f2
Expose setting to adjust angular manipulator circle bound ( #3932 )
...
* add debug drawing for angular manipulator bounds
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* remove editor viewport settings from RenderViewport
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* add setting for angular manipulator circle bound
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* update minimum value allowed for some camera settings
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* updates following review feedback, some small tidy-up
Signed-off-by: hultonha <hultonha@amazon.co.uk >
* update comment
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-09-06 14:22:57 +01:00
5851031d2e
Expose the ability to control manipulator line bounds ( #3890 )
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-09-03 10:14:03 +01:00
8c526eeeb6
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 11:13:56 -07:00
b4279ab3d8
Remove touchbending references in PhysX Gem ( #3320 )
...
* minor comments update
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-08-23 14:54:56 +01:00
4ae74c913f
Gems/PhysX
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 17:59:49 -07:00
7ec3283a3e
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-08-06 11:06:32 +01:00
0f58d7394e
fixes #2544 , fixes all doc links for physx, cloth, blast and white box
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-08-06 11:05:31 +01:00
puvvadar
greerdv
Sergey Pereslavtsev
John Jones-Steele
Nemerle
Tom Hulton-Harrop
nemerle
sphrose
Esteban Papp
amzn-sean
Mike Balfour
moraaar