Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct for orientation movement on voxel entities

Browse Source
This commit is contained in:
Joshua Barretto 2023-05-23 20:36:05 +01:00
parent 610d1d8497
commit 465a62a072
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/systems/src/phys.rs
View File

@ -297,7 +297,6 @@ impl<'a> PhysicsData<'a> {
Collider::Voxel { .. } | Collider::Volume(_) | Collider::Point => None, Collider::Voxel { .. } | Collider::Volume(_) | Collider::Point => None,
}; };
phys_cache.origins = origins; phys_cache.origins = origins;
phys_cache.ori = ori;
} }
} }
@ -734,11 +733,10 @@ impl<'a> PhysicsData<'a> {
// Update cached 'old' physics values to the current values ready for the next // Update cached 'old' physics values to the current values ready for the next
// tick // tick
prof_span!(guard, "record ori into phys_cache"); prof_span!(guard, "record ori into phys_cache");
for (pos, ori, previous_phys_cache, _) in ( for (pos, ori, previous_phys_cache) in (
&write.positions, &write.positions,
&write.orientations, &write.orientations,
&mut write.previous_phys_cache, &mut write.previous_phys_cache,
&read.colliders,
) )
.join() .join()
{ {
@ -1153,6 +1151,7 @@ impl<'a> PhysicsData<'a> {
let ori_last_to = ori_last_from.inverted(); let ori_last_to = ori_last_from.inverted();
let ori_from = Mat4::from(ori_other.to_quat()); let ori_from = Mat4::from(ori_other.to_quat());
let ori_to = ori_from.inverted();
// The velocity of the collider, taking into account // The velocity of the collider, taking into account
// orientation. // orientation.
@ -1168,8 +1167,14 @@ impl<'a> PhysicsData<'a> {
let vel_other = vel_other.0 let vel_other = vel_other.0
+ (wpos - (pos_other.0 + rpos_last)) / read.dt.0; + (wpos - (pos_other.0 + rpos_last)) / read.dt.0;
// Velocity added due to change in orientation, relative to the
// craft
let ori_vel = previous_cache_other.ori.inverse()
* (pos.0 - pos_other.0)
- ori_other.to_quat().inverse() * (pos.0 - pos_other.0);
cpos.0 = transform_last_to.mul_point(Vec3::zero()); cpos.0 = transform_last_to.mul_point(Vec3::zero());
vel.0 = ori_last_to.mul_direction(vel.0 - vel_other); vel.0 = ori_last_to.mul_direction(vel.0 - vel_other) - ori_vel;
let cylinder = (radius, z_min, z_max); let cylinder = (radius, z_min, z_max);
box_voxel_collision( box_voxel_collision(
cylinder, cylinder,
@ -1193,14 +1198,15 @@ impl<'a> PhysicsData<'a> {
); );
cpos.0 = transform_from.mul_point(cpos.0) + wpos; cpos.0 = transform_from.mul_point(cpos.0) + wpos;
vel.0 = ori_from.mul_direction(vel.0) + vel_other; vel.0 = ori_from.mul_direction(vel.0 + ori_vel) + vel_other;
tgt_pos = cpos.0; tgt_pos = cpos.0;
// union in the state updates, so that the state isn't just // union in the state updates, so that the state isn't just
// based on the most // based on the most
// recent terrain that collision was attempted with // recent terrain that collision was attempted with
if physics_state_delta.on_ground.is_some() { if physics_state_delta.on_ground.is_some() {
physics_state.ground_vel = vel_other; physics_state.ground_vel =
vel_other + ori_from.mul_direction(ori_vel);
// Rotate if on ground // Rotate if on ground
ori = ori.rotated( ori = ori.rotated(

8
voxygen/src/scene/mod.rs
View File

@ -587,7 +587,13 @@ impl Scene {
let is_running = ecs let is_running = ecs
.read_storage::<comp::Vel>() .read_storage::<comp::Vel>()
.get(scene_data.viewpoint_entity) .get(scene_data.viewpoint_entity)
.map(|v| v.0.magnitude_squared() > RUNNING_THRESHOLD.powi(2)) .zip(
ecs.read_storage::<comp::PhysicsState>()
.get(scene_data.viewpoint_entity),
)
.map(|(v, ps)| {
(v.0 - ps.ground_vel).magnitude_squared() > RUNNING_THRESHOLD.powi(2)
})
.unwrap_or(false); .unwrap_or(false);
let on_ground = ecs let on_ground = ecs