cinnaboot
/
claudes_game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix whitespace

main
cinnaboot 6 months ago
parent
3717e3ba4d
commit
dbf9231f14
5 changed files with 61 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      src/config_loader.cpp
  2. 52
      src/maneuver.cpp
  3. 6
      src/simulation.cpp
  4. 6
      src/simulation.h
  5. 18
      tests/test_maneuver_planning.cpp

40
src/config_loader.cpp
Unescape View File

@ -171,7 +171,7 @@ bool load_system_config(SimulationState* sim, const char* filepath) {
toml_free(result); toml_free(result);
return false; return false;
} }
// Load maneuvers from the same config file (before freeing TOML data) // Load maneuvers from the same config file (before freeing TOML data)
if (!load_maneuvers_from_toml(sim, result)) { if (!load_maneuvers_from_toml(sim, result)) {
toml_free(result); toml_free(result);
@ -265,7 +265,7 @@ static bool parse_toml_spacecraft(toml_datum_t craft_table, Spacecraft* craft) {
craft->local_velocity = {0.0, 0.0, 0.0}; craft->local_velocity = {0.0, 0.0, 0.0};
} }
craft->velocity = craft->local_velocity; craft->velocity = craft->local_velocity;
return true; return true;
} }
@ -276,12 +276,12 @@ static bool parse_toml_maneuver(toml_datum_t maneuver_table, Maneuver* maneuver,
} }
strncpy(maneuver->name, name.u.s, 63); strncpy(maneuver->name, name.u.s, 63);
maneuver->name[63] = '\0'; maneuver->name[63] = '\0';
toml_datum_t spacecraft_name = toml_get(maneuver_table, "spacecraft_name"); toml_datum_t spacecraft_name = toml_get(maneuver_table, "spacecraft_name");
if (spacecraft_name.type != TOML_STRING) { if (spacecraft_name.type != TOML_STRING) {
return false; return false;
} }
int craft_idx = -1; int craft_idx = -1;
for (int i = 0; i < sim->craft_count; i++) { for (int i = 0; i < sim->craft_count; i++) {
if (strcmp(sim->spacecraft[i].name, spacecraft_name.u.s) == 0) { if (strcmp(sim->spacecraft[i].name, spacecraft_name.u.s) == 0) {
@ -289,20 +289,20 @@ static bool parse_toml_maneuver(toml_datum_t maneuver_table, Maneuver* maneuver,
break; break;
} }
} }
if (craft_idx < 0) { if (craft_idx < 0) {
printf("Error: Maneuver '%s' references non-existent spacecraft '%s'\n", printf("Error: Maneuver '%s' references non-existent spacecraft '%s'\n",
maneuver->name, spacecraft_name.u.s); maneuver->name, spacecraft_name.u.s);
return false; return false;
} }
maneuver->craft_index = craft_idx; maneuver->craft_index = craft_idx;
toml_datum_t trigger_type_str = toml_get(maneuver_table, "trigger_type"); toml_datum_t trigger_type_str = toml_get(maneuver_table, "trigger_type");
if (trigger_type_str.type != TOML_STRING) { if (trigger_type_str.type != TOML_STRING) {
return false; return false;
} }
if (strcmp(trigger_type_str.u.s, "time") == 0) { if (strcmp(trigger_type_str.u.s, "time") == 0) {
maneuver->trigger_type = TRIGGER_TIME; maneuver->trigger_type = TRIGGER_TIME;
} else if (strcmp(trigger_type_str.u.s, "true_anomaly") == 0) { } else if (strcmp(trigger_type_str.u.s, "true_anomaly") == 0) {
@ -312,18 +312,18 @@ static bool parse_toml_maneuver(toml_datum_t maneuver_table, Maneuver* maneuver,
trigger_type_str.u.s, maneuver->name); trigger_type_str.u.s, maneuver->name);
return false; return false;
} }
toml_datum_t trigger_value = toml_get(maneuver_table, "trigger_value"); toml_datum_t trigger_value = toml_get(maneuver_table, "trigger_value");
if (trigger_value.type != TOML_FP64 && trigger_value.type != TOML_INT64) { if (trigger_value.type != TOML_FP64 && trigger_value.type != TOML_INT64) {
return false; return false;
} }
maneuver->trigger_value = trigger_value.type == TOML_FP64 ? trigger_value.u.fp64 : (double)trigger_value.u.int64; maneuver->trigger_value = trigger_value.type == TOML_FP64 ? trigger_value.u.fp64 : (double)trigger_value.u.int64;
toml_datum_t direction_str = toml_get(maneuver_table, "direction"); toml_datum_t direction_str = toml_get(maneuver_table, "direction");
if (direction_str.type != TOML_STRING) { if (direction_str.type != TOML_STRING) {
return false; return false;
} }
if (strcmp(direction_str.u.s, "prograde") == 0) { if (strcmp(direction_str.u.s, "prograde") == 0) {
maneuver->direction = BURN_PROGRADE; maneuver->direction = BURN_PROGRADE;
} else if (strcmp(direction_str.u.s, "retrograde") == 0) { } else if (strcmp(direction_str.u.s, "retrograde") == 0) {
@ -341,16 +341,16 @@ static bool parse_toml_maneuver(toml_datum_t maneuver_table, Maneuver* maneuver,
direction_str.u.s, maneuver->name); direction_str.u.s, maneuver->name);
return false; return false;
} }
toml_datum_t delta_v = toml_get(maneuver_table, "delta_v"); toml_datum_t delta_v = toml_get(maneuver_table, "delta_v");
if (delta_v.type != TOML_FP64 && delta_v.type != TOML_INT64) { if (delta_v.type != TOML_FP64 && delta_v.type != TOML_INT64) {
return false; return false;
} }
maneuver->delta_v = delta_v.type == TOML_FP64 ? delta_v.u.fp64 : (double)delta_v.u.int64; maneuver->delta_v = delta_v.type == TOML_FP64 ? delta_v.u.fp64 : (double)delta_v.u.int64;
maneuver->executed = false; maneuver->executed = false;
maneuver->executed_time = 0.0; maneuver->executed_time = 0.0;
return true; return true;
} }
@ -359,18 +359,18 @@ static bool load_maneuvers_from_toml(SimulationState* sim, toml_result_t result)
if (maneuvers.type != TOML_ARRAY) { if (maneuvers.type != TOML_ARRAY) {
return true; return true;
} }
int maneuver_count = maneuvers.u.arr.size; int maneuver_count = maneuvers.u.arr.size;
if (maneuver_count == 0) { if (maneuver_count == 0) {
return true; return true;
} }
if (maneuver_count > sim->max_maneuvers) { if (maneuver_count > sim->max_maneuvers) {
printf("Error: Too many maneuvers (%d) for simulation (max: %d)\n", printf("Error: Too many maneuvers (%d) for simulation (max: %d)\n",
maneuver_count, sim->max_maneuvers); maneuver_count, sim->max_maneuvers);
return false; return false;
} }
for (int i = 0; i < maneuver_count; i++) { for (int i = 0; i < maneuver_count; i++) {
Maneuver maneuver; Maneuver maneuver;
toml_datum_t maneuver_table = maneuvers.u.arr.elem[i]; toml_datum_t maneuver_table = maneuvers.u.arr.elem[i];
@ -378,7 +378,7 @@ static bool load_maneuvers_from_toml(SimulationState* sim, toml_result_t result)
printf("Error: Failed to parse maneuver at index %d\n", i); printf("Error: Failed to parse maneuver at index %d\n", i);
return false; return false;
} }
for (int j = 0; j < sim->maneuver_count; j++) { for (int j = 0; j < sim->maneuver_count; j++) {
if (strcmp(sim->maneuvers[j].name, maneuver.name) == 0) { if (strcmp(sim->maneuvers[j].name, maneuver.name) == 0) {
printf("Error: Duplicate maneuver name '%s' found at index %d\n", printf("Error: Duplicate maneuver name '%s' found at index %d\n",
@ -386,11 +386,11 @@ static bool load_maneuvers_from_toml(SimulationState* sim, toml_result_t result)
return false; return false;
} }
} }
sim->maneuvers[sim->maneuver_count] = maneuver; sim->maneuvers[sim->maneuver_count] = maneuver;
sim->maneuver_count++; sim->maneuver_count++;
} }
printf("Loaded %d maneuvers from %s\n", maneuver_count, sim->config_name); printf("Loaded %d maneuvers from %s\n", maneuver_count, sim->config_name);
return true; return true;
} }

