From 54ab14e5ae370f2fa99190509903d274f4eab28f Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Thu, 6 Feb 2014 18:53:30 +0000 Subject: [PATCH] Merged commits r11015 to gradle restructure branch. Made similar cleanup in other renderer implementations git-svn-id: https://jmonkeyengine.googlecode.com/svn/branches/gradle-restructure@11020 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../jme3/renderer/android/OGLESShaderRenderer.java | 4 ++-- .../java/com/jme3/renderer/jogl/JoglGL1Renderer.java | 2 +- .../com/jme3/renderer/lwjgl/LwjglGL1Renderer.java | 2 +- .../java/com/jme3/renderer/lwjgl/LwjglRenderer.java | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java index 681c6b0e9..e5b8be69b 100644 --- a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java +++ b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java @@ -2307,7 +2307,7 @@ public class OGLESShaderRenderer implements Renderer { } } - VertexBuffer indices = null; + VertexBuffer indices; if (mesh.getNumLodLevels() > 0) { indices = mesh.getLodLevel(lod); } else { @@ -2324,7 +2324,7 @@ public class OGLESShaderRenderer implements Renderer { } private void renderMeshDefault(Mesh mesh, int lod, int count) { - VertexBuffer indices = null; + VertexBuffer indices; VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData); if (interleavedData != null && interleavedData.isUpdateNeeded()) { updateBufferData(interleavedData); diff --git a/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL1Renderer.java b/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL1Renderer.java index 4717bf77e..74993a3b2 100644 --- a/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL1Renderer.java +++ b/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL1Renderer.java @@ -1140,7 +1140,7 @@ public class JoglGL1Renderer implements GL1Renderer { } private void renderMeshDefault(Mesh mesh, int lod, int count) { - VertexBuffer indices = null; + VertexBuffer indices; VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData); if (interleavedData != null && interleavedData.isUpdateNeeded()) { diff --git a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java index f88a651d1..8ddc3eb4d 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java +++ b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java @@ -1081,7 +1081,7 @@ public class LwjglGL1Renderer implements GL1Renderer { } private void renderMeshDefault(Mesh mesh, int lod, int count) { - VertexBuffer indices = null; + VertexBuffer indices; VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData); if (interleavedData != null && interleavedData.isUpdateNeeded()) { diff --git a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java index 039b0f7f9..57e0c6405 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java +++ b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java @@ -1172,13 +1172,13 @@ public class LwjglRenderer implements Renderer { if (GLContext.getCapabilities().GL_EXT_framebuffer_blit) { int srcX0 = 0; int srcY0 = 0; - int srcX1 = 0; - int srcY1 = 0; + int srcX1; + int srcY1; int dstX0 = 0; int dstY0 = 0; - int dstX1 = 0; - int dstY1 = 0; + int dstX1; + int dstY1; int prevFBO = context.boundFBO; @@ -2410,7 +2410,7 @@ public class LwjglRenderer implements Renderer { } private void renderMeshDefault(Mesh mesh, int lod, int count) { - VertexBuffer indices = null; + VertexBuffer indices; VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData); if (interleavedData != null && interleavedData.isUpdateNeeded()) { @@ -2418,7 +2418,7 @@ public class LwjglRenderer implements Renderer { } // IntMap buffers = mesh.getBuffers(); - SafeArrayList buffersList = mesh.getBufferList(); +// SafeArrayList buffersList = mesh.getBufferList(); if (mesh.getNumLodLevels() > 0) { indices = mesh.getLodLevel(lod);