Cargo.lock

@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "outfly"
-version = "0.12.0"
+version = "0.12.0-dev"
 dependencies = [
  "bevy",
  "bevy_embedded_assets",

Cargo.toml

@@ -10,7 +10,7 @@
 
 [package]
 name = "outfly"
-version = "0.12.0"
+version = "0.12.0-dev"
 edition = "2021"
 homepage = "https://codeberg.org/outfly/outfly"
 repository = "https://codeberg.org/outfly/outfly"

assets/models/metis.gltf

@@ -75,7 +75,7 @@
 		{
 			"mimeType":"image/jpeg",
 			"name":"mercury",
-			"uri":"textures/mercury.jpg"
+			"uri":"../textures/mercury.jpg"
 		}
 	],
 	"accessors":[

assets/models/pizzeria3.gltf

@@ -1936,22 +1936,22 @@
 		{
 			"mimeType":"image/jpeg",
 			"name":"mercury",
-			"uri":"textures/mercury.jpg"
+			"uri":"../textures/mercury.jpg"
 		},
 		{
 			"mimeType":"image/jpeg",
 			"name":"solarpanel",
-			"uri":"textures/solarpanel.jpg"
+			"uri":"../textures/solarpanel.jpg"
 		},
 		{
 			"mimeType":"image/jpeg",
 			"name":"metal",
-			"uri":"textures/metal.jpg"
+			"uri":"../textures/metal.jpg"
 		},
 		{
 			"mimeType":"image/jpeg",
 			"name":"plant",
-			"uri":"textures/plant.jpg"
+			"uri":"../textures/plant.jpg"
 		}
 	],
 	"accessors":[

assets/models/satellite.gltf

@@ -299,7 +299,7 @@
 		{
 			"mimeType":"image/jpeg",
 			"name":"solarpanel",
-			"uri":"textures/solarpanel.jpg"
+			"uri":"../textures/solarpanel.jpg"
 		}
 	],
 	"accessors":[

assets/models/thebe.gltf

@@ -84,7 +84,7 @@
 		{
 			"mimeType":"image/jpeg",
 			"name":"mercury",
-			"uri":"textures/mercury.jpg"
+			"uri":"../textures/mercury.jpg"
 		}
 	],
 	"accessors":[

src/actor.rs

@@ -696,16 +696,7 @@ fn handle_wants_maxvelocity(
 }
 
 fn handle_wants_lookat(
-    mut query: Query<
+    mut query: Query<(&Position, &mut Rotation, &WantsToLookAt), Without<Camera>>,
-        (
-            &Position,
-            &mut Rotation,
-            &Transform,
-            &WantsToLookAt,
-            Option<&visual::IsEffect>,
-        ),
-        Without<Camera>,
-    >,
     q_playercam: Query<&Position, With<PlayerCamera>>,
     q_cam: Query<&Transform, With<Camera>>,
     id2pos: Res<game::Id2Pos>,
@@ -722,7 +713,7 @@ fn handle_wants_lookat(
     };
 
     // TODO: use ExternalTorque rather than hard-resetting the rotation
-    for (pos, mut rot, trans, target_id, is_effect) in &mut query {
+    for (pos, mut rot, target_id) in &mut query {
         let target_pos: DVec3 = if target_id.0 == cmd::ID_SPECIAL_PLAYERCAM {
             cam_pos
         } else if let Some(target_pos) = id2pos.0.get(&target_id.0) {
@@ -730,16 +721,12 @@ fn handle_wants_lookat(
         } else {
             continue;
         };
-        let up = if is_effect.is_some() {
+        //let up = if trans.translation.length_squared() > 1e-6 {
-            // trans.up() sometimes crashes with thruster particle effects
+        //    trans.up()
-            Dir3::Y
+        //} else {
-        } else {
+        //    Dir3::Y
-            if trans.translation.length_squared() > 1e-6 {
+        //};
-                trans.up()
+        let up = Dir3::Y; // TODO: the above code seems to be buggy, this is a workaround
-            } else {
-                Dir3::Y
-            }
-        };
         rot.0 = look_at_quat(**pos, target_pos, up.as_dvec3());
     }
 }

src/cmd.rs

@@ -908,7 +908,7 @@ fn spawn_entities(
         actor.insert(Position::from(absolute_pos));
         if state.is_sphere {
             let sphere_texture_handle = if let Some(model) = &state.model {
-                Some(asset_server.load(format!("models/textures/{}.jpg", model)))
+                Some(asset_server.load(format!("textures/{}.jpg", model)))
             } else {
                 None
             };

src/data/defs.txt

@@ -159,16 +159,8 @@ actor 0 0 0
                 orbitaround jupiter 221900e3
                 collider handcrafted
                 density 10000000000
-                scale 2e3
+                scale 3e3
-                angularmomentum 0.4 2.0 0.3
+                angularmomentum 0 0.03 0
-            actor -40e3 0 90e3 metis
-                name Moonlet
-                relativeto jupiter
-                orbitaround jupiter 221900e3
-                collider handcrafted
-                density 10000000000
-                scale 4e3
-                angularmomentum 0.02 0.01 0.0
         actor 0 0 0 io
             name Io
             id io

src/var.rs

@@ -467,9 +467,7 @@ pub struct Preferences {
     pub third_person: bool,
     pub shadows_sun: bool,
     pub avatar: usize,
-    #[serde(default = "Preferences::default_light_amp")]
     pub light_amp: usize,        // 0-3
-    #[serde(default = "Preferences::default_flashlight_power")]
     pub flashlight_power: usize, // 0-2
     pub thruster_boost: usize,   // 0-2
 
@@ -478,13 +476,6 @@ pub struct Preferences {
 }
 
 impl Preferences {
-    pub fn default_light_amp() -> usize {
-        1
-    }
-    pub fn default_flashlight_power() -> usize {
-        2
-    }
-
     pub fn get_fullscreen_mode(&self) -> WindowMode {
         match self.fullscreen_mode.as_str() {
             "legacy" => WindowMode::Fullscreen,

src/visual.rs

@@ -171,7 +171,7 @@ pub fn spawn_effects(
                 ));
             }
             Effects::ThrusterParticle(pos, v) => {
-                let texture = asset_server.load("models/textures/exhaust.png");
+                let texture = asset_server.load("textures/exhaust.png");
                 commands.spawn((
                     IsEffect,
                     hud::ToggleableHudElement,