From 5f73e61aea5b72ba75d3cccac848bfb2a2a799d5 Mon Sep 17 00:00:00 2001
From: Kenneth Russel <kbrussel@alum.mit.edu>
Date: Thu, 22 Sep 2005 04:42:14 +0000
Subject: Deleted some GLJPanel-convenience methods from GLDrawableFactory
based on expert group feedback. Changed how default null GLCapabilities and
GLCapabilitiesChooser arguments are handled in GLCanvas, GLJPanel and
GLDrawableFactory. Cleaned up JRefract and DualContext demos slightly.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JSR-231@134 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
---
src/demos/context/DualContext.java | 8 ++------
src/demos/jgears/JGears.java | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
(limited to 'src/demos')
diff --git a/src/demos/context/DualContext.java b/src/demos/context/DualContext.java
index b07d040..01ea2ba 100755
--- a/src/demos/context/DualContext.java
+++ b/src/demos/context/DualContext.java
@@ -61,12 +61,8 @@ public class DualContext extends Canvas {
private int repaintNum;
public DualContext(GLCapabilities capabilities) {
- super(GLDrawableFactory.getFactory().chooseGraphicsConfiguration(capabilities,
- new DefaultGLCapabilitiesChooser(),
- GraphicsEnvironment.
- getLocalGraphicsEnvironment().
- getDefaultScreenDevice()));
- drawable = GLDrawableFactory.getFactory().getGLDrawable(this, capabilities, new DefaultGLCapabilitiesChooser());
+ super(GLDrawableFactory.getFactory().chooseGraphicsConfiguration(capabilities, null, null));
+ drawable = GLDrawableFactory.getFactory().getGLDrawable(this, capabilities, null);
context1 = drawable.createContext(null);
context2 = drawable.createContext(null);
glut = new GLUT();
diff --git a/src/demos/jgears/JGears.java b/src/demos/jgears/JGears.java
index 438789e..5cdcadc 100644
--- a/src/demos/jgears/JGears.java
+++ b/src/demos/jgears/JGears.java
@@ -36,7 +36,7 @@ public class JGears extends GLJPanel {
}
public JGears() {
- super(caps, new DefaultGLCapabilitiesChooser(), null);
+ super(caps, null, null);
addGLEventListener(new Gears());
try {
InputStream in = JGears.class.getClassLoader().getResourceAsStream("demos/data/images/java_logo.png");
--
cgit v1.2.3