Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

refactor: Update Unity to 2022.3.62

Browse Source
This commit is contained in:
PopSlime
2025-06-21 01:22:02 +08:00
Unverified
parent d71bf7d4a5
commit 283783954f
112 changed files with 778 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Cryville/Common/AsyncDelivery.cs
View File

@@ -20,13 +20,13 @@ namespace Cryville.Common {
/// <param name="succeeded">Whether the task has succeeded.</param> /// <param name="succeeded">Whether the task has succeeded.</param>
/// <param name="result">The result.</param> /// <param name="result">The result.</param>
public void Deliver(bool succeeded, T result) { public void Deliver(bool succeeded, T result) {
if (Destination != null) Destination(succeeded, result); Destination?.Invoke(succeeded, result);
} }
/// <summary> /// <summary>
/// Cancels the task. /// Cancels the task.
/// </summary> /// </summary>
public void Cancel() { public void Cancel() {
if (CancelSource != null) CancelSource(); CancelSource?.Invoke();
} }
} }
} }

4
Assets/Cryville/Common/BinderAttribute.cs
View File

@@ -35,8 +35,8 @@ namespace Cryville.Common {
return null; return null;
else if (type.IsAssignableFrom(value.GetType())) else if (type.IsAssignableFrom(value.GetType()))
return value; return value;
else if (type.IsEnum && value is string) { else if (type.IsEnum && value is string strValue) {
return Enum.Parse(type, (string)value); return Enum.Parse(type, strValue);
} }
throw new InvalidCastException(string.Format("Cannot cast {0} to {1}", value.GetType(), type)); throw new InvalidCastException(string.Format("Cannot cast {0} to {1}", value.GetType(), type));
} }

2
Assets/Cryville/Common/Coroutine.cs
View File

