Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 04:53:29 +01:00
Code Issues Projects Releases Wiki Activity

code cleanup

Browse source
This commit is contained in:
Ellpeck 2020-06-18 17:24:35 +02:00
parent 71dabe7360
commit deec553b22
43 changed files with 52 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Demos.Android/Properties/AssemblyInfo.cs
View file

@ -1,7 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Android.App;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information

8
Demos/AutoTilingDemo.cs
View file

@ -55,17 +55,19 @@ namespace Demos {
var x1 = x;
var y1 = y;
// the connectsTo function determines for any given tile if it should connect to, that is, auto-tile with the
// neighbor in the supplied offset direction. In this example, the layout determines where grass tiles are (X)
// and where there are none ( ).
AutoTiling.ConnectsTo connectsTo = (xOff, yOff) => {
bool ConnectsTo(int xOff, int yOff) {
// don't auto-tile out of bounds
if (x1 + xOff < 0 || y1 + yOff < 0 || x1 + xOff >= 5 || y1 + yOff >= 5)
return false;
// check if the neighboring tile is also grass (X)
return this.layout[y1 + yOff][x1 + xOff] == 'X';
};
AutoTiling.DrawAutoTile(this.SpriteBatch, new Vector2(x, y) * tileSize, this.texture, region, connectsTo, Color.White);
}
AutoTiling.DrawAutoTile(this.SpriteBatch, new Vector2(x, y) * tileSize, this.texture, region, ConnectsTo, Color.White);
}
}
this.SpriteBatch.End();

2
Demos/GameImpl.cs
View file

@ -40,7 +40,7 @@ namespace Demos {
PanelTexture = new NinePatch(new TextureRegion(tex, 0, 8, 24, 24), 8),
ButtonTexture = new NinePatch(new TextureRegion(tex, 24, 8, 16, 16), 4),
ScrollBarBackground = new NinePatch(new TextureRegion(tex, 12, 0, 4, 8), 1, 1, 2, 2),
ScrollBarScrollerTexture = new NinePatch(new TextureRegion(tex, 8, 0, 4, 8), 1, 1, 2, 2),
ScrollBarScrollerTexture = new NinePatch(new TextureRegion(tex, 8, 0, 4, 8), 1, 1, 2, 2)
};
this.UiSystem.AutoScaleReferenceSize = new Point(1280, 720);
this.UiSystem.AutoScaleWithScreen = true;

8
Demos/PathfindingDemo.cs
View file

