REDCODE/SlaveMatrix-SDL
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes extractor not working post merge

Browse Source
This commit is contained in:
Samuele Lorefice
2026-06-14 19:12:05 +02:00
parent a657d6ed1c
commit e3f9c1cc52
3 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
2DGAMELIB/_2DGAMELIB/BodyTemplate.cs
View File

@@ -9,6 +9,8 @@ namespace _2DGAMELIB
[Serializable] [Serializable]
public class BodyTemplate public class BodyTemplate
{ {
public string Tag = ""; // I didn't remove this, but it has been removed on merging my changes? What? - REDCODE
public OrderedDictionary<string, VariantGrid> Difss = new OrderedDictionary<string, VariantGrid>(); public OrderedDictionary<string, VariantGrid> Difss = new OrderedDictionary<string, VariantGrid>();
private VariantGrid r; private VariantGrid r;

1
2DGAMELIB/_2DGAMELIB/ShapePart.cs
View File

@@ -78,6 +78,7 @@ namespace _2DGAMELIB
public bool Dra = true; public bool Dra = true;
public bool Hit = true; public bool Hit = true;
private bool closed; private bool closed;
public bool IsClosed => closed;
public PartGroup GetParent() public PartGroup GetParent()
{ {

66
SlaveMatrix.Extract/Program.cs
View File

@@ -277,15 +277,15 @@ class Program
["id"] = engKey, ["id"] = engKey,
["original_key"] = originalKey, ["original_key"] = originalKey,
["resource"] = name, ["resource"] = name,
["morph_x"] = difs.CountX, ["morph_x"] = difs.GetCountX(),
["morph_y"] = difs.CountY, ["morph_y"] = difs.GetCountY(),
["variants"] = new JArray(), ["variants"] = new JArray(),
["fields"] = new JArray() ["fields"] = new JArray()
}; };
var variants = (JArray)partEntry["variants"]; var variants = (JArray)partEntry["variants"];
for (int x = 0; x < difs.CountX; x++) for (int x = 0; x < difs.GetCountX(); x++)
{ {
var dif = difs[x]; var dif = difs[x];
for (int y = 0; y < dif.Count; y++) for (int y = 0; y < dif.Count; y++)
@@ -305,7 +305,7 @@ class Program
} }
} }
foreach (string childKey in difs[0][0].Keys) foreach (string childKey in difs[0][0].pars.Keys)
{ {
((JArray)partEntry["fields"]).Add(new JObject { ["name"] = childKey }); ((JArray)partEntry["fields"]).Add(new JObject { ["name"] = childKey });
} }
@@ -432,7 +432,7 @@ class Program
static void ExportParsToSvgInner(PartGroup PartGroup, StringBuilder sb, List<string> foundJoints) static void ExportParsToSvgInner(PartGroup PartGroup, StringBuilder sb, List<string> foundJoints)
{ {
foreach (string key in PartGroup.Keys) foreach (string key in PartGroup.pars.Keys)
{ {
var val = PartGroup[key]; var val = PartGroup[key];
if (val is PartGroup childPars) if (val is PartGroup childPars)
@@ -452,13 +452,13 @@ class Program
{ {
if (!ShapePart.Dra) return; if (!ShapePart.Dra) return;
var bx = ShapePart.BasePoint.X; var bx = ShapePart.GetBasePoint().X;
var by = ShapePart.BasePoint.Y; var by = ShapePart.GetBasePoint().Y;
var px = ShapePart.Position.X; var px = ShapePart.GetPosition().X;
var py = ShapePart.Position.Y; var py = ShapePart.GetPosition().Y;
var angle = ShapePart.Angle; var angle = ShapePart.GetAngle();
var sx = ShapePart.Size * ShapePart.SizeX; var sx = ShapePart.GetSize() * ShapePart.GetSizeX();
var sy = ShapePart.Size * ShapePart.SizeY; var sy = ShapePart.GetSize() * ShapePart.GetSizeY();
var hasTransform = System.Math.Abs(bx) > 0.001 || System.Math.Abs(by) > 0.001 var hasTransform = System.Math.Abs(bx) > 0.001 || System.Math.Abs(by) > 0.001
|| System.Math.Abs(px) > 0.001 || System.Math.Abs(py) > 0.001 || System.Math.Abs(px) > 0.001 || System.Math.Abs(py) > 0.001
@@ -467,22 +467,22 @@ class Program
if (hasTransform) if (hasTransform)
sb.Append($"<g transform=\"translate({F(px)},{F(py)}) rotate({F(angle)}) scale({F(sx)},{F(sy)}) translate({F(-bx)},{F(-by)})\">"); sb.Append($"<g transform=\"translate({F(px)},{F(py)}) rotate({F(angle)}) scale({F(sx)},{F(sy)}) translate({F(-bx)},{F(-by)})\">");
foreach (var outObj in ShapePart.OP) foreach (var outObj in ShapePart.GetOP())
{ {
var points = outObj.ps; var points = outObj.ps;
if (points.Count < 2) continue; if (points.Count < 2) continue;
var d = BuildSvgPath(points, outObj.Tension, ShapePart.Closed); var d = BuildSvgPath(points, outObj.Tension, ShapePart.IsClosed);
var fill = ShapePart.Closed ? "#cccccc" : "none"; var fill = ShapePart.IsClosed ? "#cccccc" : "none";
var stroke = outObj.Outline ? "#000000" : "none"; var stroke = outObj.Outline ? "#000000" : "none";
var sw_val = outObj.Outline ? System.Math.Max(ShapePart.PenWidth, 0.001) : 0.0; var sw_val = outObj.Outline ? System.Math.Max(ShapePart.GetPenWidth(), 0.001) : 0.0;
sb.AppendLine($"<path d=\"{d}\" fill=\"{fill}\" stroke=\"{stroke}\" stroke-width=\"{F(sw_val)}\"/>"); sb.AppendLine($"<path d=\"{d}\" fill=\"{fill}\" stroke=\"{stroke}\" stroke-width=\"{F(sw_val)}\"/>");
} }
if (hasTransform) if (hasTransform)
sb.Append("</g>"); sb.Append("</g>");
foreach (var joi in ShapePart.JP) foreach (var joi in ShapePart.GetJP())
{ {
foundJoints.Add($"{F(joi.Joint.X)},{F(joi.Joint.Y)}"); foundJoints.Add($"{F(joi.Joint.X)},{F(joi.Joint.Y)}");
} }
@@ -579,15 +579,15 @@ class Program
static JObject ExportDifs(VariantGrid VariantGrid) static JObject ExportDifs(VariantGrid VariantGrid)
{ {
int xCount = VariantGrid.CountX; int xCount = VariantGrid.GetCountX();
int yCount = VariantGrid.CountY; int yCount = VariantGrid.GetCountY();
var result = new JObject var result = new JObject
{ {
["Tag"] = VariantGrid.Tag ?? "", ["Tag"] = VariantGrid.Tag ?? "",
["ValueX"] = VariantGrid.ValueX, ["ValueX"] = VariantGrid.ValueX,
["ValueY"] = VariantGrid.ValueY, ["ValueY"] = VariantGrid.ValueY,
["CountX"] = xCount, ["GetCountX()"] = xCount,
["CountY"] = yCount, ["CountY"] = yCount,
["VariantGrid"] = new JArray() ["VariantGrid"] = new JArray()
}; };
@@ -616,7 +616,7 @@ class Program
["Children"] = new JObject() ["Children"] = new JObject()
}; };
foreach (string key in PartGroup.Keys) foreach (string key in PartGroup.pars.Keys)
{ {
var val = PartGroup[key]; var val = PartGroup[key];
if (val is PartGroup childPars) if (val is PartGroup childPars)
@@ -638,18 +638,18 @@ class Program
{ {
["Tag"] = ShapePart.Tag ?? "", ["Tag"] = ShapePart.Tag ?? "",
["Dra"] = ShapePart.Dra, ["Dra"] = ShapePart.Dra,
["PenWidth"] = ShapePart.PenWidth, ["PenWidth"] = ShapePart.GetPenWidth(),
["Closed"] = ShapePart.Closed, ["Closed"] = ShapePart.IsClosed,
["BasePoint"] = ExportVec(ShapePart.BasePoint), ["BasePoint"] = ExportVec(ShapePart.GetBasePoint()),
["Position"] = ExportVec(ShapePart.Position), ["Position"] = ExportVec(ShapePart.GetPosition()),
["Angle"] = ShapePart.Angle, ["Angle"] = ShapePart.GetAngle(),
["Size"] = ShapePart.Size, ["Size"] = ShapePart.GetSize(),
["SizeX"] = ShapePart.SizeX, ["SizeX"] = ShapePart.GetSizeX(),
["SizeY"] = ShapePart.SizeY, ["SizeY"] = ShapePart.GetSizeY(),
["CurveOutline"] = new JArray() ["CurveOutline"] = new JArray()
}; };
foreach (var outObj in ShapePart.OP) foreach (var outObj in ShapePart.GetOP())
{ {
var outJ = new JObject var outJ = new JObject
{ {
@@ -662,10 +662,10 @@ class Program
((JArray)result["CurveOutline"]).Add(outJ); ((JArray)result["CurveOutline"]).Add(outJ);
} }
if (ShapePart.JP.Count > 0) if (ShapePart.GetJP().Count > 0)
{ {
result["Joints"] = new JArray(); result["Joints"] = new JArray();
foreach (var joi in ShapePart.JP) foreach (var joi in ShapePart.GetJP())
((JArray)result["Joints"]).Add(ExportVec(joi.Joint)); ((JArray)result["Joints"]).Add(ExportVec(joi.Joint));
} }
@@ -676,7 +676,7 @@ class Program
{ {
var result = ExportPar(ShapePartT); var result = ExportPar(ShapePartT);
result["Text"] = ShapePartT.Text ?? ""; result["Text"] = ShapePartT.Text ?? "";
result["FontSize"] = ShapePartT.FontSize; result["FontSize"] = ShapePartT.GetFontSize();
return result; return result;
} }