52
src/maneuver.cpp
Unescape View File

@ -55,9 +55,9 @@ Vec3 get_burn_direction_vector(BurnDirection direction, Vec3 local_pos, Vec3 loc
void apply_impulsive_burn(Spacecraft* craft, BurnDirection direction, double delta_v) { void apply_impulsive_burn(Spacecraft* craft, BurnDirection direction, double delta_v) {
Vec3 dir = get_burn_direction_vector(direction, craft->local_position, craft->local_velocity); Vec3 dir = get_burn_direction_vector(direction, craft->local_position, craft->local_velocity);
Vec3 delta_v_vec = vec3_scale(dir, delta_v); Vec3 delta_v_vec = vec3_scale(dir, delta_v);
craft->local_velocity = vec3_add(craft->local_velocity, delta_v_vec); craft->local_velocity = vec3_add(craft->local_velocity, delta_v_vec);
} }
@ -74,36 +74,36 @@ bool check_maneuver_trigger(Maneuver* maneuver, Spacecraft* craft, SimulationSta
switch (maneuver->trigger_type) { switch (maneuver->trigger_type) {
case TRIGGER_TIME: case TRIGGER_TIME:
return sim->time >= maneuver->trigger_value; return sim->time >= maneuver->trigger_value;
case TRIGGER_TRUE_ANOMALY: { case TRIGGER_TRUE_ANOMALY: {
Vec3 r = craft->local_position; Vec3 r = craft->local_position;
Vec3 v = craft->local_velocity; Vec3 v = craft->local_velocity;
double r_mag = vec3_magnitude(r); double r_mag = vec3_magnitude(r);
double v_mag = vec3_magnitude(v); double v_mag = vec3_magnitude(v);
if (r_mag < 1.0) { if (r_mag < 1.0) {
return false; return false;
} }
Vec3 r_unit = vec3_scale(r, 1.0 / r_mag); Vec3 r_unit = vec3_scale(r, 1.0 / r_mag);
Vec3 h = vec3_cross(r, v); Vec3 h = vec3_cross(r, v);
double h_mag = vec3_magnitude(h); double h_mag = vec3_magnitude(h);
if (h_mag < 1e-10) { if (h_mag < 1e-10) {
return false; return false;
} }
Vec3 h_unit = vec3_scale(h, 1.0 / h_mag); Vec3 h_unit = vec3_scale(h, 1.0 / h_mag);
Vec3 e_vec = {0.0, 0.0, 0.0}; Vec3 e_vec = {0.0, 0.0, 0.0};
double mu = 0.0; double mu = 0.0;
if (craft->parent_index >= 0 && craft->parent_index < sim->body_count) { if (craft->parent_index >= 0 && craft->parent_index < sim->body_count) {
CelestialBody* parent = &sim->bodies[craft->parent_index]; CelestialBody* parent = &sim->bodies[craft->parent_index];
mu = G * parent->mass; mu = G * parent->mass;
Vec3 v_cross_h = vec3_cross(v, h); Vec3 v_cross_h = vec3_cross(v, h);
Vec3 v_cross_h_over_mu = vec3_scale(v_cross_h, 1.0 / mu); Vec3 v_cross_h_over_mu = vec3_scale(v_cross_h, 1.0 / mu);
Vec3 r_over_mag = vec3_scale(r, 1.0 / r_mag); Vec3 r_over_mag = vec3_scale(r, 1.0 / r_mag);
@ -111,58 +111,58 @@ bool check_maneuver_trigger(Maneuver* maneuver, Spacecraft* craft, SimulationSta
} else { } else {
return false; return false;
} }
double e_mag = vec3_magnitude(e_vec); double e_mag = vec3_magnitude(e_vec);
if (e_mag < 1e-10) { if (e_mag < 1e-10) {
Vec3 v_unit = vec3_scale(v, 1.0 / v_mag); Vec3 v_unit = vec3_scale(v, 1.0 / v_mag);
double cos_nu = vec3_dot(r_unit, v_unit); double cos_nu = vec3_dot(r_unit, v_unit);
cos_nu = fmax(-1.0, fmin(1.0, cos_nu)); cos_nu = fmax(-1.0, fmin(1.0, cos_nu));
double nu = acos(cos_nu); double nu = acos(cos_nu);
double target_nu = maneuver->trigger_value; double target_nu = maneuver->trigger_value;
while (target_nu < 0) target_nu += 2.0 * M_PI; while (target_nu < 0) target_nu += 2.0 * M_PI;
while (target_nu >= 2.0 * M_PI) target_nu -= 2.0 * M_PI; while (target_nu >= 2.0 * M_PI) target_nu -= 2.0 * M_PI;
double nu_normalized = nu; double nu_normalized = nu;
while (nu_normalized < 0) nu_normalized += 2.0 * M_PI; while (nu_normalized < 0) nu_normalized += 2.0 * M_PI;
while (nu_normalized >= 2.0 * M_PI) nu_normalized -= 2.0 * M_PI; while (nu_normalized >= 2.0 * M_PI) nu_normalized -= 2.0 * M_PI;
double angle_diff = fabs(nu_normalized - target_nu); double angle_diff = fabs(nu_normalized - target_nu);
if (angle_diff > M_PI) { if (angle_diff > M_PI) {
angle_diff = 2.0 * M_PI - angle_diff; angle_diff = 2.0 * M_PI - angle_diff;
} }
return angle_diff < 0.01; return angle_diff < 0.01;
} }
double cos_nu = vec3_dot(e_vec, r) / (e_mag * r_mag); double cos_nu = vec3_dot(e_vec, r) / (e_mag * r_mag);
cos_nu = fmax(-1.0, fmin(1.0, cos_nu)); cos_nu = fmax(-1.0, fmin(1.0, cos_nu));
double nu = acos(cos_nu); double nu = acos(cos_nu);
Vec3 r_cross_v = vec3_cross(r, v); Vec3 r_cross_v = vec3_cross(r, v);
double r_cross_v_dot_e = vec3_dot(r_cross_v, e_vec); double r_cross_v_dot_e = vec3_dot(r_cross_v, e_vec);
if (r_cross_v_dot_e < 0) { if (r_cross_v_dot_e < 0) {
nu = 2.0 * M_PI - nu; nu = 2.0 * M_PI - nu;
} }
double target_nu = maneuver->trigger_value; double target_nu = maneuver->trigger_value;
while (target_nu < 0) target_nu += 2.0 * M_PI; while (target_nu < 0) target_nu += 2.0 * M_PI;
while (target_nu >= 2.0 * M_PI) target_nu -= 2.0 * M_PI; while (target_nu >= 2.0 * M_PI) target_nu -= 2.0 * M_PI;
double nu_normalized = nu; double nu_normalized = nu;
while (nu_normalized < 0) nu_normalized += 2.0 * M_PI; while (nu_normalized < 0) nu_normalized += 2.0 * M_PI;
while (nu_normalized >= 2.0 * M_PI) nu_normalized -= 2.0 * M_PI; while (nu_normalized >= 2.0 * M_PI) nu_normalized -= 2.0 * M_PI;
double angle_diff = fabs(nu_normalized - target_nu); double angle_diff = fabs(nu_normalized - target_nu);
if (angle_diff > M_PI) { if (angle_diff > M_PI) {
angle_diff = 2.0 * M_PI - angle_diff; angle_diff = 2.0 * M_PI - angle_diff;
} }
return angle_diff < 0.01; return angle_diff < 0.01;
} }
default: default:
return false; return false;
} }

6
src/simulation.cpp
Unescape View File

@ -11,19 +11,19 @@
SimulationState* create_simulation(int max_bodies, int max_craft, int max_maneuvers, double time_step) { SimulationState* create_simulation(int max_bodies, int max_craft, int max_maneuvers, double time_step) {
SimulationState* sim = (SimulationState*)malloc(sizeof(SimulationState)); SimulationState* sim = (SimulationState*)malloc(sizeof(SimulationState));
sim->bodies = (CelestialBody*)malloc(sizeof(CelestialBody) * max_bodies); sim->bodies = (CelestialBody*)malloc(sizeof(CelestialBody) * max_bodies);
if (max_craft > 0) { if (max_craft > 0) {
sim->spacecraft = (Spacecraft*)malloc(sizeof(Spacecraft) * max_craft); sim->spacecraft = (Spacecraft*)malloc(sizeof(Spacecraft) * max_craft);
} else { } else {
sim->spacecraft = NULL; sim->spacecraft = NULL;
} }
if (max_maneuvers > 0) { if (max_maneuvers > 0) {
sim->maneuvers = (Maneuver*)malloc(sizeof(Maneuver) * max_maneuvers); sim->maneuvers = (Maneuver*)malloc(sizeof(Maneuver) * max_maneuvers);
} else { } else {
sim->maneuvers = NULL; sim->maneuvers = NULL;
} }
sim->body_count = 0; sim->body_count = 0;
sim->max_bodies = max_bodies; sim->max_bodies = max_bodies;
sim->craft_count = 0; sim->craft_count = 0;

6
src/simulation.h
Unescape View File

@ -27,15 +27,15 @@ struct SimulationState {
CelestialBody* bodies; CelestialBody* bodies;
int body_count; int body_count;
int max_bodies; int max_bodies;
Spacecraft* spacecraft; Spacecraft* spacecraft;
int craft_count; int craft_count;
int max_craft; int max_craft;
Maneuver* maneuvers; Maneuver* maneuvers;
int maneuver_count; int maneuver_count;
int max_maneuvers; int max_maneuvers;
double time; double time;
double dt; double dt;
char config_name[256]; char config_name[256];

18
tests/test_maneuver_planning.cpp
Unescape View File

@ -61,18 +61,18 @@ TEST_CASE("True anomaly trigger executes at correct angle", "[maneuver][trigger]
REQUIRE(!sim->maneuvers[1].executed); REQUIRE(!sim->maneuvers[1].executed);
double first_burn_velocity = 0.0; double first_burn_velocity = 0.0;
const double FIRST_BURN_TIME = 3600.0; const double FIRST_BURN_TIME = 3600.0;
while (sim->time < FIRST_BURN_TIME) { while (sim->time < FIRST_BURN_TIME) {
update_simulation(sim); update_simulation(sim);
} }
first_burn_velocity = vec3_magnitude(sim->spacecraft[0].local_velocity); first_burn_velocity = vec3_magnitude(sim->spacecraft[0].local_velocity);
const double TARGET_ANOMALY = 3.14159; const double TARGET_ANOMALY = 3.14159;
(void)TARGET_ANOMALY; (void)TARGET_ANOMALY;
double max_sim_time = FIRST_BURN_TIME + 72000.0; double max_sim_time = FIRST_BURN_TIME + 72000.0;
while (sim->time < max_sim_time) { while (sim->time < max_sim_time) {
update_simulation(sim); update_simulation(sim);
if (sim->maneuvers[1].executed) { if (sim->maneuvers[1].executed) {
@ -83,11 +83,11 @@ TEST_CASE("True anomaly trigger executes at correct angle", "[maneuver][trigger]
REQUIRE(sim->maneuvers[1].executed); REQUIRE(sim->maneuvers[1].executed);
double second_burn_velocity = vec3_magnitude(sim->spacecraft[0].local_velocity); double second_burn_velocity = vec3_magnitude(sim->spacecraft[0].local_velocity);
double second_burn_kinetic_energy = 0.5 * sim->spacecraft[0].mass * double second_burn_kinetic_energy = 0.5 * sim->spacecraft[0].mass *
second_burn_velocity * second_burn_velocity; second_burn_velocity * second_burn_velocity;
double first_burn_kinetic_energy = 0.5 * sim->spacecraft[0].mass * double first_burn_kinetic_energy = 0.5 * sim->spacecraft[0].mass *
first_burn_velocity * first_burn_velocity; first_burn_velocity * first_burn_velocity;
REQUIRE(second_burn_kinetic_energy > first_burn_kinetic_energy); REQUIRE(second_burn_kinetic_energy > first_burn_kinetic_energy);
destroy_simulation(sim); destroy_simulation(sim);
@ -132,13 +132,13 @@ TEST_CASE("Duplicate maneuver names fail config load", "[maneuver][config][error
Maneuver duplicate_maneuver = sim->maneuvers[0]; Maneuver duplicate_maneuver = sim->maneuvers[0];
sim->maneuvers[sim->maneuver_count] = duplicate_maneuver; sim->maneuvers[sim->maneuver_count] = duplicate_maneuver;
(void)sim->maneuver_count; (void)sim->maneuver_count;
sim->maneuver_count++; sim->maneuver_count++;
bool is_duplicate = (std::string(sim->maneuvers[0].name) == bool is_duplicate = (std::string(sim->maneuvers[0].name) ==
std::string(sim->maneuvers[2].name)); std::string(sim->maneuvers[2].name));
REQUIRE(is_duplicate); REQUIRE(is_duplicate);
destroy_simulation(sim); destroy_simulation(sim);

Write Preview
Loading…
Cancel
Save