@ -8,7 +8,6 @@ using MLEM.Input;
using MLEM.Misc;
using MLEM.Pathfinding;
using MLEM.Startup;
using MLEM.Textures;
namespace Demos {
public class PathfindingDemo : Demo {
@ -39,14 +38,15 @@ namespace Demos {
// If your game contains harder-to-move-on areas like, say, a muddy pit, you can return a higher cost value for those
// locations. If you want to scale your cost function differently, you can specify a different default cost in your
// pathfinder's constructor
AStar<Point>.GetCost cost = (pos, nextPos) => {
float Cost(Point pos, Point nextPos) {
if (nextPos.X < 0 || nextPos.Y < 0 || nextPos.X >= 50 || nextPos.Y >= 50)
return float.MaxValue;
return this.world[nextPos.X, nextPos.Y] ? 1 : float.MaxValue;
};
}
// Actually initialize the pathfinder with the cost function, as well as specify if moving diagonally between tiles should be
// allowed or not (in this case it's not)
this.pathfinder = new AStar2(cost, false);
this.pathfinder = new AStar2(Cost, false);
// Now find a path from the top left to the bottom right corner and store it in a variable
// If no path can be found after the maximum amount of tries (10000 by default), the pathfinder will abort and return no path (null)

17
Demos/UiDemo.cs
View file

@ -4,12 +4,9 @@ using System.Linq;
using Coroutine;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Animations;
using MLEM.Extensions;
using MLEM.Font;
using MLEM.Formatting;
using MLEM.Formatting.Codes;
using MLEM.Input;
using MLEM.Misc;
using MLEM.Startup;
using MLEM.Textures;
@ -143,7 +140,7 @@ namespace Demos {
// Check the WobbleButton method for an explanation of how this button works
var group = this.root.AddChild(new CustomDrawGroup(Anchor.AutoLeft, new Vector2(1, 0)));
group.AddChild(new Button(Anchor.AutoCenter, new Vector2(0.5F, 10), "Wobble Me", "This button wobbles around visually when clicked, but this doesn't affect its actual size and positioning") {
OnPressed = element => CoroutineHandler.Start(this.WobbleButton(group)),
OnPressed = element => CoroutineHandler.Start(WobbleButton(group)),
PositionOffset = new Vector2(0, 1)
});
this.root.AddChild(new Button(Anchor.AutoCenter, new Vector2(0.5F, 10), "Transform Ui", "This button causes the entire ui to be transformed (both in positioning, rotation and scale)") {
@ -160,13 +157,13 @@ namespace Demos {
this.root.AddChild(new VerticalSpace(3));
this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, "Progress bars!"));
var bar1 = this.root.AddChild(new ProgressBar(Anchor.AutoLeft, new Vector2(1, 8), Direction2.Right, 10) {PositionOffset = new Vector2(0, 1)});
CoroutineHandler.Start(this.WobbleProgressBar(bar1));
CoroutineHandler.Start(WobbleProgressBar(bar1));
var bar2 = this.root.AddChild(new ProgressBar(Anchor.AutoLeft, new Vector2(1, 8), Direction2.Left, 10) {PositionOffset = new Vector2(0, 1)});
CoroutineHandler.Start(this.WobbleProgressBar(bar2));
CoroutineHandler.Start(WobbleProgressBar(bar2));
var bar3 = this.root.AddChild(new ProgressBar(Anchor.AutoLeft, new Vector2(8, 30), Direction2.Down, 10) {PositionOffset = new Vector2(0, 1)});
CoroutineHandler.Start(this.WobbleProgressBar(bar3));
CoroutineHandler.Start(WobbleProgressBar(bar3));
var bar4 = this.root.AddChild(new ProgressBar(Anchor.AutoInline, new Vector2(8, 30), Direction2.Up, 10) {PositionOffset = new Vector2(1, 1)});
CoroutineHandler.Start(this.WobbleProgressBar(bar4));
CoroutineHandler.Start(WobbleProgressBar(bar4));
this.root.AddChild(new VerticalSpace(3));
var dropdown = this.root.AddChild(new Dropdown(Anchor.AutoLeft, new Vector2(1, 10), "Dropdown Menu"));
@ -203,7 +200,7 @@ namespace Demos {
// This method is used by the wobbling button (see above)
// Note that this particular example makes use of the Coroutine package, which is not required but makes demonstration easier
private IEnumerator<Wait> WobbleButton(CustomDrawGroup group) {
private static IEnumerator<Wait> WobbleButton(CustomDrawGroup group) {
var counter = 0F;
while (counter < 4 * Math.PI) {
// A custom draw group allows the implementation of any sort of custom rendering for all of its child components
@ -219,7 +216,7 @@ namespace Demos {
group.Transform = Matrix.Identity;
}
private IEnumerator<Wait> WobbleProgressBar(ProgressBar bar) {
private static IEnumerator<Wait> WobbleProgressBar(ProgressBar bar) {
var reducing = false;
while (bar.Root != null) {
if (reducing) {

1
MLEM.Data/Json/JsonConverters.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Linq;
using System.Reflection;
using Newtonsoft.Json;
namespace MLEM.Data.Json {

2
MLEM.Extended/Extensions/SpriteBatchExtensions.cs
View file

@ -1,9 +1,7 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Extensions;
using MLEM.Textures;
using MonoGame.Extended;
using MonoGame.Extended.BitmapFonts;
namespace MLEM.Extended.Extensions {
/// <summary>

2
MLEM.Extended/Font/GenericBitmapFont.cs
View file

@ -1,8 +1,6 @@
using System.Collections.Generic;
using System.Text;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Extended.Extensions;
using MLEM.Font;
using MonoGame.Extended.BitmapFonts;

1
MLEM.Extended/Tiled/TiledExtensions.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;

1
MLEM.Extended/Tiled/TiledMapCollisions.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using Microsoft.Xna.Framework;
using MLEM.Extensions;

1
MLEM.Startup/MlemGame.cs
View file

@ -2,7 +2,6 @@ using Coroutine;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using MLEM.Input;
using MLEM.Ui;
using MLEM.Ui.Style;

1
MLEM.Ui/Elements/Button.cs
View file

@ -1,6 +1,5 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Extensions;
using MLEM.Textures;
using MLEM.Ui.Style;

2
MLEM.Ui/Elements/Checkbox.cs
View file

@ -1,7 +1,5 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Extensions;
using MLEM.Input;
using MLEM.Misc;
using MLEM.Textures;
using MLEM.Ui.Style;

1
MLEM.Ui/Elements/CustomDrawGroup.cs
View file

@ -1,4 +1,3 @@
using System;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;

2
MLEM.Ui/Elements/Element.cs
View file

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Audio;
using Microsoft.Xna.Framework.Graphics;

5
MLEM.Ui/Elements/ElementHelper.cs
View file

@ -1,5 +1,4 @@
using Microsoft.Xna.Framework;
using MLEM.Input;
using MLEM.Textures;
namespace MLEM.Ui.Elements {
@ -91,7 +90,7 @@ namespace MLEM.Ui.Elements {
var upButton = new Button(Anchor.TopRight, Vector2.One, "+") {
OnPressed = element => {
var text = field.Text.ToString();
var text = field.Text;
if (int.TryParse(text, out var val))
field.SetText(val + stepPerClick);
}
@ -101,7 +100,7 @@ namespace MLEM.Ui.Elements {
var downButton = new Button(Anchor.BottomRight, Vector2.One, "-") {
OnPressed = element => {
var text = field.Text.ToString();
var text = field.Text;
if (int.TryParse(text, out var val))
field.SetText(val - stepPerClick);
}

1
MLEM.Ui/Elements/Panel.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;

7
MLEM.Ui/Elements/Paragraph.cs
View file

@ -1,17 +1,10 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text.RegularExpressions;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Extensions;
using MLEM.Font;
using MLEM.Formatting;
using MLEM.Formatting.Codes;
using MLEM.Input;
using MLEM.Misc;
using MLEM.Textures;
using MLEM.Ui.Style;
namespace MLEM.Ui.Elements {

1
MLEM.Ui/Elements/RadioButton.cs
View file

@ -1,5 +1,4 @@
using Microsoft.Xna.Framework;
using MLEM.Input;
using MLEM.Ui.Style;
namespace MLEM.Ui.Elements {

2
MLEM.Ui/Elements/Slider.cs
View file

@ -1,6 +1,4 @@
using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Input;
using MLEM.Misc;
namespace MLEM.Ui.Elements {

1
MLEM.Ui/Elements/SpriteAnimationImage.cs
View file

@ -1,6 +1,5 @@
using Microsoft.Xna.Framework;
using MLEM.Animations;
using MLEM.Textures;
namespace MLEM.Ui.Elements {
/// <summary>

2
MLEM.Ui/Elements/Tooltip.cs
View file

@ -1,7 +1,5 @@
using System;
using Microsoft.Xna.Framework;
using MLEM.Extensions;
using MLEM.Font;
using MLEM.Ui.Style;
namespace MLEM.Ui.Elements {

1
MLEM.Ui/Style/UiStyle.cs
View file

@ -1,4 +1,3 @@
using System;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Audio;
using MLEM.Font;

2
MLEM.Ui/Style/UntexturedStyle.cs
View file

@ -1,10 +1,8 @@
using System.Collections.Generic;
using System.Text;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Extensions;
using MLEM.Font;
using MLEM.Textures;
namespace MLEM.Ui.Style {
/// <summary>

2
MLEM.Ui/UiControls.cs
View file

@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Input;
using Microsoft.Xna.Framework.Input.Touch;
using MLEM.Extensions;
using MLEM.Input;
using MLEM.Misc;
using MLEM.Ui.Elements;

2
MLEM.Ui/UiSystem.cs
View file

@ -5,9 +5,7 @@ using System.Linq;
using System.Text.RegularExpressions;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using MLEM.Extensions;
using MLEM.Font;
using MLEM.Formatting;
using MLEM.Formatting.Codes;
using MLEM.Input;

2
MLEM/Animations/SpriteAnimation.cs
View file

@ -10,7 +10,7 @@ namespace MLEM.Animations {
/// </summary>
public class SpriteAnimation : GenericDataHolder {
private AnimationFrame[] frames;
private readonly AnimationFrame[] frames;
/// <summary>
/// Returns the <see cref="AnimationFrame"/> at the given index.
/// Index ordering is based on the order that animation frames were added in.

1
MLEM/Content/RawContentManager.cs
View file

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;

1
MLEM/Content/SoundEffectReader.cs
View file

@ -1,4 +1,3 @@
using System;
using System.IO;
using Microsoft.Xna.Framework.Audio;

3
MLEM/Extensions/GraphicsExtensions.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
@ -79,7 +78,7 @@ namespace MLEM.Extensions {
/// Represents a context in which a <see cref="RenderTarget2D"/> is applied.
/// This class should be used with <see cref="GraphicsExtensions.WithRenderTarget"/>.
/// </summary>
public struct TargetContext : IDisposable {
public readonly struct TargetContext : IDisposable {
private readonly GraphicsDevice device;
private readonly RenderTargetBinding[] lastTargets;

2
MLEM/Font/GenericFont.cs
View file

@ -1,5 +1,3 @@
using System;
using System.Collections.Generic;
using System.Text;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;

2
MLEM/Font/GenericSpriteFont.cs
View file

@ -1,8 +1,6 @@
using System.Collections.Generic;
using System.Text;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Extensions;
namespace MLEM.Font {
/// <inheritdoc/>

1
MLEM/Formatting/Codes/ImageCode.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Text.RegularExpressions;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;

2
MLEM/Formatting/TextFormatter.cs
View file

@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text.RegularExpressions;
using Microsoft.Xna.Framework;

1
MLEM/Formatting/Token.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Xna.Framework;

1
MLEM/Formatting/TokenizedString.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

2
MLEM/Input/GenericInput.cs
View file

@ -10,7 +10,7 @@ namespace MLEM.Input {
/// Note that this type is serializable using <see cref="DataContractAttribute"/>.
/// </summary>
[DataContract]
public struct GenericInput {
public readonly struct GenericInput {
/// <summary>
/// The <see cref="InputType"/> of this generic input's current <see cref="value"/>.

52
MLEM/Input/InputHandler.cs
View file

@ -5,7 +5,6 @@ using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Input;
using Microsoft.Xna.Framework.Input.Touch;
using MLEM.Extensions;
using MLEM.Misc;
namespace MLEM.Input {
@ -433,13 +432,16 @@ namespace MLEM.Input {
/// <returns>Whether the given control is down</returns>
/// <exception cref="ArgumentException">If the passed control isn't of a supported type</exception>
public bool IsDown(GenericInput control, int index = -1) {
if (control.Type == GenericInput.InputType.Keyboard)
return this.IsKeyDown(control);
if (control.Type == GenericInput.InputType.Gamepad)
return this.IsGamepadButtonDown(control, index);
if (control.Type == GenericInput.InputType.Mouse)
return this.IsMouseButtonDown(control);
throw new ArgumentException(nameof(control));
switch (control.Type) {
case GenericInput.InputType.Keyboard:
return this.IsKeyDown(control);
case GenericInput.InputType.Gamepad:
return this.IsGamepadButtonDown(control, index);
case GenericInput.InputType.Mouse:
return this.IsMouseButtonDown(control);
default:
throw new ArgumentException(nameof(control));
}
}
/// <summary>
@ -451,13 +453,16 @@ namespace MLEM.Input {
/// <returns>Whether the given control is down</returns>
/// <exception cref="ArgumentException">If the passed control isn't of a supported type</exception>
public bool IsUp(GenericInput control, int index = -1) {
if (control.Type == GenericInput.InputType.Keyboard)
return this.IsKeyUp(control);
if (control.Type == GenericInput.InputType.Gamepad)
return this.IsGamepadButtonUp(control, index);
if (control.Type == GenericInput.InputType.Mouse)
return this.IsMouseButtonUp(control);
throw new ArgumentException(nameof(control));
switch (control.Type) {
case GenericInput.InputType.Keyboard:
return this.IsKeyUp(control);
case GenericInput.InputType.Gamepad:
return this.IsGamepadButtonUp(control, index);
case GenericInput.InputType.Mouse:
return this.IsMouseButtonUp(control);
default:
throw new ArgumentException(nameof(control));
}
}
/// <summary>
@ -469,13 +474,16 @@ namespace MLEM.Input {
/// <returns>Whether the given control is down</returns>
/// <exception cref="ArgumentException">If the passed control isn't of a supported type</exception>
public bool IsPressed(GenericInput control, int index = -1) {
if (control.Type == GenericInput.InputType.Keyboard)
return this.IsKeyPressed(control);
if (control.Type == GenericInput.InputType.Gamepad)
return this.IsGamepadButtonPressed(control, index);
if (control.Type == GenericInput.InputType.Mouse)
return this.IsMouseButtonPressed(control);
throw new ArgumentException(nameof(control));
switch (control.Type) {
case GenericInput.InputType.Keyboard:
return this.IsKeyPressed(control);
case GenericInput.InputType.Gamepad:
return this.IsGamepadButtonPressed(control, index);
case GenericInput.InputType.Mouse:
return this.IsMouseButtonPressed(control);
default:
throw new ArgumentException(nameof(control));
}
}
/// <inheritdoc cref="IsDown"/>

2
MLEM/Input/Keybind.cs
View file

@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using Microsoft.Xna.Framework.Input;
namespace MLEM.Input {
/// <summary>

1
MLEM/Misc/Direction2.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Xna.Framework;

1
MLEM/Pathfinding/AStar3.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Xna.Framework;
namespace MLEM.Pathfinding {

1
MLEM/Textures/UniformTextureAtlas.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;

4
Sandbox/GameImpl.cs
View file

@ -1,6 +1,5 @@
using System;
using System.IO;
using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
@ -11,7 +10,6 @@ using MLEM.Extended.Extensions;
using MLEM.Extended.Font;
using MLEM.Extended.Tiled;
using MLEM.Extensions;
using MLEM.Font;
using MLEM.Formatting;
using MLEM.Formatting.Codes;
using MLEM.Input;
@ -21,10 +19,8 @@ using MLEM.Textures;
using MLEM.Ui;
using MLEM.Ui.Elements;
using MLEM.Ui.Style;
using MonoGame.Extended;
using MonoGame.Extended.BitmapFonts;
using MonoGame.Extended.Tiled;
using Newtonsoft.Json.Linq;
using RectangleF = MonoGame.Extended.RectangleF;
namespace Sandbox {