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

cleanup

Browse Source
This commit is contained in:
Hannes Janetzek 2013-01-13 13:48:48 +01:00
parent bdbe0c1527
commit 21584637ed
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/oscim/overlay/BuildingOverlay.java
View File

@ -99,7 +99,7 @@ public class BuildingOverlay extends Overlay {
else else
a = (1 - max) + (tick / duration) * max; a = (1 - max) + (tick / duration) * max;
Log.d(TAG, "fade " + dir + " " + tick + "\t" + a); //Log.d(TAG, "fade " + dir + " " + tick + "\t" + a);
mAlpha = a; mAlpha = a;
mExtLayer.setAlpha(a); mExtLayer.setAlpha(a);

3
src/org/oscim/renderer/overlays/ExtrusionOverlay.java
View File

@ -203,13 +203,10 @@ public class ExtrusionOverlay extends RenderOverlay {
GLES20.glVertexAttribPointer(uExtLightPosition, 2, GLES20.glVertexAttribPointer(uExtLightPosition, 2,
GLES20.GL_UNSIGNED_BYTE, false, 8, 6); GLES20.GL_UNSIGNED_BYTE, false, 8, 6);
GLES20.glUniform4f(uExtColor, 0.6f, 0.6f, 0.6f, 0.8f);
GLES20.glDrawElements(GLES20.GL_TRIANGLES, GLES20.glDrawElements(GLES20.GL_TRIANGLES,
(el.mIndiceCnt[0] + el.mIndiceCnt[1] + el.mIndiceCnt[2]), (el.mIndiceCnt[0] + el.mIndiceCnt[1] + el.mIndiceCnt[2]),
GLES20.GL_UNSIGNED_SHORT, 0); GLES20.GL_UNSIGNED_SHORT, 0);
GLES20.glUniform4f(uExtColor, 1.0f, 0.5f, 0.5f, 0.9f);
GLES20.glDrawElements(GLES20.GL_LINES, el.mIndiceCnt[3], GLES20.glDrawElements(GLES20.GL_LINES, el.mIndiceCnt[3],
GLES20.GL_UNSIGNED_SHORT, GLES20.GL_UNSIGNED_SHORT,
(el.mIndiceCnt[0] + el.mIndiceCnt[1] + el.mIndiceCnt[2]) * 2); (el.mIndiceCnt[0] + el.mIndiceCnt[1] + el.mIndiceCnt[2]) * 2);