feat(tahuantinsuyu): fase 9 — Solar Arc como segundo overlay
Confirma que la arquitectura de fase 6 escala: tres overlays simultáneos
(transit + progression + solar_arc) sin acoplamiento entre módulos, y
sin tocar el flujo del Shell salvo registrar el nuevo branch.
Tres puntos de extensión por overlay nuevo (exactamente los predichos):
1. variante en PipelineRequest
2. helper build_*_overlay en bridge + match arm en compose
3. módulo declarativo en modules/ + registro
- engine: PipelineRequest::SolarArc { target_age_years: f64 } +
build_solar_arc_overlay que llama solar_arc_true(natal, session, age)
→ desplaza uniformemente cada placement y cusp por el arco solar
(default ≈1°/año, vía true progressed Sun). Cross aspects natal ×
dirigida vía find_synastry_aspects(majors). Layers con
module_id="solar_arc" y z=8/9 (sobre todos los demás).
- modules: solar_arc::SolarArcModule con id="solar_arc", toggle
"Activar" + slider target_age_years 0..120. Mismo shape que
ProgressionModule. Registry.with_builtins lo registra. Test pasó a
4 módulos aplicables a ChartKind::Natal.
- canvas: Radii.solar_arc = 0.40 (entre progression 0.48 y aspects),
aspects shrunk a 0.32 para hacer lugar. Helpers Radii::body_ring()
y Radii::aspect_endpoints() ahora reconocen "solar_arc". paint_wheel
itera ambos overlays (progression + solar_arc) para dibujar dots,
glyph overlays y anillos guía sutiles. Loop común `for (id, ring) in
[..]` evita duplicación de código.
- shell: build_requests detecta solar_arc.enabled, agrega request con
edad. apply_selection inicializa target_age_years para ambos
overlays (progression + solar_arc) en current_age + sincroniza los
sliders del panel. Helper module_age_or_current(id) factoriza la
lectura de edad con fallback.
Activando los tres overlays al mismo tiempo el canvas se convierte en
una rueda de cinco anillos: zodíaco (1.00), tránsito (0.82), natal
(0.66-0.78), bodies natal (0.58), progression (0.48), solar arc (0.40),
con líneas de aspectos cross convergiendo desde el ring natal hacia
cada overlay simultáneamente.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -9,9 +9,9 @@ use std::sync::OnceLock;
|
||||
use std::time::Instant;
|
||||
|
||||
use eternal_astrology::{
|
||||
find_aspects, find_synastry_aspects, secondary_progression, Aspect, AspectKind as EAspectKind,
|
||||
BirthData, BodySet, ChartConfig, HouseSystem as EHouseSystem, NatalChart, OrbTable,
|
||||
Zodiac as EZodiac,
|
||||
find_aspects, find_synastry_aspects, secondary_progression, solar_arc_true, Aspect,
|
||||
AspectKind as EAspectKind, BirthData, BodySet, ChartConfig, HouseSystem as EHouseSystem,
|
||||
NatalChart, OrbTable, Zodiac as EZodiac,
|
||||
};
|
||||
use eternal_sky::{Ayanamsha, Body, EphemerisSession, Instant as ESInstant, Observer, SessionConfig};
|
||||
|
||||
@@ -258,6 +258,9 @@ pub fn compose(
|
||||
crate::PipelineRequest::SecondaryProgression { target_age_years } => {
|
||||
build_progression_overlay(&natal, *target_age_years, &mut render)?;
|
||||
}
|
||||
crate::PipelineRequest::SolarArc { target_age_years } => {
|
||||
build_solar_arc_overlay(&natal, *target_age_years, &mut render)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -398,6 +401,71 @@ fn build_progression_overlay(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Helper: agrega al `RenderModel` las capas del overlay de Solar Arc
|
||||
/// (método true-progressed-Sun por default). Cada cuerpo natal se
|
||||
/// desplaza por el mismo arco — preserva las relaciones angulares y
|
||||
/// las posiciones relativas en casas se mantienen.
|
||||
fn build_solar_arc_overlay(
|
||||
natal: &NatalChart,
|
||||
target_age_years: f64,
|
||||
render: &mut RenderModel,
|
||||
) -> Result<(), EngineError> {
|
||||
let session = session()?;
|
||||
let arc = solar_arc_true(natal, session, target_age_years)
|
||||
.map_err(|e| EngineError::Eternal(format!("solar_arc_true: {:?}", e)))?;
|
||||
let directed = &arc.directed;
|
||||
|
||||
let glyphs: Vec<Glyph> = directed
|
||||
.placements
|
||||
.iter()
|
||||
.map(|p| Glyph {
|
||||
deg: p.longitude.longitude_deg() as f32,
|
||||
symbol: body_symbol(p.body).into(),
|
||||
annotation: Some(format!("{:.1}°", p.longitude.degree_in_sign_decimal())),
|
||||
retrograde: p.longitude_rate_rad_per_day < 0.0,
|
||||
house: Some(p.house_number),
|
||||
})
|
||||
.collect();
|
||||
render.layers.push(Layer {
|
||||
module_id: "solar_arc".into(),
|
||||
kind: LayerKind::Bodies,
|
||||
ring: 0.43,
|
||||
z: 8,
|
||||
geometry: Geometry::GlyphsOnly,
|
||||
glyphs,
|
||||
});
|
||||
|
||||
let cross = find_synastry_aspects(
|
||||
natal,
|
||||
directed,
|
||||
&OrbTable::modern_western(),
|
||||
EAspectKind::MAJORS,
|
||||
);
|
||||
let cross_lines: Vec<LineSeg> = cross
|
||||
.iter()
|
||||
.filter_map(|a| {
|
||||
let natal_p = natal.placement(a.person_a_body)?;
|
||||
let dir_p = directed.placement(a.person_b_body)?;
|
||||
let opacity = orb_to_opacity(a.orb_abs_deg(), a.kind);
|
||||
Some(LineSeg {
|
||||
from_deg: natal_p.longitude.longitude_deg() as f32,
|
||||
to_deg: dir_p.longitude.longitude_deg() as f32,
|
||||
kind: aspect_kind_id(a.kind).into(),
|
||||
opacity: opacity * 0.7,
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
render.layers.push(Layer {
|
||||
module_id: "solar_arc".into(),
|
||||
kind: LayerKind::Aspects,
|
||||
ring: 0.0,
|
||||
z: 9,
|
||||
geometry: Geometry::Lines(cross_lines),
|
||||
glyphs: Vec::new(),
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// =====================================================================
|
||||
// NatalChart → RenderModel
|
||||
// =====================================================================
|
||||
|
||||
@@ -173,8 +173,14 @@ pub enum PipelineRequest {
|
||||
/// `SystemTime::now`.
|
||||
target_age_years: f64,
|
||||
},
|
||||
// ── Fase 8 ──────────────────────────────────────────────────────
|
||||
// SolarArc { target_year: i32 },
|
||||
/// `module_id = "solar_arc"` — Solar Arc dirigido (default = "true
|
||||
/// progressed Sun"): cada cuerpo y cada cusp natal se desplazan por
|
||||
/// el mismo arco ≈ 1° por año de vida. Anillo interno bien adentro
|
||||
/// + cross aspects natal × dirigida.
|
||||
SolarArc {
|
||||
target_age_years: f64,
|
||||
},
|
||||
// ── Fase 10 ─────────────────────────────────────────────────────
|
||||
// Synastry { partner: tahuantinsuyu_model::ChartId },
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user