maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix(part): incorrect comparisons for surface validity

Browse source
This commit is contained in:
maelstrom 2025-04-29 22:41:03 +02:00
parent 22291e6a60
commit fa2ba25c4d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/objects/part.cpp
View file

@ -213,16 +213,17 @@ void Part::MakeJoints() {
for (Vector3 myFace : FACES) { for (Vector3 myFace : FACES) {
Vector3 myWorldNormal = cframe.Rotation() * myFace; Vector3 myWorldNormal = cframe.Rotation() * myFace;
Vector3 validUp = cframe.Rotation() * Vector3(1,1,1).Unit(); // If myFace == (0, 1, 0), then (0, 1, 0) would produce NaN as up, so we fudge the up so that it works Vector3 validUp = cframe.Rotation() * Vector3(1,1,1).Unit(); // If myFace == (0, 1, 0), then (0, 1, 0) would produce NaN as up, so we fudge the up so that it works
CFrame surfaceFrame(cframe.Position(), cframe * (myFace * size), validUp); CFrame surfaceFrame = CFrame::pointToward(cframe * (myFace * size / 2.f), cframe.Rotation() * myFace);
Vector3 mySurfaceCenter = cframe * (myFace * size); Vector3 mySurfaceCenter = cframe * (myFace * size / 2.f);
for (Vector3 otherFace : FACES) { for (Vector3 otherFace : FACES) {
Vector3 otherWorldNormal = otherPart->cframe.Rotation() * otherFace; Vector3 otherWorldNormal = otherPart->cframe.Rotation() * otherFace;
Vector3 otherSurfaceCenter = otherPart->cframe * (otherFace * otherPart->size); Vector3 otherSurfaceCenter = otherPart->cframe * (otherFace * otherPart->size / 2.f);
Vector3 surfacePointLocalToMyFrame = surfaceFrame.Inverse() * otherSurfaceCenter; Vector3 surfacePointLocalToMyFrame = surfaceFrame.Inverse() * otherSurfaceCenter;
float dot = myWorldNormal.Dot(otherWorldNormal); float dot = myWorldNormal.Dot(otherWorldNormal);
if (dot > -0.99) continue; // Surface is pointing opposite to ours if (dot > -0.99) continue; // Surface is pointing opposite to ours
if (abs(surfacePointLocalToMyFrame.Z()) > 0.05) continue; // Surfaces are within 0.05 studs of one another if (abs(surfacePointLocalToMyFrame.Z()) > 0.05) continue; // Surfaces are within 0.05 studs of one another
if (!checkJointContinuity(otherPart)) continue; if (!checkJointContinuity(otherPart)) continue;
@ -243,7 +244,6 @@ void Part::MakeJoints() {
CFrame contactPoint = CFrame::pointToward(mySurfaceCenter, -myWorldNormal); CFrame contactPoint = CFrame::pointToward(mySurfaceCenter, -myWorldNormal);
CFrame contact0 = cframe.Inverse() * contactPoint; CFrame contact0 = cframe.Inverse() * contactPoint;
CFrame contact1 = otherPart->cframe.Inverse() * contactPoint; CFrame contact1 = otherPart->cframe.Inverse() * contactPoint;
addDebugRenderCFrame(contactPoint);
auto joint_ = makeJointFromSurfaces(mySurface, otherSurface); auto joint_ = makeJointFromSurfaces(mySurface, otherSurface);
if (!joint_) continue; if (!joint_) continue;