worldorbit 2.5.12 → 2.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worldorbit",
-  "version": "2.5.12",
+  "version": "2.5.13",
   "description": "A text-based DSL and parser pipeline for orbital worldbuilding",
   "type": "module",
   "main": "./dist/unpkg/worldorbit.esm.js",

package/packages/core/dist/scene.js

@@ -837,8 +837,9 @@ function placeOrbitingChildren(object, positions, orbitDrafts, leaderDrafts, con
     }
     const orbiting = [...(context.orbitChildren.get(object.id) ?? [])].sort(compareOrbiting);
     const orbitMetricContext = computeOrbitMetricContext(orbiting, parent.radius, context.spacingFactor, context.scaleModel);
+    const orbitRadiiPx = resolveOrbitRadiiPx(orbiting, orbitMetricContext);
     orbiting.forEach((child, index) => {
-        const orbitGeometry = resolveOrbitGeometry(child, index, orbiting.length, parent, orbitMetricContext, context);
+        const orbitGeometry = resolveOrbitGeometry(child, index, orbiting.length, parent, orbitMetricContext, orbitRadiiPx[index] ?? orbitMetricContext.innerPx, context);
         orbitDrafts.push({
             object: child,
             parentId: object.id,
@@ -913,6 +914,7 @@ function computeOrbitMetricContext(objects, parentRadius, spacingFactor, scaleMo
             innerPx,
             stepPx,
             pixelSpread: Math.max(stepPx * Math.max(objects.length - 1, 1), stepPx),
+            minimumGapPx: stepPx * 0.42,
         };
     }
     const minMetric = Math.min(...presentMetrics);
@@ -926,9 +928,10 @@ function computeOrbitMetricContext(objects, parentRadius, spacingFactor, scaleMo
         innerPx,
         stepPx,
         pixelSpread: Math.max(stepPx * Math.max(objects.length - 1, 1), stepPx),
+        minimumGapPx: stepPx * 0.42,
     };
 }
-function resolveOrbitGeometry(object, index, count, parent, metricContext, context) {
+function resolveOrbitGeometry(object, index, count, parent, metricContext, orbitRadiusPx, context) {
     const placement = object.placement;
     const band = object.type === "belt" || object.type === "ring";
     if (!placement || placement.mode !== "orbit") {
@@ -948,7 +951,7 @@ function resolveOrbitGeometry(object, index, count, parent, metricContext, conte
         };
     }
     const eccentricity = clampNumber(typeof placement.eccentricity === "number" ? placement.eccentricity : 0, 0, 0.92);
-    const semiMajor = resolveOrbitRadiusPx(object, index, metricContext);
+    const semiMajor = orbitRadiusPx;
     const baseMinor = Math.max(semiMajor * Math.sqrt(1 - eccentricity * eccentricity), semiMajor * 0.18);
     const inclinationDeg = unitValueToDegrees(placement.inclination) ?? 0;
     const inclinationScale = context.projection === "isometric"
@@ -989,17 +992,23 @@ function resolveOrbitGeometry(object, index, count, parent, metricContext, conte
         objectY: objectPoint.y,
     };
 }
-function resolveOrbitRadiusPx(object, index, metricContext) {
-    const metric = orbitMetric(object);
-    if (metric === null) {
-        return metricContext.innerPx + index * metricContext.stepPx;
-    }
-    if (metricContext.metricSpread > 0) {
-        return (metricContext.innerPx +
-            ((metric - metricContext.minMetric) / metricContext.metricSpread) *
-                metricContext.pixelSpread);
-    }
-    return metricContext.innerPx + Math.log10(metric + 1) * metricContext.stepPx;
+function resolveOrbitRadiusPx(metric, metricContext) {
+    return metricContext.innerPx + metricContext.stepPx * log2(Math.max(metric, 0) + 1);
+}
+function resolveOrbitRadiiPx(objects, metricContext) {
+    const radii = [];
+    objects.forEach((object, index) => {
+        const metric = orbitMetric(object);
+        const fallbackRadius = metricContext.innerPx + index * metricContext.stepPx;
+        const baseRadius = metric === null
+            ? fallbackRadius
+            : resolveOrbitRadiusPx(metric, metricContext);
+        const minimumRadius = index === 0
+            ? metricContext.innerPx
+            : (radii[index - 1] ?? metricContext.innerPx) + metricContext.minimumGapPx;
+        radii.push(Math.max(baseRadius, minimumRadius));
+    });
+    return radii;
 }
 function orbitMetric(object) {
     if (!object.placement || object.placement.mode !== "orbit") {
@@ -1007,6 +1016,9 @@ function orbitMetric(object) {
     }
     return toDistanceMetric(object.placement.semiMajor ?? object.placement.distance ?? null);
 }
+function log2(value) {
+    return Math.log(value) / Math.log(2);
+}
 function resolveOrbitPhase(phase, index, count) {
     const degreeValue = phase ? unitValueToDegrees(phase) : null;
     if (degreeValue !== null) {