Skip to content

Commit

Permalink
ConstJoltPhysicsObject: replace va() with non-final targetVa() method
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephengold
stephengold committed Nov 7, 2024
1 parent ab2998a commit e3d80c1
Show file tree
Hide file tree
Showing 46 changed files with 155 additions and 141 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/github/stephengold/joltjni/BodyCreationSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public BodyCreationSettings() {
*/
public BodyCreationSettings(ConstShape shape, RVec3Arg loc, QuatArg orient,
EMotionType motionType, int objLayer) {
long shapeVa = shape.va();
long shapeVa = shape.targetVa();
int motionTypeOrdinal = motionType.ordinal();
long bodySettingsVa = createFromShape(
shapeVa, loc.xx(), loc.yy(), loc.zz(),
Expand Down Expand Up @@ -414,7 +414,7 @@ public void setRotation(QuatArg quat) {
*/
public void setShape(ConstShape shape) {
long bodySettingsVa = va();
long shapeVa = shape.va();
long shapeVa = shape.targetVa();
setShape(bodySettingsVa, shapeVa);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/stephengold/joltjni/BodyFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public BodyFilter() {
*/
public boolean shouldCollide(ConstBodyId bodyId) {
long filterVa = va();
long idVa = bodyId.va();
long idVa = bodyId.targetVa();
boolean result = shouldCollide(filterVa, idVa);

return result;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/stephengold/joltjni/BodyId.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public int getSequenceNumber() {
@Override
public boolean isEqual(ConstBodyId id2) {
long id1va = va();
long id2va = id2.va();
long id2va = id2.targetVa();
boolean result = equals(id1va, id2va);

return result;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/stephengold/joltjni/BodyIdVector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public BodyIdVector() {
*/
public int find(ConstBodyId id) {
long vectorVa = va();
long idVa = id.va();
long idVa = id.targetVa();
int numIds = size(vectorVa);
for (int i = 0; i < numIds; ++i) {
long id2Va = getId(vectorVa, i);
Expand Down
78 changes: 39 additions & 39 deletions src/main/java/com/github/stephengold/joltjni/BodyInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class BodyInterface extends NonCopyable {
*/
public void activateBody(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
activateBody(bodyInterfaceVa, bodyIdVa);
}

Expand All @@ -78,7 +78,7 @@ public void activateBody(ConstBodyId bodyId) {
public void activateBodiesInAaBox(ConstAaBox box,
BroadPhaseLayerFilter bplFilter, ObjectLayerFilter olFilter) {
long bodyInterfaceVa = va();
long boxVa = box.va();
long boxVa = box.targetVa();
long bplFilterVa = bplFilter.va();
long olFilterVa = olFilter.va();
activateBodiesInAaBox(bodyInterfaceVa, boxVa, bplFilterVa, olFilterVa);
Expand All @@ -92,7 +92,7 @@ public void activateBodiesInAaBox(ConstAaBox box,
*/
public void addBody(ConstBodyId bodyId, EActivation activation) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
int activationOrdinal = activation.ordinal();
addBody(bodyInterfaceVa, bodyIdVa, activationOrdinal);
}
Expand All @@ -105,7 +105,7 @@ public void addBody(ConstBodyId bodyId, EActivation activation) {
*/
public void addForce(ConstBodyId bodyId, Vec3Arg force) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float fx = force.getX();
float fy = force.getY();
float fz = force.getZ();
Expand All @@ -122,7 +122,7 @@ public void addForce(ConstBodyId bodyId, Vec3Arg force) {
*/
public void addForce(ConstBodyId bodyId, Vec3Arg force, RVec3Arg location) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float fx = force.getX();
float fy = force.getY();
float fz = force.getZ();
Expand All @@ -140,7 +140,7 @@ public void addForce(ConstBodyId bodyId, Vec3Arg force, RVec3Arg location) {
*/
public void addImpulse(ConstBodyId bodyId, Vec3Arg impulse) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float jx = impulse.getX();
float jy = impulse.getY();
float jz = impulse.getZ();
Expand All @@ -158,7 +158,7 @@ public void addImpulse(ConstBodyId bodyId, Vec3Arg impulse) {
public void addImpulse(ConstBodyId bodyId, Vec3Arg impulse,
RVec3Arg location) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float jx = impulse.getX();
float jy = impulse.getY();
float jz = impulse.getZ();
Expand All @@ -176,7 +176,7 @@ public void addImpulse(ConstBodyId bodyId, Vec3Arg impulse,
*/
public void addTorque(ConstBodyId bodyId, Vec3Arg torque) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float x = torque.getX();
float y = torque.getY();
float z = torque.getZ();
Expand Down Expand Up @@ -223,7 +223,7 @@ public BodyId createAndAddSoftBody(ConstSoftBodyCreationSettings settings,
*/
public Body createBody(ConstBodyCreationSettings settings) {
long bodyInterfaceVa = va();
long settingsVa = settings.va();
long settingsVa = settings.targetVa();
long bodyVa = createBody(bodyInterfaceVa, settingsVa);
if (bodyVa == 0L) {
throw new IllegalStateException("ran out of bodies");
Expand All @@ -246,8 +246,8 @@ public TwoBodyConstraint createConstraint(
ConstBodyId body1Id, ConstBodyId body2Id) {
long bodyInterfaceVa = va();
long settingsVa = settings.va();
long body1IdVa = body1Id.va();
long body2IdVa = body2Id.va();
long body1IdVa = body1Id.targetVa();
long body2IdVa = body2Id.targetVa();
long constraintVa = createConstraint(
bodyInterfaceVa, settingsVa, body1IdVa, body2IdVa);
TwoBodyConstraint result
Expand All @@ -264,7 +264,7 @@ public TwoBodyConstraint createConstraint(
*/
public Body createSoftBody(ConstSoftBodyCreationSettings settings) {
long bodyInterfaceVa = va();
long settingsVa = settings.va();
long settingsVa = settings.targetVa();
long bodyVa = createSoftBody(bodyInterfaceVa, settingsVa);
if (bodyVa == 0L) {
throw new IllegalStateException("ran out of bodies");
Expand All @@ -281,7 +281,7 @@ public Body createSoftBody(ConstSoftBodyCreationSettings settings) {
*/
public void deactivateBody(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
deactivateBody(bodyInterfaceVa, bodyIdVa);
}

Expand All @@ -292,7 +292,7 @@ public void deactivateBody(ConstBodyId bodyId) {
*/
public void destroyBody(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
destroyBody(bodyInterfaceVa, bodyIdVa);
}

Expand All @@ -305,7 +305,7 @@ public void destroyBody(ConstBodyId bodyId) {
*/
public Vec3 getAngularVelocity(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float x = getAngularVelocityX(bodyInterfaceVa, bodyIdVa);
float y = getAngularVelocityY(bodyInterfaceVa, bodyIdVa);
float z = getAngularVelocityZ(bodyInterfaceVa, bodyIdVa);
Expand All @@ -322,7 +322,7 @@ public Vec3 getAngularVelocity(ConstBodyId bodyId) {
*/
public EBodyType getBodyType(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
int ordinal = getBodyType(bodyInterfaceVa, bodyIdVa);
EBodyType result = EBodyType.values()[ordinal];

Expand All @@ -337,7 +337,7 @@ public EBodyType getBodyType(ConstBodyId bodyId) {
*/
public RVec3 getCenterOfMassPosition(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
double xx = getCenterOfMassPositionX(bodyInterfaceVa, bodyIdVa);
double yy = getCenterOfMassPositionY(bodyInterfaceVa, bodyIdVa);
double zz = getCenterOfMassPositionZ(bodyInterfaceVa, bodyIdVa);
Expand All @@ -354,7 +354,7 @@ public RVec3 getCenterOfMassPosition(ConstBodyId bodyId) {
*/
public RMat44 getCenterOfMassTransform(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
long matrixVa = getCenterOfMassTransform(bodyInterfaceVa, bodyIdVa);
RMat44 result = new RMat44(matrixVa, true);

Expand All @@ -369,7 +369,7 @@ public RMat44 getCenterOfMassTransform(ConstBodyId bodyId) {
*/
public float getFriction(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float result = getFriction(bodyInterfaceVa, bodyIdVa);
return result;
}
Expand All @@ -382,7 +382,7 @@ public float getFriction(ConstBodyId bodyId) {
*/
public float getGravityFactor(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float result = getGravityFactor(bodyInterfaceVa, bodyIdVa);

return result;
Expand All @@ -397,7 +397,7 @@ public float getGravityFactor(ConstBodyId bodyId) {
*/
public Vec3 getLinearVelocity(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float x = getLinearVelocityX(bodyInterfaceVa, bodyIdVa);
float y = getLinearVelocityY(bodyInterfaceVa, bodyIdVa);
float z = getLinearVelocityZ(bodyInterfaceVa, bodyIdVa);
Expand All @@ -414,7 +414,7 @@ public Vec3 getLinearVelocity(ConstBodyId bodyId) {
*/
public EMotionType getMotionType(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
int ordinal = getMotionType(bodyInterfaceVa, bodyIdVa);
EMotionType result = EMotionType.values()[ordinal];

Expand All @@ -429,7 +429,7 @@ public EMotionType getMotionType(ConstBodyId bodyId) {
*/
public RVec3 getPosition(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
double xx = getPositionX(bodyInterfaceVa, bodyIdVa);
double yy = getPositionY(bodyInterfaceVa, bodyIdVa);
double zz = getPositionZ(bodyInterfaceVa, bodyIdVa);
Expand All @@ -448,7 +448,7 @@ public RVec3 getPosition(ConstBodyId bodyId) {
public void getPositionAndRotation(
ConstBodyId bodyId, RVec3 storeLocation, Quat storeOrientation) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();

double xx = getPositionX(bodyInterfaceVa, bodyIdVa);
double yy = getPositionY(bodyInterfaceVa, bodyIdVa);
Expand All @@ -470,7 +470,7 @@ public void getPositionAndRotation(
*/
public float getRestitution(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float result = getRestitution(bodyInterfaceVa, bodyIdVa);

return result;
Expand All @@ -484,7 +484,7 @@ public float getRestitution(ConstBodyId bodyId) {
*/
public Quat getRotation(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();

float qw = getRotationW(bodyInterfaceVa, bodyIdVa);
float qx = getRotationX(bodyInterfaceVa, bodyIdVa);
Expand All @@ -503,7 +503,7 @@ public Quat getRotation(ConstBodyId bodyId) {
*/
public ShapeRefC getShape(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
long shapeRefVa = getShape(bodyInterfaceVa, bodyIdVa);
ShapeRefC result = new ShapeRefC(shapeRefVa, true);

Expand All @@ -527,7 +527,7 @@ public PhysicsSystem getSystem() {
* @return {@code true} if active, otherwise {@code false}
*/
public boolean isActive(ConstBodyId bodyId) {
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
boolean result = isActive(va(), bodyIdVa);
return result;
}
Expand All @@ -540,7 +540,7 @@ public boolean isActive(ConstBodyId bodyId) {
*/
public boolean isAdded(ConstBodyId bodyId) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
boolean result = isAdded(bodyInterfaceVa, bodyIdVa);
return result;
}
Expand All @@ -559,7 +559,7 @@ public boolean isAdded(ConstBodyId bodyId) {
public void moveKinematic(ConstBodyId bodyId,
RVec3Arg location, QuatArg orientation, float deltaTime) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
double xx = location.xx();
double yy = location.yy();
double zz = location.zz();
Expand All @@ -582,7 +582,7 @@ public void moveKinematic(ConstBodyId bodyId,
public void notifyShapeChanged(ConstBodyId bodyId, Vec3Arg prevCom,
boolean updateMassProperties, EActivation activation) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
int activationOrdinal = activation.ordinal();
notifyShapeChanged(bodyInterfaceVa, bodyIdVa, prevCom.getX(),
prevCom.getY(), prevCom.getZ(), updateMassProperties,
Expand All @@ -595,7 +595,7 @@ public void notifyShapeChanged(ConstBodyId bodyId, Vec3Arg prevCom,
* @param bodyId the ID of the body to remove (not null, unaffected)
*/
public void removeBody(ConstBodyId bodyId) {
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
removeBody(va(), bodyIdVa);
}

Expand All @@ -607,7 +607,7 @@ public void removeBody(ConstBodyId bodyId) {
*/
public void setAngularVelocity(ConstBodyId bodyId, Vec3Arg omega) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
setAngularVelocity(bodyInterfaceVa, bodyIdVa,
omega.getX(), omega.getY(), omega.getZ());
}
Expand All @@ -621,7 +621,7 @@ public void setAngularVelocity(ConstBodyId bodyId, Vec3Arg omega) {
*/
public void setFriction(ConstBodyId bodyId, float friction) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
setFriction(bodyInterfaceVa, bodyIdVa, friction);
}

Expand All @@ -633,7 +633,7 @@ public void setFriction(ConstBodyId bodyId, float friction) {
*/
public void setGravityFactor(ConstBodyId bodyId, float factor) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
setGravityFactor(bodyInterfaceVa, bodyIdVa, factor);
}

Expand All @@ -649,7 +649,7 @@ public void setGravityFactor(ConstBodyId bodyId, float factor) {
public void setLinearAndAngularVelocity(ConstBodyId bodyId,
Vec3Arg linearVelocity, Vec3Arg angularVelocity) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
float vx = linearVelocity.getX();
float vy = linearVelocity.getY();
float vz = linearVelocity.getZ();
Expand All @@ -667,7 +667,7 @@ public void setLinearAndAngularVelocity(ConstBodyId bodyId,
* @param velocity the desired velocity (not null, unaffected)
*/
public void setLinearVelocity(ConstBodyId bodyId, Vec3Arg velocity) {
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
setLinearVelocity(va(), bodyIdVa,
velocity.getX(), velocity.getY(), velocity.getZ());
}
Expand All @@ -683,7 +683,7 @@ public void setLinearVelocity(ConstBodyId bodyId, Vec3Arg velocity) {
public void setPositionAndRotation(ConstBodyId bodyId, RVec3Arg location,
QuatArg orientation, EActivation activationMode) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
double locX = location.xx();
double locY = location.yy();
double locZ = location.zz();
Expand All @@ -705,7 +705,7 @@ public void setPositionAndRotation(ConstBodyId bodyId, RVec3Arg location,
*/
public void setRestitution(ConstBodyId bodyId, float restitution) {
long bodyInterfaceVa = va();
long bodyIdVa = bodyId.va();
long bodyIdVa = bodyId.targetVa();
setRestitution(bodyInterfaceVa, bodyIdVa, restitution);
}
// *************************************************************************
Expand Down
Loading

0 comments on commit e3d80c1

Please sign in to comment.