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

Implement dynamic stack for skin.

Browse Source
This commit is contained in:
PopSlime
2023-01-31 22:50:24 +08:00
parent 5727fcf177
commit 450bd52095
2 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,13 +7,20 @@ using UnityEngine.Profiling;
namespace Cryville.Crtr { namespace Cryville.Crtr {
public class SkinContainer { public class SkinContainer {
readonly PdtSkin skin; readonly PdtSkin skin;
readonly List<DynamicProperty> dynprops = new List<DynamicProperty>(); readonly DynamicStack[] _stacks = new DynamicStack[2];
class DynamicStack {
public readonly List<DynamicProperty> Properties = new List<DynamicProperty>();
public readonly List<DynamicElement> Elements = new List<DynamicElement>();
public void Clear() {
Properties.Clear();
Elements.Clear();
}
}
struct DynamicProperty { struct DynamicProperty {
public RuntimeSkinContext Context { get; set; } public RuntimeSkinContext Context { get; set; }
public SkinPropertyKey Key { get; set; } public SkinPropertyKey Key { get; set; }
public PdtExpression Value { get; set; } public PdtExpression Value { get; set; }
} }
readonly List<DynamicElement> dynelems = new List<DynamicElement>();
struct DynamicElement { struct DynamicElement {
public RuntimeSkinContext Context { get; set; } public RuntimeSkinContext Context { get; set; }
public SkinSelectors Selectors { get; set; } public SkinSelectors Selectors { get; set; }
@@ -21,59 +28,73 @@ namespace Cryville.Crtr {
} }
public SkinContainer(PdtSkin _skin) { public SkinContainer(PdtSkin _skin) {
skin = _skin; skin = _skin;
for (int i = 0; i < _stacks.Length; i++) _stacks[i] = new DynamicStack();
} }
public void MatchStatic(ContainerState state) { public void MatchStatic(ContainerState state) {
dynprops.Clear(); dynelems.Clear(); var stack = _stacks[0];
stack.Clear();
ChartPlayer.etor.ContextState = state; ChartPlayer.etor.ContextState = state;
ChartPlayer.etor.ContextEvent = state.Container; ChartPlayer.etor.ContextEvent = state.Container;
MatchStatic(skin, state, new RuntimeSkinContext(state.Handler.SkinContext)); MatchStatic(skin, state, stack, new RuntimeSkinContext(state.Handler.SkinContext));
ChartPlayer.etor.ContextEvent = null; ChartPlayer.etor.ContextEvent = null;
ChartPlayer.etor.ContextState = null; ChartPlayer.etor.ContextState = null;
} }
void MatchStatic(SkinElement rel, ContainerState state, RuntimeSkinContext ctx) { void MatchStatic(SkinElement rel, ContainerState state, DynamicStack stack, RuntimeSkinContext ctx) {
var rc = ctx.ReadContext; var rc = ctx.ReadContext;
ChartPlayer.etor.ContextTransform = rc.Transform; ChartPlayer.etor.ContextTransform = rc.Transform;
if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeInsert(rc.PropSrcs); if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeInsert(rc.PropSrcs);
foreach (var p in rel.properties) { foreach (var p in rel.properties) {
p.Key.ExecuteStatic(state, ctx, p.Value); p.Key.ExecuteStatic(state, ctx, p.Value);
if (p.Key.IsValueRequired && !p.Value.IsConstant) dynprops.Add( if (p.Key.IsValueRequired && !p.Value.IsConstant) stack.Properties.Add(
new DynamicProperty { Context = ctx, Key = p.Key, Value = p.Value } new DynamicProperty { Context = ctx, Key = p.Key, Value = p.Value }
); );
} }
ChartPlayer.etor.ContextTransform = null; ChartPlayer.etor.ContextTransform = null;
foreach (var r in rel.elements) { foreach (var e in rel.elements) {
try { try {
var nctxs = r.Key.MatchStatic(state, rc); var nctxs = e.Key.MatchStatic(state, rc);
var roflag = r.Key.annotations.Contains("if"); if (nctxs != null) {
var woflag = r.Key.annotations.Contains("then"); var roflag = e.Key.annotations.Contains("if");
var woflag = e.Key.annotations.Contains("then");
foreach (var nctx in nctxs) { foreach (var nctx in nctxs) {
var nrctx = new RuntimeSkinContext(nctx, ctx, roflag, woflag); var nrctx = new RuntimeSkinContext(nctx, ctx, roflag, woflag);
MatchStatic(r.Value, state, nrctx); MatchStatic(e.Value, state, stack, nrctx);
}
} }
} }
catch (SelectorNotAvailableException) { catch (SelectorNotAvailableException) {
dynelems.Add( stack.Elements.Add(
new DynamicElement { Context = ctx, Selectors = r.Key, Element = r.Value } new DynamicElement { Context = ctx, Selectors = e.Key, Element = e.Value }
); );
} }
} }
if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeDiscard(); if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
} }
public void MatchDynamic(ContainerState state) { public void MatchDynamic(ContainerState state) {
if (dynprops.Count == 0 && dynelems.Count == 0) return; var stack = _stacks[state.CloneType >> 1];
var nstack = (state.CloneType >> 1) + 1 < _stacks.Length ? _stacks[(state.CloneType >> 1) + 1] : null;
if (nstack != null) nstack.Clear();
if (stack.Properties.Count == 0 && stack.Elements.Count == 0) return;
Profiler.BeginSample("SkinContainer.MatchDynamic"); Profiler.BeginSample("SkinContainer.MatchDynamic");
ChartPlayer.etor.ContextState = state; ChartPlayer.etor.ContextState = state;
ChartPlayer.etor.ContextEvent = state.Container; ChartPlayer.etor.ContextEvent = state.Container;
for (int i = 0; i < dynprops.Count; i++) { for (int i = 0; i < stack.Properties.Count; i++) {
DynamicProperty p = dynprops[i]; DynamicProperty p = stack.Properties[i];
p.Key.ExecuteDynamic(state, p.Context, p.Value); p.Key.ExecuteDynamic(state, p.Context, p.Value);
} }
for (int i = 0; i < dynelems.Count; i++) { for (int i = 0; i < stack.Elements.Count; i++) {
DynamicElement e = dynelems[i]; DynamicElement e = stack.Elements[i];
var psrcs = e.Context.ReadContext.PropSrcs; var psrcs = e.Context.ReadContext.PropSrcs;
if (psrcs != null) ChartPlayer.etor.ContextCascadeInsert(psrcs); if (psrcs != null) ChartPlayer.etor.ContextCascadeInsert(psrcs);
var nctx = e.Selectors.MatchDynamic(state, e.Context.ReadContext); SkinContext nctx = null;
if (nctx != null) MatchDynamic(e.Element, state, new RuntimeSkinContext( try {
nctx = e.Selectors.MatchDynamic(state, e.Context.ReadContext);
}
catch (SelectorNotAvailableException) {
if (nstack == null) throw;
nstack.Elements.Add(e);
}
if (nctx != null) MatchDynamic(e.Element, state, nstack, new RuntimeSkinContext(
nctx, e.Context, e.Selectors.annotations.Contains("if"), e.Selectors.annotations.Contains("then") nctx, e.Context, e.Selectors.annotations.Contains("if"), e.Selectors.annotations.Contains("then")
)); ));
if (psrcs != null) ChartPlayer.etor.ContextCascadeDiscard(); if (psrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
@@ -82,7 +103,7 @@ namespace Cryville.Crtr {
ChartPlayer.etor.ContextState = null; ChartPlayer.etor.ContextState = null;
Profiler.EndSample(); Profiler.EndSample();
} }
void MatchDynamic(SkinElement rel, ContainerState state, RuntimeSkinContext ctx) { void MatchDynamic(SkinElement rel, ContainerState state, DynamicStack stack, RuntimeSkinContext ctx) {
var rc = ctx.ReadContext; var rc = ctx.ReadContext;
ChartPlayer.etor.ContextTransform = rc.Transform; ChartPlayer.etor.ContextTransform = rc.Transform;
if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeInsert(rc.PropSrcs); if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeInsert(rc.PropSrcs);
@@ -90,13 +111,20 @@ namespace Cryville.Crtr {
p.Key.ExecuteDynamic(state, ctx, p.Value); p.Key.ExecuteDynamic(state, ctx, p.Value);
} }
ChartPlayer.etor.ContextTransform = null; ChartPlayer.etor.ContextTransform = null;
foreach (var r in rel.elements) { foreach (var e in rel.elements) {
if (!r.Key.IsUpdatable(state)) continue; if (e.Key.IsUpdatable(state)) {
var nctx = r.Key.MatchDynamic(state, rc); SkinContext nctx = e.Key.MatchDynamic(state, rc);
if (nctx != null) MatchDynamic(r.Value, state, new RuntimeSkinContext( if (nctx != null) MatchDynamic(e.Value, state, stack, new RuntimeSkinContext(
nctx, ctx, r.Key.annotations.Contains("if"), r.Key.annotations.Contains("then") nctx, ctx, e.Key.annotations.Contains("if"), e.Key.annotations.Contains("then")
)); ));
} }
else {
if (stack == null) throw new SelectorNotAvailableException();
stack.Elements.Add(
new DynamicElement { Context = ctx, Selectors = e.Key, Element = e.Value }
);
}
}
if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeDiscard(); if (rc.PropSrcs != null) ChartPlayer.etor.ContextCascadeDiscard();
} }
} }

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

@@ -93,9 +93,6 @@ namespace Cryville.Crtr {
} }
else return Enumerable.Empty<SkinContext>(); else return Enumerable.Empty<SkinContext>();
} }
public override bool IsUpdatable(ContainerState h) {
return h.Handler.OpenedAnchor != null && h.Handler.OpenedAnchor.Name == Name;
}
} }
public class AtAnchor : SkinSelector { public class AtAnchor : SkinSelector {
public int Name { get; private set; } public int Name { get; private set; }
@@ -105,10 +102,10 @@ namespace Cryville.Crtr {
public override string ToString() { return string.Format("..{0}", IdentifierManager.SharedInstance.Retrieve(Name)); } public override string ToString() { return string.Format("..{0}", IdentifierManager.SharedInstance.Retrieve(Name)); }
public override SkinContext MatchDynamic(ContainerState h, SkinContext c) { public override SkinContext MatchDynamic(ContainerState h, SkinContext c) {
return IsUpdatable(h) ? c : null; return h.Handler.OpenedAnchor != null && h.Handler.OpenedAnchor.Name == Name ? c : null;
} }
public override bool IsUpdatable(ContainerState h) { public override bool IsUpdatable(ContainerState h) {
return h.Handler.OpenedAnchor != null && h.Handler.OpenedAnchor.Name == Name; return h.CloneType >= 2;
} }
} }
public class Property : SkinSelector { public class Property : SkinSelector {