Skip to content

Commit d43c514

Browse files
committed
that's not how you spell that
1 parent 6d1ac1d commit d43c514

16 files changed

+48
-48
lines changed

BepuPhysics/Collidables/ConvexHullHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ static void ReduceFace(ref QuickList<int> faceVertexIndices, in Vector3 faceNorm
285285
}
286286
return;
287287
}
288-
Helpers.BuildOrthnormalBasis(faceNormal, out var basisX, out var basisY);
288+
Helpers.BuildOrthonormalBasis(faceNormal, out var basisX, out var basisY);
289289
Vector2 centroid = default;
290290
for (int i = 0; i < faceVertexIndices.Count; ++i)
291291
{

BepuPhysics/CollisionDetection/CollisionTasks/BoxConvexHullTester.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public unsafe void Test(ref BoxWide a, ref ConvexHullWide b, ref Vector<float> s
123123
Vector3Wide.ReadSlot(ref hull.Points[previousIndex.BundleIndex], previousIndex.InnerIndex, out var hullFaceOrigin);
124124
var previousVertex = hullFaceOrigin;
125125
var candidateCount = 0;
126-
Helpers.BuildOrthnormalBasis(slotFaceNormal, out var hullFaceX, out var hullFaceY);
126+
Helpers.BuildOrthonormalBasis(slotFaceNormal, out var hullFaceX, out var hullFaceY);
127127
Vector4 maximumVertexContainmentDots = Vector4.Zero;
128128
for (int i = 0; i < faceVertexIndices.Length; ++i)
129129
{

BepuPhysics/CollisionDetection/CollisionTasks/ConvexHullPairTester.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public unsafe void Test(ref ConvexHullWide a, ref ConvexHullWide b, ref Vector<f
7777
Matrix3x3.Transform(slotFaceNormalAInA, slotBLocalOrientationA, out var slotFaceNormalA);
7878
Vector3Wide.ReadSlot(ref localOffsetA, slotIndex, out var slotLocalOffsetA);
7979
ConvexHullTestHelper.PickRepresentativeFace(ref bSlot, slotIndex, ref localNormal, closestOnB, slotOffsetIndices, ref boundingPlaneEpsilon, out var slotFaceNormalB, out var slotLocalNormal, out var bestFaceIndexB);
80-
Helpers.BuildOrthnormalBasis(slotFaceNormalB, out var bFaceX, out var bFaceY);
80+
Helpers.BuildOrthonormalBasis(slotFaceNormalB, out var bFaceX, out var bFaceY);
8181

8282
//Test each face edge plane against the capsule edge.
8383
//Note that we do not use the faceNormal x edgeOffset edge plane, but rather edgeOffset x localNormal.

BepuPhysics/CollisionDetection/CollisionTasks/TriangleConvexHullTester.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public unsafe void Test(ref TriangleWide a, ref ConvexHullWide b, ref Vector<flo
186186
Vector3Wide.ReadSlot(ref hull.Points[previousIndex.BundleIndex], previousIndex.InnerIndex, out var hullFaceOrigin);
187187
var previousVertex = hullFaceOrigin;
188188
var candidateCount = 0;
189-
Helpers.BuildOrthnormalBasis(slotFaceNormal, out var hullFaceX, out var hullFaceY);
189+
Helpers.BuildOrthonormalBasis(slotFaceNormal, out var hullFaceX, out var hullFaceY);
190190
Vector4 maximumVertexContainmentDots = Vector4.Zero;
191191
for (int i = 0; i < faceVertexIndices.Length; ++i)
192192
{

BepuPhysics/Constraints/AngularHinge.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void Prestep(Bodies bodies, ref TwoBodyReferences bodyReferences, int cou
129129
bodies.GatherOrientation(ref bodyReferences, count, out var orientationA, out var orientationB);
130130

131131
//Note that we build the tangents in local space first to avoid inconsistencies.
132-
Helpers.BuildOrthnormalBasis(prestep.LocalHingeAxisA, out var localAX, out var localAY);
132+
Helpers.BuildOrthonormalBasis(prestep.LocalHingeAxisA, out var localAX, out var localAY);
133133
Matrix3x3Wide.CreateFromQuaternion(orientationA, out var orientationMatrixA);
134134
Matrix3x3Wide.TransformWithoutOverlap(prestep.LocalHingeAxisA, orientationMatrixA, out var hingeAxisA);
135135
Matrix2x3Wide jacobianA;

BepuPhysics/Constraints/Contact/ContactConvexTypes.cs

+24-24
Large diffs are not rendered by default.

BepuPhysics/Constraints/Contact/ContactConvexTypes.tt

+3-3
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ for (int i = 0; i < contactCount; ++i)
256256
<#}#>
257257
projection.PremultipliedFrictionCoefficient = <#if (contactCount > 1) {#>(1f / <#=contactCount#>f) * <#}#>prestep.MaterialProperties.FrictionCoefficient;
258258
projection.Normal = prestep.Normal;
259-
Helpers.BuildOrthnormalBasis(prestep.Normal, out var x, out var z);
259+
Helpers.BuildOrthonormalBasis(prestep.Normal, out var x, out var z);
260260
<#var offsetName = contactCount == 1 ? "prestep.Contact0.OffsetA" : "offsetToManifoldCenterA";#>
261261
TangentFriction<#=suffix#>.Prestep(ref x, ref z, ref <#=offsetName#>, <#if (bodyCount == 2) {#>ref offsetToManifoldCenterB, <#}#>ref projection.InertiaA, <#if (bodyCount == 2) {#>ref projection.InertiaB, <#}#>out projection.Tangent);
262262
SpringSettingsWide.ComputeSpringiness(prestep.MaterialProperties.SpringSettings, dt, out var positionErrorToVelocity, out var effectiveMassCFMScale, out projection.SoftnessImpulseScale);
@@ -283,7 +283,7 @@ for (int i = 0; i < contactCount; ++i)
283283
[MethodImpl(MethodImplOptions.AggressiveInlining)]
284284
public void WarmStart(ref BodyVelocities wsvA, <#if(bodyCount == 2) {#>ref BodyVelocities wsvB, <#}#>ref Contact<#=contactCount#><#=suffix#>Projection projection, ref Contact<#=contactCount#>AccumulatedImpulses accumulatedImpulses)
285285
{
286-
Helpers.BuildOrthnormalBasis(projection.Normal, out var x, out var z);
286+
Helpers.BuildOrthonormalBasis(projection.Normal, out var x, out var z);
287287
TangentFriction<#=suffix#>.WarmStart(ref x, ref z, ref projection.Tangent, ref projection.InertiaA, <#if (bodyCount == 2) {#>ref projection.InertiaB, <#}#>ref accumulatedImpulses.Tangent, ref wsvA<#if (bodyCount == 2) {#>, ref wsvB<#}#>);
288288
<#for (int i = 0; i < contactCount; ++i) {#>
289289
PenetrationLimit<#=suffix#>.WarmStart(projection.Penetration<#=i#>, projection.InertiaA, <#if (bodyCount == 2) {#>projection.InertiaB, <#}#>projection.Normal, accumulatedImpulses.Penetration<#=i#>, ref wsvA<#if (bodyCount == 2) {#>, ref wsvB<#}#>);
@@ -294,7 +294,7 @@ for (int i = 0; i < contactCount; ++i)
294294
[MethodImpl(MethodImplOptions.AggressiveInlining)]
295295
public void Solve(ref BodyVelocities wsvA, <#if(bodyCount == 2) {#>ref BodyVelocities wsvB, <#}#>ref Contact<#=contactCount#><#=suffix#>Projection projection, ref Contact<#=contactCount#>AccumulatedImpulses accumulatedImpulses)
296296
{
297-
Helpers.BuildOrthnormalBasis(projection.Normal, out var x, out var z);
297+
Helpers.BuildOrthonormalBasis(projection.Normal, out var x, out var z);
298298
var maximumTangentImpulse = projection.PremultipliedFrictionCoefficient *
299299
(<#for (int i = 0; i < contactCount; ++i) {#>accumulatedImpulses.Penetration<#=i#><#if(i < contactCount - 1){#> + <#}}#>);
300300
TangentFriction<#=suffix#>.Solve(ref x, ref z, ref projection.Tangent, ref projection.InertiaA, <#if (bodyCount == 2) {#>ref projection.InertiaB, <#}#>ref maximumTangentImpulse, ref accumulatedImpulses.Tangent, ref wsvA<#if (bodyCount == 2) {#>, ref wsvB<#}#>);

BepuPhysics/Constraints/Contact/ContactNonconvexCommon.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public void Prestep(Bodies bodies, ref Vector<int> bodyReferences, int count,
236236
ref var prestepContact = ref Unsafe.Add(ref prestepContactStart, i);
237237
ref var projectionContact = ref Unsafe.Add(ref projectionContactStart, i);
238238
projectionContact.Normal = prestepContact.Normal;
239-
Helpers.BuildOrthnormalBasis(prestepContact.Normal, out var x, out var z);
239+
Helpers.BuildOrthonormalBasis(prestepContact.Normal, out var x, out var z);
240240
TangentFrictionOneBody.Prestep(ref x, ref z, ref prestepContact.Offset, ref projectionCommon.InertiaA, out projectionContact.Tangent);
241241
PenetrationLimitOneBody.Prestep(projectionCommon.InertiaA,
242242
prestepContact.Offset, prestepContact.Normal, prestepContact.Depth,
@@ -257,7 +257,7 @@ public unsafe void WarmStart(ref BodyVelocities wsvA, ref TProjection projection
257257
{
258258
ref var contact = ref Unsafe.Add(ref contactStart, i);
259259
ref var contactImpulse = ref Unsafe.Add(ref accumulatedImpulsesStart, i);
260-
Helpers.BuildOrthnormalBasis(contact.Normal, out var x, out var z);
260+
Helpers.BuildOrthonormalBasis(contact.Normal, out var x, out var z);
261261
TangentFrictionOneBody.WarmStart(ref x, ref z, ref contact.Tangent, ref common.InertiaA, ref contactImpulse.Tangent, ref wsvA);
262262
PenetrationLimitOneBody.WarmStart(contact.Penetration, common.InertiaA, contact.Normal, contactImpulse.Penetration, ref wsvA);
263263
}
@@ -275,7 +275,7 @@ public void Solve(ref BodyVelocities wsvA, ref TProjection projection, ref TAccu
275275
{
276276
ref var contact = ref Unsafe.Add(ref contactStart, i);
277277
ref var contactImpulse = ref Unsafe.Add(ref accumulatedImpulsesStart, i);
278-
Helpers.BuildOrthnormalBasis(contact.Normal, out var x, out var z);
278+
Helpers.BuildOrthonormalBasis(contact.Normal, out var x, out var z);
279279
var maximumTangentImpulse = common.FrictionCoefficient * contactImpulse.Penetration;
280280
TangentFrictionOneBody.Solve(ref x, ref z, ref contact.Tangent, ref common.InertiaA, ref maximumTangentImpulse, ref contactImpulse.Tangent, ref wsvA);
281281
PenetrationLimitOneBody.Solve(contact.Penetration, common.InertiaA, contact.Normal, common.SoftnessImpulseScale,
@@ -323,7 +323,7 @@ public void Prestep(Bodies bodies, ref TwoBodyReferences bodyReferences, int cou
323323
ref var prestepContact = ref Unsafe.Add(ref prestepContactStart, i);
324324
ref var projectionContact = ref Unsafe.Add(ref projectionContactStart, i);
325325
projectionContact.Normal = prestepContact.Normal;
326-
Helpers.BuildOrthnormalBasis(prestepContact.Normal, out var x, out var z);
326+
Helpers.BuildOrthonormalBasis(prestepContact.Normal, out var x, out var z);
327327
Vector3Wide.Subtract(prestepContact.Offset, prestepOffsetB, out var contactOffsetB);
328328
TangentFriction.Prestep(ref x, ref z, ref prestepContact.Offset, ref contactOffsetB, ref projectionCommon.InertiaA, ref projectionCommon.InertiaB, out projectionContact.Tangent);
329329
PenetrationLimit.Prestep(projectionCommon.InertiaA, projectionCommon.InertiaB,
@@ -345,7 +345,7 @@ public unsafe void WarmStart(ref BodyVelocities wsvA, ref BodyVelocities wsvB, r
345345
{
346346
ref var contact = ref Unsafe.Add(ref contactStart, i);
347347
ref var contactImpulse = ref Unsafe.Add(ref accumulatedImpulsesStart, i);
348-
Helpers.BuildOrthnormalBasis(contact.Normal, out var x, out var z);
348+
Helpers.BuildOrthonormalBasis(contact.Normal, out var x, out var z);
349349
TangentFriction.WarmStart(ref x, ref z, ref contact.Tangent, ref common.InertiaA, ref common.InertiaB, ref contactImpulse.Tangent, ref wsvA, ref wsvB);
350350
PenetrationLimit.WarmStart(contact.Penetration, common.InertiaA, common.InertiaB, contact.Normal, contactImpulse.Penetration, ref wsvA, ref wsvB);
351351
}
@@ -363,7 +363,7 @@ public void Solve(ref BodyVelocities wsvA, ref BodyVelocities wsvB, ref TProject
363363
{
364364
ref var contact = ref Unsafe.Add(ref contactStart, i);
365365
ref var contactImpulse = ref Unsafe.Add(ref accumulatedImpulsesStart, i);
366-
Helpers.BuildOrthnormalBasis(contact.Normal, out var x, out var z);
366+
Helpers.BuildOrthonormalBasis(contact.Normal, out var x, out var z);
367367
var maximumTangentImpulse = common.FrictionCoefficient * contactImpulse.Penetration;
368368
TangentFriction.Solve(ref x, ref z, ref contact.Tangent, ref common.InertiaA, ref common.InertiaB, ref maximumTangentImpulse, ref contactImpulse.Tangent, ref wsvA, ref wsvB);
369369
PenetrationLimit.Solve(contact.Penetration, common.InertiaA, common.InertiaB, contact.Normal, common.SoftnessImpulseScale, ref contactImpulse.Penetration, ref wsvA, ref wsvB);

BepuPhysics/Constraints/Hinge.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void Prestep(Bodies bodies, ref TwoBodyReferences bodyReferences, int cou
120120
Matrix3x3Wide.TransformWithoutOverlap(prestep.LocalHingeAxisA, orientationMatrixA, out var hingeAxisA);
121121
Matrix3x3Wide.TransformWithoutOverlap(prestep.LocalOffsetB, orientationMatrixB, out projection.OffsetB);
122122
Matrix3x3Wide.TransformWithoutOverlap(prestep.LocalHingeAxisB, orientationMatrixB, out var hingeAxisB);
123-
Helpers.BuildOrthnormalBasis(prestep.LocalHingeAxisA, out var localAX, out var localAY);
123+
Helpers.BuildOrthonormalBasis(prestep.LocalHingeAxisA, out var localAX, out var localAY);
124124
Matrix3x3Wide.TransformWithoutOverlap(localAX, orientationMatrixA, out projection.HingeJacobian.X);
125125
Matrix3x3Wide.TransformWithoutOverlap(localAY, orientationMatrixA, out projection.HingeJacobian.Y);
126126

BepuPhysics/Constraints/PointOnLineServo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void Prestep(Bodies bodies, ref TwoBodyReferences bodyReferences, int cou
152152
Vector3Wide.Add(lineStartToClosestPointOnLine, anchorA, out projection.OffsetA);
153153

154154
//Note again that the basis is created in local space to avoid rapidly changing jacobians.
155-
Helpers.BuildOrthnormalBasis(prestep.LocalDirection, out var localTangentX, out var localTangentY);
155+
Helpers.BuildOrthonormalBasis(prestep.LocalDirection, out var localTangentX, out var localTangentY);
156156
Matrix3x3Wide.TransformWithoutOverlap(localTangentX, orientationMatrixA, out projection.LinearJacobian.X);
157157
Matrix3x3Wide.TransformWithoutOverlap(localTangentY, orientationMatrixA, out projection.LinearJacobian.Y);
158158
GetAngularJacobians(projection.LinearJacobian, projection.OffsetA, projection.OffsetB, out var angularJacobianA, out var angularJacobianB);

BepuPhysics/Helpers.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static void Swap<T>(ref T a, ref T b)
1818
}
1919

2020
[MethodImpl(MethodImplOptions.AggressiveInlining)]
21-
public static void BuildOrthnormalBasis(in Vector3Wide normal, out Vector3Wide t1, out Vector3Wide t2)
21+
public static void BuildOrthonormalBasis(in Vector3Wide normal, out Vector3Wide t1, out Vector3Wide t2)
2222
{
2323
//This could probably be improved.
2424
var sign = Vector.ConditionalSelect(Vector.LessThan(normal.Z, Vector<float>.Zero), -Vector<float>.One, Vector<float>.One);
@@ -47,7 +47,7 @@ public static void FindPerpendicular(in Vector3Wide normal, out Vector3Wide perp
4747
}
4848

4949
[MethodImpl(MethodImplOptions.AggressiveInlining)]
50-
public static void BuildOrthnormalBasis(in Vector3 normal, out Vector3 t1, out Vector3 t2)
50+
public static void BuildOrthonormalBasis(in Vector3 normal, out Vector3 t1, out Vector3 t2)
5151
{
5252
var sign = normal.Z < 0 ? -1f : 1f;
5353

DemoRenderer/Constraints/ContactLineExtractor.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace DemoRenderer.Constraints
1010
public static class ContactLines
1111
{
1212
[MethodImpl(MethodImplOptions.AggressiveInlining)]
13-
public static void BuildOrthnormalBasis(in Vector3 normal, out Vector3 t1, out Vector3 t2)
13+
public static void BuildOrthonormalBasis(in Vector3 normal, out Vector3 t1, out Vector3 t2)
1414
{
1515
//No frisvad or friends here- just want a simple and consistent basis with only one singularity.
1616
//Could be faster if needed.
@@ -32,7 +32,7 @@ public static void Add(in RigidPose poseA, ref Vector3Wide offsetAWide, ref Vect
3232
Vector3Wide.ReadFirst(normalWide, out var normal);
3333
var depth = depthWide[0];
3434
var contactPosition = offsetA + poseA.Position;
35-
BuildOrthnormalBasis(normal, out var t1, out var t2);
35+
BuildOrthonormalBasis(normal, out var t1, out var t2);
3636
var packedColor = Helpers.PackColor(tint * (depth >= 0 ? new Vector3(0,1,0) : new Vector3(0.15f, 0.25f, 0.15f)));
3737
t1 *= 0.5f;
3838
t2 *= 0.5f;

DemoRenderer/Constraints/LinearAxisServoLineExtractor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public unsafe void ExtractLines(ref LinearAxisServoPrestepData prestepBundle, in
3434
var packedBasisColor = Helpers.PackColor(new Vector3(0.2f, 0.6f, 1f) * tint);
3535
var backgroundColor = new Vector3(0f, 0f, 1f) * tint;
3636
lines.AllocateUnsafely() = new LineInstance(poseA.Position, anchorA, packedColor, 0);
37-
ContactLines.BuildOrthnormalBasis(localPlaneNormal, out var localTX, out var localTY);
37+
ContactLines.BuildOrthonormalBasis(localPlaneNormal, out var localTX, out var localTY);
3838
Matrix3x3.Transform(localTX, orientationA, out var tX);
3939
Matrix3x3.Transform(localTY, orientationA, out var tY);
4040
lines.AllocateUnsafely() = new LineInstance(anchorA - tX, anchorA + tX, packedBasisColor, 0);

Demos/Demos/SolverContactEnumerationDemo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public override void Render(Renderer renderer, Camera camera, Input input, TextB
245245
Matrix3x3 basisPose;
246246
//We want to visualize both friction and penetration impulses, so a cylinder is a good choice- radius and length.
247247
//The length will be oriented along the contact normal, while the radius will expand along the tangent directions.
248-
BepuPhysics.Helpers.BuildOrthnormalBasis(contact.Normal, out basisPose.X, out basisPose.Z);
248+
BepuPhysics.Helpers.BuildOrthonormalBasis(contact.Normal, out basisPose.X, out basisPose.Z);
249249
basisPose.Y = contact.Normal;
250250
var baseLength = 0.2f;
251251
var baseRadius = 0.1f;

Demos/Demos/SweepDemo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ unsafe void DrawSweep<TShape>(TShape shape, ref RigidPose pose, in BodyVelocity
156156
unsafe void DrawImpact(Renderer renderer, ref Vector3 hitLocation, ref Vector3 hitNormal)
157157
{
158158
//The normal itself will tend to be obscured by the shapes, so instead draw two lines representing the plane.
159-
DemoRenderer.Constraints.ContactLines.BuildOrthnormalBasis(hitNormal, out var tangent1, out var tangent2);
159+
DemoRenderer.Constraints.ContactLines.BuildOrthonormalBasis(hitNormal, out var tangent1, out var tangent2);
160160
renderer.Lines.Allocate() = new DemoRenderer.Constraints.LineInstance(hitLocation - tangent1, hitLocation + tangent1, new Vector3(0, 1, 0), new Vector3());
161161
renderer.Lines.Allocate() = new DemoRenderer.Constraints.LineInstance(hitLocation - tangent2, hitLocation + tangent2, new Vector3(0, 1, 0), new Vector3());
162162
}

Demos/SpecializedTests/DepthRefinerTestDemo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@
455455
// renderer.Lines.Allocate() = new LineInstance(basePosition, basePosition + step.SearchTarget, new Vector3(1, 0, 0), default);
456456
// else
457457
// {
458-
// ContactLines.BuildOrthnormalBasis(step.BestNormal, out var x, out var y);
458+
// ContactLines.BuildOrthonormalBasis(step.BestNormal, out var x, out var y);
459459

460460
// renderer.Lines.Allocate() = new LineInstance(basePosition, basePosition + step.BestNormal, new Vector3(1, 0, 0), default);
461461
// renderer.Lines.Allocate() = new LineInstance(basePosition + step.BestNormal * step.BestDepth, basePosition + x * 0.1f + step.BestNormal * step.BestDepth, new Vector3(1, 1, 0), default);

0 commit comments

Comments
 (0)