birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preapre codebase for FileRequest compiletime improvements (#6192)

Browse Source 
* 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>
This commit is contained in:
Artur K
2021-12-10 14:08:24 +01:00
committed by GitHub
parent 633a9e939a
commit 53b88d4752
47 changed files with 3739 additions and 3777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Source/Material.cpp
+9 -9
View File
@@ -14,7 +14,7 @@
namespace PhysX
{
Material::Material(Material&& material)
Material::Material(Material&& material)
: m_pxMaterial(AZStd::move(material.m_pxMaterial))
, m_surfaceType(material.m_surfaceType)
, m_surfaceString(AZStd::move(material.m_surfaceString))
@@ -103,7 +103,7 @@ namespace PhysX
SetDebugColor(materialConfiguration.m_debugColor);
Physics::LegacySurfaceTypeRequestsBus::BroadcastResult(
m_cryEngineSurfaceId,
m_cryEngineSurfaceId,
&Physics::LegacySurfaceTypeRequestsBus::Events::GetLegacySurfaceTypeFronName,
m_surfaceString);
}
@@ -159,7 +159,7 @@ namespace PhysX
void Material::SetDynamicFriction(float dynamicFriction)
{
AZ_Warning("PhysX Material", dynamicFriction >= 0.0f,
AZ_Warning("PhysX Material", dynamicFriction >= 0.0f,
"SetDynamicFriction: Dynamic friction %f for material %s is out of range [0, PX_MAX_F32)",
dynamicFriction, m_surfaceString.c_str());
@@ -176,10 +176,10 @@ namespace PhysX
void Material::SetStaticFriction(float staticFriction)
{
AZ_Warning("PhysX Material", staticFriction >= 0.0f,
AZ_Warning("PhysX Material", staticFriction >= 0.0f,
"SetStaticFriction: Static friction %f for material %s is out of range [0, PX_MAX_F32)",
staticFriction, m_surfaceString.c_str());
if (m_pxMaterial)
{
m_pxMaterial->setStaticFriction(AZ::GetMax(0.0f, staticFriction));
@@ -193,7 +193,7 @@ namespace PhysX
void Material::SetRestitution(float restitution)
{
AZ_Warning("PhysX Material", restitution >= 0 && restitution <= 1.0f,
AZ_Warning("PhysX Material", restitution >= 0 && restitution <= 1.0f,
"SetRestitution: Restitution %f for material %s is out of range [0, 1]",
restitution, m_surfaceString.c_str());
@@ -316,8 +316,8 @@ namespace PhysX
}
// It is important to return exactly the amount of materials specified in materialSelection
// If a number of materials different to what was cooked is assigned on a physx mesh it will lead to undefined
// behavior and subtle bugs. Unfortunately, there's no warning or assertion on physx side at the shape creation time,
// If a number of materials different to what was cooked is assigned on a physx mesh it will lead to undefined
// behavior and subtle bugs. Unfortunately, there's no warning or assertion on physx side at the shape creation time,
// nor mention of this in the documentation
outMaterials.resize(materialIdsAssignedToSlots.size(), GetDefaultMaterial());
@@ -390,7 +390,7 @@ namespace PhysX
if (!assetConfiguration.m_asset.IsReady())
{
// The asset is valid but is still loading,
// The asset is valid but is still loading,
// Do not set the empty slots in this case to avoid the entity being in invalid state
return;
}