3 Commits

Author SHA1 Message Date
Emux
fc7bb2df9b 0.6.0-rc3 2016-10-22 13:22:34 +03:00
Emux
062bb8d573 Update Android and Gradle plugin versions 2016-10-21 20:08:17 +03:00
szantai78
ccdea3b663 LocationRenderer: revert shader precision from high to medium #209, fixes #207 2016-10-21 19:18:19 +03:00
4 changed files with 13 additions and 9 deletions

View File

@@ -6,9 +6,8 @@ android:
components:
- platform-tools
- tools
- build-tools-24.0.3
- android-24
- extra-android-m2repository
- build-tools-25.0.0
- android-25
env:
global:
- GRADLE_OPTS="-Xmx2048m"

View File

@@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.1'
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
}
}
@@ -13,7 +13,7 @@ allprojects {
version = 'master-SNAPSHOT'
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
ext.androidBuildVersionTools = "24.0.3"
ext.androidBuildVersionTools = "25.0.0"
ext.gdxVersion = "1.9.4"
if (JavaVersion.current().isJava8Compatible()) {
@@ -25,7 +25,7 @@ allprojects {
}
}
def androidCompileSdk() { return 24 }
def androidCompileSdk() { return 25 }
def androidMinSdk() { return 10 }

View File

@@ -2,6 +2,10 @@
## Version 0.6.X
**Version 0.6.0-rc3 (2016-10-22)**
- Minor improvements and bug fixes
**Version 0.6.0-rc2 (2016-10-16)**
- Location layer [#171](https://github.com/mapsforge/vtm/issues/171)

View File

@@ -2,6 +2,7 @@
* Copyright 2013 Ahmad Saleem
* Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86
* Copyright 2016 ocsike
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -265,7 +266,7 @@ public class LocationRenderer extends LayerRenderer {
}
private static final String vShaderStr = ""
+ "precision highp float;"
+ "precision mediump float;"
+ "uniform mat4 u_mvp;"
+ "uniform float u_phase;"
+ "uniform float u_scale;"
@@ -277,7 +278,7 @@ public class LocationRenderer extends LayerRenderer {
+ "}";
private static final String fShaderStr1 = ""
+ "precision highp float;"
+ "precision mediump float;"
+ "varying vec2 v_tex;"
+ "uniform float u_scale;"
+ "uniform float u_phase;"
@@ -306,7 +307,7 @@ public class LocationRenderer extends LayerRenderer {
+ "}}";
private static final String fShaderStr2 = ""
+ "precision highp float;"
+ "precision mediump float;"
+ "varying vec2 v_tex;"
+ "uniform float u_scale;"
+ "uniform float u_phase;"