- Removed SafeArray usage as it wasn't used.

- Added a forgotten break for cubemap texture parameters.
- Imports and some code cleanup.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@11015 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
experimental
dan..om 11 years ago
parent 6f28e6e98b
commit 687eb0ff19
  1. 15
      engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java

@ -55,9 +55,7 @@ import com.jme3.texture.Texture;
import com.jme3.texture.Texture.WrapAxis; import com.jme3.texture.Texture.WrapAxis;
import com.jme3.util.BufferUtils; import com.jme3.util.BufferUtils;
import com.jme3.util.ListMap; import com.jme3.util.ListMap;
import com.jme3.util.NativeObject;
import com.jme3.util.NativeObjectManager; import com.jme3.util.NativeObjectManager;
import com.jme3.util.SafeArrayList;
import java.nio.*; import java.nio.*;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
@ -1168,13 +1166,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;
@ -1774,6 +1772,7 @@ public class LwjglRenderer implements Renderer {
case ThreeDimensional: case ThreeDimensional:
case CubeMap: // cubemaps use 3D coords case CubeMap: // cubemaps use 3D coords
glTexParameteri(target, GL_TEXTURE_WRAP_R, convertWrapMode(tex.getWrap(WrapAxis.R))); glTexParameteri(target, GL_TEXTURE_WRAP_R, convertWrapMode(tex.getWrap(WrapAxis.R)));
break;
case TwoDimensional: case TwoDimensional:
case TwoDimensionalArray: case TwoDimensionalArray:
glTexParameteri(target, GL_TEXTURE_WRAP_T, convertWrapMode(tex.getWrap(WrapAxis.T))); glTexParameteri(target, GL_TEXTURE_WRAP_T, convertWrapMode(tex.getWrap(WrapAxis.T)));
@ -2406,7 +2405,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()) {
@ -2414,7 +2413,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);

Loading…
Cancel
Save