diff options
6 files changed, 0 insertions, 52 deletions
diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java index acf1fc9..60470ec 100644 --- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java +++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java @@ -6616,12 +6616,6 @@ class JoglPipeline extends Pipeline { } } - // Initialization for D3D when scene begins and ends - void beginScene(Context ctx) { - } - void endScene(Context ctx) { - } - // True under Solaris, // False under windows when display mode <= 8 bit boolean validGraphicsMode() { diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java index d9d52a5..c34f4e9 100644 --- a/src/classes/share/javax/media/j3d/Canvas3D.java +++ b/src/classes/share/javax/media/j3d/Canvas3D.java @@ -4315,15 +4315,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine updateSeparateSpecularColorEnable(ctx, enable); } - final void beginScene() { - beginScene(ctx); - } - - final void endScene() { - endScene(ctx); - } - - // Send a createOffScreenBuffer message to Renderer (via // MasterControl) and wait for it to be done private void sendCreateOffScreenBuffer() { @@ -5038,14 +5029,6 @@ void addTextureResource(int id, TextureRetained obj) { Pipeline.getPipeline().updateSeparateSpecularColorEnable(ctx, control); } - // Initialization for D3D when scene begin - private void beginScene(Context ctx) { - Pipeline.getPipeline().beginScene(ctx); - } - private void endScene(Context ctx) { - Pipeline.getPipeline().endScene(ctx); - } - // True under Solaris, // False under windows when display mode <= 8 bit private boolean validGraphicsMode() { diff --git a/src/classes/share/javax/media/j3d/GraphicsContext3D.java b/src/classes/share/javax/media/j3d/GraphicsContext3D.java index 61f1803..2ea65fa 100644 --- a/src/classes/share/javax/media/j3d/GraphicsContext3D.java +++ b/src/classes/share/javax/media/j3d/GraphicsContext3D.java @@ -1747,8 +1747,6 @@ public class GraphicsContext3D extends Object { canvas3d.screen.renderer.listOfCtxs.add(canvas3d.ctx); canvas3d.screen.renderer.listOfCanvases.add(canvas3d); - canvas3d.beginScene(); - if (canvas3d.graphics2D != null) { canvas3d.graphics2D.init(); } diff --git a/src/classes/share/javax/media/j3d/NoopPipeline.java b/src/classes/share/javax/media/j3d/NoopPipeline.java index d3800af..1bd3059 100644 --- a/src/classes/share/javax/media/j3d/NoopPipeline.java +++ b/src/classes/share/javax/media/j3d/NoopPipeline.java @@ -1086,12 +1086,6 @@ class NoopPipeline extends Pipeline { void updateSeparateSpecularColorEnable(Context ctx, boolean control) { } - // Initialization for D3D when scene begin - void beginScene(Context ctx) { - } - void endScene(Context ctx) { - } - // True under Solaris, // False under windows when display mode <= 8 bit boolean validGraphicsMode() { diff --git a/src/classes/share/javax/media/j3d/Pipeline.java b/src/classes/share/javax/media/j3d/Pipeline.java index 3b7c875..5ca9caf 100644 --- a/src/classes/share/javax/media/j3d/Pipeline.java +++ b/src/classes/share/javax/media/j3d/Pipeline.java @@ -1064,10 +1064,6 @@ public Pipeline run() { // Native method to update separate specular color control abstract void updateSeparateSpecularColorEnable(Context ctx, boolean control); - // Initialization for D3D when scene begin - abstract void beginScene(Context ctx); - abstract void endScene(Context ctx); - // True under Solaris, // False under windows when display mode <= 8 bit abstract boolean validGraphicsMode(); diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java index 5c40999..c387fed 100644 --- a/src/classes/share/javax/media/j3d/Renderer.java +++ b/src/classes/share/javax/media/j3d/Renderer.java @@ -649,10 +649,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine } try { - if (canvas.ctx != null) { - // ctx may not construct until doClear(); - canvas.beginScene(); - } switch (command) { case GraphicsContext3D.CLEAR: @@ -774,9 +770,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine break; } - if (canvas.ctx != null) { - canvas.endScene(); - } } catch (RuntimeException ex) { ex.printStackTrace(); @@ -1179,8 +1172,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine Canvas3D.FIELD_ALL, canvas.useDoubleBuffer); - canvas.beginScene(); - // this is if the background image resizes with the canvas int winWidth = cvCache.getCanvasWidth(); int winHeight = cvCache.getCanvasHeight(); @@ -1468,8 +1459,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine } } - canvas.endScene(); - if (MasterControl.isStatsLoggable(Level.INFO)) { // Instrumentation of Java 3D renderer long deltaTime = System.nanoTime() - startRenderTime; @@ -1496,9 +1485,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine // Print NPE, but otherwise ignore it ne.printStackTrace(); if (canvas != null) { - if (canvas.ctx != null) { - canvas.endScene(); - } // drawingSurfaceObject will safely ignore // this request if this is not lock before canvas.drawingSurfaceObject.unLock(); @@ -1508,9 +1494,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine ex.printStackTrace(); if (canvas != null) { - if (canvas.ctx != null) { - canvas.endScene(); - } // drawingSurfaceObject will safely ignore // this request if this is not lock before canvas.drawingSurfaceObject.unLock(); |