more stuff

jan-tennert · Oct 3, 2024 · 03e74df · 03e74df
1 parent f0c4c9a
commit 03e74df
Show file tree

Hide file tree

Showing 23 changed files with 118 additions and 82 deletions.
diff --git a/assets/models/earth.glb b/assets/models/earth.glb
diff --git a/assets/models/earth_4k.glb b/assets/models/earth_4k.glb
diff --git a/assets/models/earth_4k_2.glb b/assets/models/earth_4k_2.glb
diff --git a/scenarios/solar_system_copy.sim b/scenarios/solar_system_copy.sim
@@ -1 +1 @@
-{"bodies":[{"children":[{"children":[],"data":{"mass":5.97219e24,"starting_position":{"x":132661907.41300352,"y":59622737.91959965,"z":25879893.321551036},"starting_velocity":{"x":-13.555126596660894,"y":24.447022096986885,"z":10.59802290045933},"name":"Earth","model_path":"earth.glb","diameter":12742.0,"rotation_speed":1436.0,"axial_tilt":23.439281,"simulate":true,"naif_id":399,"light_source":null}},{"children":[],"data":{"mass":6.4171e23,"starting_position":{"x":-179797351.86843538,"y":-141545418.16021723,"z":-60062982.27940703},"starting_velocity":{"x":16.704581229673664,"y":-14.67524995138464,"z":-7.181472156593413},"name":"Mars","model_path":"mars.glb","diameter":6779.0,"rotation_speed":1476.0,"axial_tilt":25.19,"simulate":true,"naif_id":4,"light_source":null}}],"data":{"mass":1.9885e30,"starting_position":{"x":-1241873.683433827,"y":-337542.17983616004,"z":-111583.58952210216},"starting_velocity":{"x":0.007299482005842327,"y":-0.012230097340821044,"z":-0.005361007667100289},"name":"Sol","model_path":"sun.glb","diameter":1492000.0,"rotation_speed":38880.0,"axial_tilt":7.25,"simulate":true,"naif_id":10,"light_source":{"intensity":3.75e28,"range":4436820000000.0,"color":"#FFFFFF","enabled":true}}}],"starting_time_millis":1697760000000,"title":"Solar System2dd","description":"A scenario wi","scale":1e-7,"timestep":900}
+{"bodies":[{"children":[{"children":[{"children":[],"data":{"mass":7.34767e22,"starting_position":{"x":132652620.33908576,"y":59288362.347238556,"z":25700653.622645397},"starting_velocity":{"x":-12.522181069822803,"y":24.478434326887943,"z":10.569978575134487},"name":"Moon","model_path":"moon.glb","diameter":3744.8,"rotation_speed":0.0,"axial_tilt":0.0,"simulate":true,"naif_id":301,"light_source":null}}],"data":{"mass":5.97219e24,"starting_position":{"x":132661907.41300352,"y":59622737.91959965,"z":25879893.321551036},"starting_velocity":{"x":-13.555126596660894,"y":24.447022096986885,"z":10.59802290045933},"name":"Earth","model_path":"earth.glb","diameter":12742.0,"rotation_speed":1436.0,"axial_tilt":23.439281,"simulate":true,"naif_id":399,"light_source":null}},{"children":[],"data":{"mass":6.4171e23,"starting_position":{"x":-179797351.86843538,"y":-141545418.16021723,"z":-60062982.27940703},"starting_velocity":{"x":16.704581229673664,"y":-14.67524995138464,"z":-7.181472156593413},"name":"Mars","model_path":"mars.glb","diameter":6779.0,"rotation_speed":1476.0,"axial_tilt":25.19,"simulate":true,"naif_id":4,"light_source":null}}],"data":{"mass":1.9885e30,"starting_position":{"x":-1241873.683433827,"y":-337542.17983616004,"z":-111583.58952210216},"starting_velocity":{"x":0.007299482005842327,"y":-0.012230097340821044,"z":-0.005361007667100289},"name":"Sol","model_path":"sun.glb","diameter":1492000.0,"rotation_speed":38880.0,"axial_tilt":7.25,"simulate":true,"naif_id":10,"light_source":{"intensity":3.75e28,"range":4436820000000.0,"color":"#FFFFFF","enabled":true}}}],"data_sets":["de440s.bsp","sat441.bsp"],"starting_time_millis":1697760000000,"title":"Solar System2dd","description":"A scenario wi","scale":1e-7,"timestep":900}
diff --git a/scenarios/voyager_1.sim b/scenarios/voyager_1.sim
@@ -1 +1 @@
-{"bodies":[{"children":[{"children":[],"data":{"mass":5.97219e24,"starting_position":{"x":-140968752.6119205,"y":42678857.74469588,"z":-25254.74791200459},"starting_velocity":{"x":-9.120162775175537,"y":-28.61319460879634,"z":-0.001164064214398408},"name":"Earth","model_path":"earth.glb","diameter":12742.0,"rotation_speed":1436.0,"axial_tilt":23.439281,"simulate":true,"horizons_id":399,"light_source":null}},{"children":[],"data":{"mass":721.0,"starting_position":{"x":-478755881.5606613,"y":626054143.9714329,"z":8162617.640802503},"starting_velocity":{"x":-13.59995211599172,"y":7.453842974225971,"z":-0.06438163739849133},"name":"Voyager-1","model_path":"voyager.glb","diameter":0.34,"rotation_speed":0.0,"axial_tilt":0.0,"simulate":true,"horizons_id":-31,"light_source":null}},{"children":[{"children":[],"data":{"mass":8.931938e22,"starting_position":{"x":-480132379.6695358,"y":628341089.094857,"z":8166689.579561204},"starting_velocity":{"x":-23.30604398175892,"y":-18.95073373004206,"z":-0.3286829175194121},"name":"Io","model_path":"io.glb","diameter":3643.2,"rotation_speed":2547.36,"axial_tilt":0.0,"simulate":true,"horizons_id":501,"light_source":null}},{"children":[],"data":{"mass":4.799844e22,"starting_position":{"x":-479228508.8604426,"y":628279494.8122885,"z":8173354.739555568},"starting_velocity":{"x":-15.83619738830984,"y":5.3755512407106485,"z":0.7180040615554422},"name":"Europa","model_path":"europa.glb","diameter":1560.8,"rotation_speed":5113.70064,"axial_tilt":0.0,"simulate":true,"horizons_id":502,"light_source":null}},{"children":[],"data":{"mass":1.4819e23,"starting_position":{"x":-479288380.8032896,"y":628940950.8439758,"z":8196875.737661481},"starting_velocity":{"x":-19.79181270480194,"y":-1.655936558187814,"z":0.3543272529809163},"name":"Ganymede","model_path":"ganymede.glb","diameter":5268.2,"rotation_speed":10303.2,"axial_tilt":0.0,"simulate":true,"horizons_id":503,"light_source":null}},{"children":[],"data":{"mass":1.075938e23,"starting_position":{"x":-480685844.2916495,"y":629724828.7996273,"z":8206658.511939555},"starting_velocity":{"x":-17.86463945783917,"y":-10.89807550844258,"z":0.052075036567377435},"name":"Callisto","model_path":"callisto.glb","diameter":4820.6,"rotation_speed":24032.16,"axial_tilt":0.0,"simulate":true,"horizons_id":504,"light_source":null}}],"data":{"mass":1.8981999999999999e27,"starting_position":{"x":-479848384.6135314,"y":628027497.1317629,"z":8159750.788519055},"starting_velocity":{"x":-10.52854951013122,"y":-7.331420678430996,"z":0.2660272900760523},"name":"Jupiter","model_path":"jupiter.glb","diameter":139822.0,"rotation_speed":595.0,"axial_tilt":3.13,"simulate":true,"horizons_id":599,"light_source":null}},{"children":[{"children":[],"data":{"mass":1.3452e23,"starting_position":{"x":-1317155488.735448,"y":456803992.4401622,"z":43802307.2827788},"starting_velocity":{"x":-9.10970895732647,"y":-8.324033972730488,"z":0.4087875904767087},"name":"Titan","model_path":"titan.glb","diameter":5149.46,"rotation_speed":22920.0,"axial_tilt":0.0,"simulate":true,"horizons_id":606,"light_source":null}},{"children":[],"data":{"mass":2.3064854e21,"starting_position":{"x":-1317381464.965859,"y":456177329.2804902,"z":44147862.34416083},"starting_velocity":{"x":-11.96618288883869,"y":-10.30164299046992,"z":1.675951141418822},"name":"Rhea","model_path":"rhea.glb","diameter":763.5,"rotation_speed":6480.0,"axial_tilt":0.0,"simulate":true,"horizons_id":605,"light_source":null}},{"children":[],"data":{"mass":1.8056591e21,"starting_position":{"x":-1318561509.285847,"y":452507022.9275259,"z":45417436.21030155},"starting_velocity":{"x":-0.7035880596626023,"y":-10.34797381487376,"z":-0.001404221072676126},"name":"Iapetus","model_path":"iapetus.glb","diameter":1470.0,"rotation_speed":113760.0,"axial_tilt":0.0,"simulate":true,"horizons_id":608,"light_source":null}},{"children":[],"data":{"mass":1.0954868e21,"starting_position":{"x":-1316974888.586601,"y":455504831.651171,"z":44457903.16273892},"starting_velocity":{"x":2.190650173065378,"y":-2.194720708533485,"z":-3.899770264251245},"name":"Dione","model_path":"dione.glb","diameter":1123.0,"rotation_speed":3941.1576,"axial_tilt":0.0,"simulate":true,"horizons_id":604,"light_source":null}},{"children":[],"data":{"mass":6.174959e20,"starting_position":{"x":-1317564566.3964,"y":455669729.5049866,"z":44434988.86481687},"starting_velocity":{"x":-1.159233797631503,"y":-19.06283686401938,"z":5.226097668691422},"name":"Tethys","model_path":"tethys.glb","diameter":1062.0,"rotation_speed":2718.0,"axial_tilt":0.0,"simulate":true,"horizons_id":603,"light_source":null}},{"children":[],"data":{"mass":3.75094e19,"starting_position":{"x":-1317457651.240214,"y":455690951.4964175,"z":44405049.32898799},"starting_velocity":{"x":-0.9394652495076392,"y":-22.09281941198265,"z":6.401370770951404},"name":"Mimas","model_path":"mimas.glb","diameter":396.0,"rotation_speed":1356.0,"axial_tilt":0.0,"simulate":true,"horizons_id":601,"light_source":null}},{"children":[],"data":{"mass":1.080318e20,"starting_position":{"x":-1317090979.081409,"y":455836517.3459905,"z":44295399.77618125},"starting_velocity":{"x":-11.35457595529069,"y":-0.031213071190596017,"z":-3.726117215904384},"name":"Enceladus","model_path":"enceladus.glb","diameter":504.0,"rotation_speed":1973.11392,"axial_tilt":0.0,"simulate":true,"horizons_id":602,"light_source":null}}],"data":{"mass":5.6834e26,"starting_position":{"x":-1317278822.117749,"y":455713951.9593686,"z":44377832.49869636},"starting_velocity":{"x":-3.677377117144201,"y":-9.15076428503438,"z":0.3062600176749717},"name":"Saturn","model_path":"saturn.glb","diameter":116464.0,"rotation_speed":633.0,"axial_tilt":26.73,"simulate":true,"horizons_id":699,"light_source":null}}],"data":{"mass":1.9885e30,"starting_position":{"x":961232.2255364412,"y":-409638.1359710687,"z":-26920.33308127907},"starting_velocity":{"x":0.01057748426413201,"y":0.01000902911669899,"z":-0.0003291835695185871},"name":"Sol","model_path":"sun.glb","diameter":1392000.0,"rotation_speed":38880.0,"axial_tilt":7.25,"simulate":true,"horizons_id":10,"light_source":{"intensity":3.75e28,"range":4436820000000.0,"color":"#FFFFFF","enabled":true}}}],"starting_time_millis":289353600000,"title":"Voyager 1 Jupiter Flyby","description":"A scenario showcasing the Jupiter flyby from Voyager-1","scale":1e-7,"timestep":20}
+{"bodies":[{"children":[{"children":[],"data":{"mass":5.97219e24,"starting_position":{"x":-140968752.6119205,"y":42678857.74469588,"z":-25254.74791200459},"starting_velocity":{"x":-9.120162775175537,"y":-28.61319460879634,"z":-0.001164064214398408},"name":"Earth","model_path":"earth.glb","diameter":12742.0,"rotation_speed":1436.0,"axial_tilt":23.439281,"simulate":true,"naif_id":-1,"light_source":null}},{"children":[],"data":{"mass":721.0,"starting_position":{"x":-478755881.5606613,"y":626054143.9714329,"z":8162617.640802503},"starting_velocity":{"x":-13.59995211599172,"y":7.453842974225971,"z":-0.06438163739849133},"name":"Voyager-1","model_path":"voyager.glb","diameter":0.34,"rotation_speed":0.0,"axial_tilt":0.0,"simulate":true,"naif_id":-1,"light_source":null}},{"children":[{"children":[],"data":{"mass":8.931938e22,"starting_position":{"x":-493605925.879685,"y":575473831.0733274,"z":265175719.89332935},"starting_velocity":{"x":-9.978391983021908,"y":-3.7823007484817617,"z":-2.279987471012407},"name":"Io","model_path":"io.glb","diameter":3643.2,"rotation_speed":2547.36,"axial_tilt":0.0,"simulate":true,"naif_id":55501,"light_source":null}},{"children":[],"data":{"mass":4.799844e22,"starting_position":{"x":-477194029.517708,"y":556538490.081504,"z":249403655.71783304},"starting_velocity":{"x":-12.757436408817693,"y":-7.563126779474686,"z":-4.3494285120587115},"name":"Europa","model_path":"europa.glb","diameter":1560.8,"rotation_speed":5113.70064,"axial_tilt":0.0,"simulate":true,"naif_id":55502,"light_source":null}},{"children":[],"data":{"mass":1.4819e23,"starting_position":{"x":-486818965.27222335,"y":547266799.9050096,"z":253312203.97226703},"starting_velocity":{"x":-12.338585855725498,"y":-6.213844491167524,"z":-2.2017724479586405},"name":"Ganymede","model_path":"ganymede.glb","diameter":5268.2,"rotation_speed":10303.2,"axial_tilt":0.0,"simulate":true,"naif_id":55503,"light_source":null}},{"children":[],"data":{"mass":1.075938e23,"starting_position":{"x":-485964054.4773958,"y":595772805.8749864,"z":262952504.4681254},"starting_velocity":{"x":-8.30759289228536,"y":-6.896388751529391,"z":-2.180655899725101},"name":"Callisto","model_path":"callisto.glb","diameter":4820.6,"rotation_speed":24032.16,"axial_tilt":0.0,"simulate":true,"naif_id":55504,"light_source":null}}],"data":{"mass":1.8981999999999999e27,"starting_position":{"x":-479848914.5271239,"y":572958028.2936275,"z":257301363.24801183},"starting_velocity":{"x":-10.530416675065974,"y":-6.83225142804572,"z":-2.672213707159385},"name":"Jupiter","model_path":"jupiter.glb","diameter":139822.0,"rotation_speed":595.0,"axial_tilt":3.13,"simulate":true,"naif_id":5,"light_source":null}},{"children":[{"children":[],"data":{"mass":1.3452e23,"starting_position":{"x":-1317155945.9130914,"y":401685520.2661368,"z":221893876.7955563},"starting_velocity":{"x":-9.109829090037053,"y":-7.800989933081476,"z":-2.9359612621322944},"name":"Titan","model_path":"titan.glb","diameter":5149.46,"rotation_speed":22920.0,"axial_tilt":0.0,"simulate":true,"naif_id":606,"light_source":null}},{"children":[],"data":{"mass":2.3064854e21,"starting_position":{"x":-1317382065.4602823,"y":400972997.6578921,"z":221961663.9500768},"starting_velocity":{"x":-11.964844277122554,"y":-10.124933789839565,"z":-2.5597577939355545},"name":"Rhea","model_path":"rhea.glb","diameter":763.5,"rotation_speed":6480.0,"axial_tilt":0.0,"simulate":true,"naif_id":605,"light_source":null}},{"children":[],"data":{"mass":1.8056591e21,"starting_position":{"x":-1318561544.5943272,"y":397100581.45783347,"z":221666433.0104799},"starting_velocity":{"x":-0.7035327859354465,"y":-9.49338661268315,"z":-4.117463427766138},"name":"Iapetus","model_path":"iapetus.glb","diameter":1470.0,"rotation_speed":113760.0,"axial_tilt":0.0,"simulate":true,"naif_id":608,"light_source":null}},{"children":[],"data":{"mass":1.0954868e21,"starting_position":{"x":-1316974778.9178972,"y":400233150.94101655,"z":221978521.7508267},"starting_velocity":{"x":2.1798879595542897,"y":-0.45446507747606546,"z":-4.45063449430418},"name":"Dione","model_path":"dione.glb","diameter":1123.0,"rotation_speed":3941.1576,"axial_tilt":0.0,"simulate":true,"naif_id":604,"light_source":null}},{"children":[],"data":{"mass":6.174959e20,"starting_position":{"x":-1317564624.039431,"y":400392597.6125812,"z":222023174.2808789},"starting_velocity":{"x":-1.1379697756912446,"y":-19.56390177319556,"z":-2.790506179151342},"name":"Tethys","model_path":"tethys.glb","diameter":1062.0,"rotation_speed":2718.0,"axial_tilt":0.0,"simulate":true,"naif_id":603,"light_source":null}},{"children":[],"data":{"mass":3.75094e19,"starting_position":{"x":-1317457696.975204,"y":400423814.833281,"z":222004140.48551643},"starting_velocity":{"x":-0.8831812142331659,"y":-22.805919749933615,"z":-2.919858165732254},"name":"Mimas","model_path":"mimas.glb","diameter":396.0,"rotation_speed":1356.0,"axial_tilt":0.0,"simulate":true,"naif_id":601,"light_source":null}},{"children":[],"data":{"mass":1.080318e20,"starting_position":{"x":-1317091549.573697,"y":400602202.1932426,"z":221961416.07156047},"starting_velocity":{"x":-11.380791737588428,"y":1.433197828984678,"z":-3.42730656043974},"name":"Enceladus","model_path":"enceladus.glb","diameter":504.0,"rotation_speed":1973.11392,"axial_tilt":0.0,"simulate":true,"naif_id":602,"light_source":null}}],"data":{"mass":5.6834e26,"starting_position":{"x":-1317279006.668406,"y":400456460.90597373,"z":221988296.4282521},"starting_velocity":{"x":-3.677373856296947,"y":-8.517486004011271,"z":-3.358977485433484},"name":"Saturn","model_path":"saturn.glb","diameter":116464.0,"rotation_speed":633.0,"axial_tilt":26.73,"simulate":true,"naif_id":699,"light_source":null}}],"data":{"mass":1.9885e30,"starting_position":{"x":961232.2255364412,"y":-409638.1359710687,"z":-26920.33308127907},"starting_velocity":{"x":0.01057748426413201,"y":0.01000902911669899,"z":-0.0003291835695185871},"name":"Sol","model_path":"sun.glb","diameter":1392000.0,"rotation_speed":38880.0,"axial_tilt":7.25,"simulate":true,"naif_id":-1,"light_source":{"intensity":3.75e28,"range":4436820000000.0,"color":"#FFFFFF","enabled":true}}}],"data_sets":["de440s.bsp","sat441.bsp"],"starting_time_millis":289353600000,"title":"Voyager 1 Jupiter Flyby","description":"A scenario showcasing the Jupiter flyby from Voyager-1","scale":1e-7,"timestep":20}
diff --git a/src/main.rs b/src/main.rs
@@ -10,16 +10,14 @@ use bevy::window::{PresentMode, Window, WindowPlugin};
 use bevy::DefaultPlugins;
 use bevy_egui::EguiPlugin;
 use bevy_mod_billboard::plugin::BillboardPlugin;
-use reqwest::blocking::Client;
 use crate::menu::MenuPlugin;
-use crate::setup::SetupPlugin;
+use simulation::scenario::setup::SetupPlugin;
 use crate::simulation::asset::SCENARIO_ASSET_SOURCE;
 use crate::simulation::asset::serialization::SerializationPlugin;
 use crate::simulation::components::editor::EditorPlugin;
 use crate::simulation::SimulationPlugin;
 
 mod constants;
-mod setup;
 mod menu;
 mod simulation;
 mod utils;