diff options
Diffstat (limited to 'src/classes/jogl')
7 files changed, 67 insertions, 23 deletions
diff --git a/src/classes/jogl/javax/media/j3d/JoglCgShaderInfo.java b/src/classes/jogl/javax/media/j3d/JoglCgShaderInfo.java index e7873ee..7ad8a5f 100755 --- a/src/classes/jogl/javax/media/j3d/JoglCgShaderInfo.java +++ b/src/classes/jogl/javax/media/j3d/JoglCgShaderInfo.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import com.sun.opengl.cg.*; +import com.sun.opengl.cg.CGprogram; class JoglCgShaderInfo extends JoglShaderObject { private CGprogram cgShader; diff --git a/src/classes/jogl/javax/media/j3d/JoglCgShaderParameter.java b/src/classes/jogl/javax/media/j3d/JoglCgShaderParameter.java index cf9e927..a0aa4d4 100755 --- a/src/classes/jogl/javax/media/j3d/JoglCgShaderParameter.java +++ b/src/classes/jogl/javax/media/j3d/JoglCgShaderParameter.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import com.sun.opengl.cg.*; +import com.sun.opengl.cg.CGparameter; class JoglCgShaderParameter extends JoglShaderObject { private CGparameter vParam; diff --git a/src/classes/jogl/javax/media/j3d/JoglCgShaderProgramInfo.java b/src/classes/jogl/javax/media/j3d/JoglCgShaderProgramInfo.java index f31b745..ad9b6b5 100755 --- a/src/classes/jogl/javax/media/j3d/JoglCgShaderProgramInfo.java +++ b/src/classes/jogl/javax/media/j3d/JoglCgShaderProgramInfo.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import com.sun.opengl.cg.*; +import com.sun.opengl.cg.CGparameter; class JoglCgShaderProgramInfo extends JoglShaderObject { private JoglCgShaderInfo vShader; // vertex shader diff --git a/src/classes/jogl/javax/media/j3d/JoglContext.java b/src/classes/jogl/javax/media/j3d/JoglContext.java index b25ff19..539bcb0 100644 --- a/src/classes/jogl/javax/media/j3d/JoglContext.java +++ b/src/classes/jogl/javax/media/j3d/JoglContext.java @@ -31,9 +31,14 @@ package javax.media.j3d; -import java.nio.*; -import javax.media.opengl.*; -import com.sun.opengl.cg.*; +import java.nio.Buffer; +import java.nio.FloatBuffer; + +import javax.media.opengl.GL; +import javax.media.opengl.GLContext; + +import com.sun.opengl.cg.CGcontext; +import com.sun.opengl.cg.CgGL; /** * Graphics context objects for Jogl rendering pipeline. diff --git a/src/classes/jogl/javax/media/j3d/JoglDrawable.java b/src/classes/jogl/javax/media/j3d/JoglDrawable.java index 8b7dc57..7adabcb 100755 --- a/src/classes/jogl/javax/media/j3d/JoglDrawable.java +++ b/src/classes/jogl/javax/media/j3d/JoglDrawable.java @@ -31,7 +31,7 @@ package javax.media.j3d; -import javax.media.opengl.*; +import javax.media.opengl.GLDrawable; /** * Drawable class for the Jogl rendering pipeline. diff --git a/src/classes/jogl/javax/media/j3d/JoglGraphicsConfiguration.java b/src/classes/jogl/javax/media/j3d/JoglGraphicsConfiguration.java index 94d62ad..5fab312 100755 --- a/src/classes/jogl/javax/media/j3d/JoglGraphicsConfiguration.java +++ b/src/classes/jogl/javax/media/j3d/JoglGraphicsConfiguration.java @@ -31,10 +31,18 @@ package javax.media.j3d; -import java.awt.*; -import java.awt.geom.*; -import java.awt.image.*; -import javax.media.opengl.*; +import java.awt.AWTException; +import java.awt.DisplayMode; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.ImageCapabilities; +import java.awt.Rectangle; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; +import java.awt.image.VolatileImage; + +import javax.media.opengl.GLCapabilities; /** * Class implementing the GraphicsConfiguration API, but not a "real" diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java index b174183..6d06822 100644 --- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java +++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java @@ -31,18 +31,49 @@ package javax.media.j3d; -import com.sun.j3d.internal.ByteBufferWrapper; -import java.awt.*; -import java.io.*; -import java.lang.reflect.*; -import java.nio.*; -import java.security.*; -import java.util.*; -import java.util.regex.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; -import com.sun.opengl.cg.*; -import com.sun.opengl.util.*; +import java.awt.BorderLayout; +import java.awt.Canvas; +import java.awt.DisplayMode; +import java.awt.EventQueue; +import java.awt.Frame; +import java.awt.GraphicsConfigTemplate; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Method; +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.DoubleBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.ArrayList; +import java.util.StringTokenizer; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.media.opengl.AWTGraphicsConfiguration; +import javax.media.opengl.AWTGraphicsDevice; +import javax.media.opengl.AbstractGraphicsConfiguration; +import javax.media.opengl.DefaultGLCapabilitiesChooser; +import javax.media.opengl.GL; +import javax.media.opengl.GLCapabilities; +import javax.media.opengl.GLCapabilitiesChooser; +import javax.media.opengl.GLContext; +import javax.media.opengl.GLDrawable; +import javax.media.opengl.GLDrawableFactory; +import javax.media.opengl.GLException; +import javax.media.opengl.GLPbuffer; +import javax.media.opengl.Threading; +import javax.media.opengl.glu.GLU; + +import com.sun.opengl.cg.CGcontext; +import com.sun.opengl.cg.CGparameter; +import com.sun.opengl.cg.CGprogram; +import com.sun.opengl.cg.CgGL; +import com.sun.opengl.util.BufferUtil; /** * Concrete implementation of Pipeline class for the JOGL rendering |