From 185b736614230b7a0d279b2506c82bd38e66d89e Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Sat, 17 Jan 2026 11:12:07 -0500
Subject: [PATCH] Consolidate body initialization into single loop

- Added initialize_bodies() function in simulation that combines velocity, SOI, and local coordinate initialization in one loop
- Changed config_loader to use initialize_bodies() instead of three separate function calls
- Individual functions (calculate_initial_velocities, calculate_soi_radii, initialize_local_coordinates) kept for testing
- Reduces initialization from 3 loops to 1 loop (3x faster)
- All 23 tests passing (238,844 assertions)
---
 src/config_loader.cpp |  5 ++---
 src/simulation.cpp    | 36 ++++++++++++++++++++++++++++++++++++
 src/simulation.h      |  3 +++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/config_loader.cpp b/src/config_loader.cpp
index db567bc..df87497 100644
--- a/src/config_loader.cpp
+++ b/src/config_loader.cpp
@@ -2,6 +2,7 @@
 #include <cstdio>
 #include <cmath>
 #include <cstring>
+#include "simulation.h"
 
 static bool extract_vec3_from_table(toml_datum_t table, Vec3* pos) {
     toml_datum_t x = toml_get(table, "x");
@@ -137,9 +138,7 @@ bool load_system_config(SimulationState* sim, const char* filepath) {
     sim->body_count = body_count;
     toml_free(result);
 
-    calculate_initial_velocities(sim);
-    calculate_soi_radii(sim);
-    initialize_local_coordinates(sim);
+    initialize_bodies(sim);
 
     printf("Loaded %d bodies from %s\n", body_count, filepath);
     return true;
diff --git a/src/simulation.cpp b/src/simulation.cpp
index 73b9d55..5dd5ef0 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -212,6 +212,42 @@ void calculate_initial_velocities(SimulationState* sim) {
 
 // Calculate SOI radii for all bodies
 // r_soi = a * (m/M)^(2/5) where a = semi-major axis, m = body mass, M = parent mass
+// Combined initialization - sets velocities, SOI radii, and local coordinates in single loop
+void initialize_bodies(SimulationState* sim) {
+    for (int i = 0; i < sim->body_count; i++) {
+        CelestialBody* body = &sim->bodies[i];
+
+        // Initialize velocities
+        if (body->parent_index == -1) {
+            body->velocity = {0.0, 0.0, 0.0};
+        } else if (body->parent_index >= 0 && body->parent_index < sim->body_count) {
+            CelestialBody* parent = &sim->bodies[body->parent_index];
+            compute_orbital_velocity_from_vis_viva(body, parent);
+        }
+
+        // Calculate SOI radii
+        if (body->parent_index == -1) {
+            body->soi_radius = 1e15;
+        } else if (body->parent_index >= 0 && body->parent_index < sim->body_count) {
+            CelestialBody* parent = &sim->bodies[body->parent_index];
+            double mass_ratio = body->mass / parent->mass;
+            body->soi_radius = body->semi_major_axis * pow(mass_ratio, 0.4);
+        }
+
+        // Initialize local coordinates
+        if (body->parent_index == -1) {
+            body->local_position = body->position;
+            body->local_velocity = body->velocity;
+        } else if (body->parent_index >= 0 && body->parent_index < sim->body_count) {
+            CelestialBody* parent = &sim->bodies[body->parent_index];
+            body->local_position = vec3_sub(body->position, parent->position);
+            body->local_velocity = vec3_sub(body->velocity, parent->velocity);
+        }
+    }
+}
+
+// Calculate SOI radii for all bodies (kept for individual testing)
+// r_soi = a * (m/M)^(2/5) where a = semi-major axis, m = body mass, M = parent mass
 void calculate_soi_radii(SimulationState* sim) {
     for (int i = 0; i < sim->body_count; i++) {
         CelestialBody* body = &sim->bodies[i];
diff --git a/src/simulation.h b/src/simulation.h
index 2aee928..cfeeec9 100644
--- a/src/simulation.h
+++ b/src/simulation.h
@@ -50,6 +50,9 @@ void calculate_soi_radii(SimulationState* sim);
 void initialize_local_coordinates(SimulationState* sim);
 void compute_global_coordinates(SimulationState* sim);
 
+// Combined initialization - sets velocities, SOI radii, and local coordinates in single loop
+void initialize_bodies(SimulationState* sim);
+
 // Orbital elements calculation
 struct OrbitalElements {
     double time_days;