diff options
| author | Sven Gothel <[email protected]> | 2011-04-26 19:24:19 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-04-26 19:24:19 +0200 |
| commit | f3afd3cd3be302c9b9cc3b6ec56cf032817e00a4 (patch) | |
| tree | e7aaef0c1860f35f6b1e115489e134ae7df6d07c /src/jbullet | |
| parent | a7317cf820a33cac7f068153649031483df53cac (diff) | |
sync w/ jogl e007bb306124411e0232e51d16aa493cbd361f74
Diffstat (limited to 'src/jbullet')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/jbullet/src/javabullet/collision/dispatch/ConvexConvexAlgorithm.java b/src/jbullet/src/javabullet/collision/dispatch/ConvexConvexAlgorithm.java index 6b674c3..08bd8ce 100644 --- a/src/jbullet/src/javabullet/collision/dispatch/ConvexConvexAlgorithm.java +++ b/src/jbullet/src/javabullet/collision/dispatch/ConvexConvexAlgorithm.java @@ -104,7 +104,7 @@ public class ConvexConvexAlgorithm extends CollisionAlgorithm { ConvexShape min1 = (ConvexShape) body1.getCollisionShape(); ClosestPointInput input = pointInputsPool.get(); - input.init(); + input.init(gl); // JAVA NOTE: original: TODO: if (dispatchInfo.m_useContinuous) gjkPairDetector.setMinkowskiA(min0); diff --git a/src/jbullet/src/javabullet/collision/narrowphase/GjkConvexCast.java b/src/jbullet/src/javabullet/collision/narrowphase/GjkConvexCast.java index a5daad0..0e94d54 100644 --- a/src/jbullet/src/javabullet/collision/narrowphase/GjkConvexCast.java +++ b/src/jbullet/src/javabullet/collision/narrowphase/GjkConvexCast.java @@ -113,7 +113,7 @@ public class GjkConvexCast implements ConvexCast { GjkPairDetector gjk = new GjkPairDetector(raySphere, convex, simplexSolver, penSolverPtr); ClosestPointInput input = pointInputsPool.get(); - input.init(); + input.init(gl); input.transformA.set(sphereTr); input.transformB.set(identityTrans); @@ -162,7 +162,7 @@ public class GjkConvexCast implements ConvexCast { GjkPairDetector gjk = new GjkPairDetector(raySphere, convex, simplexSolver, penSolverPtr); ClosestPointInput input = pointInputsPool.get(); - input.init(); + input.init(gl); input.transformA.set(sphereTr); input.transformB.set(identityTrans); diff --git a/src/jbullet/src/javabullet/demos/opengl/JOGL.java b/src/jbullet/src/javabullet/demos/opengl/JOGL.java index 44afa0d..483c652 100644 --- a/src/jbullet/src/javabullet/demos/opengl/JOGL.java +++ b/src/jbullet/src/javabullet/demos/opengl/JOGL.java @@ -101,7 +101,7 @@ public class JOGL implements WindowListener, MouseListener { // window.setEventHandlerMode(GLWindow.EVENT_HANDLER_GL_CURRENT); // default // window.setEventHandlerMode(GLWindow.EVENT_HANDLER_GL_NONE); // no current .. - window.enablePerfLog(true); + window.setUpdateFPSFrames(FPSCounter.DEFAULT_FRAMES_PER_INTERVAL, System.err); // Size OpenGL to Video Surface window.setSize(width, height); window.setFullscreen(true); @@ -109,7 +109,7 @@ public class JOGL implements WindowListener, MouseListener { width = window.getWidth(); height = window.getHeight(); - while (!quit && window.getDuration() < 200000) { + while (!quit && window.getTotalFPSDuration() < 200000) { window.display(); } |