teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-16 00:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some small tweaks to shaders following trunk merge

Browse source
This commit is contained in:
Simon 2022-03-30 20:05:14 +01:00
parent 2b2748b9f9
commit 3bb87ecbe6
20 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/app/src/main/assets/pakQ3Q.pk3
View file

Binary file not shown.

6
android/app/src/main/cpp/code/renderergl2/glsl/dlight_vp.glsl
View file

@ -12,16 +12,16 @@ uniform float u_Time;
uniform vec4 u_Color; uniform vec4 u_Color;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec2 var_Tex1; varying vec2 var_Tex1;

6
android/app/src/main/cpp/code/renderergl2/glsl/down4x_vp.glsl
View file

@ -2,15 +2,15 @@ attribute vec3 attr_Position;
attribute vec4 attr_TexCoord0; attribute vec4 attr_TexCoord0;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec2 var_TexCoords; varying vec2 var_TexCoords;

6
android/app/src/main/cpp/code/renderergl2/glsl/fogpass_vp.glsl
View file

@ -15,7 +15,7 @@ uniform vec4 u_FogDistance;
uniform vec4 u_FogDepth; uniform vec4 u_FogDepth;
uniform float u_FogEyeT; uniform float u_FogEyeT;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
#if defined(USE_DEFORM_VERTEXES) #if defined(USE_DEFORM_VERTEXES)
uniform int u_DeformGen; uniform int u_DeformGen;
@ -35,11 +35,11 @@ uniform vec4 u_Color;
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying float var_Scale; varying float var_Scale;

6
android/app/src/main/cpp/code/renderergl2/glsl/generic_vp.glsl
View file

@ -36,7 +36,7 @@ uniform float u_FogEyeT;
uniform vec4 u_FogColorMask; uniform vec4 u_FogColorMask;
#endif #endif
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
#if defined(USE_DEFORM_VERTEXES) #if defined(USE_DEFORM_VERTEXES)
uniform int u_DeformGen; uniform int u_DeformGen;
@ -66,11 +66,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES];
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec2 var_DiffuseTex; varying vec2 var_DiffuseTex;

6
android/app/src/main/cpp/code/renderergl2/glsl/lightall_vp.glsl
View file

@ -42,7 +42,7 @@ uniform vec4 u_DiffuseTexOffTurb;
#endif #endif
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
uniform vec4 u_BaseColor; uniform vec4 u_BaseColor;
uniform vec4 u_VertColor; uniform vec4 u_VertColor;
@ -69,11 +69,11 @@ uniform float u_PrimaryLightRadius;
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec4 var_TexCoords; varying vec4 var_TexCoords;

6
android/app/src/main/cpp/code/renderergl2/glsl/pshadow_vp.glsl
View file

@ -1,15 +1,15 @@
attribute vec3 attr_Position; attribute vec3 attr_Position;
attribute vec3 attr_Normal; attribute vec3 attr_Normal;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec3 var_Position; varying vec3 var_Position;

6
android/app/src/main/cpp/code/renderergl2/glsl/shadowfill_vp.glsl
View file

@ -20,7 +20,7 @@ uniform float u_DeformParams[5];
uniform float u_Time; uniform float u_Time;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
#if defined(USE_VERTEX_ANIMATION) #if defined(USE_VERTEX_ANIMATION)
uniform float u_VertexLerp; uniform float u_VertexLerp;
@ -30,11 +30,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES];
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec3 var_Position; varying vec3 var_Position;

6
android/app/src/main/cpp/code/renderergl2/glsl/texturecolor_vp.glsl
View file

@ -3,15 +3,15 @@ attribute vec4 attr_TexCoord0;
// Uniforms // Uniforms
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec2 var_Tex1; varying vec2 var_Tex1;

6
android/app/src/main/cpp/code/renderergl2/glsl/tonemap_vp.glsl
View file

@ -2,17 +2,17 @@ attribute vec3 attr_Position;
attribute vec4 attr_TexCoord0; attribute vec4 attr_TexCoord0;
// Uniforms // Uniforms
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
uniform vec3 u_ToneMinAvgMaxLinear; uniform vec3 u_ToneMinAvgMaxLinear;
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };

6
android/app/src/main/pakQ3Q/glsl/dlight_vp.glsl
View file

@ -12,16 +12,16 @@ uniform float u_Time;
uniform vec4 u_Color; uniform vec4 u_Color;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec2 var_Tex1; varying vec2 var_Tex1;

