diff options
author | Sven Gothel <[email protected]> | 2010-11-23 05:07:51 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-11-23 05:07:51 +0100 |
commit | ae1ca3f2cae849f5e5a44538284082e861a98de1 (patch) | |
tree | 65c3c820ae0c744bc1f60393d41ffec6984a786d /src/demos/misc | |
parent | a6076ff25bd3abd2d1e12f77dfde3f255ac67e7d (diff) |
Adapt to JOGL 7262641429b542929efc699e392f410f1dee2187
Diffstat (limited to 'src/demos/misc')
-rwxr-xr-x | src/demos/misc/GLCapsTableDemo.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/demos/misc/GLCapsTableDemo.java b/src/demos/misc/GLCapsTableDemo.java index 701712c..abfef88 100755 --- a/src/demos/misc/GLCapsTableDemo.java +++ b/src/demos/misc/GLCapsTableDemo.java @@ -20,6 +20,8 @@ import javax.media.opengl.GLCapabilities; import javax.media.opengl.GLCapabilitiesChooser; import javax.media.opengl.awt.GLCanvas; import com.jogamp.opengl.util.FPSAnimator; +import javax.media.nativewindow.CapabilitiesImmutable; +import javax.media.opengl.GLCapabilitiesImmutable; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JFrame; @@ -68,17 +70,17 @@ public class GLCapsTableDemo private DefaultGLCapabilitiesChooser choiceExaminer = // new DefaultGLCapabilitiesChooser() { - public int chooseCapabilities(Capabilities _desired, - Capabilities[] _available, + public int chooseCapabilities(CapabilitiesImmutable _desired, + CapabilitiesImmutable[] _available, int windowSystemRecommendedChoice) { - GLCapabilities desired = (GLCapabilities) _desired; - GLCapabilities[] available = (GLCapabilities[]) _available; + GLCapabilitiesImmutable desired = (GLCapabilitiesImmutable) _desired; + GLCapabilitiesImmutable[] available = (GLCapabilitiesImmutable[]) _available; if ( available != null ) for (int i = 0; i < available.length; i++) { - GLCapabilities c = available[i]; + GLCapabilitiesImmutable c = available[i]; if (c != null) { - GLCapsTableDemo.this.available.add((GLCapabilities) c.clone()); + GLCapsTableDemo.this.available.add((GLCapabilities) c.cloneMutable()); GLCapsTableDemo.this.indices.add(new Integer(i)); } } @@ -130,8 +132,8 @@ public class GLCapsTableDemo * @see javax.media.opengl.GLCapabilitiesChooser#chooseCapabilities(javax.media.nativewindow.Capabilities, * javax.media.nativewindow.Capabilities[], int) */ - public int chooseCapabilities(Capabilities desired, - Capabilities[] available, + public int chooseCapabilities(CapabilitiesImmutable desired, + CapabilitiesImmutable[] available, int windowSystemRecommendedChoice) { int row = capsTable.getSelectedRow(); |