diff options
Diffstat (limited to 'src/jogl/classes/jogamp')
3 files changed, 16 insertions, 18 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 401ea29c6..8f4105f98 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -422,7 +422,7 @@ public abstract class GLContextImpl extends GLContext { lastCtxReleaseStack = new Throwable(msg); if( TRACE_SWITCH ) { System.err.println(msg); - // ExceptionUtils.dumpStackTrace(System.err, 0, 10); + // ExceptionUtils.dumpStack(System.err, 0, 10); } } } @@ -773,7 +773,7 @@ public abstract class GLContextImpl extends GLContext { } if ( DEBUG_TRACE_SWITCH ) { System.err.println(getThreadName() + ": Create GL context "+(created?"OK":"FAILED")+": For " + getClass().getName()+" - "+getGLVersion()+" - "+getTraceSwitchMsg()); - // ExceptionUtils.dumpStackTrace(System.err, 0, 10); + // ExceptionUtils.dumpStack(System.err, 0, 10); } if(!created) { return CONTEXT_NOT_CURRENT; diff --git a/src/jogl/classes/jogamp/opengl/ProjectFloat.java b/src/jogl/classes/jogamp/opengl/ProjectFloat.java index ee9560214..5ec5a8e3f 100644 --- a/src/jogl/classes/jogamp/opengl/ProjectFloat.java +++ b/src/jogl/classes/jogamp/opengl/ProjectFloat.java @@ -170,7 +170,8 @@ public class ProjectFloat { * @param aspect * @param zNear * @param zFar - * @throws GLException with GL_INVALID_VALUE if zNear is <= 0, or zFar < 0, or if zNear == zFar. + * @throws GLException if {@code zNear <= 0} or {@code zFar <= zNear} + * @see FloatUtil#makePerspective(float[], int, boolean, float, float, float, float) */ public void gluPerspective(final GLMatrixFunc gl, final float fovy_deg, final float aspect, final float zNear, final float zFar) throws GLException { gl.glMultMatrixf(FloatUtil.makePerspective(mat4Tmp1, 0, true, fovy_deg * FloatUtil.PI / 180.0f, aspect, zNear, zFar), 0); diff --git a/src/jogl/classes/jogamp/opengl/util/stereo/GenericStereoDevice.java b/src/jogl/classes/jogamp/opengl/util/stereo/GenericStereoDevice.java index 491535dc1..bfe93b59c 100644 --- a/src/jogl/classes/jogamp/opengl/util/stereo/GenericStereoDevice.java +++ b/src/jogl/classes/jogamp/opengl/util/stereo/GenericStereoDevice.java @@ -36,6 +36,7 @@ import com.jogamp.nativewindow.util.RectangleImmutable; import com.jogamp.opengl.math.FovHVHalves; import com.jogamp.opengl.util.stereo.StereoDeviceConfig; import com.jogamp.opengl.util.stereo.EyeParameter; +import com.jogamp.opengl.util.stereo.LocationSensorParameter; import com.jogamp.opengl.util.stereo.StereoDevice; import com.jogamp.opengl.util.stereo.StereoDeviceFactory; import com.jogamp.opengl.util.stereo.StereoDeviceRenderer; @@ -163,31 +164,27 @@ public class GenericStereoDevice implements StereoDevice { } @Override - public boolean isValid() { - return true; - } + public boolean isValid() { return true; } @Override - public final PointImmutable getPosition() { - return surfacePos; - } + public final PointImmutable getPosition() { return surfacePos; } @Override - public final DimensionImmutable getSurfaceSize() { - return config.surfaceSizeInPixels; - } + public final DimensionImmutable getSurfaceSize() { return config.surfaceSizeInPixels; } @Override public int getRequiredRotation() { return 0; } @Override - public float[] getDefaultEyePositionOffset() { - return config.defaultEyeParam[0].positionOffset; - } + public float[] getDefaultEyePositionOffset() { return config.defaultEyeParam[0].positionOffset; } @Override - public final FovHVHalves[] getDefaultFOV() { - return defaultEyeFov; - } + public final FovHVHalves[] getDefaultFOV() { return defaultEyeFov; } + + @Override + public final LocationSensorParameter getLocationSensorParams() { return null; } + + @Override + public final void resetLocationSensorOrigin() { } @Override public final boolean startSensors(final int desiredSensorBits, final int requiredSensorBits) { |