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

Prune code.

Browse Source
This commit is contained in:
PopSlime
2022-09-30 18:19:19 +08:00
parent e8e36b83bd
commit cd4ea557c3
41 changed files with 22 additions and 3592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
Assets/Cryville/Crtr/TrackHandler.cs
View File

@@ -5,12 +5,8 @@ using Logger = Cryville.Common.Logger;
namespace Cryville.Crtr {
class TrackHandler : ContainerHandler {
// private StampedState cs;
readonly GroupHandler gh;
readonly Chart.Track track;
// List<GameObject> trackPool = new List<GameObject>();
// Dictionary<StampedEvent, GameObject> notePool = new Dictionary<StampedEvent, GameObject>();
public TrackHandler(GroupHandler gh, Chart.Track _track) : base() {
track = _track;
@@ -23,79 +19,6 @@ namespace Cryville.Crtr {
}
}
/*EventPrehandler ph;
List<StampedEvent> sevs = new List<StampedEvent>();
public void StartPrehandler(EventPrehandler parent) {
List<Chart.Event> appevs = new List<Chart.Event>();
/*foreach (Chart.Note ev in track.notes) {
if (ev.duration > 0) {
for (float b = 0f; b < ev.duration; b += ev.judgeinterval) {
appevs.Add(new Chart.Track.InternalJudgement() { beat = ev.beat, BeatOffset = b, Parent = ev });
}
}
}
ph = new EventPrehandler(
parent.chart,
track.motions.Cast<Chart.Event>(),
parent
);
}
public void PrehandleToTime(float toTime) {
ph.ForwardToTime(toTime, ev => { });
/*phs.ForwardToTime(toTime, ev => {
if (ev is Chart.Note) {
var tev = (Chart.Note)ev;
sevs.Add(new StampedEvent.Judge() {
Time = phs.Time - judge * tev.tol,
EndTime = phs.Time + judge * tev.tol,
Event = tev,
Type = tev.wipe ? JudgementType.Held : JudgementType.Attack,
JudgeArea = new Area() {
Point1 = phs.Point,
Point2 = phs.Point + new Chart.Point(0f, 0.1f, 0f, 0.1f).ToRelative(hitRect),
Type = AreaType.Circle
}
});
}
else if (ev is Chart.InternalJudgement) {
var tev = (Chart.InternalJudgement)ev;
sevs.Add(new StampedEvent.Judge() {
Time = phs.Time - judge * tev.Parent.tol,
EndTime = phs.Time + judge * tev.Parent.tol,
Event = tev,
Type = JudgementType.Held,
JudgeArea = new Area() {
Point1 = phs.Point,
Point2 = phs.Point + new Chart.Point(0f, 0.1f, 0f, 0.1f).ToRelative(hitRect),
Type = AreaType.Circle
}
});
}
});
}
public void EndPrehandler(StampedState parent) {
sevs = ph.Result;
cs = new StampedState(gh.ch.chart, sevs, parent);
}*/
/*List<StampedEvent.Judge> judgements = new List<StampedEvent.Judge>();
public void SendInput(int id, TouchPhase phase, Vector2 jpos) {
for (int i = judgements.Count - 1; i >= 0; i--) {
if (judgements[i].JudgeArea.Contains(jpos)) {
if (phase == TouchPhase.Began && judgements[i].Type == JudgementType.Attack) {
gh.ch.ReportJudge(true);
judgements.RemoveAt(i);
}
else if ((phase == TouchPhase.Stationary || phase == TouchPhase.Moved) && judgements[i].Type == JudgementType.Held) {
gh.ch.ReportJudge(true);
judgements.RemoveAt(i);
}
}
}
}*/
public override void Init() {
base.Init();
sgos = gogroup.GetComponentsInChildren<SectionalGameObject>();
@@ -128,13 +51,11 @@ namespace Cryville.Crtr {
}
}
// readonly SectionalGameObject trackObj;
Vector3 cpt; // Current point
Vector3 ppt = Vector3.zero; // Previous point
Vector3 pwp = Vector3.zero; // Previous world point
float ptime; // Previous time
float length;
// readonly GameObject obj;
public override void Update(ContainerState s, StampedEvent ev) {
base.Update(s, ev);
@@ -142,17 +63,6 @@ namespace Cryville.Crtr {
var tpt = s.ScreenPoint;
var tsv = s.ScrollVelocity;
/*Vector3 p = (Vector3)tpt - cpt;
p.z = prevz + (ts.Time - prevtime) * Main.sv * tsv;
Quaternion rotq = Quaternion.Euler(ts.Direction);
var np = prevwp + rotq * (p - prevp);
prevp = p;
prevz = p.z;
p = np;
prevwp = p;
prevtime = ts.Time;*/
Vector3 dpt = (Vector3)tpt - ppt; // Delta 2D point
dpt.z = (s.Time - ptime) * ChartPlayer.sv * tsv; // Delta Z
Quaternion rotq = Quaternion.Euler(s.Direction); // Rotation
@@ -171,7 +81,6 @@ namespace Cryville.Crtr {
ptime = s.Time;
if (!gogroup || s.CloneType == 3) return;
// sgos = gogroup.GetComponentsInChildren<PolygonSGO>();
var p = GetCurrentWorldPoint();
foreach (var i in sgos)
i.AppendPoint(p, s.QuatDir);
@@ -200,13 +109,6 @@ namespace Cryville.Crtr {
CloseAnchor("tail");
if (s.CloneType == 0 || s.CloneType == 2) {
EndUpdatePosition(ts);
/*if (trackObj != null) {
trackObj.AppendPoint(p);
trackObj.Seal();
}*/
// sgos = gogroup.GetComponentsInChildren<PolygonSGO>();
var p = GetCurrentWorldPoint();
foreach (var i in sgos) {
i.AppendPoint(p, s.QuatDir);
@@ -222,13 +124,6 @@ namespace Cryville.Crtr {
void EndUpdatePosition(ContainerState s) {
var tpt = s.ScreenPoint;
var tsv = s.ScrollVelocity;
/*float endtime = ts.Time + Main.fogDist;
Vector3 ep;
ep = (Vector3)tpt - (Vector3)cpt;
ep.z = (endtime - cs.Time) * Main.sv * tsv;
Quaternion erotq = Quaternion.Euler(ts.Direction);
ep = pwp + erotq * (ep - ppt);*/
Vector3 dpt = (Vector3)tpt - ppt;
dpt.z = (s.Time - ptime) * ChartPlayer.sv * tsv;