Use 'new' expression in places where the type is evident for the engine (#1415)

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
DrSmugleaf
2020-11-26 00:16:55 +01:00
committed by GitHub
co-authored by Pieter-Jan Briers
parent e82a83223f
commit b8e5b47e7a
242 changed files with 1171 additions and 1174 deletions
+1 -1
View File
@@ -38,7 +38,7 @@ namespace Robust.Client.Graphics.ClientEye
[ViewVariables(VVAccess.ReadWrite)]
public Vector2 Zoom
{
get => new Vector2(1 / _scale.X, 1 / _scale.Y);
get => new(1 / _scale.X, 1 / _scale.Y);
set => _scale = new Vector2(1 / value.X, 1 / value.Y);
}
@@ -23,7 +23,7 @@ namespace Robust.Client.Graphics.ClientEye
[Dependency] private readonly IEntityManager _entityManager = default!;
// We default to this when we get set to a null eye.
private readonly FixedEye _defaultEye = new FixedEye();
private readonly FixedEye _defaultEye = new();
private IEye? _currentEye;
@@ -105,7 +105,7 @@ namespace Robust.Client.Graphics.ClientEye
public ScreenCoordinates MapToScreen(MapCoordinates point)
{
return new ScreenCoordinates(WorldToScreen(point.Position));
return new(WorldToScreen(point.Position));
}
/// <inheritdoc />
@@ -20,22 +20,22 @@ namespace Robust.Client.Graphics.Clyde
private ALDevice _openALDevice;
private ALContext _openALContext;
private readonly List<LoadedAudioSample> _audioSampleBuffers = new List<LoadedAudioSample>();
private readonly List<LoadedAudioSample> _audioSampleBuffers = new();
private readonly Dictionary<int, WeakReference<AudioSource>> _audioSources =
new Dictionary<int, WeakReference<AudioSource>>();
new();
private readonly Dictionary<int, WeakReference<BufferedAudioSource>> _bufferedAudioSources =
new Dictionary<int, WeakReference<BufferedAudioSource>>();
new();
private readonly HashSet<string> _alcDeviceExtensions = new HashSet<string>();
private readonly HashSet<string> _alContextExtensions = new HashSet<string>();
private readonly HashSet<string> _alcDeviceExtensions = new();
private readonly HashSet<string> _alContextExtensions = new();
// Used to track audio sources that were disposed in the finalizer thread,
// so we need to properly send them off in the main thread.
private readonly ConcurrentQueue<(int sourceHandle, int filterHandle)> _sourceDisposeQueue = new ConcurrentQueue<(int, int)>();
private readonly ConcurrentQueue<(int sourceHandle, int filterHandle)> _bufferedSourceDisposeQueue = new ConcurrentQueue<(int, int)>();
private readonly ConcurrentQueue<int> _bufferDisposeQueue = new ConcurrentQueue<int>();
private readonly ConcurrentQueue<(int sourceHandle, int filterHandle)> _sourceDisposeQueue = new();
private readonly ConcurrentQueue<(int sourceHandle, int filterHandle)> _bufferedSourceDisposeQueue = new();
private readonly ConcurrentQueue<int> _bufferDisposeQueue = new();
public bool HasAlDeviceExtension(string extension) => _alcDeviceExtensions.Contains(extension);
public bool HasAlContextExtension(string extension) => _alContextExtensions.Contains(extension);
@@ -553,7 +553,7 @@ namespace Robust.Client.Graphics.Clyde
{
private int? SourceHandle = null;
private int[] BufferHandles;
private Dictionary<int, int> BufferMap = new Dictionary<int, int>();
private Dictionary<int, int> BufferMap = new();
private readonly Clyde _master;
private bool _mono = true;
private bool _float = false;
+2 -2
View File
@@ -16,10 +16,10 @@ namespace Robust.Client.Graphics.Clyde
// These are actually Cursor* but we can't do that because no pointer generic arguments.
// Need a queue to dispose cursors since the GLFW methods aren't allowed from non-main thread (finalizers).
// And they also aren't re-entrant.
private readonly ConcurrentQueue<IntPtr> _cursorDisposeQueue = new ConcurrentQueue<IntPtr>();
private readonly ConcurrentQueue<IntPtr> _cursorDisposeQueue = new();
private readonly Dictionary<StandardCursorShape, CursorImpl> _standardCursors =
new Dictionary<StandardCursorShape, CursorImpl>();
new();
// Keep current active cursor around so it doesn't get garbage collected.
private CursorImpl? _currentCursor;
+1 -1
View File
@@ -4,7 +4,7 @@ namespace Robust.Client.Graphics.Clyde
{
internal sealed partial class Clyde
{
private readonly ClydeDebugStats _debugStats = new ClydeDebugStats();
private readonly ClydeDebugStats _debugStats = new();
private sealed class ClydeDebugInfo : IClydeDebugInfo
{
+2 -2
View File
@@ -35,7 +35,7 @@ namespace Robust.Client.Graphics.Clyde
}
[SuppressMessage("ReSharper", "StringLiteralTypo")]
private static readonly Dictionary<string, string> _dllMapLinux = new Dictionary<string, string>
private static readonly Dictionary<string, string> _dllMapLinux = new()
{
{"opengl32.dll", "libGL.so.1"},
{"glu32.dll", "libGLU.so.1"},
@@ -48,7 +48,7 @@ namespace Robust.Client.Graphics.Clyde
};
[SuppressMessage("ReSharper", "StringLiteralTypo")]
private static readonly Dictionary<string, string> _dllMapMacOS = new Dictionary<string, string>
private static readonly Dictionary<string, string> _dllMapMacOS = new()
{
{"opengl32.dll", "/System/Library/Frameworks/OpenGL.framework/OpenGL"},
{"openal32.dll", "/System/Library/Frameworks/OpenAL.framework/OpenAL"},
@@ -15,7 +15,7 @@ namespace Robust.Client.Graphics.Clyde
[Dependency] private readonly IEntityManager _entityManager = default!;
private readonly Dictionary<GridId, Dictionary<Vector2i, MapChunkData>> _mapChunkData =
new Dictionary<GridId, Dictionary<Vector2i, MapChunkData>>();
new();
private int _verticesPerChunk(IMapChunk chunk) => chunk.ChunkSize * chunk.ChunkSize * 4;
private int _indicesPerChunk(IMapChunk chunk) => chunk.ChunkSize * chunk.ChunkSize * GetQuadBatchIndexCount();
+2 -2
View File
@@ -26,7 +26,7 @@ namespace Robust.Client.Graphics.Clyde
private readonly RefList<(SpriteComponent sprite, Matrix3 worldMatrix, Angle worldRotation, float yWorldPos)>
_drawingSpriteList
=
new RefList<(SpriteComponent, Matrix3, Angle, float)>();
new();
public void Render()
{
@@ -383,7 +383,7 @@ namespace Robust.Client.Graphics.Clyde
private sealed class OverlayComparer : IComparer<Overlay>
{
public static readonly OverlayComparer Instance = new OverlayComparer();
public static readonly OverlayComparer Instance = new();
public int Compare(Overlay? x, Overlay? y)
{
@@ -10,7 +10,7 @@ namespace Robust.Client.Graphics.Clyde
private ClydeHandle AllocRid()
{
return new ClydeHandle(_nextRid++);
return new(_nextRid++);
}
}
}
@@ -19,10 +19,10 @@ namespace Robust.Client.Graphics.Clyde
internal partial class Clyde
{
private readonly Dictionary<ClydeHandle, LoadedRenderTarget> _renderTargets =
new Dictionary<ClydeHandle, LoadedRenderTarget>();
new();
private readonly ConcurrentQueue<ClydeHandle> _renderTargetDisposeQueue
= new ConcurrentQueue<ClydeHandle>();
= new();
IRenderWindow IClyde.MainWindowRenderTarget => _mainWindowRenderTarget;
// Initialized in Clyde's constructor
@@ -25,12 +25,12 @@ namespace Robust.Client.Graphics.Clyde
private string _shaderWrapCodeRawVert = default!;
private readonly Dictionary<ClydeHandle, LoadedShader> _loadedShaders =
new Dictionary<ClydeHandle, LoadedShader>();
new();
private readonly Dictionary<ClydeHandle, LoadedShaderInstance> _shaderInstances =
new Dictionary<ClydeHandle, LoadedShaderInstance>();
new();
private readonly ConcurrentQueue<ClydeHandle> _deadShaderInstances = new ConcurrentQueue<ClydeHandle>();
private readonly ConcurrentQueue<ClydeHandle> _deadShaderInstances = new();
private class LoadedShader
{
@@ -45,7 +45,7 @@ namespace Robust.Client.Graphics.Clyde
public ClydeHandle ShaderHandle;
// TODO(perf): Maybe store these parameters not boxed with a tagged union.
public readonly Dictionary<string, object> Parameters = new Dictionary<string, object>();
public readonly Dictionary<string, object> Parameters = new();
public StencilParameters Stencil = StencilParameters.Default;
}
@@ -471,7 +471,7 @@ namespace Robust.Client.Graphics.Clyde
private struct StencilParameters
{
public static readonly StencilParameters Default = new StencilParameters
public static readonly StencilParameters Default = new()
{
Enabled = false,
Ref = 0,
@@ -21,9 +21,9 @@ namespace Robust.Client.Graphics.Clyde
private ClydeTexture _stockTextureTransparent = default!;
private readonly Dictionary<ClydeHandle, LoadedTexture> _loadedTextures =
new Dictionary<ClydeHandle, LoadedTexture>();
new();
private readonly ConcurrentQueue<ClydeHandle> _textureDisposeQueue = new ConcurrentQueue<ClydeHandle>();
private readonly ConcurrentQueue<ClydeHandle> _textureDisposeQueue = new();
public Texture LoadTextureFromPNGStream(Stream stream, string? name = null,
TextureLoadParameters? loadParams = null)
@@ -11,7 +11,7 @@ namespace Robust.Client.Graphics.Clyde
{
// Use WeakReference here instead of a separate Loaded* object since these only contain managed objects.
private readonly Dictionary<ClydeHandle, WeakReference<Viewport>> _viewports =
new Dictionary<ClydeHandle, WeakReference<Viewport>>();
new();
private Viewport CreateViewport(Vector2i size, string? name = null)
{
+2 -2
View File
@@ -68,11 +68,11 @@ namespace Robust.Client.Graphics.Clyde
private bool _checkGLErrors;
private readonly List<(ScreenshotType type, Action<Image<Rgb24>> callback)> _queuedScreenshots
= new List<(ScreenshotType, Action<Image<Rgb24>>)>();
= new();
private readonly List<(uint pbo, IntPtr sync, Vector2i size, Action<Image<Rgb24>> callback)>
_transferringScreenshots
= new List<(uint, IntPtr, Vector2i, Action<Image<Rgb24>> )>();
= new();
public Clyde()
{
@@ -155,13 +155,13 @@ namespace Robust.Client.Graphics.Clyde
public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
{
// TODO: Might wanna actually load this so the length gets reported correctly.
return new AudioStream(default, default, 1, name);
return new(default, default, 1, name);
}
public AudioStream LoadAudioWav(Stream stream, string? name = null)
{
// TODO: Might wanna actually load this so the length gets reported correctly.
return new AudioStream(default, default, 1, name);
return new(default, default, 1, name);
}
public IClydeAudioSource CreateAudioSource(AudioStream stream)
@@ -194,7 +194,7 @@ namespace Robust.Client.Graphics.Clyde
private class DummyAudioSource : IClydeAudioSource
{
public static DummyAudioSource Instance { get; } = new DummyAudioSource();
public static DummyAudioSource Instance { get; } = new();
public bool IsPlaying => default;
public bool IsLooping { get; set; }
@@ -247,7 +247,7 @@ namespace Robust.Client.Graphics.Clyde
private sealed class DummyBufferedAudioSource : DummyAudioSource, IClydeBufferedAudioSource
{
public new static DummyBufferedAudioSource Instance { get; } = new DummyBufferedAudioSource();
public new static DummyBufferedAudioSource Instance { get; } = new();
public int SampleRate { get; set; } = 0;
public void WriteBuffer(int handle, ReadOnlySpan<ushort> data)
@@ -411,7 +411,7 @@ namespace Robust.Client.Graphics.Clyde
private sealed class DummyDebugInfo : IClydeDebugInfo
{
public OpenGLVersion OpenGLVersion { get; } = new OpenGLVersion(3, 3, isES: false, isCore: true);
public OpenGLVersion OpenGLVersion { get; } = new(3, 3, isES: false, isCore: true);
public string Renderer => "ClydeHeadless";
public string Vendor => "Space Wizards Federation";
public string VersionString { get; } = $"3.3.0 WIZARDS {typeof(DummyDebugInfo).Assembly.GetName().Version}";
@@ -17,7 +17,7 @@ namespace Robust.Client.Graphics.Clyde
private class GLShaderProgram
{
private readonly sbyte?[] _uniformIntCache = new sbyte?[Clyde.UniCount];
private readonly Dictionary<string, int> _uniformCache = new Dictionary<string, int>();
private readonly Dictionary<string, int> _uniformCache = new();
private uint _handle = 0;
private GLShader? _fragmentShader;
private GLShader? _vertexShader;
+1 -1
View File
@@ -13,7 +13,7 @@ namespace Robust.Client.Graphics
public static explicit operator ClydeHandle(long x)
{
return new ClydeHandle(x);
return new(x);
}
public static explicit operator long(ClydeHandle h)
+1 -1
View File
@@ -38,7 +38,7 @@ namespace Robust.Client.Graphics.Drawing
}
public Vector2 MinimumSize =>
new Vector2(GetContentMargin(Margin.Left) + GetContentMargin(Margin.Right),
new(GetContentMargin(Margin.Left) + GetContentMargin(Margin.Right),
GetContentMargin(Margin.Top) + GetContentMargin(Margin.Bottom));
public float? ContentMarginLeftOverride
+2 -2
View File
@@ -24,7 +24,7 @@ namespace Robust.Client.Graphics
private readonly Library _library;
private readonly Dictionary<(FontFaceHandle, int fontSize), FontInstanceHandle> _loadedInstances =
new Dictionary<(FontFaceHandle, int), FontInstanceHandle>();
new();
public FontManager()
{
@@ -281,7 +281,7 @@ namespace Robust.Client.Graphics
{
public FontFaceHandle FaceHandle { get; }
public int Size { get; }
private readonly Dictionary<float, ScaledFontData> _scaledData = new Dictionary<float, ScaledFontData>();
private readonly Dictionary<float, ScaledFontData> _scaledData = new();
public readonly IReadOnlyDictionary<char, uint> GlyphMap;
private readonly FontManager _fontManager;
+1 -1
View File
@@ -36,7 +36,7 @@ namespace Robust.Client.Graphics.Overlays
private bool _isDirty = true;
private readonly List<DrawingHandleBase> TempHandles = new List<DrawingHandleBase>();
private readonly List<DrawingHandleBase> TempHandles = new();
private bool Disposed;
@@ -12,7 +12,7 @@ namespace Robust.Client.Graphics.Overlays
{
internal class OverlayManager : IOverlayManagerInternal
{
private readonly Dictionary<string, Overlay> _overlays = new Dictionary<string, Overlay>();
private readonly Dictionary<string, Overlay> _overlays = new();
public void FrameUpdate(FrameEventArgs args)
{
+2 -2
View File
@@ -21,7 +21,7 @@ namespace Robust.Client.Graphics
[ViewVariables]
public Vector2i Size { get; private set; }
[ViewVariables]
private Dictionary<StateId, State> States = new Dictionary<StateId, State>();
private Dictionary<StateId, State> States = new();
/// <summary>
/// The original path of this RSI or null.
@@ -88,7 +88,7 @@ namespace Robust.Client.Graphics
public static implicit operator StateId(string? key)
{
return new StateId(key);
return new(key);
}
public override bool Equals(object? obj)
@@ -204,7 +204,7 @@ namespace Robust.Client.Graphics.Shaders
}
[SuppressMessage("ReSharper", "StringLiteralTypo")]
private static readonly Dictionary<ShaderDataType, string> _nativeTypes = new Dictionary<ShaderDataType, string>
private static readonly Dictionary<ShaderDataType, string> _nativeTypes = new()
{
{ShaderDataType.Void, "void"},
{ShaderDataType.Bool, "bool"},
@@ -10,7 +10,7 @@ namespace Robust.Client.Graphics.Shaders
{
private TextParser? _currentParser;
private string? _currentFileName;
private readonly Stack<(TextParser? parser, string? fileName)> _parserStack = new Stack<(TextParser?, string?)>();
private readonly Stack<(TextParser? parser, string? fileName)> _parserStack = new();
private void PushTokenize(TextReader reader, string fileName)
{
@@ -637,7 +637,7 @@ namespace Robust.Client.Graphics.Shaders
Colon,
}
private static readonly Dictionary<Symbols, string> _symbolStringMap = new Dictionary<Symbols, string>
private static readonly Dictionary<Symbols, string> _symbolStringMap = new()
{
{Symbols.Semicolon, ";\n"},
{Symbols.Comma, ","},
@@ -13,13 +13,13 @@ namespace Robust.Client.Graphics.Shaders
{
private readonly IResourceManager _resManager;
private int _tokenIndex;
private readonly List<Token> _tokens = new List<Token>();
private readonly List<Token> _tokens = new();
private readonly List<ShaderUniformDefinition> _uniformsParsing = new List<ShaderUniformDefinition>();
private readonly List<ShaderConstantDefinition> _constantsParsing = new List<ShaderConstantDefinition>();
private readonly List<ShaderVaryingDefinition> _varyingsParsing = new List<ShaderVaryingDefinition>();
private readonly List<ShaderFunctionDefinition> _functionsParsing = new List<ShaderFunctionDefinition>();
private readonly LinkedList<ResourcePath> _includes = new LinkedList<ResourcePath>();
private readonly List<ShaderUniformDefinition> _uniformsParsing = new();
private readonly List<ShaderConstantDefinition> _constantsParsing = new();
private readonly List<ShaderVaryingDefinition> _varyingsParsing = new();
private readonly List<ShaderFunctionDefinition> _functionsParsing = new();
private readonly LinkedList<ResourcePath> _includes = new();
public static ParsedShader Parse(TextReader reader, IResourceManager resManager)
{
@@ -520,7 +520,7 @@ namespace Robust.Client.Graphics.Shaders
[SuppressMessage("ReSharper", "StringLiteralTypo")]
private static readonly Dictionary<string, ShaderPrecisionQualifier> _shaderTypePrecisionMap =
new Dictionary<string, ShaderPrecisionQualifier>
new()
{
{"lowp", ShaderPrecisionQualifier.Low},
{"mediump", ShaderPrecisionQualifier.Medium},
@@ -529,7 +529,7 @@ namespace Robust.Client.Graphics.Shaders
[SuppressMessage("ReSharper", "StringLiteralTypo")]
private static readonly Dictionary<string, ShaderDataType> _shaderTypeMap =
new Dictionary<string, ShaderDataType>
new()
{
{"void", ShaderDataType.Void},
{"bool", ShaderDataType.Bool},
+2 -2
View File
@@ -119,7 +119,7 @@ namespace Robust.Client.Graphics
return loadParams;
}
public static readonly TextureLoadParameters Default = new TextureLoadParameters
public static readonly TextureLoadParameters Default = new()
{
SampleParameters = TextureSampleParameters.Default,
Srgb = true
@@ -178,7 +178,7 @@ namespace Robust.Client.Graphics
return new TextureSampleParameters {Filter = filter, WrapMode = wrap};
}
public static readonly TextureSampleParameters Default = new TextureSampleParameters
public static readonly TextureSampleParameters Default = new()
{
Filter = false,
WrapMode = TextureWrapMode.None