From dac35658fb0b04e66f2e6cbce175090dcc48bde4 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 12 Nov 2010 03:33:53 +0100 Subject: Adapt to GlueGen Version changes; Adding NativeWindowVersion, JoglVersion and NewtVersion. Adapt to GlueGen Version changes: b735755815312b5fe2c003642de60711be1cd645 .. 556c7e70d3d57aa99b5787b1e4d8a7b1c299ed3f Show information of all subcomponenet. --- .../classes/com/jogamp/opengl/JoglVersion.java | 98 ++++++++++++++++++++++ .../com/jogamp/opengl/util/VersionInfo.java | 85 ------------------- 2 files changed, 98 insertions(+), 85 deletions(-) create mode 100644 src/jogl/classes/com/jogamp/opengl/JoglVersion.java delete mode 100644 src/jogl/classes/com/jogamp/opengl/util/VersionInfo.java (limited to 'src/jogl/classes/com/jogamp') diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java new file mode 100644 index 000000000..5fae77e1d --- /dev/null +++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java @@ -0,0 +1,98 @@ +/** + * Copyright 2010 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ + +package com.jogamp.opengl; + +import javax.media.opengl.*; +import com.jogamp.common.os.Platform; +import com.jogamp.common.util.VersionUtil; +import com.jogamp.common.util.JogampVersion; +import java.util.jar.Manifest; + +public class JoglVersion extends JogampVersion { + + protected static JoglVersion jogampCommonVersionInfo; + + protected JoglVersion(String packageName, Manifest mf) { + super(packageName, mf); + } + + public static JoglVersion getInstance() { + if(null == jogampCommonVersionInfo) { + synchronized(JoglVersion.class) { + if( null == jogampCommonVersionInfo ) { + final String packageName = "javax.media.opengl"; + final String fullClazzName = "javax.media.opengl.GL"; + final Manifest mf = VersionUtil.getManifest(JoglVersion.class.getClassLoader(), fullClazzName); + jogampCommonVersionInfo = new JoglVersion(packageName, mf); + } + } + } + return jogampCommonVersionInfo; + } + + public StringBuffer getInfo(GL gl, StringBuffer sb) { + sb = super.getInfo(sb); + + getGLInfo(gl, sb); + sb.append("-----------------------------------------------------------------------------------------------------"); + sb.append(Platform.getNewline()); + + return sb; + } + + public static StringBuffer getGLInfo(GL gl, StringBuffer sb) { + if(null==sb) { + sb = new StringBuffer(); + } + + sb.append(GLProfile.glAvailabilityToString()); + sb.append(Platform.getNewline()); + sb.append("Swap Interval ").append(gl.getSwapInterval()); + sb.append(Platform.getNewline()); + sb.append("GL Profile ").append(gl.getGLProfile()); + sb.append(Platform.getNewline()); + sb.append("CTX VERSION ").append(gl.getContext().getGLVersion()); + sb.append(Platform.getNewline()); + sb.append("GL ").append(gl); + sb.append(Platform.getNewline()); + sb.append("GL_VERSION ").append(gl.glGetString(gl.GL_VERSION)); + sb.append(Platform.getNewline()); + sb.append("GL_EXTENSIONS "); + sb.append(Platform.getNewline()); + sb.append(" ").append(gl.glGetString(gl.GL_EXTENSIONS)); + sb.append(Platform.getNewline()); + + return sb; + } + + public static void main(String args[]) { + System.err.println(JoglVersion.getInstance().getInfo(null)); + } +} + diff --git a/src/jogl/classes/com/jogamp/opengl/util/VersionInfo.java b/src/jogl/classes/com/jogamp/opengl/util/VersionInfo.java deleted file mode 100644 index e04b75b6b..000000000 --- a/src/jogl/classes/com/jogamp/opengl/util/VersionInfo.java +++ /dev/null @@ -1,85 +0,0 @@ -/** - * Copyright 2010 JogAmp Community. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of JogAmp Community. - */ - -package com.jogamp.opengl.util; - -import javax.media.opengl.*; -import com.jogamp.common.os.Platform; -import com.jogamp.common.util.VersionUtil; - -public class VersionInfo { - - public static StringBuffer getInfo(StringBuffer sb, String prefix) { - return VersionUtil.getInfo(VersionInfo.class.getClassLoader(), prefix, "javax.media.opengl", "GL", sb); - } - - public static StringBuffer getInfo(StringBuffer sb, String prefix, GL gl) { - if(null==sb) { - sb = new StringBuffer(); - } - - VersionUtil.getInfo(VersionInfo.class.getClassLoader(), prefix, "javax.media.opengl", "GL", sb); - sb.append("-----------------------------------------------------------------------------------------------------"); - sb.append(Platform.getNewline()); - getOpenGLInfo(sb, prefix, gl); - sb.append("-----------------------------------------------------------------------------------------------------"); - sb.append(Platform.getNewline()); - - return sb; - } - - public static StringBuffer getOpenGLInfo(StringBuffer sb, String prefix, GL gl) { - if(null==sb) { - sb = new StringBuffer(); - } - - sb.append(prefix+" "+GLProfile.glAvailabilityToString()); - sb.append(Platform.getNewline()); - sb.append(prefix+" Swap Interval " + gl.getSwapInterval()); - sb.append(Platform.getNewline()); - sb.append(prefix+" GL Profile " + gl.getGLProfile()); - sb.append(Platform.getNewline()); - sb.append(prefix+" CTX VERSION " + gl.getContext().getGLVersion()); - sb.append(Platform.getNewline()); - sb.append(prefix+" GL " + gl); - sb.append(Platform.getNewline()); - sb.append(prefix+" GL_VERSION " + gl.glGetString(gl.GL_VERSION)); - sb.append(Platform.getNewline()); - sb.append(prefix+" GL_EXTENSIONS "); - sb.append(Platform.getNewline()); - sb.append(prefix+" " + gl.glGetString(gl.GL_EXTENSIONS)); - sb.append(Platform.getNewline()); - - return sb; - } - - public static void main(String args[]) { - System.err.println(VersionInfo.getInfo(null, "JOGL")); - } -} - -- cgit v1.2.3