epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Encode channel attributes in a more sensible way.

Browse Source
This commit is contained in:
Paul Chote
2018-05-31 20:17:40 +00:00
committed by reaperrr
parent 382f4c3af5
commit c307b3e291
2 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Game/Graphics/Util.cs
View File

@@ -19,7 +19,6 @@ namespace OpenRA.Graphics
{ {
// yes, our channel order is nuts. // yes, our channel order is nuts.
static readonly int[] ChannelMasks = { 2, 1, 0, 3 }; static readonly int[] ChannelMasks = { 2, 1, 0, 3 };
static readonly float[] ChannelSelect = { 0.2f, 0.4f, 0.6f, 0.8f };
public static void FastCreateQuad(Vertex[] vertices, float3 o, Sprite r, float paletteTextureIndex, int nv, float3 size) public static void FastCreateQuad(Vertex[] vertices, float3 o, Sprite r, float paletteTextureIndex, int nv, float3 size)
{ {
@@ -35,7 +34,9 @@ namespace OpenRA.Graphics
float st = 0; float st = 0;
float sr = 0; float sr = 0;
float sb = 0; float sb = 0;
var attribC = ChannelSelect[(int)r.Channel];
// See shp.vert for documentation on the channel attribute format
var attribC = ((byte)r.Channel) << 1 | 0x01;
var ss = r as SpriteWithSecondaryData; var ss = r as SpriteWithSecondaryData;
if (ss != null) if (ss != null)
@@ -43,16 +44,18 @@ namespace OpenRA.Graphics
sl = ss.SecondaryLeft; sl = ss.SecondaryLeft;
st = ss.SecondaryTop; st = ss.SecondaryTop;
sr = ss.SecondaryRight; sr = ss.SecondaryRight;
sb = ss.SecondaryBottom; sb = ss.SecondaryBottom;
attribC = -(attribC + ChannelSelect[(int)ss.SecondaryChannel] / 10);
attribC |= ((byte)ss.SecondaryChannel) << 4 | 0x08;
} }
vertices[nv] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, attribC); var fAttribC = (float)attribC;
vertices[nv + 1] = new Vertex(b, r.Right, r.Top, sr, st, paletteTextureIndex, attribC); vertices[nv] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC);
vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, attribC); vertices[nv + 1] = new Vertex(b, r.Right, r.Top, sr, st, paletteTextureIndex, fAttribC);
vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, attribC); vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, fAttribC);
vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, sl, sb, paletteTextureIndex, attribC); vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, fAttribC);
vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, attribC); vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, sl, sb, paletteTextureIndex, fAttribC);
vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC);
} }
public static void FastCopyIntoChannel(Sprite dest, byte[] src) public static void FastCopyIntoChannel(Sprite dest, byte[] src)

50
glsl/shp.vert
View File

@@ -10,21 +10,45 @@ varying vec4 vChannelMask;
varying vec4 vDepthMask; varying vec4 vDepthMask;
varying vec4 vColorFraction; varying vec4 vColorFraction;
vec4 DecodeChannelMask(float x) vec2 UnpackChannelAttributes(float x)
{ {
if (x > 0.7) // The channel attributes float encodes a set of attributes
// stored as flags in the mantissa of the unnormalized float value.
// Bits 3-5 define the behaviour of the secondary texture channel:
// 000: Channel is not used
// 001, 011, 101, 111: Sample depth sprite from channel R,G,B,A
// Bits 0-2 define the behaviour of the primary texture channel:
// 000: Channel is not used (aVertexTexCoord instead defines a color value)
// 001, 011, 101, 111: Sample paletted sprite from channel R,G,B,A
float secondaryChannel = 0.0;
if (x >= 32.0) { x -= 32.0; secondaryChannel += 4.0; }
if (x >= 16.0) { x -= 16.0; secondaryChannel += 2.0; }
if (x >= 8.0) { x -= 8.0; secondaryChannel += 1.0; }
float primaryChannel = 0.0;
if (x >= 4.0) { x -= 4.0; primaryChannel += 4.0; }
if (x >= 2.0) { x -= 2.0; primaryChannel += 2.0; }
if (x >= 1.0) { x -= 1.0; primaryChannel += 1.0; }
return vec2(primaryChannel, secondaryChannel);
}
vec4 SelectChannelMask(float x)
{
if (x >= 7.0)
return vec4(0,0,0,1); return vec4(0,0,0,1);
if (x > 0.5) if (x >= 5.0)
return vec4(0,0,1,0); return vec4(0,0,1,0);
if (x > 0.3) if (x >= 3.0)
return vec4(0,1,0,0); return vec4(0,1,0,0);
if (x > 0.0) if (x >= 1.0)
return vec4(1,0,0,0); return vec4(1,0,0,0);
return vec4(0, 0, 0, 0); return vec4(0, 0, 0, 0);
} }
vec4 DecodeColorFraction(float x) vec4 SelectColorFraction(float x)
{ {
if (x > 0.0) if (x > 0.0)
return vec4(0, 0, 0, 0); return vec4(0, 0, 0, 0);
@@ -37,13 +61,9 @@ void main()
gl_Position = vec4((aVertexPosition.xyz - Scroll.xyz) * r1 + r2, 1); gl_Position = vec4((aVertexPosition.xyz - Scroll.xyz) * r1 + r2, 1);
vTexCoord = aVertexTexCoord; vTexCoord = aVertexTexCoord;
vTexMetadata = aVertexTexMetadata; vTexMetadata = aVertexTexMetadata;
vChannelMask = DecodeChannelMask(abs(aVertexTexMetadata.t));
vColorFraction = DecodeColorFraction(abs(aVertexTexMetadata.t)); vec2 attrib = UnpackChannelAttributes(aVertexTexMetadata.t);
if (aVertexTexMetadata.t < 0.0) vChannelMask = SelectChannelMask(attrib.s);
{ vColorFraction = SelectColorFraction(attrib.s);
float x = -aVertexTexMetadata.t * 10.0; vDepthMask = SelectChannelMask(attrib.t);
vDepthMask = DecodeChannelMask(x - floor(x));
}
else
vDepthMask = vec4(0,0,0,0);
} }