diff --git a/.editorconfig b/.editorconfig index 3b6a873829..4b35c9120b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -599,7 +599,6 @@ dotnet_diagnostic.SA1642.severity = none # ConstructorSummaryDocumentationShould dotnet_diagnostic.SA1649.severity = none # FileNameMustMatchTypeName # Requires C# 8/9 - TODO Consider enabling -dotnet_diagnostic.SA1141.severity = none # UseTupleSyntax dotnet_diagnostic.SA1316.severity = none # TupleElementNamesShouldUseCorrectCasing dotnet_diagnostic.SA1414.severity = none # TupleTypesInSignaturesShouldHaveElementNames diff --git a/OpenRA.Game/Server/Connection.cs b/OpenRA.Game/Server/Connection.cs index f6d052cd4a..2885c1f8ab 100644 --- a/OpenRA.Game/Server/Connection.cs +++ b/OpenRA.Game/Server/Connection.cs @@ -70,7 +70,7 @@ namespace OpenRA.Server void SendReceiveLoop(object s) { - var (server, socket) = (ValueTuple)s; + var (server, socket) = ((Server, Socket))s; socket.Blocking = false; socket.NoDelay = true; diff --git a/OpenRA.Platforms.Default/ThreadedGraphicsContext.cs b/OpenRA.Platforms.Default/ThreadedGraphicsContext.cs index 4752fdbd3f..563515c4e4 100644 --- a/OpenRA.Platforms.Default/ThreadedGraphicsContext.cs +++ b/OpenRA.Platforms.Default/ThreadedGraphicsContext.cs @@ -88,22 +88,22 @@ namespace OpenRA.Platforms.Default getCreateFrameBuffer = tuple => { - var t = (ValueTuple)tuple; + var t = ((Size, Color))tuple; return new ThreadedFrameBuffer(this, context.CreateFrameBuffer(t.Item1, (ITextureInternal)CreateTexture(), t.Item2)); }; getCreateShader = name => new ThreadedShader(this, context.CreateShader((string)name)); getCreateVertexBuffer = length => new ThreadedVertexBuffer(this, context.CreateVertexBuffer((int)length)); doDrawPrimitives = - tuple => - { - var t = (ValueTuple)tuple; - context.DrawPrimitives(t.Item1, t.Item2, t.Item3); - }; + tuple => + { + var t = ((PrimitiveType, int, int))tuple; + context.DrawPrimitives(t.Item1, t.Item2, t.Item3); + }; doEnableScissor = tuple => { - var t = (ValueTuple)tuple; + var t = ((int, int, int, int))tuple; context.EnableScissor(t.Item1, t.Item2, t.Item3, t.Item4); }; doSetBlendMode = mode => context.SetBlendMode((BlendMode)mode); @@ -513,8 +513,8 @@ namespace OpenRA.Platforms.Default { this.device = device; bind = vertexBuffer.Bind; - setData1 = tuple => { var t = (ValueTuple)tuple; vertexBuffer.SetData(t.Item1, t.Item2); device.ReturnVertices(t.Item1); }; - setData2 = tuple => { var t = (ValueTuple)tuple; vertexBuffer.SetData(t.Item1, t.Item2, t.Item3, t.Item4); 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 = ((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; }; dispose = vertexBuffer.Dispose; } @@ -584,11 +584,11 @@ namespace OpenRA.Platforms.Default getScaleFilter = () => texture.ScaleFilter; setScaleFilter = value => texture.ScaleFilter = (TextureScaleFilter)value; getSize = () => texture.Size; - setEmpty = tuple => { var t = (ValueTuple)tuple; texture.SetEmpty(t.Item1, t.Item2); }; + setEmpty = tuple => { var t = ((int, int))tuple; texture.SetEmpty(t.Item1, t.Item2); }; getData = () => texture.GetData(); - setData1 = tuple => { var t = (ValueTuple)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; }; - setData3 = tuple => { var t = (ValueTuple)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; }; dispose = texture.Dispose; } @@ -674,13 +674,13 @@ namespace OpenRA.Platforms.Default { this.device = device; prepareRender = shader.PrepareRender; - setBool = tuple => { var t = (ValueTuple)tuple; shader.SetBool(t.Item1, t.Item2); }; - setMatrix = tuple => { var t = (ValueTuple)tuple; shader.SetMatrix(t.Item1, t.Item2); }; - setTexture = tuple => { var t = (ValueTuple)tuple; shader.SetTexture(t.Item1, t.Item2); }; - setVec1 = tuple => { var t = (ValueTuple)tuple; shader.SetVec(t.Item1, t.Item2); }; - setVec2 = tuple => { var t = (ValueTuple)tuple; shader.SetVec(t.Item1, t.Item2, t.Item3); }; - setVec3 = tuple => { var t = (ValueTuple)tuple; shader.SetVec(t.Item1, t.Item2, t.Item3); }; - setVec4 = tuple => { var t = (ValueTuple)tuple; shader.SetVec(t.Item1, t.Item2, t.Item3, t.Item4); }; + setBool = tuple => { var t = ((string, bool))tuple; shader.SetBool(t.Item1, t.Item2); }; + setMatrix = tuple => { var t = ((string, float[]))tuple; shader.SetMatrix(t.Item1, t.Item2); }; + setTexture = tuple => { var t = ((string, ITexture))tuple; shader.SetTexture(t.Item1, t.Item2); }; + setVec1 = tuple => { var t = ((string, float))tuple; shader.SetVec(t.Item1, t.Item2); }; + setVec2 = tuple => { var t = ((string, float[], int))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 = ((string, float, float, float))tuple; shader.SetVec(t.Item1, t.Item2, t.Item3, t.Item4); }; } public void PrepareRender()