From 28c878f3e522ffb7d5ec0f9c934509459baa3367 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Fri, 3 Mar 2023 13:34:12 +0800 Subject: [PATCH] Code cleanup. --- .../Cryville/Common/Collections/Generic/PairCollection.cs | 8 ++++---- Assets/Cryville/Common/Font/FontTable.cs | 2 +- Assets/Cryville/Common/Pdt/PdtExpression.cs | 8 ++++---- Assets/Cryville/Common/Pdt/PdtInterpreter.cs | 2 +- Assets/Cryville/Common/Pdt/PdtOperator.cs | 2 +- Assets/Cryville/Common/Unity/UI/SetParameterBehaviour.cs | 2 +- Assets/Cryville/Crtr/Browsing/PVPNumber.cs | 4 ++-- Assets/Cryville/Crtr/Components/SectionalGameObject.cs | 2 +- Assets/Cryville/Crtr/Components/SpriteScale3.cs | 4 ++-- Assets/Cryville/Crtr/Components/SpriteText.cs | 2 +- Assets/Cryville/Crtr/Event/ContainerHandler.cs | 6 +++--- Assets/Cryville/Crtr/Game.cs | 6 +++--- Assets/Cryville/Crtr/Motion.cs | 8 ++++---- Assets/Cryville/Crtr/PdtEvaluator.cs | 2 +- Assets/Cryville/Crtr/PropOp.cs | 4 ++-- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Assets/Cryville/Common/Collections/Generic/PairCollection.cs b/Assets/Cryville/Common/Collections/Generic/PairCollection.cs index f88da28..3d73d3d 100644 --- a/Assets/Cryville/Common/Collections/Generic/PairCollection.cs +++ b/Assets/Cryville/Common/Collections/Generic/PairCollection.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; namespace Cryville.Common.Collections.Generic { public struct PairCollection : IDisposable { public void Dispose() { } - IPairList _pairList; - IDictionary _dictionary; + readonly IPairList _pairList; + readonly IDictionary _dictionary; public PairCollection(object collection) : this() { var type = collection.GetType(); if (typeof(IPairList).IsAssignableFrom(type)) _pairList = (IPairList)collection; @@ -20,8 +20,8 @@ namespace Cryville.Common.Collections.Generic { } public struct PairCollection : IDisposable { public void Dispose() { } - IPairList _pairList; - IDictionary _dictionary; + readonly IPairList _pairList; + readonly IDictionary _dictionary; public PairCollection(object collection) : this() { var type = collection.GetType(); if (typeof(IPairList).IsAssignableFrom(type)) _pairList = (IPairList)collection; diff --git a/Assets/Cryville/Common/Font/FontTable.cs b/Assets/Cryville/Common/Font/FontTable.cs index d593b9b..acb6386 100644 --- a/Assets/Cryville/Common/Font/FontTable.cs +++ b/Assets/Cryville/Common/Font/FontTable.cs @@ -45,7 +45,7 @@ namespace Cryville.Common.Font { return tableDirectoryOffsets; } public override TableDirectory GetSubTable(UInt32 item) { - var i = (UInt32)item; + var i = item; return new TableDirectory(Reader, i); } } diff --git a/Assets/Cryville/Common/Pdt/PdtExpression.cs b/Assets/Cryville/Common/Pdt/PdtExpression.cs index 2a6b3e3..641f9f0 100644 --- a/Assets/Cryville/Common/Pdt/PdtExpression.cs +++ b/Assets/Cryville/Common/Pdt/PdtExpression.cs @@ -92,7 +92,7 @@ namespace Cryville.Common.Pdt { } } public partial class PdtInterpreter { - readonly static Dictionary OP_PRIORITY = new Dictionary { + static readonly Dictionary OP_PRIORITY = new Dictionary { { '@', 7 }, { '*', 6 }, { '/', 6 }, { '%', 6 }, { '+', 5 }, { '-', 5 }, @@ -103,7 +103,7 @@ namespace Cryville.Common.Pdt { { ',', 0 }, { '$', -1 }, }; - readonly static Dictionary OP_TYPE = new Dictionary { + static readonly Dictionary OP_TYPE = new Dictionary { { '@', 0 }, { '*', 0 }, { '/', 0 }, { '%', 0 }, { '+', 0 }, { '-', 0 }, @@ -115,7 +115,7 @@ namespace Cryville.Common.Pdt { { '$', -1 }, }; - readonly static PdtExpression _emptyexp; + static readonly PdtExpression _emptyexp; static PdtInterpreter() { var ins = new LinkedList(); ins.AddLast(new PdtInstruction.PushConstant( @@ -143,7 +143,7 @@ namespace Cryville.Common.Pdt { public override string ToString() { return string.Format("0x{0:x4}: {1}", Type, Value); } - public readonly static PdtExpToken EmptyOperator = new PdtExpToken { + public static readonly PdtExpToken EmptyOperator = new PdtExpToken { Type = 0x0080, Value = "$", }; diff --git a/Assets/Cryville/Common/Pdt/PdtInterpreter.cs b/Assets/Cryville/Common/Pdt/PdtInterpreter.cs index 8d3a8a3..7ca6ccb 100644 --- a/Assets/Cryville/Common/Pdt/PdtInterpreter.cs +++ b/Assets/Cryville/Common/Pdt/PdtInterpreter.cs @@ -28,7 +28,7 @@ namespace Cryville.Common.Pdt { /// 0x1000End of Key /// /// - readonly static int[] cm = new int[] { + static readonly int[] cm = new int[] { // 0 1 2 3 4 5 6 7 8 9 A B C D E F 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, diff --git a/Assets/Cryville/Common/Pdt/PdtOperator.cs b/Assets/Cryville/Common/Pdt/PdtOperator.cs index f71a21e..29d736e 100644 --- a/Assets/Cryville/Common/Pdt/PdtOperator.cs +++ b/Assets/Cryville/Common/Pdt/PdtOperator.cs @@ -4,7 +4,7 @@ namespace Cryville.Common.Pdt { /// /// PDT operator. /// - public unsafe abstract class PdtOperator { + public abstract unsafe class PdtOperator { byte* _prmem; int _loadindex; readonly PdtVariableMemory[] _operands; diff --git a/Assets/Cryville/Common/Unity/UI/SetParameterBehaviour.cs b/Assets/Cryville/Common/Unity/UI/SetParameterBehaviour.cs index c72f59d..4bd23a5 100644 --- a/Assets/Cryville/Common/Unity/UI/SetParameterBehaviour.cs +++ b/Assets/Cryville/Common/Unity/UI/SetParameterBehaviour.cs @@ -3,6 +3,6 @@ using UnityEngine; namespace Cryville.Common.Unity.UI { public abstract class SetParameterBehaviour : StateMachineBehaviour { [SerializeField] protected string m_name; - public override abstract void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex); + public abstract override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex); } } diff --git a/Assets/Cryville/Crtr/Browsing/PVPNumber.cs b/Assets/Cryville/Crtr/Browsing/PVPNumber.cs index c10688b..02fa7a0 100644 --- a/Assets/Cryville/Crtr/Browsing/PVPNumber.cs +++ b/Assets/Cryville/Crtr/Browsing/PVPNumber.cs @@ -9,11 +9,11 @@ namespace Cryville.Crtr.Browsing { public override object Value { get { float s_value = GetDisplayValue(); - return IntegerMode ? (object)(int)s_value : (object)s_value; + return IntegerMode ? (int)s_value : (object)s_value; } set { if (value is double) m_value = (double)value; - else m_value = IntegerMode ? (double)(int)value : (double)(float)value; + else m_value = IntegerMode ? (int)value : (double)(float)value; float s_value = GetDisplayValue(); m_text.text = s_value.ToString(); if (Range != null && MaxStep == 0) { diff --git a/Assets/Cryville/Crtr/Components/SectionalGameObject.cs b/Assets/Cryville/Crtr/Components/SectionalGameObject.cs index 0d3dd6c..1134336 100644 --- a/Assets/Cryville/Crtr/Components/SectionalGameObject.cs +++ b/Assets/Cryville/Crtr/Components/SectionalGameObject.cs @@ -72,7 +72,7 @@ namespace Cryville.Crtr.Components { public op_set_shape(PolygonSGO self) : base(1) { _self = self; } - protected unsafe override void Execute() { + protected override unsafe void Execute() { var o = GetOperand(0); if (o.Type != PdtInternalType.Vector) throw new ArgumentException("Not a vector"); _self._shapeLength = (o.Length - sizeof(int)) / sizeof(Vector2); diff --git a/Assets/Cryville/Crtr/Components/SpriteScale3.cs b/Assets/Cryville/Crtr/Components/SpriteScale3.cs index 21dae88..2f7df55 100644 --- a/Assets/Cryville/Crtr/Components/SpriteScale3.cs +++ b/Assets/Cryville/Crtr/Components/SpriteScale3.cs @@ -8,12 +8,12 @@ namespace Cryville.Crtr.Components { SubmitProperty("border", new PropOp.Vector2(v => Border = v)); } - readonly static Dictionary uvrefl + static readonly Dictionary uvrefl = new Dictionary() { {-0.5f, 0}, {-0.4f, 1}, {0.4f, 2}, {0.5f, 3}, }; static Vector2[] _origuv; - protected new static Vector2[] OriginalUV { + protected static new Vector2[] OriginalUV { get { if (_origuv == null) { var m = GenericResources.Meshes["quad_scale3h"]; diff --git a/Assets/Cryville/Crtr/Components/SpriteText.cs b/Assets/Cryville/Crtr/Components/SpriteText.cs index 10c589b..ee45005 100644 --- a/Assets/Cryville/Crtr/Components/SpriteText.cs +++ b/Assets/Cryville/Crtr/Components/SpriteText.cs @@ -19,7 +19,7 @@ namespace Cryville.Crtr.Components { public op_set_frames(SpriteText self) : base(2) { _self = self; } - protected unsafe override void Execute() { + protected override unsafe void Execute() { var keys = GetOperand(0).AsString(); var values = GetOperand(1); int arrtype; int len; diff --git a/Assets/Cryville/Crtr/Event/ContainerHandler.cs b/Assets/Cryville/Crtr/Event/ContainerHandler.cs index ce439e0..7fd83e9 100644 --- a/Assets/Cryville/Crtr/Event/ContainerHandler.cs +++ b/Assets/Cryville/Crtr/Event/ContainerHandler.cs @@ -82,9 +82,9 @@ namespace Cryville.Crtr.Event { Anchor a_cur; Anchor a_head; Anchor a_tail; - readonly static int _a_cur = IdentifierManager.SharedInstance.Request("cur"); - readonly static int _a_head = IdentifierManager.SharedInstance.Request("head"); - readonly static int _a_tail = IdentifierManager.SharedInstance.Request("tail"); + static readonly int _a_cur = IdentifierManager.SharedInstance.Request("cur"); + static readonly int _a_head = IdentifierManager.SharedInstance.Request("head"); + static readonly int _a_tail = IdentifierManager.SharedInstance.Request("tail"); double atime_head; double atime_tail; public Anchor RegisterAnchor(int name, bool dyn = false, int propSrcCount = 0) { diff --git a/Assets/Cryville/Crtr/Game.cs b/Assets/Cryville/Crtr/Game.cs index 684a151..8d686f6 100644 --- a/Assets/Cryville/Crtr/Game.cs +++ b/Assets/Cryville/Crtr/Game.cs @@ -24,7 +24,7 @@ namespace Cryville.Crtr { get; private set; } - public readonly static string FileProtocolPrefix + public static readonly string FileProtocolPrefix #if UNITY_STANDALONE_WIN = "file:///"; #elif UNITY_ANDROID @@ -37,9 +37,9 @@ namespace Cryville.Crtr { public static SimpleSequencerSource AudioSequencer; public static SimpleSequencerSession AudioSession; public static InputManager InputManager; - public readonly static NetworkTaskWorker NetworkTaskWorker = new NetworkTaskWorker(); + public static readonly NetworkTaskWorker NetworkTaskWorker = new NetworkTaskWorker(); - public readonly static JsonSerializerSettings GlobalJsonSerializerSettings + public static readonly JsonSerializerSettings GlobalJsonSerializerSettings = new JsonSerializerSettings() { DefaultValueHandling = DefaultValueHandling.Ignore, }; diff --git a/Assets/Cryville/Crtr/Motion.cs b/Assets/Cryville/Crtr/Motion.cs index 9ce899c..4a999f7 100644 --- a/Assets/Cryville/Crtr/Motion.cs +++ b/Assets/Cryville/Crtr/Motion.cs @@ -360,7 +360,7 @@ namespace Cryville.Crtr { public abstract void LerpWith(Vector start, float lerpedTime, ref Vector result); public abstract float DelerpWith(Vector start, Vector value); public abstract bool IsZero(); - public override abstract string ToString(); + public abstract override string ToString(); public abstract unsafe void ToArray(float* arr); public Vector Clone() { @@ -610,8 +610,8 @@ namespace Cryville.Crtr { } } } - w = aw ? rw : (float?)null; - h = ah ? rh : (float?)null; + w = aw ? rw : null; + h = ah ? rh : null; } public static VecPtComp Parse(string s) { @@ -968,7 +968,7 @@ namespace Cryville.Crtr { public class VectorOp : PropOp { readonly Action _cb; public VectorOp(Action cb) { _cb = cb; } - protected unsafe override void Execute() { + protected override unsafe void Execute() { var op = GetOperand(0); float[] values; if (op.Type == PdtInternalType.Number) { diff --git a/Assets/Cryville/Crtr/PdtEvaluator.cs b/Assets/Cryville/Crtr/PdtEvaluator.cs index 1d97fb1..2622d39 100644 --- a/Assets/Cryville/Crtr/PdtEvaluator.cs +++ b/Assets/Cryville/Crtr/PdtEvaluator.cs @@ -644,7 +644,7 @@ namespace Cryville.Crtr { } } #endregion - unsafe static class oputil { + static unsafe class oputil { public static float AsNumber(PropSrc src) { if (src == null) throw new ArgumentNullException("src"); int type; byte[] value; diff --git a/Assets/Cryville/Crtr/PropOp.cs b/Assets/Cryville/Crtr/PropOp.cs index c28e03e..cb08ad3 100644 --- a/Assets/Cryville/Crtr/PropOp.cs +++ b/Assets/Cryville/Crtr/PropOp.cs @@ -63,7 +63,7 @@ namespace Cryville.Crtr { public class StringArray : PropOp { readonly Action _cb; public StringArray(Action cb) { _cb = cb; } - protected unsafe override void Execute() { + protected override unsafe void Execute() { var op = GetOperand(0); int arrtype; int len; op.GetArraySuffix(out arrtype, out len); @@ -100,7 +100,7 @@ namespace Cryville.Crtr { } } public class Enum : PropOp { - readonly static Dictionary _cache = new Dictionary(); + static readonly Dictionary _cache = new Dictionary(); readonly Action _cb; readonly Func _caster; static Enum() {