@@ -4,7 +4,7 @@ using System.Diagnostics;
namespace Cryville.Common { namespace Cryville.Common {
public class Coroutine { public class Coroutine {
readonly IEnumerator<float> _enumerator; readonly IEnumerator<float> _enumerator;
readonly Stopwatch _stopwatch = new Stopwatch(); readonly Stopwatch _stopwatch = new();
public float Progress { get; private set; } public float Progress { get; private set; }
public Coroutine(IEnumerator<float> enumerator) { public Coroutine(IEnumerator<float> enumerator) {
_enumerator = enumerator; _enumerator = enumerator;

16
Assets/Cryville/Common/Font/FontFile.cs
View File

@@ -16,13 +16,11 @@ namespace Cryville.Common.Font {
} }
public void Close() { Reader.Close(); } public void Close() { Reader.Close(); }
public static FontFile Create(FileInfo file) { public static FontFile Create(FileInfo file) => file.Extension switch {
switch (file.Extension) { ".ttf" or ".otf" => new FontFileTTF(file),
case ".ttf": case ".otf": return new FontFileTTF(file); ".ttc" or ".otc" => new FontFileTTC(file),
case ".ttc": case ".otc": return new FontFileTTC(file); _ => null,
default: return null; };
}
}
public Enumerator GetEnumerator() { public Enumerator GetEnumerator() {
return new Enumerator(this); return new Enumerator(this);
@@ -42,7 +40,7 @@ namespace Cryville.Common.Font {
_index = -1; _index = -1;
} }
public Typeface Current { public readonly Typeface Current {
get { get {
if (_index < 0) if (_index < 0)
throw new InvalidOperationException(_index == -1 ? "Enum not started" : "Enum ended"); throw new InvalidOperationException(_index == -1 ? "Enum not started" : "Enum ended");
@@ -50,7 +48,7 @@ namespace Cryville.Common.Font {
} }
} }
object IEnumerator.Current { get { return Current; } } readonly object IEnumerator.Current => Current;
public void Dispose() { public void Dispose() {
_index = -2; _index = -2;

3
Assets/Cryville/Common/Font/FontManager.cs
View File

@@ -17,8 +17,7 @@ namespace Cryville.Common.Font {
Shared.Logger.Log(3, "UI", "Discarding a font with a duplicate full name {0}", f.FullName); Shared.Logger.Log(3, "UI", "Discarding a font with a duplicate full name {0}", f.FullName);
continue; continue;
} }
List<Typeface> set2; if (!map2.TryGetValue(f.FamilyName, out List<Typeface> set2)) {
if (!map2.TryGetValue(f.FamilyName, out set2)) {
map2.Add(f.FamilyName, set2 = new List<Typeface>()); map2.Add(f.FamilyName, set2 = new List<Typeface>());
} }
set2.Add(f); set2.Add(f);

5
Assets/Cryville/Common/Font/FontMatcher.cs
View File

@@ -12,7 +12,7 @@ namespace Cryville.Common.Font {
public class FallbackListFontMatcher : FontMatcher { public class FallbackListFontMatcher : FontMatcher {
readonly LanguageMatching _matcher; readonly LanguageMatching _matcher;
static readonly string UltimateFallbackScript = "zzzz"; static readonly string UltimateFallbackScript = "zzzz";
public Dictionary<string, List<string>> MapScriptToTypefaces = new Dictionary<string, List<string>>(); public Dictionary<string, List<string>> MapScriptToTypefaces = new();
public static Dictionary<string, List<string>> GetDefaultWindowsFallbackMap() { public static Dictionary<string, List<string>> GetDefaultWindowsFallbackMap() {
var map = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase); var map = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
FillKeysWithScripts(map, () => new List<string>()); FillKeysWithScripts(map, () => new List<string>());
@@ -333,8 +333,7 @@ namespace Cryville.Common.Font {
yield return typeface1; yield return typeface1;
} }
if (distinctFamily) continue; if (distinctFamily) continue;
IReadOnlyCollection<Typeface> typefaces2; if (Manager.MapNameToTypefaces.TryGetValue(candidate, out IReadOnlyCollection<Typeface> typefaces2)) {
if (Manager.MapNameToTypefaces.TryGetValue(candidate, out typefaces2)) {
foreach (var typeface in typefaces2) { foreach (var typeface in typefaces2) {
if (typeface1 == typeface) continue; if (typeface1 == typeface) continue;
yield return typeface; yield return typeface;

22
Assets/Cryville/Common/Font/FontTable.cs
View File

@@ -25,7 +25,7 @@ namespace Cryville.Common.Font {
readonly UInt16 majorVersion; readonly UInt16 majorVersion;
readonly UInt16 minorVersion; readonly UInt16 minorVersion;
readonly UInt32 numFonts; readonly UInt32 numFonts;
readonly List<UInt32> tableDirectoryOffsets = new List<UInt32>(); readonly List<UInt32> tableDirectoryOffsets = new();
#pragma warning disable IDE0052 // Reserved #pragma warning disable IDE0052 // Reserved
readonly String dsigTag; readonly String dsigTag;
readonly UInt32 dsigLength; readonly UInt32 dsigLength;
@@ -61,7 +61,7 @@ namespace Cryville.Common.Font {
readonly UInt16 entrySelector; readonly UInt16 entrySelector;
readonly UInt16 rangeShift; readonly UInt16 rangeShift;
#pragma warning restore IDE0052 // Reserved #pragma warning restore IDE0052 // Reserved
readonly List<TableRecord> tableRecords = new List<TableRecord>(); readonly List<TableRecord> tableRecords = new();
public TableDirectory(BinaryReader reader, UInt32 offset) : base(reader, offset) { public TableDirectory(BinaryReader reader, UInt32 offset) : base(reader, offset) {
sfntVersion = reader.ReadUInt32(); sfntVersion = reader.ReadUInt32();
if (sfntVersion != 0x00010000 && sfntVersion != 0x4F54544F && if (sfntVersion != 0x00010000 && sfntVersion != 0x4F54544F &&
@@ -81,13 +81,11 @@ namespace Cryville.Common.Font {
public override IReadOnlyList<TableRecord> GetItems() { public override IReadOnlyList<TableRecord> GetItems() {
return tableRecords; return tableRecords;
} }
public override object GetSubTable(TableRecord item) { public override object GetSubTable(TableRecord item) => item.tableTag switch {
switch (item.tableTag) { "name" => new NameTable(Reader, item.offset),
case "name": return new NameTable(Reader, item.offset); "meta" => new MetaTable(Reader, item.offset),
case "meta": return new MetaTable(Reader, item.offset); _ => throw new NotImplementedException(),
default: throw new NotImplementedException(); };
}
}
} }
public struct TableRecord { public struct TableRecord {
public string tableTag; public string tableTag;
@@ -99,9 +97,9 @@ namespace Cryville.Common.Font {
readonly UInt16 version; readonly UInt16 version;
readonly UInt16 count; readonly UInt16 count;
readonly UInt16 storageOffset; readonly UInt16 storageOffset;
readonly List<NameRecord> nameRecord = new List<NameRecord>(); readonly List<NameRecord> nameRecord = new();
readonly UInt16 langTagCount; readonly UInt16 langTagCount;
readonly List<LangTagRecord> langTagRecord = new List<LangTagRecord>(); readonly List<LangTagRecord> langTagRecord = new();
public NameTable(BinaryReader reader, UInt32 offset) : base(reader, offset) { public NameTable(BinaryReader reader, UInt32 offset) : base(reader, offset) {
version = reader.ReadUInt16(); version = reader.ReadUInt16();
count = reader.ReadUInt16(); count = reader.ReadUInt16();
@@ -213,7 +211,7 @@ namespace Cryville.Common.Font {
readonly UInt32 flags; readonly UInt32 flags;
#pragma warning restore IDE0052 // Reserved #pragma warning restore IDE0052 // Reserved
readonly UInt32 dataMapCount; readonly UInt32 dataMapCount;
readonly List<DataMap> dataMaps = new List<DataMap>(); readonly List<DataMap> dataMaps = new();
public MetaTable(BinaryReader reader, UInt32 offset) : base(reader, offset) { public MetaTable(BinaryReader reader, UInt32 offset) : base(reader, offset) {
version = reader.ReadUInt32(); version = reader.ReadUInt32();
if (version != 1) throw new NotSupportedException(); if (version != 1) throw new NotSupportedException();

4
Assets/Cryville/Common/IOExtensions.cs
View File

@@ -25,7 +25,7 @@ namespace Cryville.Common {
/// <param name="encoding">The encoding of the string.</param> /// <param name="encoding">The encoding of the string.</param>
/// <returns>The string read from the reader.</returns> /// <returns>The string read from the reader.</returns>
public static string ReadUInt16String(this BinaryReader reader, Encoding encoding = null) { public static string ReadUInt16String(this BinaryReader reader, Encoding encoding = null) {
if (encoding == null) encoding = Encoding.UTF8; encoding ??= Encoding.UTF8;
var len = reader.ReadUInt16(); var len = reader.ReadUInt16();
byte[] buffer = reader.ReadBytes(len); byte[] buffer = reader.ReadBytes(len);
return encoding.GetString(buffer); return encoding.GetString(buffer);
@@ -38,7 +38,7 @@ namespace Cryville.Common {
/// <param name="value">The string to write by the writer.</param> /// <param name="value">The string to write by the writer.</param>
/// <param name="encoding">The encoding of the string.</param> /// <param name="encoding">The encoding of the string.</param>
public static void WriteUInt16String(this BinaryWriter writer, string value, Encoding encoding = null) { public static void WriteUInt16String(this BinaryWriter writer, string value, Encoding encoding = null) {
if (encoding == null) encoding = Encoding.UTF8; encoding ??= Encoding.UTF8;
byte[] buffer = encoding.GetBytes(value); byte[] buffer = encoding.GetBytes(value);
writer.Write((ushort)buffer.Length); writer.Write((ushort)buffer.Length);
writer.Write(buffer); writer.Write(buffer);

16
Assets/Cryville/Common/Identifier.cs
View File

@@ -2,26 +2,26 @@ using System;
namespace Cryville.Common { namespace Cryville.Common {
public struct Identifier : IEquatable<Identifier> { public struct Identifier : IEquatable<Identifier> {
public static Identifier Empty = new Identifier(0); public static Identifier Empty = new(0);
public int Key { get; private set; } public int Key { get; private set; }
public object Name { get { return IdentifierManager.Shared.Retrieve(Key); } } public readonly object Name => IdentifierManager.Shared.Retrieve(Key);
public Identifier(int key) { public Identifier(int key) {
Key = key; Key = key;
} }
public Identifier(object name) { public Identifier(object name) {
Key = IdentifierManager.Shared.Request(name); Key = IdentifierManager.Shared.Request(name);
} }
public override bool Equals(object obj) { public override readonly bool Equals(object obj) {
if (obj == null || !(obj is Identifier)) return false; if (obj == null || obj is not Identifier other) return false;
return Equals((Identifier)obj); return Equals(other);
} }
public bool Equals(Identifier other) { public readonly bool Equals(Identifier other) {
return Key == other.Key; return Key == other.Key;
} }
public override int GetHashCode() { public override readonly int GetHashCode() {
return Key; return Key;
} }
public override string ToString() { public override readonly string ToString() {
if (Key == 0) return ""; if (Key == 0) return "";
return Name.ToString(); return Name.ToString();
} }

4
Assets/Cryville/Common/Math/ColumnVector.cs
View File

@@ -42,13 +42,13 @@ namespace Cryville.Common.Math {
} }
} }
/// <summary> /// <summary>
/// Performs dot operation with a <see cref="System.Single" /> column vector. /// Performs dot operation with a <see cref="float" /> column vector.
/// </summary> /// </summary>
/// <param name="lhs">The lefthand column vector.</param> /// <param name="lhs">The lefthand column vector.</param>
/// <param name="o">The vector operator.</param> /// <param name="o">The vector operator.</param>
/// <returns>The result of the dot operation.</returns> /// <returns>The result of the dot operation.</returns>
public T Dot(ColumnVector<float> lhs, IVectorOperator<T> o) { public T Dot(ColumnVector<float> lhs, IVectorOperator<T> o) {
T res = default(T); T res = default;
for (var i = 0; i < Size; i++) for (var i = 0; i < Size; i++)
res = o.Add(res, o.ScalarMultiply(lhs[i], content[i])); res = o.Add(res, o.ScalarMultiply(lhs[i], content[i]));
return res; return res;

3
Assets/Cryville/Common/Network/Http11/Http11Client.cs
View File

@@ -71,8 +71,7 @@ namespace Cryville.Common.Network.Http11 {
headers["Host"] = _baseUri.Host; headers["Host"] = _baseUri.Host;
byte[] payload = null; byte[] payload = null;
if (body != null) { if (body != null) {
if (encoding == null) encoding ??= Encoding.UTF8;
encoding = Encoding.UTF8;
payload = encoding.GetBytes(body); payload = encoding.GetBytes(body);
headers.Add("Content-Encoding", encoding.EncodingName); headers.Add("Content-Encoding", encoding.EncodingName);
headers.Add("Content-Length", payload.Length.ToString(CultureInfo.InvariantCulture)); headers.Add("Content-Length", payload.Length.ToString(CultureInfo.InvariantCulture));

2
Assets/Cryville/Common/Network/Http11/Http11Response.cs
View File

@@ -56,7 +56,7 @@ namespace Cryville.Common.Network.Http11 {
} }
internal static string ReadLine(BinaryReader reader) { internal static string ReadLine(BinaryReader reader) {
StringBuilder result = new StringBuilder(); StringBuilder result = new();
char c; char c;
while (true) { while (true) {
c = reader.ReadChar(); c = reader.ReadChar();

5
Assets/Cryville/Common/Network/Http11/Http11ResponseStream.cs
View File

@@ -72,8 +72,7 @@ namespace Cryville.Common.Network.Http11 {
public void ReadChunk() { public void ReadChunk() {
if (_chunk != null && _chunk.Length == 0) return; if (_chunk != null && _chunk.Length == 0) return;
string[] chunkHeader = Http11Response.ReadLine(_reader).Split(';'); string[] chunkHeader = Http11Response.ReadLine(_reader).Split(';');
int chunkSize; if (!int.TryParse(chunkHeader[0], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out int chunkSize))
if (!int.TryParse(chunkHeader[0], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out chunkSize))
throw new IOException("Corrupted chunk received"); throw new IOException("Corrupted chunk received");
if (chunkSize == 0) { if (chunkSize == 0) {
_chunk = new byte[0]; _chunk = new byte[0];
@@ -106,7 +105,7 @@ namespace Cryville.Common.Network.Http11 {
} }
public override byte[] ReadToEnd() { public override byte[] ReadToEnd() {
if (_chunk.Length == 0) return new byte[0]; if (_chunk.Length == 0) return new byte[0];
List<byte[]> segs = new List<byte[]>(); List<byte[]> segs = new();
while (true) { while (true) {
if (_pos != 0) { if (_pos != 0) {
var buffer = new byte[_chunk.Length - _pos]; var buffer = new byte[_chunk.Length - _pos];

15
Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs
View File

@@ -56,9 +56,9 @@ namespace Cryville.Common.Pdt {
while (ip != null) { while (ip != null) {
bool nextFlag = false; bool nextFlag = false;
var i = ip.Value; var i = ip.Value;
if (i is PdtInstruction.Operate) { if (i is PdtInstruction.Operate iop) {
int fc0 = _framecount; int fc0 = _framecount;
int fc1 = ((PdtInstruction.Operate)i).Signature.ParamCount; int fc1 = iop.Signature.ParamCount;
try { i.Execute(this, ref ip); } catch (Exception) { } try { i.Execute(this, ref ip); } catch (Exception) { }
if (fc0 - _framecount == fc1) { if (fc0 - _framecount == fc1) {
unsafe { unsafe {
@@ -77,8 +77,7 @@ namespace Cryville.Common.Pdt {
} }
} }
} }
else if (i is PdtInstruction.Collapse) { else if (i is PdtInstruction.Collapse t) {
var t = (PdtInstruction.Collapse)i;
try { try {
var pins = ip; var pins = ip;
i.Execute(this, ref ip); i.Execute(this, ref ip);
@@ -133,15 +132,14 @@ namespace Cryville.Common.Pdt {
exp.IsConstant = true; exp.IsConstant = true;
exp.IsPotentialConstant = true; exp.IsPotentialConstant = true;
for (var ins = il.First; ins != null; ins = ins.Next) { for (var ins = il.First; ins != null; ins = ins.Next) {
if (!(ins.Value is PdtInstruction.PushConstant)) { if (ins.Value is not PdtInstruction.PushConstant) {
exp.IsConstant = false; exp.IsConstant = false;
break; break;
} }
} }
} }
void ReplaceIP(LinkedList<PdtInstruction> il, ref LinkedListNode<PdtInstruction> ip, PdtInstruction ins, Dictionary<LinkedListNode<PdtInstruction>, List<PdtInstruction.Collapse>> cols) { void ReplaceIP(LinkedList<PdtInstruction> il, ref LinkedListNode<PdtInstruction> ip, PdtInstruction ins, Dictionary<LinkedListNode<PdtInstruction>, List<PdtInstruction.Collapse>> cols) {
List<PdtInstruction.Collapse> cins; if (cols.TryGetValue(ip, out List<PdtInstruction.Collapse> cins)) cols.Remove(ip);
if (cols.TryGetValue(ip, out cins)) cols.Remove(ip);
ip = il.AddAfter(ip, ins); ip = il.AddAfter(ip, ins);
il.Remove(ip.Previous); il.Remove(ip.Previous);
if (cins != null) cols.Add(ip, cins); if (cins != null) cols.Add(ip, cins);
@@ -163,8 +161,7 @@ namespace Cryville.Common.Pdt {
} }
internal unsafe void PushVariable(int name, bool forced) { internal unsafe void PushVariable(int name, bool forced) {
fixed (StackFrame* frame = &_stack[_framecount++]) { fixed (StackFrame* frame = &_stack[_framecount++]) {
byte[] value; GetVariable(name, forced, out frame->Type, out byte[] value);
GetVariable(name, forced, out frame->Type, out value);
frame->Offset = _goffset; frame->Offset = _goffset;
frame->Length = value.Length; frame->Length = value.Length;
Array.Copy(value, 0, _mem, _goffset, value.Length); Array.Copy(value, 0, _mem, _goffset, value.Length);

13
Assets/Cryville/Common/Pdt/PdtExpression.cs
View File

@@ -114,7 +114,7 @@ namespace Cryville.Common.Pdt {
} }
} }
public partial class PdtInterpreter { public partial class PdtInterpreter {
static readonly Dictionary<char, int> OP_PRIORITY = new Dictionary<char, int> { static readonly Dictionary<char, int> OP_PRIORITY = new() {
{ '@', 7 }, { '@', 7 },
{ '*', 6 }, { '/', 6 }, { '%', 6 }, { '*', 6 }, { '/', 6 }, { '%', 6 },
{ '+', 5 }, { '-', 5 }, { '+', 5 }, { '-', 5 },
@@ -125,7 +125,7 @@ namespace Cryville.Common.Pdt {
{ ',', 0 }, { ',', 0 },
{ '$', -1 }, { '$', -1 },
}; };
static readonly Dictionary<char, int> OP_TYPE = new Dictionary<char, int> { static readonly Dictionary<char, int> OP_TYPE = new() {
{ '@', 0 }, { '@', 0 },
{ '*', 0 }, { '/', 0 }, { '%', 0 }, { '*', 0 }, { '/', 0 }, { '%', 0 },
{ '+', 0 }, { '-', 0 }, { '+', 0 }, { '-', 0 },
@@ -153,10 +153,10 @@ namespace Cryville.Common.Pdt {
private struct PdtExpToken { private struct PdtExpToken {
public CharCategory Type { get; set; } public CharCategory Type { get; set; }
public string Value { get; set; } public string Value { get; set; }
public override string ToString() { public override readonly string ToString() {
return string.Format("0x{0:x4}: {1}", Type, Value); return string.Format("0x{0:x4}: {1}", Type, Value);
} }
public static readonly PdtExpToken EmptyOperator = new PdtExpToken { public static readonly PdtExpToken EmptyOperator = new() {
Type = CharCategory.Operator, Type = CharCategory.Operator,
Value = "$", Value = "$",
}; };
@@ -249,13 +249,12 @@ namespace Cryville.Common.Pdt {
PdtExpToken? buf = null; PdtExpToken? buf = null;
while (true) { while (true) {
if (buf != null && t.Type != CharCategory.OpeningBracket) { if (buf != null && t.Type != CharCategory.OpeningBracket) {
PdtExpression def; if (defs.TryGetValue(buf.Value.Value, out PdtExpression def)) {
if (defs.TryGetValue(buf.Value.Value, out def)) {
foreach (var i in def.Instructions) ins.AddLast(i); foreach (var i in def.Instructions) ins.AddLast(i);
} }
else { else {
var name = buf.Value.Value; var name = buf.Value.Value;
if (name[0] == '?') ins.AddLast(new PdtInstruction.PushVariable(name.Substring(1), true)); if (name[0] == '?') ins.AddLast(new PdtInstruction.PushVariable(name[1..], true));
else ins.AddLast(new PdtInstruction.PushVariable(name)); else ins.AddLast(new PdtInstruction.PushVariable(name));
} }
buf = null; buf = null;

41
Assets/Cryville/Common/Pdt/PdtInterpreter.cs
View File

@@ -65,7 +65,7 @@ namespace Cryville.Common.Pdt {
/// </summary> /// </summary>
public int Position { get; protected set; } public int Position { get; protected set; }
readonly StringBuilder _sb = new StringBuilder(); readonly StringBuilder _sb = new();
#pragma warning disable IDE1006 #pragma warning disable IDE1006
/// <summary> /// <summary>
/// The character at the current position. /// The character at the current position.
@@ -86,7 +86,7 @@ namespace Cryville.Common.Pdt {
protected string tokenb(CharCategory flag) { protected string tokenb(CharCategory flag) {
int sp = Position; int sp = Position;
while ((ct & flag) == 0) Position++; while ((ct & flag) == 0) Position++;
return Source.Substring(sp, Position - sp); return Source[sp..Position];
} }
/// <summary> /// <summary>
/// Reads a token until a character that is not of type <paramref name="flag" /> is met. /// Reads a token until a character that is not of type <paramref name="flag" /> is met.
@@ -97,7 +97,7 @@ namespace Cryville.Common.Pdt {
protected string tokenw(CharCategory flag) { protected string tokenw(CharCategory flag) {
int sp = Position; int sp = Position;
while ((ct & flag) != 0) Position++; while ((ct & flag) != 0) Position++;
return Source.Substring(sp, Position - sp); return Source[sp..Position];
} }
/// <summary> /// <summary>
/// Skips over whitespaces. /// Skips over whitespaces.
@@ -163,7 +163,7 @@ namespace Cryville.Common.Pdt {
return new PdtExpression(ins); return new PdtExpression(ins);
} }
readonly Dictionary<string, PdtExpression> defs = new Dictionary<string, PdtExpression>(); readonly Dictionary<string, PdtExpression> defs = new();
/// <summary> /// <summary>
/// Creates an instance of the <see cref="PdtInterpreter" /> class. /// Creates an instance of the <see cref="PdtInterpreter" /> class.
/// </summary> /// </summary>
@@ -186,8 +186,7 @@ namespace Cryville.Common.Pdt {
public object Interpret(Type type) { public object Interpret(Type type) {
try { try {
if (m_formatVersion == null) InterpretDirectives(); if (m_formatVersion == null) InterpretDirectives();
if (_binder == null) _binder ??= BinderAttribute.CreateBinderOfType(type);
_binder = BinderAttribute.CreateBinderOfType(type);
return InterpretObject(type); return InterpretObject(type);
} }
catch (Exception ex) { catch (Exception ex) {
@@ -256,18 +255,17 @@ namespace Cryville.Common.Pdt {
} }
void InterpretObjectInternal<T>(bool pcflag, Type type, object pkey, object result, Func<Type, object> vfunc) where T : Attribute { void InterpretObjectInternal<T>(bool pcflag, Type type, object pkey, object result, Func<Type, object> vfunc) where T : Attribute {
if (pcflag) { if (pcflag) {
using (var collection = new PairCollection(result)) { using var collection = new PairCollection(result);
var ktype = type.GetGenericArguments()[0]; var ktype = type.GetGenericArguments()[0];
var ptype = type.GetGenericArguments()[1]; var ptype = type.GetGenericArguments()[1];
object key = _binder.ChangeType(pkey, ktype, null); object key = _binder.ChangeType(pkey, ktype, null);
object value = vfunc(ptype); object value = vfunc(ptype);
collection.Add(key, value); collection.Add(key, value);
}
} }
else { else {
MemberInfo prop = null; MemberInfo prop = null;
bool flag = false; bool flag = false;
if (pkey is string) prop = FieldLikeHelper.GetMember(type, (string)pkey); if (pkey is string pname) prop = FieldLikeHelper.GetMember(type, pname);
if (prop == null) { if (prop == null) {
prop = FieldLikeHelper.FindMemberWithAttribute<T>(type); prop = FieldLikeHelper.FindMemberWithAttribute<T>(type);
flag = true; flag = true;
@@ -279,13 +277,12 @@ namespace Cryville.Common.Pdt {
if (origCollection == null) { if (origCollection == null) {
FieldLikeHelper.SetValue(prop, result, origCollection = Activator.CreateInstance(ptype)); FieldLikeHelper.SetValue(prop, result, origCollection = Activator.CreateInstance(ptype));
} }
using (var collection = new PairCollection(origCollection)) { using var collection = new PairCollection(origCollection);
var ktype = ptype.GetGenericArguments()[0]; var ktype = ptype.GetGenericArguments()[0];
var vtype = ptype.GetGenericArguments()[1]; var vtype = ptype.GetGenericArguments()[1];
object key = _binder.ChangeType(pkey, ktype, null); object key = _binder.ChangeType(pkey, ktype, null);
object value = vfunc(vtype); object value = vfunc(vtype);
collection.Add(key, value); collection.Add(key, value);
}
} }
else FieldLikeHelper.SetValue(prop, result, vfunc(ptype), _binder); else FieldLikeHelper.SetValue(prop, result, vfunc(ptype), _binder);
} }
@@ -326,7 +323,7 @@ namespace Cryville.Common.Pdt {
src.Take(interpreter.Position).Count(c => c == '\n') + 1, src.Take(interpreter.Position).Count(c => c == '\n') + 1,
pos - lineStartPos + 1, pos - lineStartPos + 1,
innerException == null ? "Unknown error" : innerException.Message, innerException == null ? "Unknown error" : innerException.Message,
src.Substring(previewStartPos, previewEndPos - previewStartPos) src[previewStartPos..previewEndPos]
); );
} }
} }

12
Assets/Cryville/Common/Pdt/PdtOperator.cs
View File

@@ -102,17 +102,17 @@ namespace Cryville.Common.Pdt {
ParamCount = paramCount; ParamCount = paramCount;
_hash = Name ^ ((ParamCount << 16) | (ParamCount >> 16)); _hash = Name ^ ((ParamCount << 16) | (ParamCount >> 16));
} }
public override bool Equals(object obj) { public override readonly bool Equals(object obj) {
if (!(obj is PdtOperatorSignature)) return false; if (obj is not PdtOperatorSignature other) return false;
return Equals((PdtOperatorSignature)obj); return Equals(other);
} }
public bool Equals(PdtOperatorSignature other) { public readonly bool Equals(PdtOperatorSignature other) {
return Name == other.Name && ParamCount == other.ParamCount; return Name == other.Name && ParamCount == other.ParamCount;
} }
public override int GetHashCode() { public override readonly int GetHashCode() {
return _hash; return _hash;
} }
public override string ToString() { public override readonly string ToString() {
return string.Format("{0}({1})", IdentifierManager.Shared.Retrieve(Name), ParamCount); return string.Format("{0}({1})", IdentifierManager.Shared.Retrieve(Name), ParamCount);
} }
} }

26
Assets/Cryville/Common/Pdt/PdtVariableMemory.cs
View File

@@ -24,7 +24,7 @@ namespace Cryville.Common.Pdt {
/// Copies the memory in the span to another span. /// Copies the memory in the span to another span.
/// </summary> /// </summary>
/// <param name="dest">The destination span.</param> /// <param name="dest">The destination span.</param>
public void CopyTo(PdtVariableMemory dest) { public readonly void CopyTo(PdtVariableMemory dest) {
CopyTo(dest._ptr, 0, Length); CopyTo(dest._ptr, 0, Length);
} }
/// <summary> /// <summary>
@@ -32,7 +32,7 @@ namespace Cryville.Common.Pdt {
/// </summary> /// </summary>
/// <param name="dest">The destination buffer.</param> /// <param name="dest">The destination buffer.</param>
/// <param name="destOffset">The offset on the destination buffer to start copying to.</param> /// <param name="destOffset">The offset on the destination buffer to start copying to.</param>
public void CopyTo(byte[] dest, int destOffset) { public readonly void CopyTo(byte[] dest, int destOffset) {
fixed (byte* ptr = dest) { fixed (byte* ptr = dest) {
CopyTo(ptr, destOffset, Length); CopyTo(ptr, destOffset, Length);
} }
@@ -44,13 +44,13 @@ namespace Cryville.Common.Pdt {
/// <param name="destOffset">The offset on the destination buffer to start copying to.</param> /// <param name="destOffset">The offset on the destination buffer to start copying to.</param>
/// <param name="length">The length to copy.</param> /// <param name="length">The length to copy.</param>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="length" /> is greater than the length of the span.</exception> /// <exception cref="ArgumentOutOfRangeException"><paramref name="length" /> is greater than the length of the span.</exception>
public void CopyTo(byte* dest, int destOffset, int length) { public readonly void CopyTo(byte* dest, int destOffset, int length) {
if (length > Length) throw new ArgumentOutOfRangeException("length"); if (length > Length) throw new ArgumentOutOfRangeException("length");
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
dest[destOffset + i] = _ptr[i]; dest[destOffset + i] = _ptr[i];
} }
/// <inheritdoc /> /// <inheritdoc />
public bool Equals(PdtVariableMemory obj) { public readonly bool Equals(PdtVariableMemory obj) {
if (Type != obj.Type || Length != obj.Length) return false; if (Type != obj.Type || Length != obj.Length) return false;
for (int i = 0; i < Length; i++) { for (int i = 0; i < Length; i++) {
if (*(_ptr + i) != *(obj._ptr + i)) return false; if (*(_ptr + i) != *(obj._ptr + i)) return false;
@@ -63,7 +63,7 @@ namespace Cryville.Common.Pdt {
/// <param name="offset">The offset on the span to start reading from.</param> /// <param name="offset">The offset on the span to start reading from.</param>
/// <returns>A number.</returns> /// <returns>A number.</returns>
/// <exception cref="InvalidCastException">The span at the offset does not represent a number.</exception> /// <exception cref="InvalidCastException">The span at the offset does not represent a number.</exception>
public float AsNumber(int offset = 0) { public readonly float AsNumber(int offset = 0) {
if (Type != PdtInternalType.Number && Type != PdtInternalType.Vector) if (Type != PdtInternalType.Number && Type != PdtInternalType.Vector)
throw new InvalidCastException("Not a number"); throw new InvalidCastException("Not a number");
float value; float value;
@@ -79,7 +79,7 @@ namespace Cryville.Common.Pdt {
/// <param name="offset">The offset from the start of the span.</param> /// <param name="offset">The offset from the start of the span.</param>
/// <exception cref="InvalidCastException">The span at the offset does not represent a number.</exception> /// <exception cref="InvalidCastException">The span at the offset does not represent a number.</exception>
/// <exception cref="InvalidOperationException">The length of the span is not sufficient.</exception> /// <exception cref="InvalidOperationException">The length of the span is not sufficient.</exception>
public void SetNumber(float value, int offset = 0) { public readonly void SetNumber(float value, int offset = 0) {
if (Type != PdtInternalType.Number && Type != PdtInternalType.Vector) if (Type != PdtInternalType.Number && Type != PdtInternalType.Vector)
throw new InvalidCastException("Not a number"); throw new InvalidCastException("Not a number");
if (Length < sizeof(float) + offset) if (Length < sizeof(float) + offset)
@@ -94,7 +94,7 @@ namespace Cryville.Common.Pdt {
/// <param name="offset">The offset on the span to start reading from.</param> /// <param name="offset">The offset on the span to start reading from.</param>
/// <returns>A string.</returns> /// <returns>A string.</returns>
/// <exception cref="InvalidCastException">The span at the offset does not represent a string.</exception> /// <exception cref="InvalidCastException">The span at the offset does not represent a string.</exception>
public string AsString(int offset = 0) { public readonly string AsString(int offset = 0) {
if (Type != PdtInternalType.String && Type != PdtInternalType.Array) if (Type != PdtInternalType.String && Type != PdtInternalType.Array)
throw new InvalidCastException("Not a string"); throw new InvalidCastException("Not a string");
var len = *(int*)(_ptr + offset); var len = *(int*)(_ptr + offset);
@@ -107,7 +107,7 @@ namespace Cryville.Common.Pdt {
/// <param name="offset">The offset from the start of the span.</param> /// <param name="offset">The offset from the start of the span.</param>
/// <exception cref="InvalidCastException">The span at the offset does not represent a string.</exception> /// <exception cref="InvalidCastException">The span at the offset does not represent a string.</exception>
/// <exception cref="InvalidOperationException">The length of the span is not sufficient.</exception> /// <exception cref="InvalidOperationException">The length of the span is not sufficient.</exception>
public void SetString(string value, int offset = 0) { public readonly void SetString(string value, int offset = 0) {
if (Type != PdtInternalType.String && Type != PdtInternalType.Array) if (Type != PdtInternalType.String && Type != PdtInternalType.Array)
throw new InvalidCastException("Not a string"); throw new InvalidCastException("Not a string");
int strlen = value.Length; int strlen = value.Length;
@@ -124,7 +124,7 @@ namespace Cryville.Common.Pdt {
/// <param name="offset">The offset on the span to start reading from.</param> /// <param name="offset">The offset on the span to start reading from.</param>
/// <returns>The name of an undefined identifier.</returns> /// <returns>The name of an undefined identifier.</returns>
/// <exception cref="InvalidCastException">The span does not represent an undefined identifier.</exception> /// <exception cref="InvalidCastException">The span does not represent an undefined identifier.</exception>
public int AsIdentifier(int offset = 0) { public readonly int AsIdentifier(int offset = 0) {
if (Type != PdtInternalType.Undefined && Type != PdtInternalType.Array) if (Type != PdtInternalType.Undefined && Type != PdtInternalType.Array)
throw new InvalidCastException("Not an identifier"); throw new InvalidCastException("Not an identifier");
return *(int*)(_ptr + offset); return *(int*)(_ptr + offset);
@@ -140,7 +140,7 @@ namespace Cryville.Common.Pdt {
/// <remarks> /// <remarks>
/// <para>Use <see cref="AsNumber(int)" /> instead while reading an unaligned number.</para> /// <para>Use <see cref="AsNumber(int)" /> instead while reading an unaligned number.</para>
/// </remarks> /// </remarks>
public T As<T>(int offset = 0) { public readonly T As<T>(int offset = 0) {
var len = Unsafe.SizeOf<T>(); var len = Unsafe.SizeOf<T>();
if (offset >= Length) if (offset >= Length)
throw new ArgumentOutOfRangeException("offset"); throw new ArgumentOutOfRangeException("offset");
@@ -159,7 +159,7 @@ namespace Cryville.Common.Pdt {
/// <remarks> /// <remarks>
/// <para>Use <see cref="SetNumber(float, int)" /> instead while writing an unaligned number.</para> /// <para>Use <see cref="SetNumber(float, int)" /> instead while writing an unaligned number.</para>
/// </remarks> /// </remarks>
public void Set<T>(T value, int offset = 0) { public readonly void Set<T>(T value, int offset = 0) {
var len = Unsafe.SizeOf<T>(); var len = Unsafe.SizeOf<T>();
if (offset >= Length) if (offset >= Length)
throw new ArgumentOutOfRangeException("offset"); throw new ArgumentOutOfRangeException("offset");
@@ -173,7 +173,7 @@ namespace Cryville.Common.Pdt {
/// <param name="arrtype">The type of the array.</param> /// <param name="arrtype">The type of the array.</param>
/// <param name="pc">The item count of the array.</param> /// <param name="pc">The item count of the array.</param>
/// <exception cref="InvalidCastException">The span does not represent an array.</exception> /// <exception cref="InvalidCastException">The span does not represent an array.</exception>
public void GetArraySuffix(out int arrtype, out int pc) { public readonly void GetArraySuffix(out int arrtype, out int pc) {
if (Type != PdtInternalType.Vector && Type != PdtInternalType.Array) if (Type != PdtInternalType.Vector && Type != PdtInternalType.Array)
throw new InvalidCastException("Not an array or vector"); throw new InvalidCastException("Not an array or vector");
arrtype = *(int*)(_ptr + Length - sizeof(int)); arrtype = *(int*)(_ptr + Length - sizeof(int));
@@ -186,7 +186,7 @@ namespace Cryville.Common.Pdt {
/// <param name="arrtype">The type of the array.</param> /// <param name="arrtype">The type of the array.</param>
/// <param name="pc">The item count of the array.</param> /// <param name="pc">The item count of the array.</param>
/// <exception cref="InvalidCastException">The span does not represent an array.</exception> /// <exception cref="InvalidCastException">The span does not represent an array.</exception>
public void SetArraySuffix(int arrtype, int pc = 0) { public readonly void SetArraySuffix(int arrtype, int pc = 0) {
if (Type != PdtInternalType.Vector && Type != PdtInternalType.Array) if (Type != PdtInternalType.Vector && Type != PdtInternalType.Array)
throw new InvalidCastException("Not an array or vector"); throw new InvalidCastException("Not an array or vector");
*(int*)(_ptr + Length - sizeof(int)) = arrtype; *(int*)(_ptr + Length - sizeof(int)) = arrtype;

8
Assets/Cryville/Common/Qualified.cs
View File

@@ -6,15 +6,15 @@ namespace Cryville.Common {
public T Value { get; set; } public T Value { get; set; }
public string Unit { get; set; } public string Unit { get; set; }
public Qualified(string unit) : this(default(T), unit) { } public Qualified(string unit) : this(default, unit) { }
public Qualified(T value, string unit) { public Qualified(T value, string unit) {
Value = value; Value = value;
Unit = unit; Unit = unit;
} }
public override string ToString() { return ToString("G3"); } public override readonly string ToString() { return ToString("G3"); }
public string ToString(string format) { return ToString(format, null); } public readonly string ToString(string format) { return ToString(format, null); }
public string ToString(string format, IFormatProvider formatProvider) { public readonly string ToString(string format, IFormatProvider formatProvider) {
double value = Value.ToDouble(formatProvider); double value = Value.ToDouble(formatProvider);
int expIndex = (int)System.Math.Log10(value) / 3; int expIndex = (int)System.Math.Log10(value) / 3;
if (expIndex == 0) { if (expIndex == 0) {

2
Assets/Cryville/Common/Shared.cs
View File

@@ -2,6 +2,6 @@ using Cryville.Common.Logging;
namespace Cryville.Common { namespace Cryville.Common {
public static class Shared { public static class Shared {
public static readonly Logger Logger = new Logger(); public static readonly Logger Logger = new();
} }
} }

6
Assets/Cryville/Common/StringUtils.cs
View File

@@ -13,7 +13,7 @@ namespace Cryville.Common {
/// <param name="s">The file name or file path.</param> /// <param name="s">The file name or file path.</param>
/// <returns>The file name or file path with the extension removed.</returns> /// <returns>The file name or file path with the extension removed.</returns>
public static string TrimExt(string s) { public static string TrimExt(string s) {
return s.Substring(0, s.LastIndexOf(".")); return s[..s.LastIndexOf(".")];
} }
/// <summary> /// <summary>
/// Converts the value of a <see cref="TimeSpan" /> to a human-readable string. /// Converts the value of a <see cref="TimeSpan" /> to a human-readable string.
@@ -52,12 +52,12 @@ namespace Cryville.Common {
public static string GetProcessPathFromCommand(string command) { public static string GetProcessPathFromCommand(string command) {
command = command.Trim(); command = command.Trim();
if (command[0] == '"') { if (command[0] == '"') {
return command.Substring(1, command.IndexOf('"', 1) - 1); return command[1..command.IndexOf('"', 1)];
} }
else { else {
int e = command.IndexOf(' '); int e = command.IndexOf(' ');
if (e == -1) return command; if (e == -1) return command;
else return command.Substring(0, e); else return command[..e];
} }
} }
} }

2
Assets/Cryville/Common/Unity/NetworkTaskWorker.cs
View File

@@ -16,7 +16,7 @@ namespace Cryville.Common.Unity {
public class NetworkTaskWorker { public class NetworkTaskWorker {
bool suspended; bool suspended;
NetworkTask currentNetworkTask; NetworkTask currentNetworkTask;
readonly Queue<NetworkTask> networkTasks = new Queue<NetworkTask>(); readonly Queue<NetworkTask> networkTasks = new();
/// <summary> /// <summary>
/// Current queued task count. /// Current queued task count.

20
Assets/Cryville/Common/Unity/StateTweener.cs
View File

@@ -30,13 +30,13 @@ namespace Cryville.Common.Unity {
[SerializeField] [SerializeField]
public string Attribute; public string Attribute;
public bool Equals(AttributeBinding other) { public readonly bool Equals(AttributeBinding other) {
return Component.Equals(other.Component) && Attribute.Equals(other.Attribute); return Component.Equals(other.Component) && Attribute.Equals(other.Attribute);
} }
public override bool Equals(object obj) { public override readonly bool Equals(object obj) {
return obj is AttributeBinding && Equals((AttributeBinding)obj); return obj is AttributeBinding other && Equals(other);
} }
public override int GetHashCode() { public override readonly int GetHashCode() {
return Component.GetHashCode() ^ Attribute.GetHashCode(); return Component.GetHashCode() ^ Attribute.GetHashCode();
} }
} }
@@ -44,10 +44,10 @@ namespace Cryville.Common.Unity {
[SerializeField] [SerializeField]
StateTweener[] m_children; StateTweener[] m_children;
readonly List<string> _statePriority = new List<string>(); readonly List<string> _statePriority = new();
readonly Dictionary<AttributeBinding, object> _defaults = new Dictionary<AttributeBinding, object>(); readonly Dictionary<AttributeBinding, object> _defaults = new();
readonly Dictionary<AttributeBinding, PropertyTweener<object>> _tweeners = new Dictionary<AttributeBinding, PropertyTweener<object>>(); readonly Dictionary<AttributeBinding, PropertyTweener<object>> _tweeners = new();
readonly Dictionary<string, Dictionary<AttributeBinding, object>> _runtimeStates = new Dictionary<string, Dictionary<AttributeBinding, object>>(); readonly Dictionary<string, Dictionary<AttributeBinding, object>> _runtimeStates = new();
void Awake() { void Awake() {
var types = new Dictionary<AttributeBinding, Type>(); var types = new Dictionary<AttributeBinding, Type>();
@@ -130,7 +130,7 @@ namespace Cryville.Common.Unity {
foreach (var tweener in _tweeners) tweener.Value.Advance(Time.deltaTime); foreach (var tweener in _tweeners) tweener.Value.Advance(Time.deltaTime);
} }
readonly List<string> m_cState = new List<string>(); readonly List<string> m_cState = new();
public IReadOnlyList<string> CurrentState => m_cState; public IReadOnlyList<string> CurrentState => m_cState;
public void ClearState(float transitionDuration = float.Epsilon) { public void ClearState(float transitionDuration = float.Epsilon) {
foreach (var child in m_children) child.ClearState(transitionDuration); foreach (var child in m_children) child.ClearState(transitionDuration);
@@ -161,7 +161,7 @@ namespace Cryville.Common.Unity {
if (index < 0) return; if (index < 0) return;
m_cState.RemoveAt(index); m_cState.RemoveAt(index);
if (index < m_cState.Count) return; if (index < m_cState.Count) return;
var attrs = m_cState.Count == 0 ? _defaults : _runtimeStates[m_cState[m_cState.Count - 1]]; var attrs = m_cState.Count == 0 ? _defaults : _runtimeStates[m_cState[^1]];
foreach (var tweener in _tweeners) { foreach (var tweener in _tweeners) {
tweener.Value.Start(attrs[tweener.Key], transitionDuration); tweener.Value.Start(attrs[tweener.Key], transitionDuration);
} }

2
Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs
View File

@@ -113,7 +113,7 @@ namespace Cryville.Common.Unity.UI {
private bool initialized; private bool initialized;
private GameObject[][] lines; private GameObject[][] lines;
private int[] refl; private int[] refl;
Vector2 cpos = new Vector2(0, 1); Vector2 cpos = new(0, 1);
Vector2 pprectsize; Vector2 pprectsize;
#pragma warning disable IDE0051 #pragma warning disable IDE0051

3
Assets/Cryville/Common/Unity/UI/TMPAutoFont.cs
View File

@@ -35,8 +35,7 @@ namespace Cryville.Common.Unity.UI {
if (MaxFallbackCount <= 0) break; if (MaxFallbackCount <= 0) break;
} }
else { else {
if (_font.fallbackFontAssetTable == null) _font.fallbackFontAssetTable ??= new List<FontAsset>();
_font.fallbackFontAssetTable = new List<FontAsset>();
_font.fallbackFontAssetTable.Add(ifont); _font.fallbackFontAssetTable.Add(ifont);
Shared.Logger.Log(1, "UI", "Using fallback font #{0}: {1}", _font.fallbackFontAssetTable.Count, typeface.FullName); Shared.Logger.Log(1, "UI", "Using fallback font #{0}: {1}", _font.fallbackFontAssetTable.Count, typeface.FullName);
if (_font.fallbackFontAssetTable.Count >= MaxFallbackCount) break; if (_font.fallbackFontAssetTable.Count >= MaxFallbackCount) break;

8
Assets/Cryville/Crtr/BeatTime.cs
View File

@@ -25,7 +25,7 @@ namespace Cryville.Crtr {
public int d; public int d;
[JsonIgnore] [JsonIgnore]
public double Decimal { get { return b + (double)n / d; } } public readonly double Decimal { get { return b + (double)n / d; } }
public int CompareTo(BeatTime other) { public int CompareTo(BeatTime other) {
var c = b.CompareTo(other.b); var c = b.CompareTo(other.b);
@@ -34,15 +34,15 @@ namespace Cryville.Crtr {
} }
public override bool Equals(object obj) { public override bool Equals(object obj) {
if (!(obj is BeatTime)) return false; if (obj is not BeatTime other) return false;
return Equals((BeatTime)obj); return Equals(other);
} }
public bool Equals(BeatTime other) { public bool Equals(BeatTime other) {
return b.Equals(other.b) && ((double)n / d).Equals((double)other.n / other.d); return b.Equals(other.b) && ((double)n / d).Equals((double)other.n / other.d);
} }
public override int GetHashCode() { public override readonly int GetHashCode() {
return Decimal.GetHashCode(); return Decimal.GetHashCode();
} }

17
Assets/Cryville/Crtr/Browsing/Actions/ActionManager.cs
View File

@@ -4,28 +4,27 @@ using System.Linq;
namespace Cryville.Crtr.Browsing.Actions { namespace Cryville.Crtr.Browsing.Actions {
public class ActionManager { public class ActionManager {
readonly Dictionary<Type, List<IResourceAction>> _actions = new Dictionary<Type, List<IResourceAction>>(); readonly Dictionary<Type, List<IResourceAction>> _actions = new();
readonly Dictionary<IResourceAction, int> _refCounts = new Dictionary<IResourceAction, int>(); readonly Dictionary<IResourceAction, int> _refCounts = new();
public event Action Changed; public event Action Changed;
class ActionPriorityComparer : IComparer<IResourceAction> { class ActionPriorityComparer : IComparer<IResourceAction> {
public static readonly ActionPriorityComparer Instance = new ActionPriorityComparer(); public static readonly ActionPriorityComparer Instance = new();
public int Compare(IResourceAction x, IResourceAction y) { public int Compare(IResourceAction x, IResourceAction y) {
return x.Priority.CompareTo(y.Priority); return x.Priority.CompareTo(y.Priority);
} }
} }
void Register(Type type, IResourceAction action) { void Register(Type type, IResourceAction action) {
List<IResourceAction> actions; if (!_actions.TryGetValue(type, out List<IResourceAction> actions)) {
if (!_actions.TryGetValue(type, out actions)) {
_actions.Add(type, actions = new List<IResourceAction>()); _actions.Add(type, actions = new List<IResourceAction>());
} }
int index = actions.BinarySearch(action, ActionPriorityComparer.Instance); int index = actions.BinarySearch(action, ActionPriorityComparer.Instance);
if (index < 0) index = ~index; if (index < 0) index = ~index;
actions.Insert(index, action); actions.Insert(index, action);
if (_refCounts.ContainsKey(action)) _refCounts[action]++; if (_refCounts.ContainsKey(action)) _refCounts[action]++;
else _refCounts[action] = 0; else _refCounts[action] = 1;
Changed?.Invoke(); Changed?.Invoke();
} }
public void Register(IResourceAction action) { public void Register(IResourceAction action) {
@@ -36,8 +35,7 @@ namespace Cryville.Crtr.Browsing.Actions {
} }
public void Unregister(Type type, IResourceAction action) { public void Unregister(Type type, IResourceAction action) {
List<IResourceAction> actions; if (!_actions.TryGetValue(type, out List<IResourceAction> actions)) return;
if (!_actions.TryGetValue(type, out actions)) return;
if (--_refCounts[action] > 0) return; if (--_refCounts[action] > 0) return;
actions.Remove(action); actions.Remove(action);
Changed?.Invoke(); Changed?.Invoke();
@@ -54,9 +52,8 @@ namespace Cryville.Crtr.Browsing.Actions {
} }
IEnumerable<IResourceAction> GetActions(Uri uri, IResourceMeta res, Type type) { IEnumerable<IResourceAction> GetActions(Uri uri, IResourceMeta res, Type type) {
if (type == null) return Enumerable.Empty<IResourceAction>(); if (type == null) return Enumerable.Empty<IResourceAction>();
List<IResourceAction> actions;
IEnumerable<IResourceAction> result; IEnumerable<IResourceAction> result;
if (_actions.TryGetValue(type, out actions)) if (_actions.TryGetValue(type, out List<IResourceAction> actions))
result = actions.Where(i => i.CanInvoke(uri, res)); result = actions.Where(i => i.CanInvoke(uri, res));
else else
result = Enumerable.Empty<IResourceAction>(); result = Enumerable.Empty<IResourceAction>();

8
Assets/Cryville/Crtr/Browsing/Actions/OpenConfigAction.cs
View File

@@ -10,7 +10,7 @@ namespace Cryville.Crtr.Browsing.Actions {
public override int Priority { get { return -50; } } public override int Priority { get { return -50; } }
static readonly Dictionary<string, int> _rulesetTabs = new Dictionary<string, int>(); static readonly Dictionary<string, int> _rulesetTabs = new();
public override bool CanInvoke(Uri uri, IChartDetail resource) { public override bool CanInvoke(Uri uri, IChartDetail resource) {
return true; return true;
@@ -20,15 +20,13 @@ namespace Cryville.Crtr.Browsing.Actions {
} }
public static bool HasTab(string ruleset) { public static bool HasTab(string ruleset) {
int tabId;
var master = ResourceBrowserMaster.Instance; var master = ResourceBrowserMaster.Instance;
if (master == null) return false; if (master == null) return false;
return _rulesetTabs.TryGetValue(ruleset, out tabId) && master.HasTab(tabId); return _rulesetTabs.TryGetValue(ruleset, out int tabId) && master.HasTab(tabId);
} }
public static void Invoke(string ruleset, Action<RulesetConfig> overrides = null) { public static void Invoke(string ruleset, Action<RulesetConfig> overrides = null) {
var master = ResourceBrowserMaster.Instance; var master = ResourceBrowserMaster.Instance;
int tabId; if (_rulesetTabs.TryGetValue(ruleset, out int tabId) && master.TryOpenTab(tabId))
if (_rulesetTabs.TryGetValue(ruleset, out tabId) && master.TryOpenTab(tabId))
return; return;
var browser = Object.Instantiate(master.m_configBrowserPrefab).GetComponent<RulesetConfigBrowser>(); var browser = Object.Instantiate(master.m_configBrowserPrefab).GetComponent<RulesetConfigBrowser>();
try { try {

8
Assets/Cryville/Crtr/Browsing/Actions/ResourceAction.cs
View File

@@ -8,15 +8,15 @@ namespace Cryville.Crtr.Browsing.Actions {
public abstract bool CanInvoke(Uri uri, T resource); public abstract bool CanInvoke(Uri uri, T resource);
public bool CanInvoke(Uri uri, IResourceMeta resource) { public bool CanInvoke(Uri uri, IResourceMeta resource) {
if (resource == null) throw new ArgumentNullException("resource"); if (resource == null) throw new ArgumentNullException("resource");
if (!(resource is T)) throw new ArgumentException("Mismatched resource type."); if (resource is not T res) throw new ArgumentException("Mismatched resource type.");
return CanInvoke(uri, (T)resource); return CanInvoke(uri, res);
} }
public abstract void Invoke(Uri uri, T resource); public abstract void Invoke(Uri uri, T resource);
public void Invoke(Uri uri, IResourceMeta resource) { public void Invoke(Uri uri, IResourceMeta resource) {
if (resource == null) throw new ArgumentNullException("resource"); if (resource == null) throw new ArgumentNullException("resource");
if (!(resource is T)) throw new ArgumentException("Mismatched resource type."); if (resource is not T res) throw new ArgumentException("Mismatched resource type.");
Invoke(uri, (T)resource); Invoke(uri, res);
} }
} }
} }

10
Assets/Cryville/Crtr/Browsing/ExtensionManager.cs
View File

@@ -10,18 +10,17 @@ namespace Cryville.Crtr.Browsing {
internal static class ExtensionManager { internal static class ExtensionManager {
static bool _init; static bool _init;
static readonly Dictionary<string, List<ResourceConverter>> _converters static readonly Dictionary<string, List<ResourceConverter>> _converters
= new Dictionary<string, List<ResourceConverter>>(); = new();
public static ISet<string> GetSupportedFormats() { public static ISet<string> GetSupportedFormats() {
return new HashSet<string>(_converters.Keys); return new HashSet<string>(_converters.Keys);
} }
public static bool TryGetConverters(string extension, out IEnumerable<ResourceConverter> converters) { public static bool TryGetConverters(string extension, out IEnumerable<ResourceConverter> converters) {
List<ResourceConverter> outResult; bool result = _converters.TryGetValue(extension, out List<ResourceConverter> outResult);
bool result = _converters.TryGetValue(extension, out outResult);
converters = outResult; converters = outResult;
return result; return result;
} }
static readonly Dictionary<string, string> _localRes static readonly Dictionary<string, string> _localRes
= new Dictionary<string, string>(); = new();
public static IReadOnlyDictionary<string, string> GetLocalResourcePaths() { public static IReadOnlyDictionary<string, string> GetLocalResourcePaths() {
return _localRes; return _localRes;
} }
@@ -62,8 +61,7 @@ namespace Cryville.Crtr.Browsing {
stream.Seek(0, SeekOrigin.Begin); stream.Seek(0, SeekOrigin.Begin);
var buf = new byte[stream.Length]; var buf = new byte[stream.Length];
stream.Read(buf, 0, buf.Length); stream.Read(buf, 0, buf.Length);
var asm = Assembly.Load(buf); var asm = Assembly.Load(buf) ?? throw new TypeLoadException("Failed to load the module");
if (asm == null) throw new TypeLoadException("Failed to load the module");
asms.Add(asm.GetName().Name); asms.Add(asm.GetName().Name);
foreach (var type in asm.GetTypes()) { foreach (var type in asm.GetTypes()) {
if (typeof(ExtensionInterface).IsAssignableFrom(type)) { if (typeof(ExtensionInterface).IsAssignableFrom(type)) {

5
Assets/Cryville/Crtr/Browsing/FileSystemResourceManager.cs
View File

@@ -17,7 +17,7 @@ namespace Cryville.Crtr.Browsing {
public FileSystemEntry this[int index] { get { return _filteredItems[index]; } } public FileSystemEntry this[int index] { get { return _filteredItems[index]; } }
IResourceMeta IResourceManager.this[int index] { get { return this[index]; } } IResourceMeta IResourceManager.this[int index] { get { return this[index]; } }
readonly List<string> _dirParts = new List<string>(); readonly List<string> _dirParts = new();
readonly IList<string> m_dirParts; readonly IList<string> m_dirParts;
public IList<string> CurrentDirectory { get { return m_dirParts; } } public IList<string> CurrentDirectory { get { return m_dirParts; } }
public int Count { get { return _filteredItems.Length; } } public int Count { get { return _filteredItems.Length; } }
@@ -136,8 +136,7 @@ namespace Cryville.Crtr.Browsing {
public IEnumerable<MetaProperty> Properties { public IEnumerable<MetaProperty> Properties {
get { get {
yield return new MetaProperty("Name", _name); yield return new MetaProperty("Name", _name);
if (FileSystemInfo is FileInfo) { if (FileSystemInfo is FileInfo file) {
var file = (FileInfo)FileSystemInfo;
yield return new MetaProperty("Size", new Qualified<long>(file.Length, "B")); yield return new MetaProperty("Size", new Qualified<long>(file.Length, "B"));
} }
yield return new MetaProperty("Write.Time", FileSystemInfo.LastWriteTime); yield return new MetaProperty("Write.Time", FileSystemInfo.LastWriteTime);

4
Assets/Cryville/Crtr/Browsing/Legacy/LegacyResourceManager.cs
View File

@@ -10,11 +10,11 @@ namespace Cryville.Crtr.Browsing.Legacy {
internal abstract class LegacyResourceManager<T> : IPathedResourceManager<T> where T : IResourceMeta { internal abstract class LegacyResourceManager<T> : IPathedResourceManager<T> where T : IResourceMeta {
protected readonly LegacyResourceStore _store; protected readonly LegacyResourceStore _store;
DirectoryInfo _cd; DirectoryInfo _cd;
readonly FileSystemWatcher _watcher = new FileSystemWatcher(); readonly FileSystemWatcher _watcher = new();
DirectoryInfo[] _items = new DirectoryInfo[0]; DirectoryInfo[] _items = new DirectoryInfo[0];
DirectoryInfo[] _filteredItems = new DirectoryInfo[0]; DirectoryInfo[] _filteredItems = new DirectoryInfo[0];
string _filter = string.Empty; string _filter = string.Empty;
readonly List<string> _dirParts = new List<string>(); readonly List<string> _dirParts = new();
readonly IList<string> m_dirParts; readonly IList<string> m_dirParts;
public IList<string> CurrentDirectory { get { return m_dirParts; } } public IList<string> CurrentDirectory { get { return m_dirParts; } }
public int Count { get { return _filteredItems.Length; } } public int Count { get { return _filteredItems.Length; } }

6
Assets/Cryville/Crtr/Browsing/Legacy/LegacyResourceStore.cs
View File

@@ -34,8 +34,7 @@ namespace Cryville.Crtr.Browsing.Legacy {
} }
public bool ImportFrom(Uri uri) { public bool ImportFrom(Uri uri) {
var file = new FileInfo(uri.LocalPath); var file = new FileInfo(uri.LocalPath);
IEnumerable<ResourceConverter> converters; if (!ExtensionManager.TryGetConverters(file.Extension, out IEnumerable<ResourceConverter> converters)) return false;
if (!ExtensionManager.TryGetConverters(file.Extension, out converters)) return false;
foreach (var converter in converters) { foreach (var converter in converters) {
var resources = new List<Resource>(); var resources = new List<Resource>();
var ses = new ConversionSession { var ses = new ConversionSession {
@@ -69,8 +68,7 @@ namespace Cryville.Crtr.Browsing.Legacy {
coverFile.CopyTo(Path.Combine(dir.FullName, tres.Meta.cover), true); coverFile.CopyTo(Path.Combine(dir.FullName, tres.Meta.cover), true);
} }
} }
else if (res is FileResource) { else if (res is FileResource tres) {
var tres = (FileResource)res;
DirectoryInfo dest; DirectoryInfo dest;
bool singleFileFlag = false; bool singleFileFlag = false;
if (res is ChartResource) if (res is ChartResource)

2
Assets/Cryville/Crtr/Browsing/UI/BrowserItemTile.cs
View File

@@ -31,7 +31,7 @@ namespace Cryville.Crtr.Browsing.UI {
OnReset(); OnReset();
} }
protected override void OnReset() { protected override void OnReset() {
if (_cover != null) _cover.Cancel(); _cover?.Cancel();
if (m_icon.sprite != null && m_icon.sprite != m_iconPlaceholder) { if (m_icon.sprite != null && m_icon.sprite != m_iconPlaceholder) {
Destroy(m_icon.sprite.texture); Destroy(m_icon.sprite.texture);
Destroy(m_icon.sprite); Destroy(m_icon.sprite);

3
Assets/Cryville/Crtr/Browsing/UI/BrowserTabLayout.cs
View File

@@ -79,8 +79,7 @@ namespace Cryville.Crtr.Browsing.UI {
protected override void OnEnable() { protected override void OnEnable() {
base.OnEnable(); base.OnEnable();
m_layoutMinWidth = GetTargetLayoutMinWidth(); m_layoutMinWidth = GetTargetLayoutMinWidth();
if (_tweener == null) _tweener ??= new PropertyTweener<float>(
_tweener = new PropertyTweener<float>(
() => m_layoutMinWidth, () => m_layoutMinWidth,
v => UpdateLayoutMinWidth(v), v => UpdateLayoutMinWidth(v),
Tweeners.Float.With(EasingFunctions.OutQuad) Tweeners.Float.With(EasingFunctions.OutQuad)

2
Assets/Cryville/Crtr/Browsing/UI/DetailPanel.cs
View File

@@ -72,7 +72,7 @@ namespace Cryville.Crtr.Browsing.UI {
} }
void DestroyDynamicResources() { void DestroyDynamicResources() {
if (_image != null) _image.Cancel(); _image?.Cancel();
if (m_cover.sprite != null && m_cover.sprite != m_coverPlaceholder) { if (m_cover.sprite != null && m_cover.sprite != m_coverPlaceholder) {
Destroy(m_cover.sprite.texture); Destroy(m_cover.sprite.texture);
Destroy(m_cover.sprite); Destroy(m_cover.sprite);

8
Assets/Cryville/Crtr/Browsing/UI/PathedResourceBrowser.cs
View File

@@ -34,8 +34,8 @@ namespace Cryville.Crtr.Browsing.UI {
IResourceAction _importAction; IResourceAction _importAction;
readonly IResourceAction[] _importActionArray = new IResourceAction[1]; readonly IResourceAction[] _importActionArray = new IResourceAction[1];
readonly HashSet<int> _selectedItems = new HashSet<int>(); readonly HashSet<int> _selectedItems = new();
readonly Dictionary<int, BrowserItem> _items = new Dictionary<int, BrowserItem>(); readonly Dictionary<int, BrowserItem> _items = new();
bool _destroyed; bool _destroyed;
protected virtual void Start() { protected virtual void Start() {
@@ -52,10 +52,10 @@ namespace Cryville.Crtr.Browsing.UI {
} }
void OnEnable() { void OnEnable() {
if (_manager != null) _manager.Activate(); _manager?.Activate();
} }
void OnDisable() { void OnDisable() {
if (_manager != null) _manager.Deactivate(); _manager?.Deactivate();
} }
public void Init(IPathedResourceManager<IResourceMeta> manager) { public void Init(IPathedResourceManager<IResourceMeta> manager) {

7
Assets/Cryville/Crtr/Browsing/UI/ResourceBrowserMaster.cs
View File

@@ -21,8 +21,8 @@ namespace Cryville.Crtr.Browsing.UI {
internal GameObject m_configBrowserPrefab; internal GameObject m_configBrowserPrefab;
BrowserTab _currentTab; BrowserTab _currentTab;
readonly Dictionary<int, BrowserTab> _tabMap = new Dictionary<int, BrowserTab>(); readonly Dictionary<int, BrowserTab> _tabMap = new();
readonly Dictionary<BrowserTab, ResourceBrowser> _tabs = new Dictionary<BrowserTab, ResourceBrowser>(); readonly Dictionary<BrowserTab, ResourceBrowser> _tabs = new();
public ActionManager Actions { get; private set; } public ActionManager Actions { get; private set; }
@@ -77,8 +77,7 @@ namespace Cryville.Crtr.Browsing.UI {
return _tabMap.ContainsKey(id); return _tabMap.ContainsKey(id);
} }
public bool TryOpenTab(int id) { public bool TryOpenTab(int id) {
BrowserTab tab; if (_tabMap.TryGetValue(id, out BrowserTab tab)) {
if (_tabMap.TryGetValue(id, out tab)) {
OnTabClicked(tab); OnTabClicked(tab);
return true; return true;
} }

22
Assets/Cryville/Crtr/Browsing/UI/RulesetConfigBrowser.cs
View File

@@ -31,21 +31,21 @@ namespace Cryville.Crtr.Browsing.UI {
public void Load(string rulesetName, Action<RulesetConfig> overrides = null) { public void Load(string rulesetName, Action<RulesetConfig> overrides = null) {
RulesetName = rulesetName; RulesetName = rulesetName;
FileInfo file = new FileInfo(Path.Combine( FileInfo file = new(Path.Combine(
Game.GameDataPath, "rulesets", rulesetName, ".umgr" Game.GameDataPath, "rulesets", rulesetName, ".umgr"
)); ));
if (!file.Exists) { if (!file.Exists) {
throw new FileNotFoundException("Ruleset for the resource not found\nMake sure you have imported the ruleset"); throw new FileNotFoundException("Ruleset for the resource not found\nMake sure you have imported the ruleset");
} }
DirectoryInfo dir = file.Directory; DirectoryInfo dir = file.Directory;
using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) { using (StreamReader reader = new(file.FullName, Encoding.UTF8)) {
_ruleset = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() { _ruleset = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
MissingMemberHandling = MissingMemberHandling.Error MissingMemberHandling = MissingMemberHandling.Error
}); });
if (_ruleset.format != RulesetDefinition.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version"); if (_ruleset.format != RulesetDefinition.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
_ruleset.LoadPdt(dir); _ruleset.LoadPdt(dir);
} }
FileInfo cfgfile = new FileInfo(Path.Combine( FileInfo cfgfile = new(Path.Combine(
Game.GameDataPath, "config", "rulesets", rulesetName + ".json" Game.GameDataPath, "config", "rulesets", rulesetName + ".json"
)); ));
if (!cfgfile.Exists) { if (!cfgfile.Exists) {
@@ -53,11 +53,10 @@ namespace Cryville.Crtr.Browsing.UI {
_rscfg = new RulesetConfig(); _rscfg = new RulesetConfig();
} }
else { else {
using (StreamReader cfgreader = new StreamReader(cfgfile.FullName, Encoding.UTF8)) { using StreamReader cfgreader = new(cfgfile.FullName, Encoding.UTF8);
_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() { _rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
MissingMemberHandling = MissingMemberHandling.Error MissingMemberHandling = MissingMemberHandling.Error
}); });
}
} }
overrides?.Invoke(_rscfg); overrides?.Invoke(_rscfg);
@@ -92,12 +91,11 @@ namespace Cryville.Crtr.Browsing.UI {
void OnDisable() { void OnDisable() {
if (_loaded) { if (_loaded) {
m_inputConfigPanel.SaveTo(_rscfg.inputs); m_inputConfigPanel.SaveTo(_rscfg.inputs);
FileInfo cfgFile = new FileInfo(Path.Combine( FileInfo cfgFile = new(Path.Combine(
Game.GameDataPath, "config", "rulesets", RulesetName + ".json" Game.GameDataPath, "config", "rulesets", RulesetName + ".json"
)); ));
using (StreamWriter cfgWriter = new StreamWriter(cfgFile.FullName, false, Encoding.UTF8)) { using StreamWriter cfgWriter = new(cfgFile.FullName, false, Encoding.UTF8);
cfgWriter.Write(JsonConvert.SerializeObject(_rscfg, Game.GlobalJsonSerializerSettings)); cfgWriter.Write(JsonConvert.SerializeObject(_rscfg, Game.GlobalJsonSerializerSettings));
}
} }
} }

8
Assets/Cryville/Crtr/BuiltinResources.cs
View File

@@ -6,13 +6,13 @@ using UnityEngine;
namespace Cryville.Crtr { namespace Cryville.Crtr {
public static class BuiltinResources { public static class BuiltinResources {
public static Dictionary<string, Type> Components public static Dictionary<string, Type> Components
= new Dictionary<string, Type>(); = new();
public static Dictionary<string, Shader> Shaders public static Dictionary<string, Shader> Shaders
= new Dictionary<string, Shader>(); = new();
public static Dictionary<string, Mesh> Meshes public static Dictionary<string, Mesh> Meshes
= new Dictionary<string, Mesh>(); = new();
public static Dictionary<string, Material> Materials public static Dictionary<string, Material> Materials
= new Dictionary<string, Material>(); = new();
static bool loaded; static bool loaded;

88
Assets/Cryville/Crtr/Chart.cs
View File

@@ -18,7 +18,7 @@ namespace Cryville.Crtr {
} }
public abstract class ChartEvent { public abstract class ChartEvent {
public BeatTime? time; public BeatTime? time;
[JsonIgnore] [JsonIgnore]
public float BeatPosition { public float BeatPosition {
get { get {
@@ -27,7 +27,7 @@ namespace Cryville.Crtr {
} }
public BeatTime? endtime; public BeatTime? endtime;
[JsonIgnore] [JsonIgnore]
public float EndBeatPosition { public float EndBeatPosition {
get { get {
@@ -35,10 +35,10 @@ namespace Cryville.Crtr {
return (float)endtime.Value.Decimal + BeatOffset; return (float)endtime.Value.Decimal + BeatOffset;
} }
} }
[JsonIgnore] [JsonIgnore]
public float BeatOffset; public float BeatOffset;
[JsonIgnore] [JsonIgnore]
public abstract int Priority { get; } public abstract int Priority { get; }
@@ -66,8 +66,7 @@ namespace Cryville.Crtr {
[JsonIgnore] [JsonIgnore]
public ReleaseEvent ReleaseEvent { public ReleaseEvent ReleaseEvent {
get { get {
if (relev == null) relev = new ReleaseEvent(this); return relev ??= new ReleaseEvent(this);
return relev;
} }
} }
@@ -96,15 +95,15 @@ namespace Cryville.Crtr {
SubmitPropOp("endtime", new PropOp.BeatTime(v => endtime = v)); SubmitPropOp("endtime", new PropOp.BeatTime(v => endtime = v));
} }
} }
public class ReleaseEvent : ChartEvent { public class ReleaseEvent : ChartEvent {
public readonly ChartEvent Original; public readonly ChartEvent Original;
public ReleaseEvent(ChartEvent orig) { public ReleaseEvent(ChartEvent orig) {
Original = orig; Original = orig;
time = orig.endtime; time = orig.endtime;
} }
public override int Priority { public override int Priority {
get { get {
return Original.Priority + 1; return Original.Priority + 1;
@@ -112,7 +111,7 @@ namespace Cryville.Crtr {
} }
} }
public abstract class EventContainer : ChartEvent { public abstract class EventContainer : ChartEvent {
public List<Chart.Motion> motions = new List<Chart.Motion>(); public List<Chart.Motion> motions = new();
[JsonIgnore] [JsonIgnore]
public Clip Clip { get; private set; } public Clip Clip { get; private set; }
@@ -120,7 +119,7 @@ namespace Cryville.Crtr {
public EventContainer() { public EventContainer() {
SubmitPropOp("clip", new PropOp.Clip(v => Clip = v)); SubmitPropOp("clip", new PropOp.Clip(v => Clip = v));
} }
[JsonIgnore] [JsonIgnore]
public virtual IEnumerable<ChartEvent> Events { public virtual IEnumerable<ChartEvent> Events {
get { get {
@@ -128,12 +127,10 @@ namespace Cryville.Crtr {
} }
} }
public virtual EventList GetEventsOfType(string type) { public virtual EventList GetEventsOfType(string type) => type switch {
switch (type) { "motions" => new EventList<Chart.Motion>(motions),
case "motions": return new EventList<Chart.Motion>(motions); _ => throw new ArgumentException(string.Format("Unknown event type \"{0}\"", type)),
default: throw new ArgumentException(string.Format("Unknown event type \"{0}\"", type)); };
}
}
} }
public abstract class EventList : ChartEvent { public abstract class EventList : ChartEvent {
public IList<ChartEvent> Events { get; private set; } public IList<ChartEvent> Events { get; private set; }
@@ -178,8 +175,8 @@ namespace Cryville.Crtr {
public string ruleset; public string ruleset;
public List<Group> groups = new List<Group>(); public List<Group> groups = new();
public override IEnumerable<ChartEvent> Events { public override IEnumerable<ChartEvent> Events {
get { get {
return base.Events return base.Events
@@ -189,33 +186,29 @@ namespace Cryville.Crtr {
} }
} }
public override EventList GetEventsOfType(string type) { public override EventList GetEventsOfType(string type) => type switch {
switch (type) { "groups" => new EventList<Group>(groups),
case "groups": return new EventList<Group>(groups); _ => base.GetEventsOfType(type),
default: return base.GetEventsOfType(type); };
}
}
public override int Priority { get { return 10; } } public override int Priority { get { return 10; } }
public class Group : EventContainer { public class Group : EventContainer {
public List<Track> tracks = new List<Track>(); public List<Track> tracks = new();
public List<Note> notes = new List<Note>(); public List<Note> notes = new();
public override IEnumerable<ChartEvent> Events { public override IEnumerable<ChartEvent> Events {
get { get {
return base.Events return base.Events
.Concat(notes.Cast<ChartEvent>() .Concat(notes.Cast<ChartEvent>()
.Concat(tracks.Cast<ChartEvent>() .Concat(tracks.Cast<ChartEvent>()
)); ));
} }
} }
public override EventList GetEventsOfType(string type) { public override EventList GetEventsOfType(string type) => type switch {
switch (type) { "tracks" => new EventList<Track>(tracks),
case "tracks": return new EventList<Track>(tracks); "notes" => new EventList<Note>(notes),
case "notes": return new EventList<Note>(notes); _ => base.GetEventsOfType(type),
default: return base.GetEventsOfType(type); };
}
}
public override int Priority { get { return 12; } } public override int Priority { get { return 12; } }
} }
@@ -228,8 +221,8 @@ namespace Cryville.Crtr {
string m_motion; string m_motion;
[JsonRequired] [JsonRequired]
public string motion { public string motion {
get { return m_motion == null ? ToString() : m_motion; } get => m_motion ?? ToString();
set { LoadFromString(value); } set => LoadFromString(value);
} }
#pragma warning restore IDE1006 #pragma warning restore IDE1006
private void LoadFromString(string s) { private void LoadFromString(string s) {
@@ -264,12 +257,11 @@ namespace Cryville.Crtr {
[JsonIgnore] [JsonIgnore]
public Identifier Name { public Identifier Name {
get { get {
if (name == default(Identifier)) throw new InvalidOperationException("Motion name not set"); if (name == default) throw new InvalidOperationException("Motion name not set");
return name; return name;
} }
private set { private set {
MotionRegistry reg; if (!ChartPlayer.motionRegistry.TryGetValue(value, out MotionRegistry reg))
if (!ChartPlayer.motionRegistry.TryGetValue(value, out reg))
throw new ArgumentException("Invalid motion name"); throw new ArgumentException("Invalid motion name");
Node = new MotionNode { Value = reg.InitValue }; Node = new MotionNode { Value = reg.InitValue };
name = value; name = value;
@@ -293,7 +285,7 @@ namespace Cryville.Crtr {
SubmitPropOp("name", new PropOp.Identifier(v => { SubmitPropOp("name", new PropOp.Identifier(v => {
var n = new Identifier(v); var n = new Identifier(v);
if (name == n) { } if (name == n) { }
else if (name == default(Identifier)) Name = n; else if (name == default) Name = n;
else throw new RulesetViolationException(string.Format( else throw new RulesetViolationException(string.Format(
"Motion name not matched, expected {0}, got {1}", n, Name "Motion name not matched, expected {0}, got {1}", n, Name
)); ));
@@ -306,7 +298,7 @@ namespace Cryville.Crtr {
} }
public class Note : EventContainer { public class Note : EventContainer {
public List<Judge> judges = new List<Judge>(); public List<Judge> judges = new();
public override IEnumerable<ChartEvent> Events { public override IEnumerable<ChartEvent> Events {
get { get {
return base.Events return base.Events
@@ -315,12 +307,10 @@ namespace Cryville.Crtr {
} }
} }
public override EventList GetEventsOfType(string type) { public override EventList GetEventsOfType(string type) => type switch {
switch (type) { "judges" => new EventList<Judge>(judges),
case "judges": return new EventList<Judge>(judges); _ => base.GetEventsOfType(type),
default: return base.GetEventsOfType(type); };
}
}
public override int Priority { get { return 20; } } public override int Priority { get { return 20; } }
} }
@@ -345,7 +335,7 @@ namespace Cryville.Crtr {
// TODO [Obsolete] // TODO [Obsolete]
public List<Signature> sigs; // Signatures public List<Signature> sigs; // Signatures
// TODO [Obsolete] // TODO [Obsolete]
public class Signature : ChartEvent { public class Signature : ChartEvent {
public float? tempo; public float? tempo;

20
Assets/Cryville/Crtr/ChartCompatibilityHandler.cs
View File

@@ -11,11 +11,11 @@ namespace Cryville.Crtr {
public static IMotionStringParser MotionStringParser { get; private set; } public static IMotionStringParser MotionStringParser { get; private set; }
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) { public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) {
var obj = JToken.ReadFrom(reader); var obj = JToken.ReadFrom(reader);
switch (obj["format"].ToObject<int>()) { MotionStringParser = obj["format"].ToObject<int>() switch {
case 2: MotionStringParser = MotionStringParser2.Instance; break; 2 => MotionStringParser2.Instance,
case 3: MotionStringParser = MotionStringParser3.Instance; break; 3 => MotionStringParser3.Instance,
default: throw new FormatException("Unsupported chart format"); _ => throw new FormatException("Unsupported chart format"),
} };
return base.ReadJson(obj.CreateReader(), objectType, existingValue, serializer); return base.ReadJson(obj.CreateReader(), objectType, existingValue, serializer);
} }
public override Chart Create(Type objectType) { public override Chart Create(Type objectType) {
@@ -28,12 +28,11 @@ namespace Cryville.Crtr {
static MotionStringParser2 _instance; static MotionStringParser2 _instance;
public static MotionStringParser2 Instance { public static MotionStringParser2 Instance {
get { get {
if (_instance == null) _instance ??= new MotionStringParser2();
_instance = new MotionStringParser2();
return _instance; return _instance;
} }
} }
static readonly PdtFragmentInterpreter _itor = new PdtFragmentInterpreter(); static readonly PdtFragmentInterpreter _itor = new();
static readonly PropOp _vecop = new VectorOp(v => _vecbuf = v); static readonly PropOp _vecop = new VectorOp(v => _vecbuf = v);
static float[] _vecbuf; static float[] _vecbuf;
public void Parse(string str, out Identifier name, out MotionNode node) { public void Parse(string str, out Identifier name, out MotionNode node) {
@@ -74,12 +73,11 @@ namespace Cryville.Crtr {
static MotionStringParser3 _instance; static MotionStringParser3 _instance;
public static MotionStringParser3 Instance { public static MotionStringParser3 Instance {
get { get {
if (_instance == null) _instance ??= new MotionStringParser3();
_instance = new MotionStringParser3();
return _instance; return _instance;
} }
} }
static readonly PdtFragmentInterpreter _itor = new PdtFragmentInterpreter(); static readonly PdtFragmentInterpreter _itor = new();
static readonly PropOp _vecop = new VectorOp(v => _vecbuf = v); static readonly PropOp _vecop = new VectorOp(v => _vecbuf = v);
static float[] _vecbuf; static float[] _vecbuf;
public void Parse(string str, out Identifier name, out MotionNode node) { public void Parse(string str, out Identifier name, out MotionNode node) {

187
Assets/Cryville/Crtr/ChartPlayer.cs
View File

@@ -97,12 +97,12 @@ namespace Cryville.Crtr {
} }
void OnDestroy() { void OnDestroy() {
if (cbus != null) cbus.Dispose(); cbus?.Dispose();
if (bbus != null) bbus.Dispose(); bbus?.Dispose();
if (tbus != null) tbus.Dispose(); tbus?.Dispose();
if (nbus != null) nbus.Dispose(); nbus?.Dispose();
if (loadThread != null) loadThread.Abort(); loadThread?.Abort();
if (inputProxy != null) inputProxy.Dispose(); inputProxy?.Dispose();
if (texs != null) foreach (var t in texs) Texture.Destroy(t.Value); if (texs != null) foreach (var t in texs) Texture.Destroy(t.Value);
Game.MainLogger.RemoveListener(loggerListener); Game.MainLogger.RemoveListener(loggerListener);
loggerListener.Dispose(); loggerListener.Dispose();
@@ -200,24 +200,22 @@ namespace Cryville.Crtr {
} }
} }
} }
readonly TargetString statusstr = new TargetString(); readonly StringBuffer statusbuf = new();
readonly StringBuffer statusbuf = new StringBuffer(); readonly StringBuffer logsbuf = new();
readonly TargetString logsstr = new TargetString(); readonly List<string> logEntries = new();
readonly StringBuffer logsbuf = new StringBuffer(); readonly ArrayPool<char> logBufferPool = new();
readonly List<string> logEntries = new List<string>();
int logsLength = 0; int logsLength = 0;
LogHandler d_addLogEntry; LogHandler d_addLogEntry;
void AddLogEntry(int level, string module, string msg) { void AddLogEntry(int level, string module, string msg) {
string color; string color = level switch {
switch (level) { 0 => "#888888",
case 0: color = "#888888"; break; 1 => "#bbbbbb",
case 1: color = "#bbbbbb"; break; 2 => "#0088ff",
case 2: color = "#0088ff"; break; 3 => "#ffff00",
case 3: color = "#ffff00"; break; 4 => "#ff0000",
case 4: color = "#ff0000"; break; 5 => "#bb0000",
case 5: color = "#bb0000"; break; _ => "#ff00ff",
default: color = "#ff00ff"; break; };
}
var l = string.Format( var l = string.Format(
"\n<color={1}bb><{2}> {3}</color>", "\n<color={1}bb><{2}> {3}</color>",
DateTime.UtcNow.ToString("s"), color, module, msg DateTime.UtcNow.ToString("s"), color, module, msg
@@ -235,10 +233,10 @@ namespace Cryville.Crtr {
foreach (var l in logEntries) { foreach (var l in logEntries) {
logsbuf.Append(l); logsbuf.Append(l);
} }
logsstr.Length = logsbuf.Count; var lbuf = logBufferPool.Rent(logsbuf.Count);
var larr = logsstr.TrustedAsArray(); logsbuf.CopyTo(0, lbuf, 0, logsbuf.Count);
logsbuf.CopyTo(0, larr, 0, logsbuf.Count); logs.SetText(lbuf, 0, logsbuf.Count);
logs.SetText(larr, 0, logsbuf.Count); logBufferPool.Return(lbuf);
statusbuf.Clear(); statusbuf.Clear();
statusbuf.AppendFormat( statusbuf.AppendFormat(
@@ -286,14 +284,15 @@ namespace Cryville.Crtr {
); );
if (judge != null) { if (judge != null) {
statusbuf.Append("\n== Scores ==\n"); statusbuf.Append("\n== Scores ==\n");
var fullScoreStr = judge.GetFullFormattedScoreString(); var fullScoreStrLen = judge.GetFullFormattedScoreString(logBufferPool, out char[] fullScoreStr);
statusbuf.Append(fullScoreStr.TrustedAsArray(), 0, fullScoreStr.Length); statusbuf.Append(fullScoreStr, 0, fullScoreStrLen);
logBufferPool.Return(fullScoreStr);
} }
} }
statusstr.Length = statusbuf.Count; var buf = logBufferPool.Rent(statusbuf.Count);
var sarr = statusstr.TrustedAsArray(); statusbuf.CopyTo(0, buf, 0, statusbuf.Count);
statusbuf.CopyTo(0, sarr, 0, statusbuf.Count); status.SetText(buf, 0, statusbuf.Count);
status.SetText(sarr, 0, statusbuf.Count); logBufferPool.Return(buf);
} }
#endregion #endregion
@@ -386,8 +385,7 @@ namespace Cryville.Crtr {
var hitPlane = new Plane(Vector3.forward, Vector3.zero); var hitPlane = new Plane(Vector3.forward, Vector3.zero);
var r0 = Camera.main.ViewportPointToRay(new Vector3(0, 0, 1)); var r0 = Camera.main.ViewportPointToRay(new Vector3(0, 0, 1));
float dist; hitPlane.Raycast(r0, out float dist);
hitPlane.Raycast(r0, out dist);
var p0 = r0.GetPoint(dist); var p0 = r0.GetPoint(dist);
var r1 = Camera.main.ViewportPointToRay(new Vector3(1, 1, 1)); var r1 = Camera.main.ViewportPointToRay(new Vector3(1, 1, 1));
hitPlane.Raycast(r1, out dist); hitPlane.Raycast(r1, out dist);
@@ -397,18 +395,18 @@ namespace Cryville.Crtr {
screenSize = new Vector2(Screen.width, Screen.height); screenSize = new Vector2(Screen.width, Screen.height);
frustumPlanes = GeometryUtility.CalculateFrustumPlanes(Camera.main); frustumPlanes = GeometryUtility.CalculateFrustumPlanes(Camera.main);
FileInfo chartFile = new FileInfo(Settings.Default.LoadChart); FileInfo chartFile = new(Settings.Default.LoadChart);
FileInfo rulesetFile = new FileInfo(Path.Combine( FileInfo rulesetFile = new(Path.Combine(
Game.GameDataPath, "rulesets", Settings.Default.LoadRuleset Game.GameDataPath, "rulesets", Settings.Default.LoadRuleset
)); ));
if (!rulesetFile.Exists) throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset"); if (!rulesetFile.Exists) throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset");
FileInfo rulesetConfigFile = new FileInfo(Path.Combine( FileInfo rulesetConfigFile = new(Path.Combine(
Game.GameDataPath, "config", "rulesets", Settings.Default.LoadRulesetConfig Game.GameDataPath, "config", "rulesets", Settings.Default.LoadRulesetConfig
)); ));
if (!rulesetConfigFile.Exists) throw new FileNotFoundException("Ruleset config not found\nPlease open the config to generate"); if (!rulesetConfigFile.Exists) throw new FileNotFoundException("Ruleset config not found\nPlease open the config to generate");
using (StreamReader cfgreader = new StreamReader(rulesetConfigFile.FullName, Encoding.UTF8)) { using (StreamReader cfgreader = new(rulesetConfigFile.FullName, Encoding.UTF8)) {
_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() { _rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
MissingMemberHandling = MissingMemberHandling.Error MissingMemberHandling = MissingMemberHandling.Error
}); });
@@ -416,11 +414,11 @@ namespace Cryville.Crtr {
sv = _rscfg.generic.ScrollVelocity; sv = _rscfg.generic.ScrollVelocity;
soundOffset += _rscfg.generic.SoundOffset; soundOffset += _rscfg.generic.SoundOffset;
FileInfo skinFile = new FileInfo(Path.Combine( FileInfo skinFile = new(Path.Combine(
Game.GameDataPath, "skins", rulesetFile.Directory.Name, _rscfg.generic.Skin, ".umgs" Game.GameDataPath, "skins", rulesetFile.Directory.Name, _rscfg.generic.Skin, ".umgs"
)); ));
if (!skinFile.Exists) throw new FileNotFoundException("Skin not found\nPlease specify an available skin in the config"); if (!skinFile.Exists) throw new FileNotFoundException("Skin not found\nPlease specify an available skin in the config");
using (StreamReader reader = new StreamReader(skinFile.FullName, Encoding.UTF8)) { using (StreamReader reader = new(skinFile.FullName, Encoding.UTF8)) {
skin = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() { skin = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
MissingMemberHandling = MissingMemberHandling.Error MissingMemberHandling = MissingMemberHandling.Error
}); });
@@ -446,7 +444,7 @@ namespace Cryville.Crtr {
} }
IEnumerator<float> LoadTextures(List<string> queue) { IEnumerator<float> LoadTextures(List<string> queue) {
Stopwatch stopwatch = new Stopwatch(); Stopwatch stopwatch = new();
stopwatch.Start(); stopwatch.Start();
#if UNITY_5_4_OR_NEWER #if UNITY_5_4_OR_NEWER
DownloadHandlerTexture texHandler = null; DownloadHandlerTexture texHandler = null;
@@ -499,7 +497,7 @@ namespace Cryville.Crtr {
} }
IEnumerator<float> Prehandle() { IEnumerator<float> Prehandle() {
Stopwatch timer = new Stopwatch(); Stopwatch timer = new();
timer.Reset(); timer.Start(); timer.Reset(); timer.Start();
Game.MainLogger.Log(0, "Load/Prehandle", "Prehandling (iteration 2)"); yield return 0; Game.MainLogger.Log(0, "Load/Prehandle", "Prehandling (iteration 2)"); yield return 0;
cbus.BroadcastPreInit(); cbus.BroadcastPreInit();
@@ -618,73 +616,72 @@ namespace Cryville.Crtr {
{ new Identifier("track") , new MotionRegistry(typeof(Vec1)) }, { new Identifier("track") , new MotionRegistry(typeof(Vec1)) },
}; };
using (StreamReader reader = new StreamReader(info.chartFile.FullName, Encoding.UTF8)) { using StreamReader reader = new(info.chartFile.FullName, Encoding.UTF8);
PdtEvaluator.Instance.Reset(); PdtEvaluator.Instance.Reset();
LoadRuleset(info.rulesetFile); loadPregress = .05f; LoadRuleset(info.rulesetFile); loadPregress = .05f;
chart = JsonConvert.DeserializeObject<Chart>(reader.ReadToEnd(), new JsonSerializerSettings() { chart = JsonConvert.DeserializeObject<Chart>(reader.ReadToEnd(), new JsonSerializerSettings() {
MissingMemberHandling = MissingMemberHandling.Error MissingMemberHandling = MissingMemberHandling.Error
}); });
Game.MainLogger.Log(0, "Load/WorkerThread", "Applying ruleset (iteration 1)"); loadPregress = .10f; Game.MainLogger.Log(0, "Load/WorkerThread", "Applying ruleset (iteration 1)"); loadPregress = .10f;
pruleset.PrePatch(chart); pruleset.PrePatch(chart);
Game.MainLogger.Log(0, "Load/WorkerThread", "Batching events"); loadPregress = .20f; Game.MainLogger.Log(0, "Load/WorkerThread", "Batching events"); loadPregress = .20f;
var batcher = new EventBatcher(chart); var batcher = new EventBatcher(chart);
batcher.Forward(); batcher.Forward();
cbus = batcher.Batch(); loadPregress = .30f; cbus = batcher.Batch(); loadPregress = .30f;
LoadSkin(info.skinFile); LoadSkin(info.skinFile);
Game.MainLogger.Log(0, "Load/WorkerThread", "Initializing judge and input"); loadPregress = .35f; Game.MainLogger.Log(0, "Load/WorkerThread", "Initializing judge and input"); loadPregress = .35f;
judge = new Judge(this, pruleset); judge = new Judge(this, pruleset);
PdtEvaluator.Instance.ContextJudge = judge; PdtEvaluator.Instance.ContextJudge = judge;
inputProxy = new InputProxy(pruleset, judge, screenSize); inputProxy = new InputProxy(pruleset, judge, screenSize);
inputProxy.LoadFrom(_rscfg.inputs); inputProxy.LoadFrom(_rscfg.inputs);
if (!inputProxy.IsCompleted()) { if (!inputProxy.IsCompleted()) {
Game.MainLogger.Log(2, "Game", "Input config not completed. Input disabled"); Game.MainLogger.Log(2, "Game", "Input config not completed. Input disabled");
inputProxy.Clear(); inputProxy.Clear();
}
Game.MainLogger.Log(0, "Load/WorkerThread", "Attaching handlers"); loadPregress = .40f;
var ch = new ChartHandler(chart);
cbus.RootState.AttachHandler(ch);
foreach (var gs in cbus.RootState.Children) {
var gh = new GroupHandler((Chart.Group)gs.Key, ch);
gs.Value.AttachHandler(gh);
foreach (var ts in gs.Value.Children) {
ContainerHandler th;
if (ts.Key is Chart.Note) {
th = new NoteHandler((Chart.Note)ts.Key, gh);
}
else {
th = new TrackHandler((Chart.Track)ts.Key, gh);
}
ts.Value.AttachHandler(th);
}
}
cbus.AttachSystems(pskin, judge);
Game.MainLogger.Log(0, "Load/WorkerThread", "Prehandling (iteration 1)"); loadPregress = .60f;
using (var pbus = cbus.Clone(16)) {
pbus.Forward();
}
Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 1)"); loadPregress = .70f;
bbus = cbus.Clone(1, -clippingDist);
Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 2)"); loadPregress = .80f;
tbus = bbus.Clone(2);
Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 3)"); loadPregress = .90f;
nbus = bbus.Clone(3);
loadPregress = 1;
} }
Game.MainLogger.Log(0, "Load/WorkerThread", "Attaching handlers"); loadPregress = .40f;
var ch = new ChartHandler(chart);
cbus.RootState.AttachHandler(ch);
foreach (var gs in cbus.RootState.Children) {
var gh = new GroupHandler((Chart.Group)gs.Key, ch);
gs.Value.AttachHandler(gh);
foreach (var ts in gs.Value.Children) {
ContainerHandler th;
if (ts.Key is Chart.Note) {
th = new NoteHandler((Chart.Note)ts.Key, gh);
}
else {
th = new TrackHandler((Chart.Track)ts.Key, gh);
}
ts.Value.AttachHandler(th);
}
}
cbus.AttachSystems(pskin, judge);
Game.MainLogger.Log(0, "Load/WorkerThread", "Prehandling (iteration 1)"); loadPregress = .60f;
using (var pbus = cbus.Clone(16)) {
pbus.Forward();
}
Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 1)"); loadPregress = .70f;
bbus = cbus.Clone(1, -clippingDist);
Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 2)"); loadPregress = .80f;
tbus = bbus.Clone(2);
Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 3)"); loadPregress = .90f;
nbus = bbus.Clone(3);
loadPregress = 1;
} }
void LoadRuleset(FileInfo file) { void LoadRuleset(FileInfo file) {
DirectoryInfo dir = file.Directory; DirectoryInfo dir = file.Directory;
Game.MainLogger.Log(0, "Load/WorkerThread", "Loading ruleset: {0}", file); Game.MainLogger.Log(0, "Load/WorkerThread", "Loading ruleset: {0}", file);
using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) { using (StreamReader reader = new(file.FullName, Encoding.UTF8)) {
ruleset = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() { ruleset = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
MissingMemberHandling = MissingMemberHandling.Error MissingMemberHandling = MissingMemberHandling.Error
}); });

3
Assets/Cryville/Crtr/Config/IPropertyMasterAdapter.cs
View File

@@ -12,8 +12,7 @@ namespace Cryville.Crtr.Config {
readonly object _target; readonly object _target;
public DefaultPropertyMasterAdapter(object target) { public DefaultPropertyMasterAdapter(object target) {
if (target == null) throw new ArgumentNullException("target"); _target = target ?? throw new ArgumentNullException("target");
_target = target;
} }
public string DefaultCategory { get { return "miscellaneous"; } } public string DefaultCategory { get { return "miscellaneous"; } }

6
Assets/Cryville/Crtr/Config/RulesetConfig.cs
View File

@@ -6,7 +6,7 @@ using System.ComponentModel;
namespace Cryville.Crtr.Config { namespace Cryville.Crtr.Config {
public class RulesetConfig { public class RulesetConfig {
public Generic generic = new Generic(); public Generic generic = new();
public class Generic { public class Generic {
[Category("basic")] [Category("basic")]
[JsonProperty("skin")] [JsonProperty("skin")]
@@ -30,9 +30,9 @@ namespace Cryville.Crtr.Config {
} }
} }
public Dictionary<string, object> configs public Dictionary<string, object> configs
= new Dictionary<string, object>(); = new();
public Dictionary<string, InputEntry> inputs public Dictionary<string, InputEntry> inputs
= new Dictionary<string, InputEntry>(); = new();
public class InputEntry { public class InputEntry {
public string handler; public string handler;
public int type; public int type;

14
Assets/Cryville/Crtr/Config/RulesetConfigPropertyAdapter.cs
View File

@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace Cryville.Crtr.Config { namespace Cryville.Crtr.Config {
internal class RulesetConfigPropertyMasterAdapter : IPropertyMasterAdapter { internal class RulesetConfigPropertyMasterAdapter : IPropertyMasterAdapter {
readonly List<RulesetConfigPropertyAdapter> _props = new List<RulesetConfigPropertyAdapter>(); readonly List<RulesetConfigPropertyAdapter> _props = new();
readonly RulesetConfigStore _store; readonly RulesetConfigStore _store;
public PdtEvaluator Evaluator { get; private set; } public PdtEvaluator Evaluator { get; private set; }
@@ -43,11 +43,11 @@ namespace Cryville.Crtr.Config {
_master = master; _master = master;
_def = def; _def = def;
Name = (string)key.Name; Name = (string)key.Name;
switch (_def.type) { Type = _def.type switch {
case ConfigType.number: Type = PropertyType.Number; break; ConfigType.number => PropertyType.Number,
case ConfigType.number_stepped: Type = PropertyType.NumberStepped; break; ConfigType.number_stepped => PropertyType.NumberStepped,
default: Type = PropertyType.Unknown; break; _ => PropertyType.Unknown,
} };
_rangeOp = new PropOp.Clip(v => { _rangeOp = new PropOp.Clip(v => {
m_range[0] = (double)v.Behind; m_range[0] = (double)v.Behind;
m_range[1] = (double)v.Ahead; m_range[1] = (double)v.Ahead;
@@ -85,7 +85,7 @@ namespace Cryville.Crtr.Config {
public bool SetMapped { get { return false; } } public bool SetMapped { get { return false; } }
readonly PropStores.Float _numst = new PropStores.Float(); readonly PropStores.Float _numst = new();
public object MapValue(object value) { public object MapValue(object value) {
_numst.Value = (float)(double)value; _numst.Value = (float)(double)value;
if (_def.value == null) return _numst.Value; if (_def.value == null) return _numst.Value;

4
Assets/Cryville/Crtr/Config/RulesetConfigStore.cs
View File

@@ -6,8 +6,8 @@ using System.Collections.Generic;
namespace Cryville.Crtr.Config { namespace Cryville.Crtr.Config {
public class RulesetConfigStore { public class RulesetConfigStore {
readonly IntKeyedDictionary<PropSrc> _srcs = new IntKeyedDictionary<PropSrc>(); readonly IntKeyedDictionary<PropSrc> _srcs = new();
readonly Dictionary<string, int> _revMap = new Dictionary<string, int>(); readonly Dictionary<string, int> _revMap = new();
readonly Dictionary<string, object> _values; readonly Dictionary<string, object> _values;
public RulesetConfigStore(Dictionary<Identifier, ConfigDefinition> defs, Dictionary<string, object> values) { public RulesetConfigStore(Dictionary<Identifier, ConfigDefinition> defs, Dictionary<string, object> values) {
_values = values; _values = values;

2
Assets/Cryville/Crtr/Config/UI/InputConfigPanel.cs
View File

@@ -15,7 +15,7 @@ namespace Cryville.Crtr.Config.UI {
PdtRuleset _ruleset; PdtRuleset _ruleset;
InputProxy _proxy; InputProxy _proxy;
readonly Dictionary<Identifier, InputConfigPanelEntry> _entries = new Dictionary<Identifier, InputConfigPanelEntry>(); readonly Dictionary<Identifier, InputConfigPanelEntry> _entries = new();
public void Load(PdtRuleset ruleset, RulesetConfig rulesetConfig) { public void Load(PdtRuleset ruleset, RulesetConfig rulesetConfig) {
_ruleset = ruleset; _ruleset = ruleset;

7
Assets/Cryville/Crtr/Config/UI/InputDialog.cs
View File

@@ -29,7 +29,7 @@ namespace Cryville.Crtr.Config.UI {
int _targetDim; int _targetDim;
PhysicalDimension? _targetPDim; PhysicalDimension? _targetPDim;
bool _targetNotNull; bool _targetNotNull;
readonly Dictionary<InputSource, InputDialogEntry> _recvsrcs = new Dictionary<InputSource, InputDialogEntry>(); readonly Dictionary<InputSource, InputDialogEntry> _recvsrcs = new();
void ShowInternal(Action<InputSource?> callback, string message, InputDefinition def, InputProxy proxy) { void ShowInternal(Action<InputSource?> callback, string message, InputDefinition def, InputProxy proxy) {
_active = true; _active = true;
_callback = callback; _callback = callback;
@@ -56,7 +56,7 @@ namespace Cryville.Crtr.Config.UI {
var result = new PhysicalDimension(); var result = new PhysicalDimension();
foreach (var comp in comps) { foreach (var comp in comps) {
int dim = 1; int dim = 1;
if (comp.Length > 1) dim = int.Parse(comp.Substring(1)); if (comp.Length > 1) dim = int.Parse(comp[1..]);
switch (comp[0]) { switch (comp[0]) {
case 'T': result.Time += dim; break; case 'T': result.Time += dim; break;
case 'L': result.Length += dim; break; case 'L': result.Length += dim; break;
@@ -98,8 +98,7 @@ namespace Cryville.Crtr.Config.UI {
Action<InputEvent> _d_HandleInputEvent; Action<InputEvent> _d_HandleInputEvent;
void HandleInputEvent(InputEvent ev) { void HandleInputEvent(InputEvent ev) {
InputSource src = ev.Identifier.Source; InputSource src = ev.Identifier.Source;
InputDialogEntry entry; if (!_recvsrcs.TryGetValue(src, out InputDialogEntry entry)) {
if (!_recvsrcs.TryGetValue(src, out entry)) {
_recvsrcs.Add(src, entry = AddSourceItem(src)); _recvsrcs.Add(src, entry = AddSourceItem(src));
if (_proxy.IsUsed(src)) { if (_proxy.IsUsed(src)) {
entry.Status |= InputDeviceStatus.Used; entry.Status |= InputDeviceStatus.Used;

3
Assets/Cryville/Crtr/Config/UI/InputDialogEntry.cs
View File

@@ -74,8 +74,7 @@ namespace Cryville.Crtr.Config.UI {
Dictionary<int, InputVector> _activeInputs; Dictionary<int, InputVector> _activeInputs;
public void OnInputEvent(InputEvent ev) { public void OnInputEvent(InputEvent ev) {
var id = ev.Identifier.Id; var id = ev.Identifier.Id;
InputVector lastVec; if (!_activeInputs.TryGetValue(id, out InputVector lastVec)) {
if (!_activeInputs.TryGetValue(id, out lastVec)) {
if (ev.To.IsNull) return; if (ev.To.IsNull) return;
_activeInputs.Add(id, lastVec = ev.To.Vector); _activeInputs.Add(id, lastVec = ev.To.Vector);
} }

Some files were not shown because too many files have changed in this diff Show More