Skip to content

Commit

Permalink
DebugShapeFactory: privatize and rename 2 fields
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengold committed Jan 14, 2024
1 parent 957837d commit 6da447a
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/main/native/glue/com_jme3_bullet_util_DebugShapeFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
#include "BulletCollision/CollisionShapes/btShapeHull.h"

class DebugCallback : public btTriangleCallback, public btInternalTriangleIndexCallback {
JNIEnv *m_pEnv;
jobject m_callback;
public:
JNIEnv *pEnv;
jobject callback;
/*
* constructor:
*/
DebugCallback(JNIEnv *pEnv, jobject object) {
this->pEnv = pEnv;
this->callback = object;
m_pEnv = pEnv;
m_callback = object;
}

virtual void internalProcessTriangleIndex(btVector3* triangle,
Expand All @@ -60,15 +60,15 @@ class DebugCallback : public btTriangleCallback, public btInternalTriangleIndexC
vertexA = triangle[0];
vertexB = triangle[1];
vertexC = triangle[2];
pEnv->CallVoidMethod(callback, jmeClasses::DebugMeshCallback_addVector,
m_pEnv->CallVoidMethod(m_callback, jmeClasses::DebugMeshCallback_addVector,
vertexA.getX(), vertexA.getY(), vertexA.getZ(),
partId, triangleIndex);
EXCEPTION_CHK(pEnv,);
pEnv->CallVoidMethod(callback, jmeClasses::DebugMeshCallback_addVector,
EXCEPTION_CHK(m_pEnv,);
m_pEnv->CallVoidMethod(m_callback, jmeClasses::DebugMeshCallback_addVector,
vertexB.getX(), vertexB.getY(), vertexB.getZ(),
partId, triangleIndex);
EXCEPTION_CHK(pEnv,);
pEnv->CallVoidMethod(callback, jmeClasses::DebugMeshCallback_addVector,
EXCEPTION_CHK(m_pEnv,);
m_pEnv->CallVoidMethod(m_callback, jmeClasses::DebugMeshCallback_addVector,
vertexC.getX(), vertexC.getY(), vertexC.getZ(),
partId, triangleIndex);
// no check for exceptions!
Expand Down Expand Up @@ -179,4 +179,4 @@ JNIEXPORT void JNICALL Java_com_jme3_bullet_util_DebugShapeFactory_getVertices
}
delete pHull; //dance026
}
}
}

0 comments on commit 6da447a

Please sign in to comment.