6
android/app/src/main/pakQ3Q/glsl/down4x_vp.glsl
View file

@ -2,15 +2,15 @@ attribute vec3 attr_Position;
attribute vec4 attr_TexCoord0; attribute vec4 attr_TexCoord0;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec2 var_TexCoords; varying vec2 var_TexCoords;

6
android/app/src/main/pakQ3Q/glsl/fogpass_vp.glsl
View file

@ -15,7 +15,7 @@ uniform vec4 u_FogDistance;
uniform vec4 u_FogDepth; uniform vec4 u_FogDepth;
uniform float u_FogEyeT; uniform float u_FogEyeT;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
#if defined(USE_DEFORM_VERTEXES) #if defined(USE_DEFORM_VERTEXES)
uniform int u_DeformGen; uniform int u_DeformGen;
@ -35,11 +35,11 @@ uniform vec4 u_Color;
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying float var_Scale; varying float var_Scale;

6
android/app/src/main/pakQ3Q/glsl/generic_vp.glsl
View file

@ -36,7 +36,7 @@ uniform float u_FogEyeT;
uniform vec4 u_FogColorMask; uniform vec4 u_FogColorMask;
#endif #endif
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
#if defined(USE_DEFORM_VERTEXES) #if defined(USE_DEFORM_VERTEXES)
uniform int u_DeformGen; uniform int u_DeformGen;
@ -66,11 +66,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES];
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec2 var_DiffuseTex; varying vec2 var_DiffuseTex;

6
android/app/src/main/pakQ3Q/glsl/lightall_vp.glsl
View file

@ -42,7 +42,7 @@ uniform vec4 u_DiffuseTexOffTurb;
#endif #endif
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
uniform vec4 u_BaseColor; uniform vec4 u_BaseColor;
uniform vec4 u_VertColor; uniform vec4 u_VertColor;
@ -69,11 +69,11 @@ uniform float u_PrimaryLightRadius;
// Uniforms // Uniforms
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec4 var_TexCoords; varying vec4 var_TexCoords;

6
android/app/src/main/pakQ3Q/glsl/pshadow_vp.glsl
View file

@ -1,15 +1,15 @@
attribute vec3 attr_Position; attribute vec3 attr_Position;
attribute vec3 attr_Normal; attribute vec3 attr_Normal;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec3 var_Position; varying vec3 var_Position;

6
android/app/src/main/pakQ3Q/glsl/shadowfill_vp.glsl
View file

@ -20,7 +20,7 @@ uniform float u_DeformParams[5];
uniform float u_Time; uniform float u_Time;
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
#if defined(USE_VERTEX_ANIMATION) #if defined(USE_VERTEX_ANIMATION)
uniform float u_VertexLerp; uniform float u_VertexLerp;
@ -30,11 +30,11 @@ uniform mat4 u_BoneMatrix[MAX_GLSL_BONES];
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec3 var_Position; varying vec3 var_Position;

6
android/app/src/main/pakQ3Q/glsl/texturecolor_vp.glsl
View file

@ -3,15 +3,15 @@ attribute vec4 attr_TexCoord0;
// Uniforms // Uniforms
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };
varying vec2 var_Tex1; varying vec2 var_Tex1;

6
android/app/src/main/pakQ3Q/glsl/tonemap_vp.glsl
View file

@ -2,17 +2,17 @@ attribute vec3 attr_Position;
attribute vec4 attr_TexCoord0; attribute vec4 attr_TexCoord0;
// Uniforms // Uniforms
uniform mat4 u_ModelMatrix; uniform highp mat4 u_ModelMatrix;
uniform vec3 u_ToneMinAvgMaxLinear; uniform vec3 u_ToneMinAvgMaxLinear;
layout(shared) uniform ViewMatrices layout(shared) uniform ViewMatrices
{ {
uniform mat4 u_ViewMatrices[NUM_VIEWS]; uniform highp mat4 u_ViewMatrices[NUM_VIEWS];
}; };
layout(shared) uniform ProjectionMatrix layout(shared) uniform ProjectionMatrix
{ {
uniform mat4 u_ProjectionMatrix; uniform highp mat4 u_ProjectionMatrix;
}; };

2
android/run.bat
View file

@ -3,7 +3,7 @@
setlocal setlocal
set BUILD_TYPE=release 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 Define the following environment variables to sign a release build
@REM set KEYSTORE= @REM set KEYSTORE=