Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Publish assembly ports from authored sources

Yuechen Li521ee917b262
diff --git a/Aetheris.Kernel.Firmament.Tests/Assembly/GuitarSurfacingWitnessTests.cs b/Aetheris.Kernel.Firmament.Tests/Assembly/GuitarSurfacingWitnessTests.cs
index 7623369b..d4c2f79f 100644
--- a/Aetheris.Kernel.Firmament.Tests/Assembly/GuitarSurfacingWitnessTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/Assembly/GuitarSurfacingWitnessTests.cs
@@ -5,21 +5,46 @@ namespace Aetheris.Kernel.Firmament.Tests.Assembly;
public sealed class GuitarSurfacingWitnessTests
{
+ [Fact]
+ public void MultiFileProjectCompilesWithoutFilesystemResolutionAndKeepsPublicNeckPorts()
+ {
+ var root = FirmamentCorpusHarness.ResolveFixtureFullPath("fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm");
+ var documents = Directory.GetFiles(Path.GetDirectoryName(root)!, "*.firmament")
+ .Append(root).Select(path => new KeyValuePair<string, string>(Path.GetFileName(path), File.ReadAllText(path))).ToArray();
+ var result = new AssemblyM1Pipeline().CompileProject(new FirmamentProjectSnapshot("guitar.firmasm", documents));
+ Assert.True(result.IsSuccess, string.Join("\n", result.Diagnostics));
+ Assert.Equal(55, result.Geometry!.DefinitionBodies.Count);
+ Assert.Equal(107, result.Geometry.InstanceBodies.Count);
+ Assert.Equal(7, result.Ir!.AssemblyDefinitions!.Count);
+ var neck = result.Ir.Instances.Single(i => i.Path.ToString() == "GuitarX0.Neck");
+ Assert.True(neck.IsEncapsulatedDefinition);
+ Assert.True(neck.SemanticRoot.ExposedMembers.ContainsKey("NutMount"));
+ var nut = Assert.IsType<Aetheris.Semantics.ExactDatumFrameBinding>(AssemblyWorldQuery.Resolve(result.Ir,
+ neck.SemanticRoot.ExposedMembers["NutMount"].StableIdentity));
+ Assert.Equal(660, nut.OriginY, 6);
+ Assert.Equal(55, nut.OriginZ, 6);
+ Assert.DoesNotContain("Headstock", neck.SemanticRoot.ExposedMembers.Keys);
+ Assert.Equal(13, result.Ir.SourceDependencies!.Count);
+ Assert.Contains(result.Ir.SourceDependencies, d => d.Path == "tuners-assembly.firmament");
+ }
[Fact]
public void SingleCutCarveAndBackExportClosedOrientedMeshesThroughOrdinaryAssembly()
{
var path = FirmamentCorpusHarness.ResolveFixtureFullPath(
- "fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar-x0.firmament");
+ "fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm");
var compiled = new AssemblyM1Pipeline().CompileFile(path);
Assert.True(compiled.IsSuccess, string.Join("\n", compiled.Diagnostics.Select(d => d.Message)));
var mesh = AssemblyDisplayMeshExporter.Export(compiled);
Assert.Equal(107, mesh.Occurrences.Count(o => o.DefinitionId is not null));
Assert.Equal(7, compiled.Ir!.Patterns!.Count);
- Assert.Single(compiled.Ir.Joints!);
+ Assert.Empty(compiled.Ir.Joints!);
+ Assert.Equal(7, compiled.Ir.AssemblyDefinitions!.Count);
+ Assert.Single(compiled.Ir.AssemblyDefinitions.Single(d => d.DefinitionIdentity == "GuitarNeck").LocalMates,
+ mate => mate.Name == "VeneerSeat");
Assert.DoesNotContain(File.ReadAllText(path), "LegacyExplicit");
- Assert.Contains(compiled.Ir.Instances, i => i.Path.ToString() == "GuitarX0.TunerPosts.TunerPost00.TunerPost"
+ Assert.Contains(compiled.Ir.Instances, i => i.Path.ToString() == "GuitarX0.Neck.Tuners.TunerPosts.TunerPost00.TunerPost"
&& i.Provenance.Any(p => p.Stage == "assembly-pattern"));
- var head = compiled.Ir.Instances.Single(i => i.Path.ToString() == "GuitarX0.Headstock");
+ var head = compiled.Ir.Instances.Single(i => i.Path.ToString() == "GuitarX0.Neck.Headstock");
Assert.Equal(660, head.ResolvedTransform!.Matrix[13], 6);
Assert.Equal(48, head.ResolvedTransform.Matrix[14], 6);
Assert.Equal(6, mesh.Definitions.Count(d => d.Identity.StartsWith("GuitarString<", StringComparison.Ordinal)));
diff --git a/Aetheris.Kernel.Firmament/Assembly/AssemblyM0Parser.cs b/Aetheris.Kernel.Firmament/Assembly/AssemblyM0Parser.cs
index 91f388d8..31da0a93 100644
--- a/Aetheris.Kernel.Firmament/Assembly/AssemblyM0Parser.cs
+++ b/Aetheris.Kernel.Firmament/Assembly/AssemblyM0Parser.cs
@@ -23,7 +23,7 @@ public sealed class AssemblyM0Parser
if (source is null) return new(null, loadDiagnostics, 0);
var parsed = Parse(source, fullPath);
var diagnostics = loadDiagnostics.Concat(parsed.Diagnostics).ToArray();
- return new(parsed.Source is null ? null : parsed.Source with { SourceDependencies = dependencies }, diagnostics, parsed.ElapsedMilliseconds);
+ return new(parsed.Source is null ? null : parsed.Source with { SourceDependencies = dependencies.Concat(parsed.Source.SourceDependencies ?? []).DistinctBy(d => d.Path).ToArray() }, diagnostics, parsed.ElapsedMilliseconds);
}
public ParseResult ParseProject(FirmamentProjectSnapshot project)
@@ -33,8 +33,8 @@ public sealed class AssemblyM0Parser
var dependencies = new List<AssemblySourceDependencyIr>();
var source = LoadProjectSource(project.RootDocument, project, [], dependencies, diagnostics);
if (source is null) return new(null, diagnostics, 0);
- var parsed = Parse(source, project.RootDocument);
- return new(parsed.Source is null ? null : parsed.Source with { SourceDependencies = dependencies },
+ var parsed = Parse(source, project.RootDocument, project);
+ return new(parsed.Source is null ? null : parsed.Source with { SourceDependencies = dependencies.Concat(parsed.Source.SourceDependencies ?? []).DistinctBy(d => d.Path).ToArray() },
[.. diagnostics, .. parsed.Diagnostics], parsed.ElapsedMilliseconds);
}
@@ -92,7 +92,7 @@ public sealed class AssemblyM0Parser
return Path.GetDirectoryName(path)!;
}
- public ParseResult Parse(string input, string sourceIdentity = "<memory>")
+ public ParseResult Parse(string input, string sourceIdentity = "<memory>", FirmamentProjectSnapshot? project = null)
{
var watch = Stopwatch.StartNew();
var diagnostics = new List<AssemblyDiagnostic>();
@@ -114,8 +114,23 @@ public sealed class AssemblyM0Parser
diagnostics.Add(new("assembly-" + diagnostic.Split(':')[0], diagnostic));
var concepts = ParseAssemblyConcepts(source, sourceIdentity, diagnostics);
var interfaces = ParseInterfaces(source, sourceIdentity, diagnostics);
+ var declarationChars = source.ToCharArray();
+ foreach (Match header in Regex.Matches(source, @"\b(?:Template\s*<[^>]+>\s*Assembly|Assembly|Interface(?:\s*<[^>]+>)?)\s+[A-Za-z_]\w*(?:\s*:\s*[A-Za-z_]\w*)?\s*\{"))
+ {
+ var block = BalancedBody(source, header.Index + header.Length - 1, diagnostics, "assembly declaration");
+ if (block is not null) Array.Fill(declarationChars, ' ', header.Index, header.Length + block.Length + 1);
+ }
+ var definitionSource = new string(declarationChars).Trim();
+ var portDependencies = new List<AssemblySourceDependencyIr>();
+ var portCache = new Dictionary<string, IReadOnlyList<SemanticValue>>(StringComparer.Ordinal);
+ IReadOnlyList<SemanticValue> Ports(string identity)
+ {
+ if (!portCache.TryGetValue(identity, out var ports))
+ portCache[identity] = ports = AssemblyPublishedPorts.BindAuthored(identity, definitionSource, sourceIdentity, diagnostics, project, portDependencies);
+ return ports;
+ }
var templateRanges = new List<(int Start, int Length)>();
- var assemblyDefinitions = ParseAssemblyDefinitions(source, sourceIdentity, interfaces, concepts, gearAuthorities, diagnostics, templateRanges);
+ var assemblyDefinitions = ParseAssemblyDefinitions(source, sourceIdentity, interfaces, concepts, gearAuthorities, diagnostics, templateRanges, Ports);
// Template-produced Assembly bodies are declarations, not exported roots.
// Blank them without changing offsets, then locate the single root Assembly.
var rootSearch = source.ToCharArray();
@@ -127,25 +142,15 @@ public sealed class AssemblyM0Parser
var body = BalancedBody(source, assemblyHeader.Index + assemblyHeader.Length - 1, diagnostics, "Assembly");
if (body is null) return Done(null);
var specializationCache = new Dictionary<string, AssemblyMemberSource>(StringComparer.Ordinal);
- var tree = ParseTree(body, sourceIdentity, diagnostics, assemblyDefinitions, interfaces, specializationCache, gearAuthorities);
+ var tree = ParseTree(body, sourceIdentity, diagnostics, assemblyDefinitions, interfaces, specializationCache, gearAuthorities, Ports);
if (tree is null) return Done(null);
var mates = ParseMates(body, sourceIdentity, diagnostics);
var relations = ParseRelations(body, diagnostics);
var asserts = ParseAsserts(body, sourceIdentity, diagnostics);
var anchorMatch = Regex.Match(RemoveBlocks(body, "Mate", @"Assert\s+ToleranceStackup"), @"\bAnchor\s*:\s*(?<path>[A-Za-z_]\w*(?:\.[A-Za-z_]\w*)*)\s*;", RegexOptions.CultureInvariant);
var anchor = anchorMatch.Success ? AssemblyPath.Parse(anchorMatch.Groups["path"].Value) : new AssemblyPath([tree.Name]);
- var definitionBoundary = new[]
- {
- Regex.Match(source, @"^[ \t]*Interface(?:\s*<[^>]+>)?\s+[A-Za-z_]\w*\s*\{", RegexOptions.CultureInvariant | RegexOptions.Multiline),
- Regex.Match(source, @"^[ \t]*Template\s*<[^>]+>\s*Assembly\s+[A-Za-z_]\w*\s*\{", RegexOptions.CultureInvariant | RegexOptions.Multiline),
- Regex.Match(source, @"^[ \t]*Assembly\s+[A-Za-z_]\w*\s*\{", RegexOptions.CultureInvariant | RegexOptions.Multiline)
- }.Where(match => match.Success).Select(match => match.Index).DefaultIfEmpty(0).Min();
- var declarationChars = source.ToCharArray();
- foreach (var range in templateRanges) Array.Fill(declarationChars, ' ', range.Start, range.Length);
- var declarations = new string(declarationChars);
- var definitionSource = definitionBoundary > 0 ? declarations[..definitionBoundary].Trim() : null;
var frames = ParseFrameTransforms(body, sourceIdentity, diagnostics);
- var result = new AssemblySource(assemblyHeader.Groups["name"].Value, tree, interfaces, mates, anchor, relations, asserts, sourceIdentity, definitionSource, assemblyDefinitions, FrameTransforms: frames, Patterns: expandedPatterns.Document?.Patterns);
+ var result = new AssemblySource(assemblyHeader.Groups["name"].Value, tree, interfaces, mates, anchor, relations, asserts, sourceIdentity, definitionSource, assemblyDefinitions, SourceDependencies: portDependencies, FrameTransforms: frames, Patterns: expandedPatterns.Document?.Patterns);
return Done(result);
ParseResult Done(AssemblySource? value) { watch.Stop(); return new(value, diagnostics, watch.Elapsed.TotalMilliseconds); }
@@ -355,7 +360,8 @@ public sealed class AssemblyM0Parser
private static IReadOnlyList<AssemblyDefinitionSource> ParseAssemblyDefinitions(string source, string sourceIdentity,
IReadOnlyList<InterfaceDefinition> interfaces, IReadOnlyList<AssemblyConceptDefinition> concepts,
IReadOnlyDictionary<string, GearAir> gearAuthorities,
- List<AssemblyDiagnostic> diagnostics, List<(int Start, int Length)> ranges)
+ List<AssemblyDiagnostic> diagnostics, List<(int Start, int Length)> ranges,
+ Func<string, IReadOnlyList<SemanticValue>>? publishedPorts = null)
{
var result = new List<AssemblyDefinitionSource>();
foreach (Match template in Regex.Matches(source,
@@ -366,7 +372,7 @@ public sealed class AssemblyM0Parser
if (body is null) continue;
var close = template.Index + template.Length + body.Length + 1;
ranges.Add((template.Index, close - template.Index));
- var root = ParseTree(body, sourceIdentity, diagnostics, result, interfaces, new Dictionary<string, AssemblyMemberSource>(StringComparer.Ordinal), gearAuthorities);
+ var root = ParseTree(body, sourceIdentity, diagnostics, result, interfaces, new Dictionary<string, AssemblyMemberSource>(StringComparer.Ordinal), gearAuthorities, publishedPorts);
if (root is null) continue;
var exposed = ParseAssemblyExposes(body, root, sourceIdentity, diagnostics);
root = root with { ExposedSemantics = exposed, IsEncapsulatedDefinition = true };
@@ -612,7 +618,8 @@ public sealed class AssemblyM0Parser
private static AssemblyMemberSource? ParseTree(string body, string sourceIdentity, List<AssemblyDiagnostic> diagnostics,
IReadOnlyList<AssemblyDefinitionSource>? definitions = null, IReadOnlyList<InterfaceDefinition>? interfaces = null,
IDictionary<string, AssemblyMemberSource>? specializationCache = null,
- IReadOnlyDictionary<string, GearAir>? gearAuthorities = null)
+ IReadOnlyDictionary<string, GearAir>? gearAuthorities = null,
+ Func<string, IReadOnlyList<SemanticValue>>? publishedPorts = null)
{
// One bounded generic argument list is admitted in a Part definition. The
// inner '>' belongs to the Firmament Template application, not the XML-like tag.
@@ -661,6 +668,8 @@ public sealed class AssemblyM0Parser
if (open.node.Kind is AssemblyInstanceKind.Part or AssemblyInstanceKind.Panel)
{
open.node.Semantics.AddRange(ParseSemantics(nodeBody, open.node.Definition, sourceIdentity, diagnostics));
+ if (open.node.Kind == AssemblyInstanceKind.Part && publishedPorts is not null)
+ open.node.Semantics.AddRange(publishedPorts(open.node.Definition));
if (open.node.Kind == AssemblyInstanceKind.Part && gearAuthorities?.GetValueOrDefault(open.node.Definition) is { } gear)
{
var endpoint = GearEndpoint(gear, sourceIdentity);
diff --git a/Aetheris.Kernel.Firmament/Assembly/AssemblyM1Execution.cs b/Aetheris.Kernel.Firmament/Assembly/AssemblyM1Execution.cs
index 1c4e70c7..6cfb1357 100644
--- a/Aetheris.Kernel.Firmament/Assembly/AssemblyM1Execution.cs
+++ b/Aetheris.Kernel.Firmament/Assembly/AssemblyM1Execution.cs
@@ -409,7 +409,9 @@ public sealed class AssemblyM1Pipeline
return member with
{
Children = member.Children.Select(child => Enrich(child, definitions)).ToArray(),
- ExposedSemantics = [.. member.ExposedSemantics, .. generated],
+ ExposedSemantics = [.. member.ExposedSemantics.Where(value =>
+ !(value.Provenance.Any(p => p.Stage == "definition-port-publication")
+ && generated.Any(g => g.ExposedName == value.ExposedName))), .. generated],
Provenance = provenance
};
}
diff --git a/Aetheris.Kernel.Firmament/Assembly/AssemblyPublishedPorts.cs b/Aetheris.Kernel.Firmament/Assembly/AssemblyPublishedPorts.cs
index 8e5dfa2f..df644b78 100644
--- a/Aetheris.Kernel.Firmament/Assembly/AssemblyPublishedPorts.cs
+++ b/Aetheris.Kernel.Firmament/Assembly/AssemblyPublishedPorts.cs
@@ -2,12 +2,74 @@ using System.Globalization;
using System.Text.RegularExpressions;
using Aetheris.Semantics;
using Aetheris.Surfacing;
+using Aetheris.Kernel.Firmament.FirmamentV2;
namespace Aetheris.Kernel.Firmament.Assembly;
/// <summary>Definition-owned publication, evaluated after typed template specialization.</summary>
internal static class AssemblyPublishedPorts
{
+ // Publish semantic intent before a reusable assembly's local solve. This
+ // reads authored frames and uses the existing typed specialization/binder;
+ // it never materializes a body or imports STEP.
+ internal static IReadOnlyList<SemanticValue> BindAuthored(string identity, string declarations,
+ string sourceIdentity, List<AssemblyDiagnostic> diagnostics, FirmamentProjectSnapshot? project,
+ List<AssemblySourceDependencyIr> dependencies)
+ {
+ var file = Regex.Match(identity, "^(?:SectionChainFile|LoftFile)<\\\"(?<path>[^\\\"]+)\\\">$");
+ if (file.Success)
+ {
+ var requested = file.Groups["path"].Value;
+ string path, source;
+ if (project is not null)
+ {
+ try { path = FirmamentProjectSnapshot.NormalizePath(requested); }
+ catch (ArgumentException)
+ { diagnostics.Add(new("assembly-profile-invalid-resource-path", $"Invalid port source path '{requested}'.")); return []; }
+ if (!path.EndsWith(".firmament", StringComparison.OrdinalIgnoreCase))
+ { diagnostics.Add(new("assembly-profile-resource-kind-invalid", "Port sources must be .firmament documents.")); return []; }
+ if (!project.TryResolve(path, out source!))
+ { diagnostics.Add(new("assembly-profile-unresolved-resource", $"Port source '{path}' was not found in the project snapshot.")); return []; }
+ }
+ else
+ {
+ path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(Path.GetFullPath(sourceIdentity))!, requested));
+ if (!File.Exists(path))
+ { diagnostics.Add(new("assembly-profile-unresolved-resource", $"Port source '{requested}' was not found at '{path}'.")); return []; }
+ source = File.ReadAllText(path);
+ }
+ if (!dependencies.Any(d => d.Path == path))
+ dependencies.Add(new(path, Convert.ToHexString(System.Security.Cryptography.SHA256.HashData(System.Text.Encoding.UTF8.GetBytes(source))), false));
+ if (!Regex.IsMatch(source, @"\bExpose\s*\{\s*Semantic\b")) return [];
+ var chain = SectionChainAuthoringParser.Compile(Strip(source, diagnostics), materialize: false);
+ if (!chain.IsSuccess || chain.Chain is null)
+ {
+ foreach (var error in chain.Diagnostics) diagnostics.Add(new("assembly-port-section-binding-failed", error));
+ return [];
+ }
+ var owner = Regex.Match(source, @"\bModel\s+(?<name>[A-Za-z_]\w*)\s*\{").Groups["name"].Value;
+ return Read(source, owner, identity, path, diagnostics, chain.Chain);
+ }
+ if (!identity.Contains('<')) return [];
+ var templateName = identity[..identity.IndexOf('<')].Trim();
+ var header = Regex.Match(declarations, $@"\b(?:Struct|Model)\s+{Regex.Escape(templateName)}(?:\s*:\s*[A-Za-z_]\w*)?\s*\{{");
+ if (!header.Success) return [];
+ var body = AssemblyM0Parser.BalancedBody(declarations, header.Index + header.Length - 1, diagnostics, "port definition");
+ if (body is null || !Regex.IsMatch(body, @"\bExpose\s*\{\s*Semantic\b")) return [];
+ var inspectionDiagnostics = new List<string>();
+ var kind = FirmamentV2TemplateExpansion.Inspect(declarations, inspectionDiagnostics)
+ .SingleOrDefault(t => t.Name == templateName)?.TargetKind ?? "Struct";
+ var application = $"{kind} __AssemblyPart = {identity}\n";
+ var module = kind == "Model" ? declarations + "\n" + application
+ : "Model __AssemblyDefinition {\n Units: mm\n" + declarations + "\n" + application + "}\n";
+ var expansion = FirmamentTemplateSourceCompiler.Expand(module, out var errors);
+ if (expansion is null || errors.Count > 0)
+ {
+ foreach (var error in errors) diagnostics.Add(new("assembly-port-specialization-failed", error));
+ return [];
+ }
+ return Read(expansion.ExpandedSource, "__AssemblyPart", identity, sourceIdentity, diagnostics);
+ }
internal static string Strip(string source, List<AssemblyDiagnostic> diagnostics)
{
var chars = source.ToCharArray();
@@ -49,7 +111,9 @@ internal static class AssemblyPublishedPorts
{
if (value.ExposedMembers.Count == 0)
diagnostics.Add(new("assembly-port-empty-or-unresolved",$"Published Semantic '{value.ExposedName}' has no resolved supported members."));
- result.Add(value);
+ result.Add(new SemanticValue(value.StableIdentity, value.Type, value.Capabilities.Values, value.Bindings,
+ value.ExposedMembers.Values, [.. value.Provenance, new("definition-port-publication", identity, value.ExposedName ?? "", SemanticSourceSpan.Generated(sourceIdentity))],
+ value.AuthoredSourceSpan, value.GeneratedSourceSpan, value.ExposedName));
}
if (!Regex.IsMatch(ports,@"\bSemantic\s+[A-Za-z_]\w*\s*\{"))
diagnostics.Add(new("assembly-port-invalid-publication","Part Expose requires named Semantic blocks."));
diff --git a/demos/GuitarSurfacingX0/Program.cs b/demos/GuitarSurfacingX0/Program.cs
index 8f0e9a20..3f14634d 100644
--- a/demos/GuitarSurfacingX0/Program.cs
+++ b/demos/GuitarSurfacingX0/Program.cs
@@ -2,7 +2,7 @@ using System.Diagnostics;
using System.Text.Json;
using Aetheris.Kernel.Firmament.Assembly;
-var source = args.Length > 0 ? args[0] : "fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar-x0.firmament";
+var source = args.Length > 0 ? args[0] : "fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm";
var output = args.Length > 1 ? args[1] : "artifacts/local/guitar-x0/timings.json";
var runs = new List<object>();
for (var i = 0; i < 2; i++)
diff --git a/docs/public/demos/guitar-subassemblies.md b/docs/public/demos/guitar-subassemblies.md
new file mode 100644
index 00000000..0cdd4d27
--- /dev/null
+++ b/docs/public/demos/guitar-subassemblies.md
@@ -0,0 +1,102 @@
+# Guitar as a multi-file assembly
+
+The preferred entry is [guitar.firmasm](../../../fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm).
+It contains only Include declarations and five top-level subassembly occurrences.
+The old guitar-x0.firmament entry is a small compatibility composition root.
+
+```text
+guitar.firmasm
+├─ hardware-definitions.firmament shared exact part templates and HardwareSite
+├─ body-assembly.firmament back, binding and carved top
+│ └─ MahoganyBack / IvoryBinding / CarvedMaple.firmament SectionChain sources
+├─ neck-assembly.firmament neck, board, frets, inlays, nut and headstock
+│ ├─ Neck.firmament exact six-section neck and published ports
+│ └─ tuners-assembly.firmament keyed tuner posts, washers and buttons
+├─ electronics-assembly.firmament knobs, selector and decorative covers
+│ └─ pickups-assembly.firmament keyed seats, coils and poles
+├─ bridge-assembly.firmament bridge, stop tailpiece and keyed saddles
+└─ strings-assembly.firmament WireForm template and six formed routes
+```
+
+These are real reusable `Subassembly` definitions, not text fragments or imported
+STEP packages. Tuners are a nested occurrence under Neck; Pickups nest under
+Electronics. The root retains five readable placements. Each module owns its
+local layout; moving a root occurrence moves its already-solved children.
+Existing absolute coordinates now describe module-local layout. Replacing all
+of those with new mounting ports is a separate refinement.
+
+Neck exposes only NutMount, HeelMount and HeadFront. Its NutWorld/HeadTilt frames
+and Fixed VeneerSeat remain private to that definition. The parent cannot reach
+private part ports through the neck boundary. The local fixed relationship is
+recorded in the solved neck definition; it is not recreated as a root joint.
+
+The compiler now publishes concrete authored part ports before reusable local
+assembly solving. Template ports use the existing typed specialization frontend;
+section ports use the existing SectionChain binder with materialization disabled.
+Actual geometry still goes through M1 once per shared part definition. M1 replaces
+early publication values with the materialized definition's ports without creating
+duplicates. Declaration collection retains geometry templates and finite data from
+all included modules, rather than stopping at the first subassembly declaration.
+
+The immutable project-snapshot path resolves included modules and the four
+SectionChain resources from supplied documents. Its dependency report includes
+13 used source documents, each with a hash. Existing include checks and private
+semantic boundaries remain in force. Source-row offsets still refer to the
+expanded source; this change does not add per-file editor source maps.
+
+Reproduce:
+
+```powershell
+python scripts/create-guitar-x0.py
+dotnet Aetheris.CLI/bin/Release/net10.0/aetheris.dll asm inspect fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm --json --profile
+./scripts/qualify-guitar-x0.ps1 -OutDir artifacts/local/guitar-subassemblies -Viewport
+```
+
+The existing generator writes the modules reproducibly. Profile interpolation,
+fret formulas and string-route calculations remain its current responsibilities;
+Authoring D is not part of this reorganization. Downstream sunburst shading also
+remains unchanged. Generated exports and evidence belong under artifacts/local.
+
+## Qualification
+
+The modular witness was qualified through the real CLI, immutable project
+snapshot, AP242 exporter/importer and OpenUSD viewer:
+
+| Evidence | Result |
+|---|---|
+| Composition | 5 root groups, 7 reusable assembly definitions, 7 keyed patterns |
+| Geometry | 55 shared exact part definitions, 107 visible parts |
+| Display hierarchy | 164 nodes, including the 7 new groups |
+| Baseline comparison | All position/normal/index buffers identical; all 107 world transforms identical |
+| AP242 reimport | 107 bodies, hierarchy depth 5; source assembly hierarchy retained |
+| Cold compilation | 10.455 s |
+| Warm recompilation | 4.873 s |
+| Display preparation, cold / warm | 0.489 / 0.392 s |
+| OpenUSD | No composition errors; maximum world-transform error 1.23e-15 |
+| 36 usdview camera rotations | 0 compile calls, 0 rebuilds, 0 stage changes; mean orbit/readback 26.18 ms |
+
+Cold includes first-use JIT/library initialization. Warm recompiles the source in
+the same process without a persistent model cache. Neither includes process
+startup or dotnet build. Camera evidence is from the standalone exported USD
+viewer, which has no compiler connection.
+
+Release solution build passed, the core fast lane passed 1,005 tests, and 36
+focused foundation/guitar/project tests passed. The default full solution gate
+reported 4,034 passed and one unrelated posed-slider display timeout at its
+six-second tessellation budget. That test passed in 0.78 s in isolation. A
+controlled full solution gate with xUnit collections serialized passed all
+4,035 tests; budgets and assertions were unchanged. This supports contention
+as the explanation, without claiming the default gate was green.
+
+Fresh exports and evidence are in `artifacts/local/guitar-subassemblies/`:
+`guitar.step`, `guitar.usda`, `inspection.json`, `timings.json`,
+`baseline-comparison.json`, `step-assembly-analysis.json`, `usd-validation.json`
+and `viewport/viewer.json`. Test logs are in
+`artifacts/local/guitar-foundation/subassembly-*.log`.
+
+The existing Cycles hero images remain applicable because geometry buffers and
+world placements are identical. No new beauty render was required for this
+organization change; the fresh shaded viewport was visually checked. The
+presentation witness is preserved while its authored structure is easier to
+navigate. Remaining module-local coordinate layout and Python-generated profile
+and route data are explicitly deferred refinements.
diff --git a/docs/public/demos/guitar-surfacing-x0.md b/docs/public/demos/guitar-surfacing-x0.md
index 67e9940e..0f089cad 100644
--- a/docs/public/demos/guitar-surfacing-x0.md
+++ b/docs/public/demos/guitar-surfacing-x0.md
@@ -4,7 +4,7 @@
GUITAR-SURFACING-X0 is an original single-cut guitar presentation witness inspired by the Les Paul family. The supplied photographs guided proportions and finish; no photograph, logo, downloaded guitar model, or external product mesh is bundled. Aetheris constructs every guitar part. Blender imports the actual OpenUSD export and adds downstream appearance, studio lighting, floor, and camera.
-The [authored assembly](../../../fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar-x0.firmament) has a cubic single-cut outline, mahogany back, cream edge band, a five-section carved maple top with a 13 mm rise, a six-section D-profile G1 neck, tapered fretboard, tilted headstock, 22 frets, inlays, two pickups, bridge, stop tailpiece, four controls, selector, tuner placeholders, and six continuous formed strings.
+The [authored assembly](../../../fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm) has a cubic single-cut outline, mahogany back, cream edge band, a five-section carved maple top with a 13 mm rise, a six-section D-profile G1 neck, tapered fretboard, tilted headstock, 22 frets, inlays, two pickups, bridge, stop tailpiece, four controls, selector, tuner placeholders, and six continuous formed strings. See [the multi-file subassembly layout](guitar-subassemblies.md) for the current source organization.
## Reproduce
diff --git a/docs/public/firmament/assembly-authoring-foundation.md b/docs/public/firmament/assembly-authoring-foundation.md
index 1ccd3747..e06d5b5d 100644
--- a/docs/public/firmament/assembly-authoring-foundation.md
+++ b/docs/public/firmament/assembly-authoring-foundation.md
@@ -66,10 +66,10 @@ Expose { Semantic NutMount { DatumFrame Frame = Neck.Section.S5.Frame; } }
```
The chain and section must exist. This aliases the section's exact frame rather
-than a tessellation sample. Publication occurs during M1 materialization;
-reusable assemblies still solve internal graphs earlier in M0. Ports needed
-during that local solve currently require inline authoring; early automatic
-publication of geometry-template ports remains a boundary.
+than a tessellation sample. Concrete authored part ports are now published before
+M0 reusable local solving, through typed template specialization and the existing
+SectionChain binder without body materialization. M1 still owns exact geometry.
+See [the multi-file guitar](../demos/guitar-subassemblies.md) for the motivating case.
## Keyed finite patterns
@@ -141,7 +141,7 @@ needed to take that step. Appearance remains downstream Cycles shading.
Ground truth:
```powershell
-dotnet Aetheris.CLI/bin/Release/net10.0/aetheris.dll asm inspect fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar-x0.firmament --json --profile
+dotnet Aetheris.CLI/bin/Release/net10.0/aetheris.dll asm inspect fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm --json --profile
./scripts/qualify-guitar-x0.ps1 -OutDir artifacts/local/guitar-foundation -Render -Viewport
```
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/body-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/body-assembly.firmament
new file mode 100644
index 00000000..fbe57030
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/body-assembly.firmament
@@ -0,0 +1,16 @@
+
+Subassembly GuitarBody {
+ <Assembly GuitarBody>
+ <Part MahoganyBack = SectionChainFile<"MahoganyBack.firmament">>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,0mm]; }
+ </Part>
+ <Part IvoryBinding = SectionChainFile<"IvoryBinding.firmament">>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,0mm]; }
+ </Part>
+ <Part CarvedMaple = SectionChainFile<"CarvedMaple.firmament">>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,0mm]; }
+ </Part>
+ </Assembly>
+
+ Anchor: GuitarBody;
+}
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/bridge-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/bridge-assembly.firmament
new file mode 100644
index 00000000..ee0beed4
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/bridge-assembly.firmament
@@ -0,0 +1,25 @@
+Static SaddlesSites: Set<HardwareSite> {
+ Saddle0 => HardwareSite { X: -25.5mm; Y: -35mm; Z: 63mm }
+ Saddle1 => HardwareSite { X: -15.3mm; Y: -35mm; Z: 63mm }
+ Saddle2 => HardwareSite { X: -5.1mm; Y: -35mm; Z: 63mm }
+ Saddle3 => HardwareSite { X: 5.1mm; Y: -35mm; Z: 63mm }
+ Saddle4 => HardwareSite { X: 15.3mm; Y: -35mm; Z: 63mm }
+ Saddle5 => HardwareSite { X: 25.5mm; Y: -35mm; Z: 63mm }
+}
+Subassembly GuitarBridge {
+ <Assembly GuitarBridge>
+ <Part Bridge = Panel<L:82mm,W:12mm,H:6mm,R:5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,-35mm,57mm]; }
+ </Part>
+ <Part Tailpiece = Panel<L:88mm,W:15mm,H:7mm,R:6mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,-75mm,53mm]; }
+ </Part>
+ Pattern Saddles Over SaddlesSites {
+ site => <Part Saddle = Panel<L:7mm,W:9mm,H:2mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
+ </Part>
+ }
+ </Assembly>
+
+ Anchor: GuitarBridge;
+}
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/electronics-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/electronics-assembly.firmament
new file mode 100644
index 00000000..e12fa324
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/electronics-assembly.firmament
@@ -0,0 +1,62 @@
+Include "pickups-assembly.firmament";
+
+Subassembly GuitarElectronics {
+ <Assembly GuitarElectronics>
+ <Part KnobSkirt0 = Drum<R:12mm,H:3mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [79mm,-95mm,50mm]; }
+ </Part>
+ <Part AmberKnob0 = Drum<R:9mm,H:9mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [79mm,-95mm,53mm]; }
+ </Part>
+ <Part KnobCap0 = Drum<R:5mm,H:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [79mm,-95mm,62mm]; }
+ </Part>
+ <Part KnobSkirt1 = Drum<R:12mm,H:3mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [123mm,-70mm,45mm]; }
+ </Part>
+ <Part AmberKnob1 = Drum<R:9mm,H:9mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [123mm,-70mm,48mm]; }
+ </Part>
+ <Part KnobCap1 = Drum<R:5mm,H:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [123mm,-70mm,57mm]; }
+ </Part>
+ <Part KnobSkirt2 = Drum<R:12mm,H:3mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [75mm,-156mm,47mm]; }
+ </Part>
+ <Part AmberKnob2 = Drum<R:9mm,H:9mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [75mm,-156mm,50mm]; }
+ </Part>
+ <Part KnobCap2 = Drum<R:5mm,H:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [75mm,-156mm,59mm]; }
+ </Part>
+ <Part KnobSkirt3 = Drum<R:12mm,H:3mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [121mm,-131mm,43mm]; }
+ </Part>
+ <Part AmberKnob3 = Drum<R:9mm,H:9mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [121mm,-131mm,46mm]; }
+ </Part>
+ <Part KnobCap3 = Drum<R:5mm,H:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [121mm,-131mm,55mm]; }
+ </Part>
+ <Part SelectorRing = Drum<R:16mm,H:1.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [-73mm,137mm,43mm]; }
+ </Part>
+ <Part SelectorStem = Drum<R:2.5mm,H:12mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [-73mm,137mm,44.5mm]; }
+ </Part>
+ <Part SelectorTip = Drum<R:4mm,H:7mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [-73mm,137mm,54mm]; }
+ </Part>
+ <Part ControlCover = Panel<L:63mm,W:93mm,H:1mm,R:15mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [85mm,-115mm,-1mm]; }
+ </Part>
+ <Part SelectorCover = Drum<R:24mm,H:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [-73mm,137mm,-1mm]; }
+ </Part>
+ <Assembly Pickups = GuitarPickups>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ </Assembly>
+
+ Anchor: GuitarElectronics;
+}
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar-x0.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar-x0.firmament
index ebe9f187..21b958fd 100644
--- a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar-x0.firmament
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar-x0.firmament
@@ -1,356 +1,28 @@
-// GUITAR-SURFACING-X0. Original design inspired by the single-cut family.
-// Every visible product part is compiled Firmament geometry. Finish is downstream.
-Template<D: Length, Lead: Length, Tail: Length, Deflection: Angle> Struct GuitarString {
- WireForm String {
- Diameter: D
- Material: Standard.Materials.StainlessSteel.304_Annealed
- StartFrame { Origin: [0mm,0mm,0mm]; Tangent: [0,0,1]; Up: [1,0,0] }
- Straight SpeakingLength { Length: Lead }
- Bend NutBreak { Radius: 3mm; Angle: Deflection; Plane: Up }
- Straight TunerLead { Length: Tail }
- }
-}
-Template<L: Length, W: Length, H: Length, R: Length> Struct Panel {
- RoundedRect2 Outline { Center: [0mm,0mm] Size: [L,W] Radius: R }
- Profile P { Loop Outer { Outline |> TraceLoop } }
- Extrude Body { Profile: P From: 0mm To: H }
-}
-Template<R: Length,H: Length> Struct Drum {
- Circle2 Outline { Center: [0mm,0mm] Radius: R }
- Profile P { Loop Outer { Outline |> TraceLoop } }
- Extrude Body { Profile: P From: 0mm To: H }
-}
-Template<L: Length,W: Length,H: Length> Struct Surround {
- RoundedRect2 Outer { Center: [0mm,0mm] Size: [L,W] Radius: 4mm }
- // Solid decorative seat; the black bobbins sit on it. No routed opening claim.
- Profile P { Loop Outer { Outer |> TraceLoop } }
- Extrude Body { Profile: P From: 0mm To: H }
-}
-Template<H: Length> Struct Board {
- Point2 RightNut { Position: [21.5mm,660mm] }
- Point2 LeftNut { Position: [-21.5mm,660mm] }
- Concept Path Outline { Start: Point2(-28mm,120mm) Heading: 0deg
- Line End { Length: 56mm }
- Line Right { To: RightNut }
- Line Nut { To: LeftNut }
- Close Left
- }
- Profile P From Outline
- Extrude Body { Profile: P From: 0mm To: H }
-}
-Template<H: Length> Struct Head {
- Expose { Semantic Base { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }
- Semantic Front { DatumFrame Frame = [0mm,0mm,H] x [1,0,0] y [0,1,0] z [0,0,1]; } }
- Point2 RFlare { Position: [34mm,40mm] }
- Point2 RSide { Position: [39mm,154mm] }
- Point2 RCrown { Position: [12mm,160mm] }
- Point2 LCrown { Position: [-12mm,160mm] }
- Point2 LSide { Position: [-39mm,154mm] }
- Point2 LFlare { Position: [-34mm,40mm] }
- Concept Path Outline { Start: Point2(-21.5mm,0mm) Heading: 0deg
- Line Base { Length: 43mm }
- Line FlareR { To: RFlare }
- Line SideR { To: RSide }
- Line CrownR { To: RCrown }
- Line Crown { To: LCrown }
- Line CrownL { To: LSide }
- Line SideL { To: LFlare }
- Close FlareL
- }
- Profile P From Outline
- Extrude Body { Profile: P From: 0mm To: H }
-}
-Record HardwareSite { X: Length; Y: Length; Z: Length }
-Static PickupSeatsSites: Set<HardwareSite> {
- NeckPickupCream => HardwareSite { X: 0mm; Y: 98mm; Z: 53mm }
- BridgePickupCream => HardwareSite { X: 0mm; Y: 0mm; Z: 53mm }
-}
-Static PickupCoilsSites: Set<HardwareSite> {
- NeckPickupCoil0 => HardwareSite { X: 0mm; Y: 88mm; Z: 57mm }
- NeckPickupCoil1 => HardwareSite { X: 0mm; Y: 108mm; Z: 57mm }
- BridgePickupCoil0 => HardwareSite { X: 0mm; Y: -10mm; Z: 57mm }
- BridgePickupCoil1 => HardwareSite { X: 0mm; Y: 10mm; Z: 57mm }
-}
-Static PickupPolesSites: Set<HardwareSite> {
- NeckPickupPole0 => HardwareSite { X: -25.5mm; Y: 108mm; Z: 62mm }
- NeckPickupPole1 => HardwareSite { X: -15.3mm; Y: 108mm; Z: 62mm }
- NeckPickupPole2 => HardwareSite { X: -5.1mm; Y: 108mm; Z: 62mm }
- NeckPickupPole3 => HardwareSite { X: 5.1mm; Y: 108mm; Z: 62mm }
- NeckPickupPole4 => HardwareSite { X: 15.3mm; Y: 108mm; Z: 62mm }
- NeckPickupPole5 => HardwareSite { X: 25.5mm; Y: 108mm; Z: 62mm }
- BridgePickupPole0 => HardwareSite { X: -25.5mm; Y: 10mm; Z: 62mm }
- BridgePickupPole1 => HardwareSite { X: -15.3mm; Y: 10mm; Z: 62mm }
- BridgePickupPole2 => HardwareSite { X: -5.1mm; Y: 10mm; Z: 62mm }
- BridgePickupPole3 => HardwareSite { X: 5.1mm; Y: 10mm; Z: 62mm }
- BridgePickupPole4 => HardwareSite { X: 15.3mm; Y: 10mm; Z: 62mm }
- BridgePickupPole5 => HardwareSite { X: 25.5mm; Y: 10mm; Z: 62mm }
-}
-Static SaddlesSites: Set<HardwareSite> {
- Saddle0 => HardwareSite { X: -25.5mm; Y: -35mm; Z: 63mm }
- Saddle1 => HardwareSite { X: -15.3mm; Y: -35mm; Z: 63mm }
- Saddle2 => HardwareSite { X: -5.1mm; Y: -35mm; Z: 63mm }
- Saddle3 => HardwareSite { X: 5.1mm; Y: -35mm; Z: 63mm }
- Saddle4 => HardwareSite { X: 15.3mm; Y: -35mm; Z: 63mm }
- Saddle5 => HardwareSite { X: 25.5mm; Y: -35mm; Z: 63mm }
-}
-Static TunerPostsSites: Set<HardwareSite> {
- TunerPost00 => HardwareSite { X: -27mm; Y: 716.513464mm; Z: 49.56839mm }
- TunerPost01 => HardwareSite { X: -27mm; Y: 751.590786mm; Z: 41.470152mm }
- TunerPost02 => HardwareSite { X: -27mm; Y: 786.668108mm; Z: 33.371914mm }
- TunerPost20 => HardwareSite { X: 27mm; Y: 716.513464mm; Z: 49.56839mm }
- TunerPost21 => HardwareSite { X: 27mm; Y: 751.590786mm; Z: 41.470152mm }
- TunerPost22 => HardwareSite { X: 27mm; Y: 786.668108mm; Z: 33.371914mm }
-}
-Static TunerWashersSites: Set<HardwareSite> {
- TunerWasher00 => HardwareSite { X: -27mm; Y: 716.513464mm; Z: 49.56839mm }
- TunerWasher01 => HardwareSite { X: -27mm; Y: 751.590786mm; Z: 41.470152mm }
- TunerWasher02 => HardwareSite { X: -27mm; Y: 786.668108mm; Z: 33.371914mm }
- TunerWasher20 => HardwareSite { X: 27mm; Y: 716.513464mm; Z: 49.56839mm }
- TunerWasher21 => HardwareSite { X: 27mm; Y: 751.590786mm; Z: 41.470152mm }
- TunerWasher22 => HardwareSite { X: 27mm; Y: 786.668108mm; Z: 33.371914mm }
-}
-Static TunerButtonsSites: Set<HardwareSite> {
- TunerButton00 => HardwareSite { X: -49mm; Y: 716.513464mm; Z: 42.56839mm }
- TunerButton01 => HardwareSite { X: -49mm; Y: 751.590786mm; Z: 34.470152mm }
- TunerButton02 => HardwareSite { X: -49mm; Y: 786.668108mm; Z: 26.371914mm }
- TunerButton20 => HardwareSite { X: 49mm; Y: 716.513464mm; Z: 42.56839mm }
- TunerButton21 => HardwareSite { X: 49mm; Y: 751.590786mm; Z: 34.470152mm }
- TunerButton22 => HardwareSite { X: 49mm; Y: 786.668108mm; Z: 26.371914mm }
-}
+// Compatibility entry; prefer guitar.firmasm.
+// GUITAR-SURFACING-X0: composition root. Geometry and local layout live in modules.
+Include "hardware-definitions.firmament";
+Include "body-assembly.firmament";
+Include "neck-assembly.firmament";
+Include "electronics-assembly.firmament";
+Include "bridge-assembly.firmament";
+Include "strings-assembly.firmament";
Assembly GuitarX0 {
<Assembly GuitarX0>
- <Part MahoganyBack = SectionChainFile<"MahoganyBack.firmament">>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,0mm]; }
- </Part>
- <Part IvoryBinding = SectionChainFile<"IvoryBinding.firmament">>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,0mm]; }
- </Part>
- <Part CarvedMaple = SectionChainFile<"CarvedMaple.firmament">>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,0mm]; }
- </Part>
- <Part Neck = SectionChainFile<"Neck.firmament">>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,0mm]; }
- </Part>
- <Part BoardBinding = Board<H:5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,55mm]; }
- </Part>
- <Part Rosewood = Board<H:2mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,60mm]; }
- </Part>
-<Part Headstock = Head<H:14mm>>
- Placement { From: Base.Frame; To: HeadTilt.Frame; }
-</Part>
-<Part HeadVeneer = Head<H:1mm>>
-</Part>
- <Part Nut = Panel<L:44mm,W:4mm,H:3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,658mm,62mm]; }
- </Part>
- <Part Bridge = Panel<L:82mm,W:12mm,H:6mm,R:5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,-35mm,57mm]; }
- </Part>
- <Part Tailpiece = Panel<L:88mm,W:15mm,H:7mm,R:6mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,-75mm,53mm]; }
- </Part>
- <Part KnobSkirt0 = Drum<R:12mm,H:3mm>>
- Placement { From: Origin; To: World; TranslateLocal: [79mm,-95mm,50mm]; }
- </Part>
- <Part AmberKnob0 = Drum<R:9mm,H:9mm>>
- Placement { From: Origin; To: World; TranslateLocal: [79mm,-95mm,53mm]; }
- </Part>
- <Part KnobCap0 = Drum<R:5mm,H:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [79mm,-95mm,62mm]; }
- </Part>
- <Part KnobSkirt1 = Drum<R:12mm,H:3mm>>
- Placement { From: Origin; To: World; TranslateLocal: [123mm,-70mm,45mm]; }
- </Part>
- <Part AmberKnob1 = Drum<R:9mm,H:9mm>>
- Placement { From: Origin; To: World; TranslateLocal: [123mm,-70mm,48mm]; }
- </Part>
- <Part KnobCap1 = Drum<R:5mm,H:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [123mm,-70mm,57mm]; }
- </Part>
- <Part KnobSkirt2 = Drum<R:12mm,H:3mm>>
- Placement { From: Origin; To: World; TranslateLocal: [75mm,-156mm,47mm]; }
- </Part>
- <Part AmberKnob2 = Drum<R:9mm,H:9mm>>
- Placement { From: Origin; To: World; TranslateLocal: [75mm,-156mm,50mm]; }
- </Part>
- <Part KnobCap2 = Drum<R:5mm,H:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [75mm,-156mm,59mm]; }
- </Part>
- <Part KnobSkirt3 = Drum<R:12mm,H:3mm>>
- Placement { From: Origin; To: World; TranslateLocal: [121mm,-131mm,43mm]; }
- </Part>
- <Part AmberKnob3 = Drum<R:9mm,H:9mm>>
- Placement { From: Origin; To: World; TranslateLocal: [121mm,-131mm,46mm]; }
- </Part>
- <Part KnobCap3 = Drum<R:5mm,H:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [121mm,-131mm,55mm]; }
- </Part>
- <Part SelectorRing = Drum<R:16mm,H:1.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [-73mm,137mm,43mm]; }
- </Part>
- <Part SelectorStem = Drum<R:2.5mm,H:12mm>>
- Placement { From: Origin; To: World; TranslateLocal: [-73mm,137mm,44.5mm]; }
- </Part>
- <Part SelectorTip = Drum<R:4mm,H:7mm>>
- Placement { From: Origin; To: World; TranslateLocal: [-73mm,137mm,54mm]; }
- </Part>
- <Part ControlCover = Panel<L:63mm,W:93mm,H:1mm,R:15mm>>
- Placement { From: Origin; To: World; TranslateLocal: [85mm,-115mm,-1mm]; }
- </Part>
- <Part SelectorCover = Drum<R:24mm,H:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [-73mm,137mm,-1mm]; }
- </Part>
- <Part Fret1 = Panel<L:42.896685mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,622.753068mm,62mm]; }
- </Part>
- <Part Fret2 = Panel<L:43.697598mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,589.484395mm,62mm]; }
- </Part>
- <Part Fret3 = Panel<L:44.453559mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,558.082949mm,62mm]; }
- </Part>
- <Part PearlInlay3 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,573.783672mm,62mm]; }
- </Part>
- <Part Fret4 = Panel<L:45.167091mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,528.44393mm,62mm]; }
- </Part>
- <Part Fret5 = Panel<L:45.840575mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,500.468422mm,62mm]; }
- </Part>
- <Part PearlInlay5 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,514.456176mm,62mm]; }
- </Part>
- <Part Fret6 = Panel<L:46.47626mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,474.063059mm,62mm]; }
- </Part>
- <Part Fret7 = Panel<L:47.076266mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,449.139714mm,62mm]; }
- </Part>
- <Part PearlInlay7 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,461.601386mm,62mm]; }
- </Part>
- <Part Fret8 = Panel<L:47.642597mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,425.61521mm,62mm]; }
- </Part>
- <Part Fret9 = Panel<L:48.177142mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,403.411034mm,62mm]; }
- </Part>
- <Part PearlInlay9 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,414.513122mm,62mm]; }
- </Part>
- <Part Fret10 = Panel<L:48.681685mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,382.453083mm,62mm]; }
- </Part>
- <Part Fret11 = Panel<L:49.15791mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,362.671412mm,62mm]; }
- </Part>
- <Part Fret12 = Panel<L:49.607407mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,344mm,62mm]; }
- </Part>
- <Part PearlInlay12 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,353.335706mm,62mm]; }
- </Part>
- <Part Fret13 = Panel<L:50.031676mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,326.376534mm,62mm]; }
- </Part>
- <Part Fret14 = Panel<L:50.432132mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,309.742197mm,62mm]; }
- </Part>
- <Part Fret15 = Panel<L:50.810113mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,294.041474mm,62mm]; }
- </Part>
- <Part PearlInlay15 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,301.891836mm,62mm]; }
- </Part>
- <Part Fret16 = Panel<L:51.166879mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,279.221965mm,62mm]; }
- </Part>
- <Part Fret17 = Panel<L:51.503621mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,265.234211mm,62mm]; }
- </Part>
- <Part PearlInlay17 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,272.228088mm,62mm]; }
- </Part>
- <Part Fret18 = Panel<L:51.821463mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,252.031529mm,62mm]; }
- </Part>
- <Part Fret19 = Panel<L:52.121466mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,239.569857mm,62mm]; }
- </Part>
- <Part PearlInlay19 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,245.800693mm,62mm]; }
- </Part>
- <Part Fret20 = Panel<L:52.404632mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,227.807605mm,62mm]; }
- </Part>
- <Part Fret21 = Panel<L:52.671904mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,216.705517mm,62mm]; }
- </Part>
- <Part PearlInlay21 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,222.256561mm,62mm]; }
- </Part>
- <Part Fret22 = Panel<L:52.924176mm,W:1.2mm,H:1mm,R:0.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [0mm,206.226542mm,62mm]; }
- </Part>
- <Part String0 = GuitarString<D:0.28mm,Lead:732.679593mm,Tail:59.754816mm,Deflection:13.639458deg>>
- Placement { From: Origin; To: World; TranslateLocal: [-25.5mm,-75mm,65mm]; Normal: [0.0102313880420824,0.999947657979523,0]; Up: [0.677063937819737,-0.00692766648519513,0.735891589530075]; }
- </Part>
- <Part String1 = GuitarString<D:0.36mm,Lead:732.619706mm,Tail:96.378981mm,Deflection:14.968066deg>>
- Placement { From: Origin; To: World; TranslateLocal: [-15.3mm,-75mm,65mm]; Normal: [0.00613903847430546,0.999981155925756,0]; Up: [0.67110198271469,-0.00411999852962634,0.741353596071758]; }
- </Part>
- <Part String2 = GuitarString<D:0.44mm,Lead:732.593764mm,Tail:133.054198mm,Deflection:15.480813deg>>
- Placement { From: Origin; To: World; TranslateLocal: [-5.1mm,-75mm,65mm]; Normal: [0.00204638043552803,0.999997906161364,0]; Up: [0.664265923957594,-0.001359343637021,0.747495106641937]; }
- </Part>
- <Part String5 = GuitarString<D:0.68mm,Lead:732.679593mm,Tail:59.754816mm,Deflection:13.639458deg>>
- Placement { From: Origin; To: World; TranslateLocal: [25.5mm,-75mm,65mm]; Normal: [-0.0102313880420824,0.999947657979523,0]; Up: [-0.677063937819737,-0.00692766648519513,0.735891589530075]; }
- </Part>
- <Part String4 = GuitarString<D:0.6mm,Lead:732.619706mm,Tail:96.378981mm,Deflection:14.968066deg>>
- Placement { From: Origin; To: World; TranslateLocal: [15.3mm,-75mm,65mm]; Normal: [-0.00613903847430546,0.999981155925756,0]; Up: [-0.67110198271469,-0.00411999852962634,0.741353596071758]; }
- </Part>
- <Part String3 = GuitarString<D:0.52mm,Lead:732.593764mm,Tail:133.054198mm,Deflection:15.480813deg>>
- Placement { From: Origin; To: World; TranslateLocal: [5.1mm,-75mm,65mm]; Normal: [-0.00204638043552803,0.999997906161364,0]; Up: [-0.664265923957594,-0.001359343637021,0.747495106641937]; }
- </Part>
-Pattern PickupSeats Over PickupSeatsSites {
- site => <Part PickupCream = Surround<L:88mm,W:46mm,H:4mm>>
- Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
- </Part>
-}
-Pattern PickupCoils Over PickupCoilsSites {
- site => <Part PickupCoil = Panel<L:70mm,W:17mm,H:5mm,R:3mm>>
- Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
- </Part>
-}
-Pattern PickupPoles Over PickupPolesSites {
- site => <Part PickupPole = Drum<R:2.2mm,H:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
- </Part>
-}
-Pattern Saddles Over SaddlesSites {
- site => <Part Saddle = Panel<L:7mm,W:9mm,H:2mm,R:1mm>>
- Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
- </Part>
-}
-Pattern TunerPosts Over TunerPostsSites {
- site => <Part TunerPost = Drum<R:4mm,H:8mm>>
- Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
- </Part>
-}
-Pattern TunerWashers Over TunerWashersSites {
- site => <Part TunerWasher = Drum<R:7mm,H:1.5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
- </Part>
-}
-Pattern TunerButtons Over TunerButtonsSites {
- site => <Part TunerButton = Panel<L:15mm,W:19mm,H:6mm,R:5mm>>
- Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
- </Part>
-}
+ <Assembly Body = GuitarBody>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ <Assembly Neck = GuitarNeck>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ <Assembly Electronics = GuitarElectronics>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ <Assembly Bridge = GuitarBridge>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ <Assembly Strings = GuitarStrings>
+ Placement { From: Origin; To: World; }
+ </Assembly>
</Assembly>
- FrameTransform NutWorld { From: GuitarX0.Neck.NutMount.Frame; Normal: [0,1,0]; Up: [0,0,1]; TranslateLocal: [0mm,-7mm,0mm]; }
- FrameTransform HeadTilt { From: NutWorld.Frame; RotateLocal: { Axis: X; Angle: -13deg } }
- Interface<Fixed> VeneerSeat { A: GuitarX0.Headstock.Front.Frame; B: GuitarX0.HeadVeneer.Base.Frame; Gap: 0mm; Clocking: 0deg; }
Anchor: GuitarX0;
}
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm
new file mode 100644
index 00000000..8b580b2a
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/guitar.firmasm
@@ -0,0 +1,27 @@
+// GUITAR-SURFACING-X0: composition root. Geometry and local layout live in modules.
+Include "hardware-definitions.firmament";
+Include "body-assembly.firmament";
+Include "neck-assembly.firmament";
+Include "electronics-assembly.firmament";
+Include "bridge-assembly.firmament";
+Include "strings-assembly.firmament";
+Assembly GuitarX0 {
+ <Assembly GuitarX0>
+ <Assembly Body = GuitarBody>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ <Assembly Neck = GuitarNeck>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ <Assembly Electronics = GuitarElectronics>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ <Assembly Bridge = GuitarBridge>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ <Assembly Strings = GuitarStrings>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ </Assembly>
+ Anchor: GuitarX0;
+}
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmament
new file mode 100644
index 00000000..b545cae2
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/hardware-definitions.firmament
@@ -0,0 +1,52 @@
+Template<L: Length, W: Length, H: Length, R: Length> Struct Panel {
+ RoundedRect2 Outline { Center: [0mm,0mm] Size: [L,W] Radius: R }
+ Profile P { Loop Outer { Outline |> TraceLoop } }
+ Extrude Body { Profile: P From: 0mm To: H }
+}
+Template<R: Length,H: Length> Struct Drum {
+ Circle2 Outline { Center: [0mm,0mm] Radius: R }
+ Profile P { Loop Outer { Outline |> TraceLoop } }
+ Extrude Body { Profile: P From: 0mm To: H }
+}
+Template<L: Length,W: Length,H: Length> Struct Surround {
+ RoundedRect2 Outer { Center: [0mm,0mm] Size: [L,W] Radius: 4mm }
+ // Solid decorative seat; the black bobbins sit on it. No routed opening claim.
+ Profile P { Loop Outer { Outer |> TraceLoop } }
+ Extrude Body { Profile: P From: 0mm To: H }
+}
+Template<H: Length> Struct Board {
+ Point2 RightNut { Position: [21.5mm,660mm] }
+ Point2 LeftNut { Position: [-21.5mm,660mm] }
+ Concept Path Outline { Start: Point2(-28mm,120mm) Heading: 0deg
+ Line End { Length: 56mm }
+ Line Right { To: RightNut }
+ Line Nut { To: LeftNut }
+ Close Left
+ }
+ Profile P From Outline
+ Extrude Body { Profile: P From: 0mm To: H }
+}
+Template<H: Length> Struct Head {
+ Expose { Semantic Base { DatumFrame Frame = [0,0,0] x [1,0,0] y [0,1,0] z [0,0,1]; }
+ Semantic Front { DatumFrame Frame = [0mm,0mm,H] x [1,0,0] y [0,1,0] z [0,0,1]; } }
+ Point2 RFlare { Position: [34mm,40mm] }
+ Point2 RSide { Position: [39mm,154mm] }
+ Point2 RCrown { Position: [12mm,160mm] }
+ Point2 LCrown { Position: [-12mm,160mm] }
+ Point2 LSide { Position: [-39mm,154mm] }
+ Point2 LFlare { Position: [-34mm,40mm] }
+ Concept Path Outline { Start: Point2(-21.5mm,0mm) Heading: 0deg
+ Line Base { Length: 43mm }
+ Line FlareR { To: RFlare }
+ Line SideR { To: RSide }
+ Line CrownR { To: RCrown }
+ Line Crown { To: LCrown }
+ Line CrownL { To: LSide }
+ Line SideL { To: LFlare }
+ Close FlareL
+ }
+ Profile P From Outline
+ Extrude Body { Profile: P From: 0mm To: H }
+}
+
+Record HardwareSite { X: Length; Y: Length; Z: Length }
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/neck-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/neck-assembly.firmament
new file mode 100644
index 00000000..52ecf2d2
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/neck-assembly.firmament
@@ -0,0 +1,124 @@
+Include "tuners-assembly.firmament";
+
+Subassembly GuitarNeck {
+ <Assembly GuitarNeck>
+ <Part Neck = SectionChainFile<"Neck.firmament">>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,0mm]; }
+ </Part>
+ <Part BoardBinding = Board<H:5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,55mm]; }
+ </Part>
+ <Part Rosewood = Board<H:2mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,0mm,60mm]; }
+ </Part>
+ <Part Headstock = Head<H:14mm>>
+ Placement { From: Base.Frame; To: HeadTilt.Frame; }
+ </Part>
+ <Part HeadVeneer = Head<H:1mm>>
+ </Part>
+ <Part Nut = Panel<L:44mm,W:4mm,H:3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,658mm,62mm]; }
+ </Part>
+ <Part Fret1 = Panel<L:42.896685mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,622.753068mm,62mm]; }
+ </Part>
+ <Part Fret2 = Panel<L:43.697598mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,589.484395mm,62mm]; }
+ </Part>
+ <Part Fret3 = Panel<L:44.453559mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,558.082949mm,62mm]; }
+ </Part>
+ <Part PearlInlay3 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,573.783672mm,62mm]; }
+ </Part>
+ <Part Fret4 = Panel<L:45.167091mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,528.44393mm,62mm]; }
+ </Part>
+ <Part Fret5 = Panel<L:45.840575mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,500.468422mm,62mm]; }
+ </Part>
+ <Part PearlInlay5 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,514.456176mm,62mm]; }
+ </Part>
+ <Part Fret6 = Panel<L:46.47626mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,474.063059mm,62mm]; }
+ </Part>
+ <Part Fret7 = Panel<L:47.076266mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,449.139714mm,62mm]; }
+ </Part>
+ <Part PearlInlay7 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,461.601386mm,62mm]; }
+ </Part>
+ <Part Fret8 = Panel<L:47.642597mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,425.61521mm,62mm]; }
+ </Part>
+ <Part Fret9 = Panel<L:48.177142mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,403.411034mm,62mm]; }
+ </Part>
+ <Part PearlInlay9 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,414.513122mm,62mm]; }
+ </Part>
+ <Part Fret10 = Panel<L:48.681685mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,382.453083mm,62mm]; }
+ </Part>
+ <Part Fret11 = Panel<L:49.15791mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,362.671412mm,62mm]; }
+ </Part>
+ <Part Fret12 = Panel<L:49.607407mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,344mm,62mm]; }
+ </Part>
+ <Part PearlInlay12 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,353.335706mm,62mm]; }
+ </Part>
+ <Part Fret13 = Panel<L:50.031676mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,326.376534mm,62mm]; }
+ </Part>
+ <Part Fret14 = Panel<L:50.432132mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,309.742197mm,62mm]; }
+ </Part>
+ <Part Fret15 = Panel<L:50.810113mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,294.041474mm,62mm]; }
+ </Part>
+ <Part PearlInlay15 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,301.891836mm,62mm]; }
+ </Part>
+ <Part Fret16 = Panel<L:51.166879mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,279.221965mm,62mm]; }
+ </Part>
+ <Part Fret17 = Panel<L:51.503621mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,265.234211mm,62mm]; }
+ </Part>
+ <Part PearlInlay17 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,272.228088mm,62mm]; }
+ </Part>
+ <Part Fret18 = Panel<L:51.821463mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,252.031529mm,62mm]; }
+ </Part>
+ <Part Fret19 = Panel<L:52.121466mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,239.569857mm,62mm]; }
+ </Part>
+ <Part PearlInlay19 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,245.800693mm,62mm]; }
+ </Part>
+ <Part Fret20 = Panel<L:52.404632mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,227.807605mm,62mm]; }
+ </Part>
+ <Part Fret21 = Panel<L:52.671904mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,216.705517mm,62mm]; }
+ </Part>
+ <Part PearlInlay21 = Panel<L:25mm,W:12mm,H:0.3mm,R:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,222.256561mm,62mm]; }
+ </Part>
+ <Part Fret22 = Panel<L:52.924176mm,W:1.2mm,H:1mm,R:0.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [0mm,206.226542mm,62mm]; }
+ </Part>
+ <Assembly Tuners = GuitarTuners>
+ Placement { From: Origin; To: World; }
+ </Assembly>
+ </Assembly>
+ FrameTransform NutWorld { From: GuitarNeck.Neck.NutMount.Frame; Normal: [0,1,0]; Up: [0,0,1]; TranslateLocal: [0mm,-7mm,0mm]; }
+ FrameTransform HeadTilt { From: NutWorld.Frame; RotateLocal: { Axis: X; Angle: -13deg } }
+ Interface<Fixed> VeneerSeat { A: GuitarNeck.Headstock.Front.Frame; B: GuitarNeck.HeadVeneer.Base.Frame; Gap: 0mm; Clocking: 0deg; }
+ Anchor: GuitarNeck;
+ Expose { DatumFrame NutMount = Neck.NutMount.Frame; DatumFrame HeelMount = Neck.HeelMount.Frame; DatumFrame HeadFront = Headstock.Front.Frame; }
+}
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/pickups-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/pickups-assembly.firmament
new file mode 100644
index 00000000..1061e535
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/pickups-assembly.firmament
@@ -0,0 +1,45 @@
+Static PickupSeatsSites: Set<HardwareSite> {
+ NeckPickupCream => HardwareSite { X: 0mm; Y: 98mm; Z: 53mm }
+ BridgePickupCream => HardwareSite { X: 0mm; Y: 0mm; Z: 53mm }
+}
+Static PickupCoilsSites: Set<HardwareSite> {
+ NeckPickupCoil0 => HardwareSite { X: 0mm; Y: 88mm; Z: 57mm }
+ NeckPickupCoil1 => HardwareSite { X: 0mm; Y: 108mm; Z: 57mm }
+ BridgePickupCoil0 => HardwareSite { X: 0mm; Y: -10mm; Z: 57mm }
+ BridgePickupCoil1 => HardwareSite { X: 0mm; Y: 10mm; Z: 57mm }
+}
+Static PickupPolesSites: Set<HardwareSite> {
+ NeckPickupPole0 => HardwareSite { X: -25.5mm; Y: 108mm; Z: 62mm }
+ NeckPickupPole1 => HardwareSite { X: -15.3mm; Y: 108mm; Z: 62mm }
+ NeckPickupPole2 => HardwareSite { X: -5.1mm; Y: 108mm; Z: 62mm }
+ NeckPickupPole3 => HardwareSite { X: 5.1mm; Y: 108mm; Z: 62mm }
+ NeckPickupPole4 => HardwareSite { X: 15.3mm; Y: 108mm; Z: 62mm }
+ NeckPickupPole5 => HardwareSite { X: 25.5mm; Y: 108mm; Z: 62mm }
+ BridgePickupPole0 => HardwareSite { X: -25.5mm; Y: 10mm; Z: 62mm }
+ BridgePickupPole1 => HardwareSite { X: -15.3mm; Y: 10mm; Z: 62mm }
+ BridgePickupPole2 => HardwareSite { X: -5.1mm; Y: 10mm; Z: 62mm }
+ BridgePickupPole3 => HardwareSite { X: 5.1mm; Y: 10mm; Z: 62mm }
+ BridgePickupPole4 => HardwareSite { X: 15.3mm; Y: 10mm; Z: 62mm }
+ BridgePickupPole5 => HardwareSite { X: 25.5mm; Y: 10mm; Z: 62mm }
+}
+Subassembly GuitarPickups {
+ <Assembly GuitarPickups>
+ Pattern PickupSeats Over PickupSeatsSites {
+ site => <Part PickupCream = Surround<L:88mm,W:46mm,H:4mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
+ </Part>
+ }
+ Pattern PickupCoils Over PickupCoilsSites {
+ site => <Part PickupCoil = Panel<L:70mm,W:17mm,H:5mm,R:3mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
+ </Part>
+ }
+ Pattern PickupPoles Over PickupPolesSites {
+ site => <Part PickupPole = Drum<R:2.2mm,H:1mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
+ </Part>
+ }
+ </Assembly>
+
+ Anchor: GuitarPickups;
+}
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/strings-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/strings-assembly.firmament
new file mode 100644
index 00000000..2a480e29
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/strings-assembly.firmament
@@ -0,0 +1,37 @@
+// GUITAR-SURFACING-X0. Original design inspired by the single-cut family.
+// Every visible product part is compiled Firmament geometry. Finish is downstream.
+Template<D: Length, Lead: Length, Tail: Length, Deflection: Angle> Struct GuitarString {
+ WireForm String {
+ Diameter: D
+ Material: Standard.Materials.StainlessSteel.304_Annealed
+ StartFrame { Origin: [0mm,0mm,0mm]; Tangent: [0,0,1]; Up: [1,0,0] }
+ Straight SpeakingLength { Length: Lead }
+ Bend NutBreak { Radius: 3mm; Angle: Deflection; Plane: Up }
+ Straight TunerLead { Length: Tail }
+ }
+}
+
+Subassembly GuitarStrings {
+ <Assembly GuitarStrings>
+ <Part String0 = GuitarString<D:0.28mm,Lead:732.679593mm,Tail:59.754816mm,Deflection:13.639458deg>>
+ Placement { From: Origin; To: World; TranslateLocal: [-25.5mm,-75mm,65mm]; Normal: [0.0102313880420824,0.999947657979523,0]; Up: [0.677063937819737,-0.00692766648519513,0.735891589530075]; }
+ </Part>
+ <Part String1 = GuitarString<D:0.36mm,Lead:732.619706mm,Tail:96.378981mm,Deflection:14.968066deg>>
+ Placement { From: Origin; To: World; TranslateLocal: [-15.3mm,-75mm,65mm]; Normal: [0.00613903847430546,0.999981155925756,0]; Up: [0.67110198271469,-0.00411999852962634,0.741353596071758]; }
+ </Part>
+ <Part String2 = GuitarString<D:0.44mm,Lead:732.593764mm,Tail:133.054198mm,Deflection:15.480813deg>>
+ Placement { From: Origin; To: World; TranslateLocal: [-5.1mm,-75mm,65mm]; Normal: [0.00204638043552803,0.999997906161364,0]; Up: [0.664265923957594,-0.001359343637021,0.747495106641937]; }
+ </Part>
+ <Part String5 = GuitarString<D:0.68mm,Lead:732.679593mm,Tail:59.754816mm,Deflection:13.639458deg>>
+ Placement { From: Origin; To: World; TranslateLocal: [25.5mm,-75mm,65mm]; Normal: [-0.0102313880420824,0.999947657979523,0]; Up: [-0.677063937819737,-0.00692766648519513,0.735891589530075]; }
+ </Part>
+ <Part String4 = GuitarString<D:0.6mm,Lead:732.619706mm,Tail:96.378981mm,Deflection:14.968066deg>>
+ Placement { From: Origin; To: World; TranslateLocal: [15.3mm,-75mm,65mm]; Normal: [-0.00613903847430546,0.999981155925756,0]; Up: [-0.67110198271469,-0.00411999852962634,0.741353596071758]; }
+ </Part>
+ <Part String3 = GuitarString<D:0.52mm,Lead:732.593764mm,Tail:133.054198mm,Deflection:15.480813deg>>
+ Placement { From: Origin; To: World; TranslateLocal: [5.1mm,-75mm,65mm]; Normal: [-0.00204638043552803,0.999997906161364,0]; Up: [-0.664265923957594,-0.001359343637021,0.747495106641937]; }
+ </Part>
+ </Assembly>
+
+ Anchor: GuitarStrings;
+}
diff --git a/fixtures/Canonical/AssemblyInterfaces/GuitarX0/tuners-assembly.firmament b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/tuners-assembly.firmament
new file mode 100644
index 00000000..190e6884
--- /dev/null
+++ b/fixtures/Canonical/AssemblyInterfaces/GuitarX0/tuners-assembly.firmament
@@ -0,0 +1,45 @@
+Static TunerPostsSites: Set<HardwareSite> {
+ TunerPost00 => HardwareSite { X: -27mm; Y: 716.513464mm; Z: 49.56839mm }
+ TunerPost01 => HardwareSite { X: -27mm; Y: 751.590786mm; Z: 41.470152mm }
+ TunerPost02 => HardwareSite { X: -27mm; Y: 786.668108mm; Z: 33.371914mm }
+ TunerPost20 => HardwareSite { X: 27mm; Y: 716.513464mm; Z: 49.56839mm }
+ TunerPost21 => HardwareSite { X: 27mm; Y: 751.590786mm; Z: 41.470152mm }
+ TunerPost22 => HardwareSite { X: 27mm; Y: 786.668108mm; Z: 33.371914mm }
+}
+Static TunerWashersSites: Set<HardwareSite> {
+ TunerWasher00 => HardwareSite { X: -27mm; Y: 716.513464mm; Z: 49.56839mm }
+ TunerWasher01 => HardwareSite { X: -27mm; Y: 751.590786mm; Z: 41.470152mm }
+ TunerWasher02 => HardwareSite { X: -27mm; Y: 786.668108mm; Z: 33.371914mm }
+ TunerWasher20 => HardwareSite { X: 27mm; Y: 716.513464mm; Z: 49.56839mm }
+ TunerWasher21 => HardwareSite { X: 27mm; Y: 751.590786mm; Z: 41.470152mm }
+ TunerWasher22 => HardwareSite { X: 27mm; Y: 786.668108mm; Z: 33.371914mm }
+}
+Static TunerButtonsSites: Set<HardwareSite> {
+ TunerButton00 => HardwareSite { X: -49mm; Y: 716.513464mm; Z: 42.56839mm }
+ TunerButton01 => HardwareSite { X: -49mm; Y: 751.590786mm; Z: 34.470152mm }
+ TunerButton02 => HardwareSite { X: -49mm; Y: 786.668108mm; Z: 26.371914mm }
+ TunerButton20 => HardwareSite { X: 49mm; Y: 716.513464mm; Z: 42.56839mm }
+ TunerButton21 => HardwareSite { X: 49mm; Y: 751.590786mm; Z: 34.470152mm }
+ TunerButton22 => HardwareSite { X: 49mm; Y: 786.668108mm; Z: 26.371914mm }
+}
+Subassembly GuitarTuners {
+ <Assembly GuitarTuners>
+ Pattern TunerPosts Over TunerPostsSites {
+ site => <Part TunerPost = Drum<R:4mm,H:8mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
+ </Part>
+ }
+ Pattern TunerWashers Over TunerWashersSites {
+ site => <Part TunerWasher = Drum<R:7mm,H:1.5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
+ </Part>
+ }
+ Pattern TunerButtons Over TunerButtonsSites {
+ site => <Part TunerButton = Panel<L:15mm,W:19mm,H:6mm,R:5mm>>
+ Placement { From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }
+ </Part>
+ }
+ </Assembly>
+
+ Anchor: GuitarTuners;
+}
diff --git a/scripts/create-guitar-x0.py b/scripts/create-guitar-x0.py
index 828411c6..ed4a62dd 100644
--- a/scripts/create-guitar-x0.py
+++ b/scripts/create-guitar-x0.py
@@ -7,6 +7,7 @@ from pathlib import Path
import math
import json
import re
+from textwrap import dedent, indent
ROOT = Path('fixtures/Canonical/AssemblyInterfaces/GuitarX0')
ROOT.mkdir(parents=True, exist_ok=True)
@@ -243,7 +244,7 @@ for side in [-1,1]:
formed_string(f'String{string_index}',((string_index-2.5)*10.2,-75,65),((string_index-2.5)*7.2,658,65),(side*27,y,z+5),.28+string_index*.08)
# Finite keyed occurrence families. Values remain ordinary checked Firmament
# Records; the compiler owns expansion, identities, and definition sharing.
-catalog=['Record HardwareSite { X: Length; Y: Length; Z: Length }']
+catalog=[]
for family,matcher in [
('PickupSeats',r'(?:Neck|Bridge)PickupCream'),
('PickupCoils',r'(?:Neck|Bridge)PickupCoil[01]'),
@@ -269,14 +270,67 @@ for family,matcher in [
Placement {{ From: Origin; To: World; TranslateLocal: [site.X,site.Y,site.Z]; }}
</Part>
}}''')
-assembly=templates+'\n'.join(catalog)+'\nAssembly GuitarX0 {\n <Assembly GuitarX0>\n'+'\n'.join(parts)+'''\n </Assembly>
- FrameTransform NutWorld { From: GuitarX0.Neck.NutMount.Frame; Normal: [0,1,0]; Up: [0,0,1]; TranslateLocal: [0mm,-7mm,0mm]; }
+def write_module(filename, name, members, rows=(), includes=(), relations='', exposes=''):
+ prefix=''.join(f'Include "{item}";\n' for item in includes)
+ text=prefix+'\n'.join(rows)+f'\nSubassembly {name} {{\n <Assembly {name}>\n'
+ text+='\n'.join(indent(dedent(member).strip(),' ') for member in members)+f'\n </Assembly>\n{relations}\n Anchor: {name};\n'
+ if exposes:text+=' Expose { '+exposes+' }\n'
+ text+='}\n'
+ (ROOT/filename).write_text(text)
+
+groups={name:[] for name in ('Body','Neck','Tuners','Pickups','Electronics','Bridge','Strings')}
+for declaration in parts:
+ name=re.search(r'(?:<Part|Pattern)\s+(\w+)',declaration)[1]
+ if name in ('MahoganyBack','IvoryBinding','CarvedMaple'): group='Body'
+ elif name.startswith('Tuner'):group='Tuners'
+ elif name.startswith('Pickup'):group='Pickups'
+ elif name in ('Bridge','Tailpiece','Saddles'):group='Bridge'
+ elif name.startswith('String'):group='Strings'
+ elif name.startswith(('Knob','AmberKnob','Selector','ControlCover')):group='Electronics'
+ else:group='Neck'
+ groups[group].append(declaration)
+
+def occurrence(name,definition):
+ return f'<Assembly {name} = {definition}>\n Placement {{ From: Origin; To: World; }}\n</Assembly>'
+
+def rows_for(prefixes):
+ return [row for row in catalog if any(row.startswith('Static '+prefix) for prefix in prefixes)]
+
+# Common geometry definitions are separate from product containment. The string
+# definition belongs to its route module rather than the common hardware catalog.
+string_end=templates.index('Template<L: Length')
+string_template=templates[:string_end]
+(ROOT/'hardware-definitions.firmament').write_text(templates[string_end:]+'\nRecord HardwareSite { X: Length; Y: Length; Z: Length }\n')
+write_module('body-assembly.firmament','GuitarBody',groups['Body'])
+write_module('tuners-assembly.firmament','GuitarTuners',groups['Tuners'],rows_for(('Tuner',)))
+neck_relations=''' FrameTransform NutWorld { From: GuitarNeck.Neck.NutMount.Frame; Normal: [0,1,0]; Up: [0,0,1]; TranslateLocal: [0mm,-7mm,0mm]; }
FrameTransform HeadTilt { From: NutWorld.Frame; RotateLocal: { Axis: X; Angle: -13deg } }
- Interface<Fixed> VeneerSeat { A: GuitarX0.Headstock.Front.Frame; B: GuitarX0.HeadVeneer.Base.Frame; Gap: 0mm; Clocking: 0deg; }
+ Interface<Fixed> VeneerSeat { A: GuitarNeck.Headstock.Front.Frame; B: GuitarNeck.HeadVeneer.Base.Frame; Gap: 0mm; Clocking: 0deg; }'''
+write_module('neck-assembly.firmament','GuitarNeck',groups['Neck']+[occurrence('Tuners','GuitarTuners')],
+ includes=('tuners-assembly.firmament',),relations=neck_relations,
+ exposes='DatumFrame NutMount = Neck.NutMount.Frame; DatumFrame HeelMount = Neck.HeelMount.Frame; DatumFrame HeadFront = Headstock.Front.Frame;')
+write_module('pickups-assembly.firmament','GuitarPickups',groups['Pickups'],rows_for(('Pickup',)))
+write_module('electronics-assembly.firmament','GuitarElectronics',groups['Electronics']+[occurrence('Pickups','GuitarPickups')],
+ includes=('pickups-assembly.firmament',))
+write_module('bridge-assembly.firmament','GuitarBridge',groups['Bridge'],rows_for(('Saddles',)))
+write_module('strings-assembly.firmament','GuitarStrings',groups['Strings'],rows=(string_template,))
+assembly='''// GUITAR-SURFACING-X0: composition root. Geometry and local layout live in modules.
+Include "hardware-definitions.firmament";
+Include "body-assembly.firmament";
+Include "neck-assembly.firmament";
+Include "electronics-assembly.firmament";
+Include "bridge-assembly.firmament";
+Include "strings-assembly.firmament";
+Assembly GuitarX0 {
+ <Assembly GuitarX0>
+'''+ '\n'.join(indent(occurrence(name,'Guitar'+name),' ') for name in ('Body','Neck','Electronics','Bridge','Strings'))+'''
+ </Assembly>
Anchor: GuitarX0;
}
'''
-(ROOT/'guitar-x0.firmament').write_text(assembly)
+(ROOT/'guitar.firmasm').write_text(assembly)
+# Retain the old fixture entry as a tiny source-compatible composition root.
+(ROOT/'guitar-x0.firmament').write_text('// Compatibility entry; prefer guitar.firmasm.\n'+assembly)
looks={
'SectionChainFile<"CarvedMaple.firmament">':(.65,.28,.035,0,.35),
'SectionChainFile<"MahoganyBack.firmament">':(.15,.025,.012,0,.4),
diff --git a/scripts/qualify-guitar-x0.ps1 b/scripts/qualify-guitar-x0.ps1
index b2af7b70..e44cd859 100644
--- a/scripts/qualify-guitar-x0.ps1
+++ b/scripts/qualify-guitar-x0.ps1
@@ -19,7 +19,7 @@ try {
$out = [IO.Path]::GetFullPath($OutDir)
New-Item -ItemType Directory -Force -Path $out | Out-Null
$fixture = 'fixtures/Canonical/AssemblyInterfaces/GuitarX0'
- $source = "$fixture/guitar-x0.firmament"
+ $source = "$fixture/guitar.firmasm"
$cli = 'Aetheris.CLI/bin/Release/net10.0/aetheris.dll'
Invoke-Logged 'dotnet' @('build','Aetheris.slnx','-c','Release','-m:1','--nologo','-v:q') "$out/build.log"
Invoke-Logged 'dotnet' @('run','--project','demos/GuitarSurfacingX0','-c','Release','--',$source,"$out/timings.json") "$out/benchmark.log"