diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2013-02-18 22:38:08 -0800 |
---|---|---|
committer | Harvey Harrison <harvey.harrison@gmail.com> | 2013-02-18 22:38:08 -0800 |
commit | 9bfc9f3b52eb49f1ac739f5720e4d532f492f093 (patch) | |
tree | ed4c01933c95771df801b6f0ec92d880291cb2df /src/classes | |
parent | 25a81a7a34d4364a51df180c13940d32ffe1a7f6 (diff) |
j3dcore: remove some commented out and superceded code in JoglPipeline
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Diffstat (limited to 'src/classes')
-rw-r--r-- | src/classes/share/javax/media/j3d/JoglPipeline.java | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/src/classes/share/javax/media/j3d/JoglPipeline.java b/src/classes/share/javax/media/j3d/JoglPipeline.java index c487b45..2bd9ce9 100644 --- a/src/classes/share/javax/media/j3d/JoglPipeline.java +++ b/src/classes/share/javax/media/j3d/JoglPipeline.java @@ -8472,81 +8472,6 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height) nativeWindow.destroy(); } } - /* - private static AWTGraphicsConfiguration createAwtGraphicsConfiguration(GLCapabilities capabilities, - CapabilitiesChooser chooser, - GraphicsDevice device) { - //FIXME unit id? - AWTGraphicsDevice awtGraphicsDevice = new AWTGraphicsDevice(device, 0); - GraphicsConfigurationFactory factory = GraphicsConfigurationFactory.getFactory(awtGraphicsDevice.getClass(), GLCapabilities.class); - AWTGraphicsConfiguration awtGraphicsConfiguration = (AWTGraphicsConfiguration) factory.chooseGraphicsConfiguration(capabilities, capabilities, - chooser, new AWTGraphicsScreen(awtGraphicsDevice), VisualIDHolder.VID_UNDEFINED); - return awtGraphicsConfiguration; - } - - private static AWTGraphicsConfiguration createAwtGraphicsConfiguration(GLCapabilities capabilities, - CapabilitiesChooser chooser, - AWTGraphicsDevice awtGraphicsDevice) { - GraphicsConfigurationFactory factory = GraphicsConfigurationFactory.getFactory(awtGraphicsDevice.getClass(), GLCapabilities.class); - AWTGraphicsConfiguration awtGraphicsConfiguration = (AWTGraphicsConfiguration) factory.chooseGraphicsConfiguration(capabilities, capabilities, - chooser, new AWTGraphicsScreen(awtGraphicsDevice), VisualIDHolder.VID_UNDEFINED); - return awtGraphicsConfiguration; - }*/ - - private static GraphicsConfiguration unwrap(AWTGraphicsConfiguration config) { - if (config == null) { - return null; - } - return config.getAWTGraphicsConfiguration(); - } - - /* Used in conjunction with IndexCapabilitiesChooser in pixel format - // selection -- see getBestConfiguration - class CapabilitiesCapturer extends DefaultGLCapabilitiesChooser implements ExtendedCapabilitiesChooser { - private boolean done; - private GLCapabilities capabilities; - private int chosenIndex = -1; - - public boolean done() { - return done; - } - - public GLCapabilities getCapabilities() { - return capabilities; - } - - public int getChosenIndex() { - return chosenIndex; - } - - public int chooseCapabilities(GLCapabilities desired, - GLCapabilities[] available, - int windowSystemRecommendedChoice) { - int res = super.chooseCapabilities(desired, Arrays.asList(available), windowSystemRecommendedChoice); - capabilities = available[res]; - chosenIndex = res; - markDone(); - return res; - } - - public void init(GLContext context) { - // Avoid hanging things up for several seconds - kick(); - } - - private void markDone() { - synchronized (this) { - done = true; - notifyAll(); - } - } - - private void kick() { - synchronized (this) { - notifyAll(); - } - } - }*/ // Used to support the query context mechanism -- needs to be more // than just a GLCapabilitiesChooser @@ -8582,27 +8507,6 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height) } } - /* Used in two phases of pixel format selection: transforming the - // JoglGraphicsConfiguration to a real AWT GraphicsConfiguration and - // during context creation to select exactly the same graphics - // configuration as was done during getBestConfiguration. - class IndexCapabilitiesChooser implements GLCapabilitiesChooser { - private int indexToChoose; - - IndexCapabilitiesChooser(int indexToChoose) { - this.indexToChoose = indexToChoose; - } - - public int chooseCapabilities(CapabilitiesImmutable desired, - List available, - int windowSystemRecommendedChoice) { - if (DEBUG_CONFIG) { - System.err.println("IndexCapabilitiesChooser returning index=" + indexToChoose); - } - return indexToChoose; - } - }*/ - private void disposeOnEDT(final Frame f) { Runnable r = new Runnable() { public void run() { @@ -9089,17 +8993,5 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height) } } } - /* - private int getMaxPowerOf2LE(int value) { - int powerValue = 1; - if (value < 1) - return value; - - while (value >= powerValue) { - powerValue *= 2; - } - powerValue = (powerValue >> 1); - return powerValue; - }*/ } } |