phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removes unused UV2 from minimap shader and reorders parameters types.

Browse Source 
This was SVN commit r27146.
This commit is contained in:
Vladislav Belov 2022-10-11 20:56:00 +00:00
parent b728c9e97e
commit 1cd1715088
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
binaries/data/mods/public/shaders/glsl/minimap.fs
View File

@ -1,25 +1,28 @@
#version 110
#if MINIMAP_BASE || MINIMAP_LOS
uniform sampler2D baseTex;
varying vec2 v_tex;
uniform sampler2D baseTex;
#endif
#if MINIMAP_BASE || MINIMAP_LOS
varying vec2 v_tex;
#endif
#if MINIMAP_POINT
varying vec3 color;
varying vec3 color;
#endif
void main()
{
#if MINIMAP_BASE
gl_FragColor = texture2D(baseTex, v_tex);
#endif
#if MINIMAP_BASE
gl_FragColor = texture2D(baseTex, v_tex);
#endif
#if MINIMAP_LOS
gl_FragColor = texture2D(baseTex, v_tex).rrrr;
#endif
#if MINIMAP_LOS
gl_FragColor = texture2D(baseTex, v_tex).rrrr;
#endif
#if MINIMAP_POINT
gl_FragColor = vec4(color, 1.0);
#endif
#if MINIMAP_POINT
gl_FragColor = vec4(color, 1.0);
#endif
}

26
binaries/data/mods/public/shaders/glsl/minimap.vs
View File

@ -2,27 +2,29 @@
uniform mat4 transform;
uniform mat4 textureTransform;
#if MINIMAP_BASE || MINIMAP_LOS
attribute vec3 a_vertex;
attribute vec2 a_uv0;
#if MINIMAP_POINT && USE_GPU_INSTANCING
uniform float width;
#endif
#if MINIMAP_BASE || MINIMAP_LOS
varying vec2 v_tex;
attribute vec3 a_vertex;
attribute vec2 a_uv0;
#endif
#if MINIMAP_POINT
attribute vec2 a_vertex;
attribute vec3 a_color;
varying vec3 color;
attribute vec2 a_vertex;
attribute vec3 a_color;
#if USE_GPU_INSTANCING
attribute vec2 a_uv1;
#endif
#endif
#if MINIMAP_POINT && USE_GPU_INSTANCING
attribute vec2 a_uv1;
attribute vec4 a_uv2;
#if MINIMAP_BASE || MINIMAP_LOS
varying vec2 v_tex;
#endif
uniform float width;
#if MINIMAP_POINT
varying vec3 color;
#endif
void main()