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

Code cleanup.

Browse Source
This commit is contained in:
PopSlime
2023-04-22 21:08:06 +08:00
parent 2784544884
commit d72afaa75b
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,16 +36,6 @@ namespace Cryville.Common.Pdt {
return Operate(target, _framecount, true);
}
/// <summary>
/// Patches an expression with a lefthand variable and a compound operator.
/// </summary>
/// <param name="target">The name of the lefthand variable.</param>
/// <param name="op">The name of the compound operator.</param>
/// <param name="exp">The expression.</param>
public void PatchCompound(int target, int op, PdtExpression exp) {
exp.Instructions.AddFirst(new PdtInstruction.PushVariable(target));
exp.Instructions.AddLast(new PdtInstruction.Operate(op, 2));
}
/// <summary>
/// Optimizes an expression by merging its instructions.
/// </summary>
/// <param name="exp">The expression to optimize.</param>

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

@@ -27,6 +27,16 @@ namespace Cryville.Common.Pdt {
}
return r;
}
/// <summary>
/// Patches an expression with a lefthand variable and a compound operator.
/// </summary>
/// <param name="target">The name of the lefthand variable.</param>
/// <param name="op">The name of the compound operator.</param>
/// <param name="exp">The expression.</param>
public static void PatchCompound(int target, int op, PdtExpression exp) {
exp.Instructions.AddFirst(new PdtInstruction.PushVariable(target));
exp.Instructions.AddLast(new PdtInstruction.Operate(op, 2));
}
}
internal abstract class PdtInstruction {
internal abstract void Execute(PdtEvaluatorBase etor);

7
Assets/Cryville/Common/Unity/Input/UnityTouchHandler.cs
View File

@@ -59,11 +59,8 @@ namespace Cryville.Common.Unity.Input {
var t = unity::Input.GetTouch(i);
Vector2 pos = UnityCameraUtils.ScreenToWorldPoint(t.position);
var vec = new InputVector(time, pos);
if (t.phase == TouchPhase.Began || t.phase == TouchPhase.Stationary || t.phase == TouchPhase.Moved) {
handler.Feed(0, t.fingerId, vec);
}
else if (t.phase == TouchPhase.Ended || t.phase == TouchPhase.Canceled) {
handler.Feed(0, t.fingerId, vec);
handler.Feed(0, t.fingerId, vec);
if (t.phase == TouchPhase.Ended || t.phase == TouchPhase.Canceled) {
handler.Feed(0, t.fingerId, new InputVector(time));
}
}

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

@@ -252,7 +252,7 @@ namespace Cryville.Crtr {
UnityEngine.Profiling.Profiler.GetTotalReservedMemory()
#endif
);
if (RMVPool.Shared != null) {
if (MotionNodePool.Shared != null) {
statusbuf.AppendFormat(
"\nPools: RMV {0}, MC {1}, MN {2}",
RMVPool.Shared.RentedCount,

2
Assets/Cryville/Crtr/Ruleset.cs
View File

@@ -47,7 +47,7 @@ namespace Cryville.Crtr {
if (judge.scores != null) {
foreach (var s in judge.scores) {
if (s.Key.op != default(Identifier))
etor.PatchCompound(s.Key.name.Key, s.Key.op.Key, s.Value);
PdtExpression.PatchCompound(s.Key.name.Key, s.Key.op.Key, s.Value);
etor.Optimize(s.Value);
}
}