a2d86a9fa4
Merge branch 'development' into math_string_converters
2022-02-15 11:32:21 -08:00
0b317ee0f5
Merge pull request #7566 from aws-lumberyard-dev/fixClangWindowsBuild
...
Fix clang windows build
2022-02-14 14:20:39 -08:00
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
664403c5de
Mark benchmark state variables in for loops as unused in benchmarks
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2022-02-10 15:36:15 -08:00
2ad3cb770b
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-10 17:23:25 +00:00
c7e1a6d0b6
add more collider manipulator tests
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-10 16:43:49 +00:00
dac3bc4ba6
Added option to disable edit button in asset widgets when there are no asset selected. ( #7521 )
...
Added new attribute "DisableEditButtonWheNoAssetSelected" to PropertyAssetCtrl. By default it's false, keeping the original behavior of leaving the edit button enabled and if it's clicked while there is no asset assigned it'll try to create a new one.
PhysX mesh asset property uses now this new feature.
Signed-off-by: moraaar moraaar@amazon.com
2022-02-10 12:23:38 +00:00
32f9e48ad4
add more tests for collider offset and scale manipulators with non-uniform scale
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-09 22:39:25 +00:00
23788e9297
fix bug with placement of debug draw for mesh geometry in asset colliders with non-uniform scale
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 12:51:28 +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
d37315c2af
tidy up bus usage
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 10:39:13 +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
c6a0d76843
Merge pull request #7248 from aws-lumberyard-dev/TerrainMaterialsFix
...
Fixed crash and asserts when heightfield is used without Terrain World
2022-02-01 10:29:54 +00:00
b455b915a8
Making terrain query resolution a single float instead of a Vector2 ( #7186 )
...
* Making terrain query resolution a single float instead of a Vector2
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Keeping the concept of different x/y step sizes in region queries since that may be useful and is separate from query resolution. Also keeping the concept of different x/y step sizes in physics since that's independent of the terrain gem.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Formatting cleanups
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* A few more minor cleanups
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Added support to convert serialized Vector2 query resolution to a single float.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Switch ray intersection check back to using separate values for x and y resolution
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Fixing new unit tests added to use float query resolution.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Updating automated test
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2022-01-31 16:10:03 -06: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
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
71640c1c82
Merge pull request #6376 from nemerle/compiletime_filerequest_code2
...
Compile time reduction - FileRequest & related changes
2022-01-24 11:43:27 -06:00
8d7500f9c3
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-01-24 12:39:08 +00:00
d412f3cc50
update with feedback from PR
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-01-24 12:38:15 +00:00
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
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
b21878d04e
Removed unused variable
...
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com >
2022-01-21 19:57:28 +00:00
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
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
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
f61011f5ac
add editor side tests for quad colliders
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-01-20 19:45:59 +00:00
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
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
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
1036226bd0
Merge branch 'development' into bug-physX-wind-72
2022-01-18 15:54:49 +00:00
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
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
f1f81c3789
Merge remote-tracking branch 'upstream/development' into compiletime_filerequest_code2
2022-01-08 21:25:48 +01:00
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
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
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
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
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
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
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
puvvadar
Chris Burel
greerdv
moraaar
SergeyAMZN
Ken Pruiksma
Sergey Pereslavtsev
John Jones-Steele
Chris Galvan
Daniel Edwards
Steve Pham
T.J. McGrath-Daly
AMZN-byrcolin
lumberyard-employee-dm
nemerle
Mikhail Naumov
Tobias Alexander Franke
Nemerle
Tom Hulton-Harrop