Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enable nullability in Content.Client (#3257)

Browse Source 
* Enable nullability in Content.Client

* Remove #nullable enable

* Merge fixes

* Remove Debug.Assert

* Merge fixes

* Fix build

* Fix build
This commit is contained in:
DrSmugleaf
2021-03-10 14:48:29 +01:00
committed by GitHub
parent 4f9bd4e802
commit 902aa128c2
270 changed files with 1774 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Parallax/ParallaxGenerator.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Client.Parallax
{
private readonly List<Layer> Layers = new();
public static Image<Rgba32> GenerateParallax(TomlTable config, Size size, ISawmill sawmill, List<Image<Rgba32>> debugLayerDump)
public static Image<Rgba32> GenerateParallax(TomlTable config, Size size, ISawmill sawmill, List<Image<Rgba32>>? debugLayerDump)
{
sawmill.Debug("Generating parallax!");
var generator = new ParallaxGenerator();

8
Content.Client/Parallax/ParallaxManager.cs
View File

@@ -29,8 +29,8 @@ namespace Content.Client.Parallax
private static readonly ResourcePath ParallaxPath = new("/parallax_cache.png");
private static readonly ResourcePath ParallaxConfigOld = new("/parallax_config_old");
public event Action<Texture> OnTextureLoaded;
public Texture ParallaxTexture { get; private set; }
public event Action<Texture>? OnTextureLoaded;
public Texture? ParallaxTexture { get; private set; }
public async void LoadParallax()
{
@@ -75,7 +75,7 @@ namespace Content.Client.Parallax
table = Toml.ReadString(contents);
}
List<Image<Rgba32>> debugImages = null;
List<Image<Rgba32>>? debugImages = null;
if (debugParallax)
{
debugImages = new List<Image<Rgba32>>();
@@ -94,7 +94,7 @@ namespace Content.Client.Parallax
image.SaveAsPng(stream);
}
if (debugParallax)
if (debugParallax && debugImages != null)
{
var i = 0;
foreach (var debugImage in debugImages)

2
Content.Client/Parallax/ParallaxOverlay.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Parallax
private const float Slowness = 0.5f;
private Texture _parallaxTexture;
private Texture? _parallaxTexture;
public override OverlaySpace Space => OverlaySpace.ScreenSpaceBelowWorld;
private readonly ShaderInstance _shader;