sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged commits r11015 to gradle restructure branch.

Browse Source 
Made similar cleanup in other renderer implementations

git-svn-id: https://jmonkeyengine.googlecode.com/svn/branches/gradle-restructure@11020 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2014-02-06 18:53:30 +00:00
parent e65d6ea44b
commit 54ab14e5ae
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java
View File

@ -2307,7 +2307,7 @@ public class OGLESShaderRenderer implements Renderer {
} }
} }
VertexBuffer indices = null; VertexBuffer indices;
if (mesh.getNumLodLevels() > 0) { if (mesh.getNumLodLevels() > 0) {
indices = mesh.getLodLevel(lod); indices = mesh.getLodLevel(lod);
} else { } else {
@ -2324,7 +2324,7 @@ public class OGLESShaderRenderer implements Renderer {
} }
private void renderMeshDefault(Mesh mesh, int lod, int count) { private void renderMeshDefault(Mesh mesh, int lod, int count) {
VertexBuffer indices = null; VertexBuffer indices;
VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData); VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData);
if (interleavedData != null && interleavedData.isUpdateNeeded()) { if (interleavedData != null && interleavedData.isUpdateNeeded()) {
updateBufferData(interleavedData); updateBufferData(interleavedData);

2
jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL1Renderer.java
View File

@ -1140,7 +1140,7 @@ public class JoglGL1Renderer implements GL1Renderer {
} }
private void renderMeshDefault(Mesh mesh, int lod, int count) { private void renderMeshDefault(Mesh mesh, int lod, int count) {
VertexBuffer indices = null; VertexBuffer indices;
VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData); VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData);
if (interleavedData != null && interleavedData.isUpdateNeeded()) { if (interleavedData != null && interleavedData.isUpdateNeeded()) {

2
jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java
View File

@ -1081,7 +1081,7 @@ public class LwjglGL1Renderer implements GL1Renderer {
} }
private void renderMeshDefault(Mesh mesh, int lod, int count) { private void renderMeshDefault(Mesh mesh, int lod, int count) {
VertexBuffer indices = null; VertexBuffer indices;
VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData); VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData);
if (interleavedData != null && interleavedData.isUpdateNeeded()) { if (interleavedData != null && interleavedData.isUpdateNeeded()) {

12
jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java
View File

@ -1172,13 +1172,13 @@ public class LwjglRenderer implements Renderer {
if (GLContext.getCapabilities().GL_EXT_framebuffer_blit) { if (GLContext.getCapabilities().GL_EXT_framebuffer_blit) {
int srcX0 = 0; int srcX0 = 0;
int srcY0 = 0; int srcY0 = 0;
int srcX1 = 0; int srcX1;
int srcY1 = 0; int srcY1;
int dstX0 = 0; int dstX0 = 0;
int dstY0 = 0; int dstY0 = 0;
int dstX1 = 0; int dstX1;
int dstY1 = 0; int dstY1;
int prevFBO = context.boundFBO; int prevFBO = context.boundFBO;
@ -2410,7 +2410,7 @@ public class LwjglRenderer implements Renderer {
} }
private void renderMeshDefault(Mesh mesh, int lod, int count) { private void renderMeshDefault(Mesh mesh, int lod, int count) {
VertexBuffer indices = null; VertexBuffer indices;
VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData); VertexBuffer interleavedData = mesh.getBuffer(Type.InterleavedData);
if (interleavedData != null && interleavedData.isUpdateNeeded()) { if (interleavedData != null && interleavedData.isUpdateNeeded()) {
@ -2418,7 +2418,7 @@ public class LwjglRenderer implements Renderer {
} }
// IntMap<VertexBuffer> buffers = mesh.getBuffers(); // IntMap<VertexBuffer> buffers = mesh.getBuffers();
SafeArrayList<VertexBuffer> buffersList = mesh.getBufferList(); // SafeArrayList<VertexBuffer> buffersList = mesh.getBufferList();
if (mesh.getNumLodLevels() > 0) { if (mesh.getNumLodLevels() > 0) {
indices = mesh.getLodLevel(lod); indices = mesh.getLodLevel(lod);