diff options
author | Sven Gothel <sgothel@jausoft.com> | 2010-11-12 03:33:53 +0100 |
---|---|---|
committer | Sven Gothel <sgothel@jausoft.com> | 2010-11-12 03:33:53 +0100 |
commit | dac35658fb0b04e66f2e6cbce175090dcc48bde4 (patch) | |
tree | 67132669da41a0fd5a2ea9f6107246529794190d /src/jogl/classes/javax | |
parent | c2e805f5cf9c209cfbd1a3082a347d9f3d58c9d5 (diff) |
Adapt to GlueGen Version changes; Adding NativeWindowVersion, JoglVersion and NewtVersion.
Adapt to GlueGen Version changes:
b735755815312b5fe2c003642de60711be1cd645 .. 556c7e70d3d57aa99b5787b1e4d8a7b1c299ed3f
Show information of all subcomponenet.
Diffstat (limited to 'src/jogl/classes/javax')
-rw-r--r-- | src/jogl/classes/javax/media/opengl/GLProfile.java | 9 | ||||
-rw-r--r-- | src/jogl/classes/javax/media/opengl/awt/GLCanvas.java | 14 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 5eb77d8bb..c5f5a8511 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -37,14 +37,16 @@ package javax.media.opengl; +import com.jogamp.common.GlueGenVersion; import com.jogamp.common.jvm.JVMUtil; import com.jogamp.common.util.ReflectionUtil; import com.jogamp.common.util.VersionUtil; -import com.jogamp.opengl.util.VersionInfo; +import com.jogamp.nativewindow.NativeWindowVersion; import com.jogamp.opengl.impl.Debug; import com.jogamp.opengl.impl.GLDrawableFactoryImpl; import com.jogamp.opengl.impl.GLDynamicLookupHelper; import com.jogamp.opengl.impl.DesktopGLDynamicLookupHelper; +import com.jogamp.opengl.JoglVersion; import java.util.HashMap; import java.util.Iterator; import java.security.*; @@ -1060,8 +1062,9 @@ public class GLProfile { mappedProfiles = computeProfileMap(); if (DEBUG) { - System.err.print(VersionUtil.getPlatformInfo(null, "GLProfile.init")); - System.err.print(VersionUtil.getManifestInfo(GLProfile.class.getClassLoader(), "GLProfile.init", "javax.media.opengl", "GL", null)); + System.err.println(GlueGenVersion.getInstance().getInfo(null)); + System.err.println(NativeWindowVersion.getInstance().getInfo(null)); + System.err.print(JoglVersion.getInstance().getInfo(null)); System.err.println("GLProfile.init firstUIActionOnProcess "+firstUIActionOnProcess); System.err.println("GLProfile.init isAWTAvailable "+isAWTAvailable); System.err.println("GLProfile.init hasNativeOSFactory "+hasNativeOSFactory); diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java index 22b25740c..9db718bfb 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java @@ -40,17 +40,19 @@ package javax.media.opengl.awt; +import com.jogamp.common.GlueGenVersion; +import com.jogamp.common.util.VersionUtil; +import com.jogamp.nativewindow.NativeWindowVersion; import javax.media.opengl.*; import javax.media.nativewindow.*; import javax.media.nativewindow.awt.*; import com.jogamp.opengl.impl.*; -import com.jogamp.opengl.util.VersionInfo; +import com.jogamp.opengl.JoglVersion; import java.awt.Canvas; import java.awt.Color; import java.awt.Component; -import java.awt.EventQueue; import java.awt.FontMetrics; import java.awt.Frame; import java.awt.Graphics; @@ -90,7 +92,6 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable { private AWTGraphicsConfiguration awtConfig; private GLDrawable drawable; private GLContextImpl context; - private boolean autoSwapBufferMode = true; private boolean sendReshape = false; // copy of the cstr args .. @@ -794,6 +795,10 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable { * A most simple JOGL AWT test entry */ public static void main(String args[]) { + System.err.println(GlueGenVersion.getInstance().getInfo(null)); + System.err.println(NativeWindowVersion.getInstance().getInfo(null)); + System.err.print(JoglVersion.getInstance().getInfo(null)); + GLCapabilities caps = new GLCapabilities( GLProfile.getDefault() ); Frame frame = new Frame("JOGL AWT Test"); @@ -804,8 +809,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable { glCanvas.addGLEventListener(new GLEventListener() { public void init(GLAutoDrawable drawable) { GL gl = drawable.getGL(); - String prefix = "JOGL AWT Test " + Thread.currentThread().getName(); - System.err.println(VersionInfo.getInfo(null, prefix, gl).toString()); + System.err.println(JoglVersion.getInstance().getGLInfo(gl, null)); } public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { |