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

Remove track property on note event. Attach contextual state on skin evaluation.

Browse Source
This commit is contained in:
PopSlime
2022-11-19 01:04:15 +08:00
parent 3ed7e566dd
commit 3b65dbea5b
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,14 +377,6 @@ namespace Cryville.Crtr {
} }
} }
public Note() {
SubmitPropSrc("track", new PropSrc.Float(() => {
var i = motions.FirstOrDefault(m => m.RelativeNode == null && m.Name == "track");
if (i == null) return ((Vec1)ChartPlayer.motionRegistry["track"].InitValue).Value;
else return ((Vec1)i.AbsoluteValue).Value;
}));
}
public override EventList GetEventsOfType(string type) { public override EventList GetEventsOfType(string type) {
switch (type) { switch (type) {
case "judges": return new EventList<Judge>(judges); case "judges": return new EventList<Judge>(judges);

4
Assets/Cryville/Crtr/SkinContainer.cs
View File

@@ -29,7 +29,9 @@ namespace Cryville.Crtr {
else { else {
ChartPlayer.etor.ContextTransform = obj; ChartPlayer.etor.ContextTransform = obj;
ChartPlayer.etor.ContextEvent = context.Container; ChartPlayer.etor.ContextEvent = context.Container;
ChartPlayer.etor.ContextState = context;
ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value); ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
ChartPlayer.etor.ContextState = null;
ChartPlayer.etor.ContextEvent = null; ChartPlayer.etor.ContextEvent = null;
ChartPlayer.etor.ContextTransform = null; ChartPlayer.etor.ContextTransform = null;
} }
@@ -58,7 +60,9 @@ namespace Cryville.Crtr {
if (p.Value.IsConstant) continue; if (p.Value.IsConstant) continue;
ChartPlayer.etor.ContextTransform = obj; ChartPlayer.etor.ContextTransform = obj;
ChartPlayer.etor.ContextEvent = context.Container; ChartPlayer.etor.ContextEvent = context.Container;
ChartPlayer.etor.ContextState = context;
ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value); ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
ChartPlayer.etor.ContextState = null;
ChartPlayer.etor.ContextEvent = null; ChartPlayer.etor.ContextEvent = null;
ChartPlayer.etor.ContextTransform = null; ChartPlayer.etor.ContextTransform = null;
} }

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

@@ -115,7 +115,9 @@ namespace Cryville.Crtr {
public override Transform Match(ContainerState h, Transform a, Transform ot = null) { public override Transform Match(ContainerState h, Transform a, Transform ot = null) {
ChartPlayer.etor.ContextTransform = a; ChartPlayer.etor.ContextTransform = a;
ChartPlayer.etor.ContextEvent = h.Container; ChartPlayer.etor.ContextEvent = h.Container;
ChartPlayer.etor.ContextState = h;
ChartPlayer.etor.Evaluate(_op, _exp); ChartPlayer.etor.Evaluate(_op, _exp);
ChartPlayer.etor.ContextState = null;
ChartPlayer.etor.ContextEvent = null; ChartPlayer.etor.ContextEvent = null;
ChartPlayer.etor.ContextTransform = null; ChartPlayer.etor.ContextTransform = null;
return _flag ? a : null; return _flag ? a : null;