Compare commits
No commits in common. "20ff266cc45dff2eee3abe7e3fc679378a7bb6c9" and "1112e2a03a49c14f82ea9f4c2811802bdc6212a4" have entirely different histories.
20ff266cc4
...
1112e2a03a
|
@ -696,7 +696,7 @@ fn handle_wants_maxvelocity(
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_wants_lookat(
|
fn handle_wants_lookat(
|
||||||
mut query: Query<(&Position, &mut Rotation, &WantsToLookAt), Without<Camera>>,
|
mut query: Query<(&Position, &mut Rotation, &Transform, &WantsToLookAt), Without<Camera>>,
|
||||||
q_playercam: Query<&Position, With<PlayerCamera>>,
|
q_playercam: Query<&Position, With<PlayerCamera>>,
|
||||||
q_cam: Query<&Transform, With<Camera>>,
|
q_cam: Query<&Transform, With<Camera>>,
|
||||||
id2pos: Res<game::Id2Pos>,
|
id2pos: Res<game::Id2Pos>,
|
||||||
|
@ -713,7 +713,7 @@ fn handle_wants_lookat(
|
||||||
};
|
};
|
||||||
|
|
||||||
// TODO: use ExternalTorque rather than hard-resetting the rotation
|
// TODO: use ExternalTorque rather than hard-resetting the rotation
|
||||||
for (pos, mut rot, target_id) in &mut query {
|
for (pos, mut rot, trans, target_id) in &mut query {
|
||||||
let target_pos: DVec3 = if target_id.0 == cmd::ID_SPECIAL_PLAYERCAM {
|
let target_pos: DVec3 = if target_id.0 == cmd::ID_SPECIAL_PLAYERCAM {
|
||||||
cam_pos
|
cam_pos
|
||||||
} else if let Some(target_pos) = id2pos.0.get(&target_id.0) {
|
} else if let Some(target_pos) = id2pos.0.get(&target_id.0) {
|
||||||
|
|
|
@ -144,23 +144,6 @@ actor 0 0 0
|
||||||
only_in_map_at_dist 1e7 thebe
|
only_in_map_at_dist 1e7 thebe
|
||||||
clickable no
|
clickable no
|
||||||
physics off
|
physics off
|
||||||
actor 0 -53e3 0 metis
|
|
||||||
name Moonlet
|
|
||||||
relativeto jupiter
|
|
||||||
orbitaround jupiter 221900e3
|
|
||||||
orbit_phase_offset 0.0003
|
|
||||||
collider handcrafted
|
|
||||||
density 10000000000
|
|
||||||
scale 6e3
|
|
||||||
angularmomentum 0.01 0 0
|
|
||||||
actor 120e3 0 0 metis
|
|
||||||
name Moonlet
|
|
||||||
relativeto jupiter
|
|
||||||
orbitaround jupiter 221900e3
|
|
||||||
collider handcrafted
|
|
||||||
density 10000000000
|
|
||||||
scale 3e3
|
|
||||||
angularmomentum 0 0.03 0
|
|
||||||
actor 0 0 0 io
|
actor 0 0 0 io
|
||||||
name Io
|
name Io
|
||||||
id io
|
id io
|
||||||
|
@ -351,7 +334,7 @@ actor -55e3 44e3 0 suitv2
|
||||||
|
|
||||||
actor 5000 0 -3000 metis
|
actor 5000 0 -3000 metis
|
||||||
name Moonlet
|
name Moonlet
|
||||||
collider handcrafted
|
collider mesh
|
||||||
relativeto player
|
relativeto player
|
||||||
density 10000000000
|
density 10000000000
|
||||||
scale 500
|
scale 500
|
||||||
|
|
Loading…
Reference in a new issue