From 45b8bf75de84a424c0e31aec17f3e22a75ac8b2a Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Mon, 18 Mar 2013 03:53:30 +0100 Subject: [PATCH] cleanups --- .../oscim/overlay/ItemizedIconOverlay.java | 2 +- src/org/oscim/renderer/TileRenderer.java | 2 +- src/org/oscim/renderer/layer/TextLayer.java | 5 - .../renderer/overlays/ExtrusionOverlay.java | 117 ++++++------------ src/org/oscim/utils/GeometryUtils.java | 2 +- 5 files changed, 44 insertions(+), 84 deletions(-) diff --git a/src/org/oscim/overlay/ItemizedIconOverlay.java b/src/org/oscim/overlay/ItemizedIconOverlay.java index ca2df300..dc8769a7 100644 --- a/src/org/oscim/overlay/ItemizedIconOverlay.java +++ b/src/org/oscim/overlay/ItemizedIconOverlay.java @@ -28,7 +28,7 @@ import android.graphics.drawable.Drawable; import android.view.MotionEvent; public class ItemizedIconOverlay extends ItemizedOverlay { - private static final String TAG = ItemizedIconOverlay.class.getName(); + //private static final String TAG = ItemizedIconOverlay.class.getName(); protected final List mItemList; protected OnItemGestureListener mOnItemGestureListener; diff --git a/src/org/oscim/renderer/TileRenderer.java b/src/org/oscim/renderer/TileRenderer.java index 8fc60e37..55b9e6d1 100644 --- a/src/org/oscim/renderer/TileRenderer.java +++ b/src/org/oscim/renderer/TileRenderer.java @@ -34,7 +34,7 @@ import android.opengl.GLES20; * @author Hannes Janetzek */ public class TileRenderer { - //private final static String TAG = BaseMap.class.getName(); + //private final static String TAG = TileRenderer.class.getName(); // used to increase polygon-offset for each tile drawn. private static int mDrawCnt; diff --git a/src/org/oscim/renderer/layer/TextLayer.java b/src/org/oscim/renderer/layer/TextLayer.java index 9398f658..afd68095 100644 --- a/src/org/oscim/renderer/layer/TextLayer.java +++ b/src/org/oscim/renderer/layer/TextLayer.java @@ -68,11 +68,6 @@ public final class TextLayer extends TextureLayer { TextItem it = labels; for (; it != null; it = it.next) { - // todo add captions at the end - //if (item.text.caption && !it.text.caption) - //continue; - //if (!item.text.caption && it.text.caption) - //continue; if (item.text == it.text) { while (it.next != null diff --git a/src/org/oscim/renderer/overlays/ExtrusionOverlay.java b/src/org/oscim/renderer/overlays/ExtrusionOverlay.java index ab89e5cb..2bb89334 100644 --- a/src/org/oscim/renderer/overlays/ExtrusionOverlay.java +++ b/src/org/oscim/renderer/overlays/ExtrusionOverlay.java @@ -71,7 +71,7 @@ public class ExtrusionOverlay extends RenderOverlay { for (int i = 1; i < 2; i++) { // Set up the program for rendering extrusions - shaderProgram[i] = GlUtils.createProgram(extrusionVertexShader[i], + shaderProgram[i] = GlUtils.createProgram(extrusionVertexShader, extrusionFragmentShader); if (shaderProgram[i] == 0) { Log.e(TAG, "Could not create extrusion shader program. " + i); @@ -371,81 +371,46 @@ public class ExtrusionOverlay extends RenderOverlay { 1.0f, }; - final static String[] extrusionVertexShader = { - "precision mediump float;" - + "uniform mat4 u_mvp;" - + "uniform vec4 u_color[4];" - + "uniform int u_mode;" - + "uniform float u_alpha;" - + "attribute vec4 a_pos;" - + "attribute vec2 a_light;" - + "varying vec4 color;" - + "const float ff = 255.0;" - + "float c_alpha = 0.8;" - + "void main() {" - + " gl_Position = u_mvp * a_pos;" - + " if (u_mode == 0)" - // roof / depth pass - + " color = u_color[0];" - + " else {" - // decrease contrast with distance - + " float z = (0.96 + gl_Position.z * 0.04);" - + " if (u_mode == 1){" - // sides 1 - use 0xff00 - // scale direction to -0.5<>0.5 - + " float dir = abs(a_light.y / ff - 0.5);" - + " color = u_color[1] * z;" - + " color.rgb *= (0.7 + dir * 0.4);" - + " } else if (u_mode == 2){" - // sides 2 - use 0x00ff - + " float dir = abs(a_light.x / ff - 0.5);" - + " color = u_color[2] * z;" - + " color.rgb *= (0.7 + dir * 0.4);" - + " } else" - // outline - + " color = u_color[3] * z;" - + "}}", - - "precision mediump float;" - + "uniform mat4 u_mvp;" - + "uniform vec4 u_color[4];" - + "uniform int u_mode;" - + "uniform float u_alpha;" - + "attribute vec4 a_pos;" - + "attribute vec2 a_light;" - + "varying vec4 color;" - //+ "varying float z;" - + "const float ff = 255.0;" - + "void main() {" - // change height by u_alpha - + " gl_Position = u_mvp * vec4(a_pos.xy, a_pos.z * u_alpha, 1.0);" - //+ " z = gl_Position.z;" - + " if (u_mode == 0)" - // roof / depth pass - + " color = u_color[0];" - + " else {" - // decrease contrast with distance - + " if (u_mode == 1){" - // sides 1 - use 0xff00 - // scale direction to -0.5<>0.5 - //+ " float dir = abs(a_light.y / ff - 0.5);" - + " float dir = a_light.y / ff;" - + " float z = (0.98 + gl_Position.z * 0.02);" - + " color = u_color[1];" - + " color.rgb *= (0.85 + dir * 0.15) * z;" - + " } else if (u_mode == 2){" - // sides 2 - use 0x00ff - //+ " float dir = abs(a_light.x / ff - 0.5);" - + " float dir = a_light.x / ff;" - + " float z = (0.98 + gl_Position.z * 0.02);" - + " color = u_color[2] * z;" - + " color.rgb *= (0.85 + dir * 0.15) * z;" - + " } else {" - // outline - + " float z = (0.8 - gl_Position.z * 0.2);" - + " color = u_color[3] * z;" - + "}}}" - }; + final static String extrusionVertexShader = "" + + "precision mediump float;" + + "uniform mat4 u_mvp;" + + "uniform vec4 u_color[4];" + + "uniform int u_mode;" + + "uniform float u_alpha;" + + "attribute vec4 a_pos;" + + "attribute vec2 a_light;" + + "varying vec4 color;" + //+ "varying float z;" + + "const float ff = 255.0;" + + "void main() {" + // change height by u_alpha + + " gl_Position = u_mvp * vec4(a_pos.xy, a_pos.z * u_alpha, 1.0);" + //+ " z = gl_Position.z;" + + " if (u_mode == 0)" + // roof / depth pass + + " color = u_color[0];" + + " else {" + // decrease contrast with distance + + " if (u_mode == 1){" + // sides 1 - use 0xff00 + // scale direction to -0.5<>0.5 + //+ " float dir = abs(a_light.y / ff - 0.5);" + + " float dir = a_light.y / ff;" + + " float z = (0.98 + gl_Position.z * 0.02);" + + " color = u_color[1];" + + " color.rgb *= (0.85 + dir * 0.15) * z;" + + " } else if (u_mode == 2){" + // sides 2 - use 0x00ff + //+ " float dir = abs(a_light.x / ff - 0.5);" + + " float dir = a_light.x / ff;" + + " float z = (0.98 + gl_Position.z * 0.02);" + + " color = u_color[2] * z;" + + " color.rgb *= (0.85 + dir * 0.15) * z;" + + " } else {" + // outline + + " float z = (0.8 - gl_Position.z * 0.2);" + + " color = u_color[3] * z;" + + "}}}"; final static String extrusionFragmentShader = "" + "precision mediump float;" diff --git a/src/org/oscim/utils/GeometryUtils.java b/src/org/oscim/utils/GeometryUtils.java index ec64b4a3..cc859aca 100644 --- a/src/org/oscim/utils/GeometryUtils.java +++ b/src/org/oscim/utils/GeometryUtils.java @@ -194,7 +194,7 @@ public final class GeometryUtils { } double ua = ua_numr / denr; - double ub = ub_numr / denr; + //double ub = ub_numr / denr; //if (ua >= 0.0 && ua <= 1.0 && ub >= 0.0 && ub <= 1.0) {