Commit Graph

197 Commits (f2378fc8d8afd9e97d2b51b0b09e62c70eb8b39b)

Author SHA1 Message Date
greerdv 2ad3cb770b merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
moraaar 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
4 years ago
greerdv 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>
4 years ago
greerdv 8ca4dbf2da refactor and tidy up
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv d37315c2af tidy up bus usage
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 08eb115e26 fix various issues with collider manipulators and non-uniform scale
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
SergeyAMZN c6a0d76843
Merge pull request #7248 from aws-lumberyard-dev/TerrainMaterialsFix
Fixed crash and asserts when heightfield is used without Terrain World
4 years ago
Ken Pruiksma 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>
4 years ago
Sergey Pereslavtsev fc02783200 Fixed crash and asserts when heightfield is used without Terrain World
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
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
4 years ago
Chris Galvan 71640c1c82
Merge pull request #6376 from nemerle/compiletime_filerequest_code2
Compile time reduction - FileRequest & related changes
4 years ago
greerdv 8d7500f9c3 merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv d412f3cc50 update with feedback from PR
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
SergeyAMZN a623e52331
Merge pull request #7040 from aws-lumberyard-dev/TerrainMaterialsFix
LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
greerdv f61011f5ac add editor side tests for quad colliders
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv a8eb5be2e6 fix order of triangle indices for single-sided quad collider
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv cc50a18fe9 add support for quad shapes in shape collider component
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
Sergey Pereslavtsev c31e3c0208 LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
T.J. McGrath-Daly 1036226bd0 Merge branch 'development' into bug-physX-wind-72 4 years ago
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>
4 years ago
nemerle f1f81c3789 Merge remote-tracking branch 'upstream/development' into compiletime_filerequest_code2 4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
Nemerle d8e06d9d95 Apply reviewer suggestions
Signed-off-by: Nemerle <nemerle5+git@gmail.com>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
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.
4 years ago
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>
4 years ago
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>
4 years ago
amzn-sean e52557ee76
restoring physx joint typed tests on all platforms (#5836)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
moraaar bcce0678c4
Fix collider component validation function by checking if the asset is ready (#5795)
Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
puvvadar 868cac6d47 Merge commit '1b63ca3bc0924a143b2952cdf88cca0e8a57dc57' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar de6c1213a7 Merge commit 'cf540b6f44c7e439505a29d8d2ce4989c4ae8232' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar da15731fd3 Merge commit '823b5bde0b14c33a16a9993e43106eeaf442adae' into puvvadar/gitflow_211118_o3de 4 years ago
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>
4 years ago
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>
4 years ago
greerdv 5594a61ece apply feedback from PR
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 23d752e07d add option to clamp ragdoll joint masses to avoid bad mass ratios
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
greerdv 5054cfe9b5 fix typo
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv d945a031c1 prevent twist limits being created with equal lower and upper limits
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
AMZN-ScottR 9b39c63bba Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Esteban Papp 43563060bc
Making trait variable consistent and fixing warning (#5118)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago