|
|
@ -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,13 +2107,13 @@ 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(); |
|
|
|
|
|
|
|
|
|
|
|
attribs[loc] = vb; |
|
|
|
attribs[loc] = vb; |
|
|
|