diff --git a/android/app/src/main/assets/pakQ3Q.pk3 b/android/app/src/main/assets/pakQ3Q.pk3 index 0bf331a0..76000de2 100644 Binary files a/android/app/src/main/assets/pakQ3Q.pk3 and b/android/app/src/main/assets/pakQ3Q.pk3 differ diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl index a9fe11bb..31fd10ae 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl @@ -12,16 +12,16 @@ uniform float u_Time; uniform vec4 u_Color; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_Tex1; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl index 27c0d8a6..aae50b68 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl @@ -2,15 +2,15 @@ attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_TexCoords; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl index e03c0421..e25c69e7 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl @@ -15,7 +15,7 @@ uniform vec4 u_FogDistance; uniform vec4 u_FogDepth; uniform float u_FogEyeT; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_DEFORM_VERTEXES) uniform int u_DeformGen; @@ -35,11 +35,11 @@ uniform vec4 u_Color; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying float var_Scale; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl index e03f1400..e535f059 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl @@ -36,7 +36,7 @@ uniform float u_FogEyeT; uniform vec4 u_FogColorMask; #endif -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_DEFORM_VERTEXES) uniform int u_DeformGen; @@ -66,11 +66,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES]; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_DiffuseTex; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl index ce6d1372..1b6fdb67 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl @@ -42,7 +42,7 @@ uniform vec4 u_DiffuseTexOffTurb; #endif -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; uniform vec4 u_BaseColor; uniform vec4 u_VertColor; @@ -69,11 +69,11 @@ uniform float u_PrimaryLightRadius; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec4 var_TexCoords; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl index 98cdd231..b4f0821d 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl @@ -1,15 +1,15 @@ attribute vec3 attr_Position; attribute vec3 attr_Normal; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec3 var_Position; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl index 369740cd..7f2d93fc 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl @@ -20,7 +20,7 @@ uniform float u_DeformParams[5]; uniform float u_Time; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_VERTEX_ANIMATION) uniform float u_VertexLerp; @@ -30,11 +30,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES]; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec3 var_Position; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl index b844be3b..9aa7d0dc 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl @@ -3,15 +3,15 @@ attribute vec4 attr_TexCoord0; // Uniforms -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_Tex1; diff --git a/android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl b/android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl index 77188c43..2d8e62d1 100644 --- a/android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl +++ b/android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl @@ -2,17 +2,17 @@ attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; // Uniforms -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; uniform vec3 u_ToneMinAvgMaxLinear; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; diff --git a/android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl b/android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl index a9fe11bb..31fd10ae 100644 --- a/android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl @@ -12,16 +12,16 @@ uniform float u_Time; uniform vec4 u_Color; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_Tex1; diff --git a/android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl b/android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl index 27c0d8a6..aae50b68 100644 --- a/android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl @@ -2,15 +2,15 @@ attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_TexCoords; diff --git a/android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl b/android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl index e03c0421..e25c69e7 100644 --- a/android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl @@ -15,7 +15,7 @@ uniform vec4 u_FogDistance; uniform vec4 u_FogDepth; uniform float u_FogEyeT; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_DEFORM_VERTEXES) uniform int u_DeformGen; @@ -35,11 +35,11 @@ uniform vec4 u_Color; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying float var_Scale; diff --git a/android/app/src/main/pakQ3Q/glsl/generic_vp.glsl b/android/app/src/main/pakQ3Q/glsl/generic_vp.glsl index e03f1400..e535f059 100644 --- a/android/app/src/main/pakQ3Q/glsl/generic_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/generic_vp.glsl @@ -36,7 +36,7 @@ uniform float u_FogEyeT; uniform vec4 u_FogColorMask; #endif -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_DEFORM_VERTEXES) uniform int u_DeformGen; @@ -66,11 +66,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES]; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_DiffuseTex; diff --git a/android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl b/android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl index ce6d1372..1b6fdb67 100644 --- a/android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl @@ -42,7 +42,7 @@ uniform vec4 u_DiffuseTexOffTurb; #endif -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; uniform vec4 u_BaseColor; uniform vec4 u_VertColor; @@ -69,11 +69,11 @@ uniform float u_PrimaryLightRadius; // Uniforms layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec4 var_TexCoords; diff --git a/android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl b/android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl index 98cdd231..b4f0821d 100644 --- a/android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl @@ -1,15 +1,15 @@ attribute vec3 attr_Position; attribute vec3 attr_Normal; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec3 var_Position; diff --git a/android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl b/android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl index 369740cd..7f2d93fc 100644 --- a/android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl @@ -20,7 +20,7 @@ uniform float u_DeformParams[5]; uniform float u_Time; -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; #if defined(USE_VERTEX_ANIMATION) uniform float u_VertexLerp; @@ -30,11 +30,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES]; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec3 var_Position; diff --git a/android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl b/android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl index b844be3b..9aa7d0dc 100644 --- a/android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl @@ -3,15 +3,15 @@ attribute vec4 attr_TexCoord0; // Uniforms -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; varying vec2 var_Tex1; diff --git a/android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl b/android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl index 77188c43..2d8e62d1 100644 --- a/android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl +++ b/android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl @@ -2,17 +2,17 @@ attribute vec3 attr_Position; attribute vec4 attr_TexCoord0; // Uniforms -uniform mat4 u_ModelMatrix; +uniform highp mat4 u_ModelMatrix; uniform vec3 u_ToneMinAvgMaxLinear; layout(shared) uniform ViewMatrices { - uniform mat4 u_ViewMatrices[NUM_VIEWS]; + uniform highp mat4 u_ViewMatrices[NUM_VIEWS]; }; layout(shared) uniform ProjectionMatrix { - uniform mat4 u_ProjectionMatrix; + uniform highp mat4 u_ProjectionMatrix; }; diff --git a/android/run.bat b/android/run.bat index 9865aa6d..8b82bc75 100644 --- a/android/run.bat +++ b/android/run.bat @@ -3,7 +3,7 @@ setlocal set BUILD_TYPE=release -set VERSION=0.29.0 +set VERSION=0.29.0-multiview @REM Define the following environment variables to sign a release build @REM set KEYSTORE=