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

Reconstruct skin container. Add update clone type limit to skin property.

Browse Source
This commit is contained in:
PopSlime
2022-11-20 16:12:19 +08:00
parent d08eea5c1e
commit cfdb5f021e
5 changed files with 110 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,41 +9,53 @@ using UnityEngine.Profiling;
namespace Cryville.Crtr {
public class SkinContainer {
readonly PdtSkin skin;
readonly Dictionary<SkinElement, Transform> matchedStatic
= new Dictionary<SkinElement, Transform>();
readonly Dictionary<SkinElement, Transform> matchedDynamic
= new Dictionary<SkinElement, Transform>();
readonly List<DynamicProperty> dynprops = new List<DynamicProperty>();
struct DynamicProperty {
public Transform Anchor { get; set; }
public SkinPropertyKey Key { get; set; }
public PdtExpression Value { get; set; }
}
readonly List<DynamicElement> dynelems = new List<DynamicElement>();
struct DynamicElement {
public Transform Anchor { get; set; }
public SkinSelectors Selectors { get; set; }
public SkinElement Element { get; set; }
}
public SkinContainer(PdtSkin _skin) {
skin = _skin;
}
public void MatchStatic(ContainerState context) {
dynprops.Clear(); dynelems.Clear();
ChartPlayer.etor.ContextState = context;
ChartPlayer.etor.ContextEvent = context.Container;
matchedStatic.Clear();
MatchStatic(skin, context, context.Handler.gogroup);
foreach (var m in matchedStatic) {
var el = m.Key;
var obj = m.Value;
ChartPlayer.etor.ContextTransform = obj;
foreach (var p in el.properties) {
if (p.Key.Name == null)
obj.gameObject.AddComponent(p.Key.Component);
else {
ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
}
}
ChartPlayer.etor.ContextTransform = null;
}
ChartPlayer.etor.ContextEvent = null;
ChartPlayer.etor.ContextState = null;
}
void MatchStatic(SkinElement rel, ContainerState context, Transform anchor = null) {
matchedStatic.Add(rel, anchor);
ChartPlayer.etor.ContextTransform = anchor;
foreach (var p in rel.properties) {
if (p.Key.Name == null)
anchor.gameObject.AddComponent(p.Key.Component);
else {
ChartPlayer.etor.Evaluate(GetPropOp(anchor, p.Key).Operator, p.Value);
if (!p.Value.IsConstant) dynprops.Add(
new DynamicProperty { Anchor = anchor, Key = p.Key, Value = p.Value }
);
}
}
ChartPlayer.etor.ContextTransform = null;
foreach (var r in rel.elements) {
var new_anchor = r.Key.MatchStatic(context, anchor);
if (new_anchor != null) {
MatchStatic(r.Value, context, new_anchor);
try {
var new_anchor = r.Key.MatchStatic(context, anchor);
if (new_anchor != null) {
MatchStatic(r.Value, context, new_anchor);
}
}
catch (SelectorNotStaticException) {
dynelems.Add(
new DynamicElement { Anchor = anchor, Selectors = r.Key, Element = r.Value }
);
}
}
}
@@ -51,44 +63,43 @@ namespace Cryville.Crtr {
Profiler.BeginSample("SkinContainer.MatchDynamic");
ChartPlayer.etor.ContextState = context;
ChartPlayer.etor.ContextEvent = context.Container;
matchedDynamic.Clear();
MatchDynamic(skin, context, context.Handler.gogroup);
foreach (var m in matchedDynamic) {
var el = m.Key;
var obj = m.Value;
ChartPlayer.etor.ContextTransform = obj;
foreach (var p in el.properties) {
if (p.Key.Name == null) continue;
if (p.Value.IsConstant) continue;
ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
}
ChartPlayer.etor.ContextTransform = null;
foreach (var p in dynprops) {
var prop = GetPropOp(p.Anchor, p.Key);
if (context.CloneType > prop.UpdateCloneType) continue;
ChartPlayer.etor.Evaluate(prop.Operator, p.Value);
}
foreach (var e in dynelems) {
var anchor = e.Selectors.MatchDynamic(context, e.Anchor);
if (anchor != null) MatchDynamic(e.Element, context, anchor);
}
ChartPlayer.etor.ContextEvent = null;
ChartPlayer.etor.ContextState = null;
Profiler.EndSample();
}
void MatchDynamic(SkinElement rel, ContainerState context, Transform anchor = null) {
matchedDynamic.Add(rel, anchor);
ChartPlayer.etor.ContextTransform = anchor;
foreach (var p in rel.properties) {
if (p.Key.Name == null)
throw new InvalidOperationException("Component creation in dynamic context is not allowed");
var prop = GetPropOp(anchor, p.Key);
if (context.CloneType > prop.UpdateCloneType) continue;
ChartPlayer.etor.Evaluate(prop.Operator, p.Value);
}
ChartPlayer.etor.ContextTransform = null;
foreach (var r in rel.elements) {
Transform new_anchor;
if (!matchedStatic.ContainsKey(r.Value)) continue;
if (!r.Key.IsUpdatable(context)) continue;
new_anchor = r.Key.MatchDynamic(
context, r.Value, matchedStatic[r.Value], anchor
);
var new_anchor = r.Key.MatchDynamic(context, anchor);
if (new_anchor != null) {
MatchDynamic(r.Value, context, new_anchor);
}
}
}
PdtOperator GetPropOp(Transform obj, SkinPropertyKey key) {
SkinProperty GetPropOp(Transform obj, SkinPropertyKey key) {
var ctype = key.Component;
var comp = (SkinComponent)obj.GetComponent(ctype);
if (comp == null) throw new InvalidOperationException("Component instance not found");
PdtOperator result;
if (!comp.PropOps.TryGetValue(key.Name, out result))
SkinProperty result;
if (!comp.Properties.TryGetValue(key.Name, out result))
throw new ArgumentException(string.Format("Property {0} not found on component", key.Name));
return result;
}