xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix debug renderer

Browse Source
This commit is contained in:
Hannes Janetzek 2013-03-18 03:55:23 +01:00
parent 76f762d862
commit 0b7edab572
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/oscim/renderer/PolygonRenderer.java
View File

@ -29,7 +29,6 @@ import static android.opengl.GLES20.glStencilFunc;
import static android.opengl.GLES20.glStencilMask; import static android.opengl.GLES20.glStencilMask;
import static android.opengl.GLES20.glStencilOp; import static android.opengl.GLES20.glStencilOp;
import static android.opengl.GLES20.glUniform4fv; import static android.opengl.GLES20.glUniform4fv;
import static android.opengl.GLES20.glUniformMatrix4fv;
import static android.opengl.GLES20.glVertexAttribPointer; import static android.opengl.GLES20.glVertexAttribPointer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -42,6 +41,7 @@ import org.oscim.renderer.layer.Layer;
import org.oscim.renderer.layer.PolygonLayer; import org.oscim.renderer.layer.PolygonLayer;
import org.oscim.theme.renderinstruction.Area; import org.oscim.theme.renderinstruction.Area;
import org.oscim.utils.GlUtils; import org.oscim.utils.GlUtils;
import org.oscim.utils.Matrix4;
import android.opengl.GLES20; import android.opengl.GLES20;
@ -328,7 +328,7 @@ public final class PolygonRenderer {
private static float[] debugFillColor2 = { .8f, .8f, .8f, .8f }; private static float[] debugFillColor2 = { .8f, .8f, .8f, .8f };
private static FloatBuffer mDebugFill; private static FloatBuffer mDebugFill;
static void debugDraw(float[] matrix, float[] coords, int color) { static void debugDraw(Matrix4 m, float[] coords, int color) {
GLState.test(false, false); GLState.test(false, false);
if (mDebugFill == null) if (mDebugFill == null)
mDebugFill = ByteBuffer.allocateDirect(32).order(ByteOrder.nativeOrder()) mDebugFill = ByteBuffer.allocateDirect(32).order(ByteOrder.nativeOrder())
@ -345,7 +345,7 @@ public final class PolygonRenderer {
glVertexAttribPointer(hPolygonVertexPosition, 2, GLES20.GL_FLOAT, glVertexAttribPointer(hPolygonVertexPosition, 2, GLES20.GL_FLOAT,
false, 0, mDebugFill); false, 0, mDebugFill);
glUniformMatrix4fv(hPolygonMatrix, 1, false, matrix, 0); m.setAsUniform(hPolygonMatrix);
if (color == 0) if (color == 0)
glUniform4fv(hPolygonColor, 1, debugFillColor, 0); glUniform4fv(hPolygonColor, 1, debugFillColor, 0);
@ -389,7 +389,7 @@ public final class PolygonRenderer {
+ "if (z < -1.0)" + "if (z < -1.0)"
+ " gl_FragColor = vec4(0.0, z + 2.0, 0.0, 1.0)*0.8;" + " gl_FragColor = vec4(0.0, z + 2.0, 0.0, 1.0)*0.8;"
+ "else if (z < 0.0)" + "else if (z < 0.0)"
+ " gl_FragColor = vec4(z * -1.0, 0.0, 0.0, 1.0)*0.8;" + " gl_FragColor = vec4(z + 1.0, 0.0, 0.0, 1.0)*0.8;"
+ "else if (z < 1.0)" + "else if (z < 1.0)"
+ " gl_FragColor = vec4(0.0, 0.0, z, 1.0)*0.8;" + " gl_FragColor = vec4(0.0, 0.0, z, 1.0)*0.8;"
+ "else" + "else"