1 files changed, 10 insertions, 98 deletions
diff --git a/bowshock/include/bow/lgc.h b/bowshock/include/bow/lgc.h
index 6cbca87..136a2ca 100644
--- a/bowshock/include/bow/lgc.h
+++ b/bowshock/include/bow/lgc.h
@@ -4,107 +4,19 @@
 
 #include <bow/bs.h>
 
-#include <zap/bs.h>
+constexpr double bow_distMod = 0x1.16A5D2D360000000p037; // distance modifier (1 astronomical unit)
+constexpr double bow_massMod = 0x1.91930A5E75F0C192p100; // mass modifier     (1 solar mass)
+constexpr double bow_tmMod   = 0x1.0000000000000000p012; // time modifier     (1 second)
 
-typedef enum {
-	bow_objtyp_can,     // canister
-	bow_objtyp_play,    // player
-	bow_objtyp_sat,     // satellite (moon)
-	bow_objtyp_ship,    // ship
-	bow_objtyp_star,    // star
-	bow_objtyp_station, // station
-	bow_objtyp_wrld,    // world (planet)
-} bow_objtyp;
+constexpr double bow_gravConstFac = (bow_massMod*(bow_tmMod*bow_tmMod))/((bow_distMod*bow_distMod*bow_distMod)); // inverse
 
-typedef enum {
-	bow_wrld_amm, // ammonium world
-	bow_wrld_gas, // gas giant
-	bow_wrld_ice, // icy world
-	bow_wrld_rck, // rocky world
-	bow_wrld_lav, // lava world
-	bow_wrld_wat, // water world
-} bow_wrld;
+constexpr double bow_gravConst = 0x1.258688101B4BB16Dp-34*bow_gravConstFac; // gravitational constant (s^2*m*t^2)
 
-typedef enum {
-	bow_ship_aq,   // aquila
-	bow_ship_cas,  // cassiopeia
-	bow_ship_cent, // centaurus
-	bow_ship_eri,  // eridanus
-	bow_ship_lyra, // lyra
-	bow_ship_tau,  // taurus
-	bow_ship_ursa, // ursa
-} bow_ship;
+[[unsequenced]] double bow_shipMass(bow_ship id);
 
-typedef enum {
-	bow_star_a, // main sequence
-	bow_star_b, // main sequence
-	bow_star_c, // carbon
-	bow_star_f, // main sequence
-	bow_star_g, // main sequence
-	bow_star_k, // main sequence
-	bow_star_l, // brown dwarf
-	bow_star_m, // main sequence
-	bow_star_n, // neutron star
-	bow_star_o, // main sequence
-	bow_star_s, // carbon
-	bow_star_t, // brown dwarf
-	bow_star_w, // worm hole
-	bow_star_x, // black hole
-	bow_star_y, // brown dwarf
-	bow_star_z, // white hole
-} bow_star;
-
-typedef enum {
-	bow_station_cor, // coriolis
-} bow_station;
-
-struct bow_impl_obj {
-	bow_objtyp typ;
-	bow_xyz    pos;    // astronomical units
-	bow_xyz    rot;    // radians
-	bow_xyz    posvel; // astronomical units per second
-	bow_xyz    rotvel; // radians per second
-	double     mass;   // kilograms
-	union {
-		bow_wrld    wrldtyp;
-		bow_ship    shiptyp;
-		bow_star    startyp;
-		bow_station stationtyp;
-	};
-	bow_obj *  next;
-};
-
-struct bow_impl_objroot {
-	bow_obj * objs;
-};
-
-struct bow_impl_playdat {
-	char    nm[bow_cmdrnmlen+0x1u];
-	zap_i04 tm;
-	zap_i04 sysid;
-	bow_obj ship;
-};
-
-constexpr double bow_distmod = 0x1.16A5D2D3p37; // distance modifier (1 au)
-constexpr double bow_massmod = 0x1p0;           // mass modifier
-constexpr double bow_tmmod   = 0x1p12;          // time modifier
-
-constexpr double bow_gravconstfac = (bow_massmod*(bow_tmmod*bow_tmmod))/((bow_distmod*bow_distmod*bow_distmod)); // inverse
-
-constexpr double bow_gravconst = 0x1.2589EFFFp-34*bow_gravconstfac; // gravitational constant (s^2*m*t^2)
-
-char const * bow_objtypstr(bow_objtyp typ);
-
-[[unsequenced]] double bow_shipmass(bow_ship id);
-
-void bow_gravsys( bow_objroot * sys);
-void bow_gravobjs(bow_objroot * sys,bow_objroot * objs);
+void bow_gravSys( bow_objRoot * sys);
+void bow_gravObjs(bow_objRoot * objs,bow_objRoot const * sys);
 void bow_mv(      bow_obj *     obj);
-void bow_mvobjs(  bow_objroot * root);
-
-void bow_sim(bow_objroot * sys,zap_i04 dur);
-
-bow_obj * bow_addobj(  bow_objroot *       root,bow_obj const * obj);
-void      bow_freeobjs(bow_objroot * root);
+void bow_mvObjs(  bow_objRoot * root);
 
-void bow_gensys(bow_objroot * sys,zap_i04 id,zap_i04 tm);
+void bow_sim(bow_objRoot * sys,zap_i04 dur);