summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2024-02-27 11:09:54 +0100
committerLinus Färnstrand <linus@mullvad.net>2024-02-27 11:09:54 +0100
commit2ca2186fefde0b854dc1b4ae06bf2e8ce92a2336 (patch)
treede024dbfa9343980eb403528ed0e382d594a97a2 /android
parent9a22271c8c5828703a084a5b7d978162403b5335 (diff)
parent2f82e10c45777e958b30cb387380ca0b68007894 (diff)
downloadmullvadvpn-2ca2186fefde0b854dc1b4ae06bf2e8ce92a2336.tar.xz
mullvadvpn-2ca2186fefde0b854dc1b4ae06bf2e8ce92a2336.zip
Merge branch 'optimize-map-contour-lines'
Diffstat (limited to 'android')
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
index 379ac407cc..7e862ef59e 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
@@ -84,7 +84,7 @@ internal class Globe(resources: Resources) {
landVertexBuffer,
landContour,
colors.contourColorArray,
- GLES20.GL_LINES
+ GLES20.GL_LINE_STRIP
)
// Scale the globe to avoid z-fighting
@@ -153,7 +153,7 @@ internal class Globe(resources: Resources) {
)
companion object {
- private const val LAND_OCEAN_SCALE_FACTOR = 0.9999f
+ private const val LAND_OCEAN_SCALE_FACTOR = 0.99999f
// Vertex, and fragment shader code is taken from Mullvad Desktop 3dmap.ts
private val vertexShaderCode =