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

* Delete useless Android22Workaround

Browse Source
This commit is contained in:
shadowislord 2015-01-31 12:46:09 -05:00
parent 0f346ee196
commit af65215450
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jme3-android/src/main/java/com/jme3/renderer/android/Android22Workaround.java
View File

@ -1,14 +0,0 @@
package com.jme3.renderer.android;
import android.opengl.GLES20;
public class Android22Workaround {
public static void glVertexAttribPointer(int location, int components, int format, boolean normalize, int stride, int offset){
GLES20.glVertexAttribPointer(location,
components,
format,
normalize,
stride,
offset);
}
}

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

@ -37,7 +37,6 @@ import com.jme3.asset.AndroidImageInfo;
import com.jme3.light.LightList; import com.jme3.light.LightList;
import com.jme3.material.RenderState; import com.jme3.material.RenderState;
import com.jme3.math.ColorRGBA; import com.jme3.math.ColorRGBA;
import com.jme3.math.Matrix4f;
import com.jme3.math.Quaternion; import com.jme3.math.Quaternion;
import com.jme3.math.Vector2f; import com.jme3.math.Vector2f;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;
@ -49,6 +48,7 @@ import com.jme3.renderer.Renderer;
import com.jme3.renderer.RendererException; import com.jme3.renderer.RendererException;
import com.jme3.renderer.Statistics; import com.jme3.renderer.Statistics;
import com.jme3.renderer.android.TextureUtil.AndroidGLImageFormat; import com.jme3.renderer.android.TextureUtil.AndroidGLImageFormat;
import com.jme3.renderer.opengl.GLRenderer;
import com.jme3.scene.Mesh; import com.jme3.scene.Mesh;
import com.jme3.scene.Mesh.Mode; import com.jme3.scene.Mesh.Mode;
import com.jme3.scene.VertexBuffer; import com.jme3.scene.VertexBuffer;
@ -81,6 +81,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import jme3tools.shader.ShaderDebug; import jme3tools.shader.ShaderDebug;
/**
* @deprecated Should not be used anymore. Use {@link GLRenderer} instead.
*/
@Deprecated
public class OGLESShaderRenderer implements Renderer { public class OGLESShaderRenderer implements Renderer {
private static final Logger logger = Logger.getLogger(OGLESShaderRenderer.class.getName()); private static final Logger logger = Logger.getLogger(OGLESShaderRenderer.class.getName());
@ -2103,12 +2107,12 @@ public class OGLESShaderRenderer implements Renderer {
vb.getData().rewind(); vb.getData().rewind();
Android22Workaround.glVertexAttribPointer(loc, GLES20.glVertexAttribPointer(loc,
vb.getNumComponents(), vb.getNumComponents(),
convertVertexBufferFormat(vb.getFormat()), convertVertexBufferFormat(vb.getFormat()),
vb.isNormalized(), vb.isNormalized(),
vb.getStride(), vb.getStride(),
0); 0);
RendererUtil.checkGLError(); RendererUtil.checkGLError();