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

Add maximum indoor zoom so that we avoid camera glitches. Return to previous zoom when you walk outside again

Browse Source
This commit is contained in:
Joey Maher 2020-06-11 13:02:47 -05:00 committed by Monty Marz
parent 5dd4ba428b
commit a85420d73f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
voxygen/src/scene/camera.rs
View File

@ -56,6 +56,7 @@ pub struct Camera {
enclosure_check_hit: u8,
enclosure_current_camera_distance: f32,
target_distance_before_enclosure: f32,
enclosure_should_move_zoom: bool,
dependents: Dependents,
frustum: Frustum<f32>,
@ -87,6 +88,7 @@ impl Camera {
enclosure_check_hit: 0,
enclosure_current_camera_distance: 0.0,
target_distance_before_enclosure: 0.0,
enclosure_should_move_zoom: false,
dependents: Dependents {
view_mat: Mat4::identity(),
@ -162,6 +164,7 @@ impl Camera {
if enclosure_percentage >= 0.9 {
if !self.enclosed {
self.target_distance_before_enclosure = self.tgt_dist;
self.enclosure_should_move_zoom = true;
}
self.enclosed = true;
} else {
@ -250,8 +253,12 @@ impl Camera {
};
if self.enclosed {
self.enclosure_current_camera_distance = dist;
if self.tgt_dist > self.enclosure_max_distance && self.tgt_dist > self.dist {
if self.enclosure_should_move_zoom {
self.tgt_dist = dist;
self.enclosure_should_move_zoom = false;
}
if self.tgt_dist > self.enclosure_max_distance {
self.tgt_dist = self.enclosure_max_distance;
}
}
self.compute_dependents_given_distance(dist);
@ -279,7 +286,7 @@ impl Camera {
// Wrap camera yaw
self.tgt_ori.x = ori.x.rem_euclid(2.0 * PI);
// Clamp camera pitch to the vertical limits
self.tgt_ori.y = ori.y.min(PI / 2.0 - 0.0001).max(-PI / 2.0 + 0.0001);
self.tgt_ori.y = ori.y.min(PI / 2.0 - 0.0001).max(-0.20 * PI / 2.0 + 0.0001);
// Wrap camera roll
self.tgt_ori.z = ori.z.rem_euclid(2.0 * PI);
}
@ -289,7 +296,7 @@ impl Camera {
// Wrap camera yaw
self.ori.x = ori.x.rem_euclid(2.0 * PI);
// Clamp camera pitch to the vertical limits
self.ori.y = ori.y.min(PI / 2.0 - 0.0001).max(-PI / 2.0 + 0.0001);
self.ori.y = ori.y.min(PI / 2.0 - 0.0001).max(-0.20 * PI / 2.0 + 0.0001);
// Wrap camera roll
self.ori.z = ori.z.rem_euclid(2.0 * PI);
}