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

Revert "Revise update clone type to update depth."

Browse Source 
This reverts commit 4185303bd2.
This commit is contained in:
PopSlime
2023-01-20 22:26:56 +08:00
parent 39bc34fd42
commit be64bc76b5
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ namespace Cryville.Crtr {
}
if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
}
public void MatchDynamic(ContainerState state, byte depth) {
public void MatchDynamic(ContainerState state) {
if (dynprops.Count == 0 && dynelems.Count == 0) return;
Profiler.BeginSample("SkinContainer.MatchDynamic");
ChartPlayer.etor.ContextState = state;
@@ -76,7 +76,7 @@ namespace Cryville.Crtr {
var psrcs = p.Context.ReadContext.PropSrcs;
if (psrcs != null) ChartPlayer.etor.ContextCascadeInsert(psrcs);
var prop = GetPropOp(p.Context.WriteTransform, p.Key);
if (depth > prop.UpdateDepth) continue;
if (state.CloneType > prop.UpdateCloneType) continue;
ChartPlayer.etor.Evaluate(prop.Operator, p.Value);
if (psrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
}
@@ -85,7 +85,7 @@ namespace Cryville.Crtr {
var psrcs = e.Context.ReadContext.PropSrcs;
if (psrcs != null) ChartPlayer.etor.ContextCascadeInsert(psrcs);
var nctx = e.Selectors.MatchDynamic(state, e.Context.ReadContext);
if (nctx != null) MatchDynamic(e.Element, state, depth, new RuntimeSkinContext(
if (nctx != null) MatchDynamic(e.Element, state, new RuntimeSkinContext(
nctx, e.Context, e.Selectors.annotations.Contains("if"), e.Selectors.annotations.Contains("then")
));
if (psrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
@@ -94,7 +94,7 @@ namespace Cryville.Crtr {
ChartPlayer.etor.ContextState = null;
Profiler.EndSample();
}
void MatchDynamic(SkinElement rel, ContainerState state, byte depth, RuntimeSkinContext ctx) {
void MatchDynamic(SkinElement rel, ContainerState state, RuntimeSkinContext ctx) {
var rc = ctx.ReadContext;
ChartPlayer.etor.ContextTransform = rc.Transform;
if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeInsert(rc.PropSrcs);
@@ -102,14 +102,14 @@ namespace Cryville.Crtr {
if (p.Key.Name == 0)
throw new InvalidOperationException("Component creation in dynamic context is not allowed");
var prop = GetPropOp(ctx.WriteTransform, p.Key);
if (depth > prop.UpdateDepth) continue;
if (state.CloneType > prop.UpdateCloneType) continue;
ChartPlayer.etor.Evaluate(prop.Operator, p.Value);
}
ChartPlayer.etor.ContextTransform = null;
foreach (var r in rel.elements) {
if (!r.Key.IsUpdatable(state)) continue;
var nctx = r.Key.MatchDynamic(state, rc);
if (nctx != null) MatchDynamic(r.Value, state, depth, new RuntimeSkinContext(
if (nctx != null) MatchDynamic(r.Value, state, new RuntimeSkinContext(
nctx, ctx, r.Key.annotations.Contains("if"), r.Key.annotations.Contains("then")
));
}