Skip to content

Commit

Permalink
ContactManifold: rename local variables and formal arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengold committed Feb 7, 2025
1 parent 67f1982 commit 6c3ed38
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions src/main/java/com/github/stephengold/joltjni/ContactManifold.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ final public class ContactManifold
* Instantiate a manifold with the specified native object assigned but not
* owned.
*
* @param pairVa the virtual address of the native object to assign (not
* @param manifoldVa the virtual address of the native object to assign (not
* zero)
*/
public ContactManifold(long pairVa) {
setVirtualAddress(pairVa);
public ContactManifold(long manifoldVa) {
setVirtualAddress(manifoldVa);
}
// *************************************************************************
// ConstContactManifolds methods
Expand All @@ -55,10 +55,10 @@ public ContactManifold(long pairVa) {
*/
@Override
public RVec3 getBaseOffset() {
long pairVa = va();
double x = getBaseOffsetX(pairVa);
double y = getBaseOffsetY(pairVa);
double z = getBaseOffsetZ(pairVa);
long manifoldVa = va();
double x = getBaseOffsetX(manifoldVa);
double y = getBaseOffsetY(manifoldVa);
double z = getBaseOffsetZ(manifoldVa);
RVec3 result = new RVec3(x, y, z);

return result;
Expand All @@ -73,8 +73,8 @@ public RVec3 getBaseOffset() {
*/
@Override
public float getPenetrationDepth() {
long pairVa = va();
float result = getPenetrationDepth(pairVa);
long manifoldVa = va();
float result = getPenetrationDepth(manifoldVa);
return result;
}

Expand All @@ -86,8 +86,8 @@ public float getPenetrationDepth() {
*/
@Override
public SubShapeId getSubShapeId1() {
long pairVa = va();
long idVa = getSubShapeId1(pairVa);
long manifoldVa = va();
long idVa = getSubShapeId1(manifoldVa);
SubShapeId result = new SubShapeId(idVa, true);

return result;
Expand All @@ -101,8 +101,8 @@ public SubShapeId getSubShapeId1() {
*/
@Override
public SubShapeId getSubShapeId2() {
long pairVa = va();
long idVa = getSubShapeId2(pairVa);
long manifoldVa = va();
long idVa = getSubShapeId2(manifoldVa);
SubShapeId result = new SubShapeId(idVa, true);

return result;
Expand All @@ -116,32 +116,32 @@ public SubShapeId getSubShapeId2() {
*/
@Override
public Vec3 getWorldSpaceNormal() {
long pairVa = va();
float x = getWorldSpaceNormalX(pairVa);
float y = getWorldSpaceNormalY(pairVa);
float z = getWorldSpaceNormalZ(pairVa);
long manifoldVa = va();
float x = getWorldSpaceNormalX(manifoldVa);
float y = getWorldSpaceNormalY(manifoldVa);
float z = getWorldSpaceNormalZ(manifoldVa);
Vec3 result = new Vec3(x, y, z);

return result;
}
// *************************************************************************
// native private methods

native private static double getBaseOffsetX(long pairVa);
native private static double getBaseOffsetX(long manifoldVa);

native private static double getBaseOffsetY(long pairVa);
native private static double getBaseOffsetY(long manifoldVa);

native private static double getBaseOffsetZ(long pairVa);
native private static double getBaseOffsetZ(long manifoldVa);

native private static float getPenetrationDepth(long pairVa);
native private static float getPenetrationDepth(long manifoldVa);

native private static long getSubShapeId1(long pairVa);
native private static long getSubShapeId1(long manifoldVa);

native private static long getSubShapeId2(long pairVa);
native private static long getSubShapeId2(long manifoldVa);

native private static float getWorldSpaceNormalX(long pairVa);
native private static float getWorldSpaceNormalX(long manifoldVa);

native private static float getWorldSpaceNormalY(long pairVa);
native private static float getWorldSpaceNormalY(long manifoldVa);

native private static float getWorldSpaceNormalZ(long pairVa);
native private static float getWorldSpaceNormalZ(long manifoldVa);
}

0 comments on commit 6c3ed38

Please sign in to comment.