aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-07-04 01:41:15 +0200
committerSven Gothel <[email protected]>2013-07-04 01:41:15 +0200
commit98ab29dded5d8f8e482b02a8782f1dc87bb3a1a5 (patch)
treeb74612101bfdf8a151dc20773592fbaa2851f473 /src/jogl
parent238e2482fa6129418189458405ae2622987cd02e (diff)
Remove deprecated methods.
- Quaternion.isEmpty() - Texture.dispose(GL) - GLContext.getGLVersionMajor() / ..Minor() - GLContextImpl.bindPbufferToTexture() / releasePbufferFromTexture() - MouseEvent.getWheelRotation() -
Diffstat (limited to 'src/jogl')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/math/Quaternion.java16
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java6
-rw-r--r--src/jogl/classes/javax/media/opengl/GLContext.java4
-rw-r--r--src/jogl/classes/jogamp/opengl/GLContextImpl.java20
4 files changed, 4 insertions, 42 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
index f1a3f8be2..c6bf44f6d 100644
--- a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
+++ b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
@@ -330,20 +330,8 @@ public class Quaternion {
}
/**
- * Check if this quaternion is empty, ie (0,0,0,1)
- *
- * @return true if empty, false otherwise
- * @deprecated use {@link #isIdentity()} instead
- */
- @Deprecated
- public boolean isEmpty() {
- if (w == 1 && x == 0 && y == 0 && z == 0)
- return true;
- return false;
- }
-
- /**
- * Check if this quaternion represents an identity matrix, for rotation.
+ * Check if this quaternion represents an identity matrix for rotation,
+ * , ie (0,0,0,1).
*
* @return true if it is an identity rep., false otherwise
*/
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
index d6a8090fb..c52999224 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
@@ -290,12 +290,6 @@ public class Texture {
}
/**
- * @deprecated use {@link #destroy(GL)}
- */
- public final void dispose(GL gl) throws GLException {
- destroy(gl);
- }
- /**
* Destroys the native resources used by this texture object.
*
* @throws GLException if any OpenGL-related errors occurred
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 84d371ac6..684d0de65 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -671,10 +671,6 @@ public abstract class GLContext {
return ctxVersionString;
}
- /** @deprecated Use {@link #getGLVersionNumber()} */
- public final int getGLVersionMajor() { return ctxVersion.getMajor(); }
- /** @deprecated Use {@link #getGLVersionNumber()} */
- public final int getGLVersionMinor() { return ctxVersion.getMinor(); }
/**
* Returns this context OpenGL version.
* @see #getGLSLVersionNumber()
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 8671b045d..f896c95ee 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -1098,22 +1098,6 @@ public abstract class GLContextImpl extends GLContext {
*/
public abstract ProcAddressTable getPlatformExtProcAddressTable();
- /**
- * Pbuffer support; given that this is a GLContext associated with a
- * pbuffer, binds this pbuffer to its texture target.
- * @throws GLException if not implemented (default)
- * @deprecated use FBO/GLOffscreenAutoDrawable instead of pbuffer
- */
- public void bindPbufferToTexture() { throw new GLException("not implemented"); }
-
- /**
- * Pbuffer support; given that this is a GLContext associated with a
- * pbuffer, releases this pbuffer from its texture target.
- * @throws GLException if not implemented (default)
- * @deprecated use FBO/GLOffscreenAutoDrawable instead of pbuffer
- */
- public void releasePbufferFromTexture() { throw new GLException("not implemented"); }
-
public abstract ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3);
/** Maps the given "platform-independent" function name to a real function
@@ -1515,8 +1499,8 @@ public abstract class GLContextImpl extends GLContext {
int i = 0;
final String MesaSP = "Mesa ";
- final String MesaRendererAMDsp = " AMD ";
- final String MesaRendererIntelsp = "Intel(R)";
+ // final String MesaRendererAMDsp = " AMD ";
+ // final String MesaRendererIntelsp = "Intel(R)";
final boolean hwAccel = 0 == ( ctp & GLContext.CTX_IMPL_ACCEL_SOFT );
final boolean compatCtx = 0 != ( ctp & GLContext.CTX_PROFILE_COMPAT );
final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium ");