VTM: LineBucket: transparent lines

andreynovikov · Feb 3, 2024 · 122fd51 · 122fd51
1 parent f8ac992
commit 122fd51
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/app/src/main/java/mobi/maptrek/MapTrek.java b/app/src/main/java/mobi/maptrek/MapTrek.java
@@ -128,6 +128,7 @@ public class MapTrek extends Application {
  Parameters.MAP_EVENT_LAYER2 = true;
  //Parameters.TEXTURE_ATLAS = true;
  Parameters.POT_TEXTURES = true;
+ Parameters.TRANSPARENT_LINES = false;
  }
 
  @Override

diff --git a/app/src/main/java/org/oscim/renderer/bucket/LineBucket.java b/app/src/main/java/org/oscim/renderer/bucket/LineBucket.java
@@ -19,6 +19,7 @@
 
 import org.oscim.backend.GL;
 import org.oscim.backend.GLAdapter;
+import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
 import org.oscim.core.GeometryBuffer;
 import org.oscim.core.MercatorProjection;
@@ -27,6 +28,7 @@
 import org.oscim.renderer.GLUtils;
 import org.oscim.renderer.GLViewport;
 import org.oscim.theme.styles.LineStyle;
+import org.oscim.utils.Parameters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -661,6 +663,12 @@ public static RenderBucket draw(RenderBucket b, GLViewport v,
  blur = false;
  }
 
+ if (Parameters.TRANSPARENT_LINES && !Color.isOpaque(line.color)) {
+ gl.depthMask(true);
+ gl.clear(GL.DEPTH_BUFFER_BIT);
+ GLState.test(true, false);
+ }
+
  /* draw LineLayer */
  if (!line.outline) {
  /* invert scaling of extrusion vectors so that line
@@ -710,6 +718,10 @@ public static RenderBucket draw(RenderBucket b, GLViewport v,
  gl.drawArrays(GL.TRIANGLE_STRIP,
  b.vertexOffset, b.numVertices);
 
+ if (Parameters.TRANSPARENT_LINES && !Color.isOpaque(line.color)) {
+ gl.depthMask(false);
+ }
+
  continue;
  }
 
@@ -764,6 +776,10 @@ public static RenderBucket draw(RenderBucket b, GLViewport v,
  gl.drawArrays(GL.TRIANGLE_STRIP,
  ref.vertexOffset, ref.numVertices);
  }
+
+ if (Parameters.TRANSPARENT_LINES && !Color.isOpaque(line.color)) {
+ gl.depthMask(false);
+ }
  }
 
  return b;

diff --git a/app/src/main/java/org/oscim/utils/Parameters.java b/app/src/main/java/org/oscim/utils/Parameters.java
@@ -51,6 +51,11 @@ public final class Parameters {
  */
  public static boolean TEXTURE_ATLAS = false;
 
+ /**
+ * Transparent line layers.
+ */
+ public static boolean TRANSPARENT_LINES = false;
+
  /**
  * Threaded system initialization.
  */