izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Chaos - fix a couple more scaled collision issues

Browse Source 
#rb none
#jira none
#preflight 6053e73b4692a10001af6298

[CL 15744024 by Chris Caulfield in ue5-early-access branch]
This commit is contained in:
Chris Caulfield
2021-03-18 20:31:15 -04:00
parent a2df3a047f
commit 3560275fcf
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/Convex.cpp
View File

@@ -132,7 +132,7 @@ namespace Chaos
for (int32 Idx = 0; Idx < Planes.Num(); ++Idx)
{
const TPlaneConcrete<FReal, 3>& Plane = Planes[Idx];
const FVec3 ScaledNormal = (Plane.Normal() * Scale).GetSafeNormal();
const FVec3 ScaledNormal = (Plane.Normal() / Scale).GetSafeNormal();
const FReal Dot = FVec3::DotProduct(ScaledNormal, Normal);
if (Dot < MostOpposingDot)
{

11
Engine/Source/Runtime/Experimental/Chaos/Public/Chaos/ImplicitObjectScaled.h
View File

@@ -701,12 +701,13 @@ public:
virtual TVector<T, 3> FindGeometryOpposingNormal(const TVector<T, d>& DenormDir, int32 HintFaceIndex, const TVector<T, d>& OriginalNormal) const override
{
//ensure(OuterMargin == 0); //not supported: do we care?
// @todo(chaos): we need a virtual FindGeometryOpposingNormal. Some types (Convex, Box) can just return the
// normal from the face index without needing calculating the unscaled normals.
ensure(FMath::IsNearlyEqual(OriginalNormal.SizeSquared(), 1, KINDA_SMALL_NUMBER));
// Get unscaled dir and normal
const TVector<T, 3> LocalDenormDir = DenormDir * MInvScale;
const TVector<T, 3> LocalOriginalNormalDenorm = OriginalNormal * MInvScale;
const TVector<T, 3> LocalDenormDir = DenormDir * MScale;
const TVector<T, 3> LocalOriginalNormalDenorm = OriginalNormal * MScale;
const float NormalLengthScale = LocalOriginalNormalDenorm.Size();
const TVector<T, 3> LocalOriginalNormal
= ensure(NormalLengthScale > SMALL_NUMBER)
@@ -715,10 +716,10 @@ public:
// Compute final normal
const TVector<T, d> LocalNormal = MObject->FindGeometryOpposingNormal(LocalDenormDir, HintFaceIndex, LocalOriginalNormal);
TVector<T, d> Normal = LocalNormal;
TVector<T, d> Normal = LocalNormal * MInvScale;
if (CHAOS_ENSURE(Normal.SafeNormalize(TNumericLimits<T>::Min())) == 0)
{
Normal = TVector<T,3>(0,0,1);
Normal = TVector<T, 3>(0, 0, 1);
}
return Normal;