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

Fix SA1141

Browse Source
This commit is contained in:
RoosterDragon
2023-04-05 19:36:24 +01:00
committed by Pavel Penev
parent 1ce9acd442
commit 062dc2bd40
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.editorconfig
View File

@@ -599,7 +599,6 @@ dotnet_diagnostic.SA1642.severity = none # ConstructorSummaryDocumentationShould
dotnet_diagnostic.SA1649.severity = none # FileNameMustMatchTypeName dotnet_diagnostic.SA1649.severity = none # FileNameMustMatchTypeName
# Requires C# 8/9 - TODO Consider enabling # Requires C# 8/9 - TODO Consider enabling
dotnet_diagnostic.SA1141.severity = none # UseTupleSyntax
dotnet_diagnostic.SA1316.severity = none # TupleElementNamesShouldUseCorrectCasing dotnet_diagnostic.SA1316.severity = none # TupleElementNamesShouldUseCorrectCasing
dotnet_diagnostic.SA1414.severity = none # TupleTypesInSignaturesShouldHaveElementNames dotnet_diagnostic.SA1414.severity = none # TupleTypesInSignaturesShouldHaveElementNames

2
OpenRA.Game/Server/Connection.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Server
void SendReceiveLoop(object s) void SendReceiveLoop(object s)
{ {
var (server, socket) = (ValueTuple<Server, Socket>)s; var (server, socket) = ((Server, Socket))s;
socket.Blocking = false; socket.Blocking = false;
socket.NoDelay = true; socket.NoDelay = true;

38
OpenRA.Platforms.Default/ThreadedGraphicsContext.cs
View File

@@ -88,22 +88,22 @@ namespace OpenRA.Platforms.Default
getCreateFrameBuffer = getCreateFrameBuffer =
tuple => tuple =>
{ {
var t = (ValueTuple<Size, Color>)tuple; var t = ((Size, Color))tuple;
return new ThreadedFrameBuffer(this, return new ThreadedFrameBuffer(this,
context.CreateFrameBuffer(t.Item1, (ITextureInternal)CreateTexture(), t.Item2)); context.CreateFrameBuffer(t.Item1, (ITextureInternal)CreateTexture(), t.Item2));
}; };
getCreateShader = name => new ThreadedShader(this, context.CreateShader((string)name)); getCreateShader = name => new ThreadedShader(this, context.CreateShader((string)name));
getCreateVertexBuffer = length => new ThreadedVertexBuffer(this, context.CreateVertexBuffer((int)length)); getCreateVertexBuffer = length => new ThreadedVertexBuffer(this, context.CreateVertexBuffer((int)length));
doDrawPrimitives = doDrawPrimitives =
tuple => tuple =>
{ {
var t = (ValueTuple<PrimitiveType, int, int>)tuple; var t = ((PrimitiveType, int, int))tuple;
context.DrawPrimitives(t.Item1, t.Item2, t.Item3); context.DrawPrimitives(t.Item1, t.Item2, t.Item3);
}; };
doEnableScissor = doEnableScissor =
tuple => tuple =>
{ {
var t = (ValueTuple<int, int, int, int>)tuple; var t = ((int, int, int, int))tuple;
context.EnableScissor(t.Item1, t.Item2, t.Item3, t.Item4); context.EnableScissor(t.Item1, t.Item2, t.Item3, t.Item4);
}; };
doSetBlendMode = mode => context.SetBlendMode((BlendMode)mode); doSetBlendMode = mode => context.SetBlendMode((BlendMode)mode);
@@ -513,8 +513,8 @@ namespace OpenRA.Platforms.Default
{ {
this.device = device; this.device = device;
bind = vertexBuffer.Bind; bind = vertexBuffer.Bind;
setData1 = tuple => { var t = (ValueTuple<Vertex[], int>)tuple; vertexBuffer.SetData(t.Item1, t.Item2); device.ReturnVertices(t.Item1); }; setData1 = tuple => { var t = ((Vertex[], int))tuple; vertexBuffer.SetData(t.Item1, t.Item2); device.ReturnVertices(t.Item1); };
setData2 = tuple => { var t = (ValueTuple<Vertex[], int, int, int>)tuple; vertexBuffer.SetData(t.Item1, t.Item2, t.Item3, t.Item4); device.ReturnVertices(t.Item1); }; setData2 = tuple => { var t = ((Vertex[], int, int, int))tuple; vertexBuffer.SetData(t.Item1, t.Item2, t.Item3, t.Item4); device.ReturnVertices(t.Item1); };
setData3 = tuple => { setData2(tuple); return null; }; setData3 = tuple => { setData2(tuple); return null; };
dispose = vertexBuffer.Dispose; dispose = vertexBuffer.Dispose;
} }
@@ -584,11 +584,11 @@ namespace OpenRA.Platforms.Default
getScaleFilter = () => texture.ScaleFilter; getScaleFilter = () => texture.ScaleFilter;
setScaleFilter = value => texture.ScaleFilter = (TextureScaleFilter)value; setScaleFilter = value => texture.ScaleFilter = (TextureScaleFilter)value;
getSize = () => texture.Size; getSize = () => texture.Size;
setEmpty = tuple => { var t = (ValueTuple<int, int>)tuple; texture.SetEmpty(t.Item1, t.Item2); }; setEmpty = tuple => { var t = ((int, int))tuple; texture.SetEmpty(t.Item1, t.Item2); };
getData = () => texture.GetData(); getData = () => texture.GetData();
setData1 = tuple => { var t = (ValueTuple<byte[], int, int>)tuple; texture.SetData(t.Item1, t.Item2, t.Item3); }; setData1 = tuple => { var t = ((byte[], int, int))tuple; texture.SetData(t.Item1, t.Item2, t.Item3); };
setData2 = tuple => { setData1(tuple); return null; }; setData2 = tuple => { setData1(tuple); return null; };
setData3 = tuple => { var t = (ValueTuple<float[], int, int>)tuple; texture.SetFloatData(t.Item1, t.Item2, t.Item3); }; setData3 = tuple => { var t = ((float[], int, int))tuple; texture.SetFloatData(t.Item1, t.Item2, t.Item3); };
setData4 = tuple => { setData3(tuple); return null; }; setData4 = tuple => { setData3(tuple); return null; };
dispose = texture.Dispose; dispose = texture.Dispose;
} }
@@ -674,13 +674,13 @@ namespace OpenRA.Platforms.Default
{ {
this.device = device; this.device = device;
prepareRender = shader.PrepareRender; prepareRender = shader.PrepareRender;
setBool = tuple => { var t = (ValueTuple<string, bool>)tuple; shader.SetBool(t.Item1, t.Item2); }; setBool = tuple => { var t = ((string, bool))tuple; shader.SetBool(t.Item1, t.Item2); };
setMatrix = tuple => { var t = (ValueTuple<string, float[]>)tuple; shader.SetMatrix(t.Item1, t.Item2); }; setMatrix = tuple => { var t = ((string, float[]))tuple; shader.SetMatrix(t.Item1, t.Item2); };
setTexture = tuple => { var t = (ValueTuple<string, ITexture>)tuple; shader.SetTexture(t.Item1, t.Item2); }; setTexture = tuple => { var t = ((string, ITexture))tuple; shader.SetTexture(t.Item1, t.Item2); };
setVec1 = tuple => { var t = (ValueTuple<string, float>)tuple; shader.SetVec(t.Item1, t.Item2); }; setVec1 = tuple => { var t = ((string, float))tuple; shader.SetVec(t.Item1, t.Item2); };
setVec2 = tuple => { var t = (ValueTuple<string, float[], int>)tuple; shader.SetVec(t.Item1, t.Item2, t.Item3); }; setVec2 = tuple => { var t = ((string, float[], int))tuple; shader.SetVec(t.Item1, t.Item2, t.Item3); };
setVec3 = tuple => { var t = (ValueTuple<string, float, float>)tuple; shader.SetVec(t.Item1, t.Item2, t.Item3); }; setVec3 = tuple => { var t = ((string, float, float))tuple; shader.SetVec(t.Item1, t.Item2, t.Item3); };
setVec4 = tuple => { var t = (ValueTuple<string, float, float, float>)tuple; shader.SetVec(t.Item1, t.Item2, t.Item3, t.Item4); }; setVec4 = tuple => { var t = ((string, float, float, float))tuple; shader.SetVec(t.Item1, t.Item2, t.Item3, t.Item4); };
} }
public void PrepareRender() public void PrepareRender()