gitea-mirror/aladin-lite
1
0
Fork 0
mirror of https://github.com/cds-astro/aladin-lite.git synced 2026-01-10 04:07:59 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/cds-astro/aladin-lite into develop

Browse Source
This commit is contained in:
Thomas Boch
2021-03-17 12:03:12 +01:00
parent 5404e139a9 12008b53a0
commit 6fee0877bc
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/src/camera/viewport.rs
View File

@@ -80,7 +80,7 @@ fn set_canvas_size(gl: &WebGl2Context, width: u32, height: u32) {
canvas.set_width(width);
canvas.set_height(height);
gl.viewport(0, 0, width as i32, height as i32);
gl.scissor(0, 0, width as i32, height as i32);
//gl.scissor(0, 0, width as i32, height as i32);
}
use crate::math;
@@ -117,6 +117,7 @@ impl CameraViewPort {
.as_f64()
.unwrap() as f32;
set_canvas_size(&gl, width as u32, height as u32);
gl.scissor(0, 0, width as i32, height as i32);
let aspect = width / height;
let ndc_to_clip = P::compute_ndc_to_clip_factor(width as f64, height as f64);
@@ -184,6 +185,7 @@ impl CameraViewPort {
self.aspect = width / height;
set_canvas_size(&self.gl, width as u32, height as u32);
self.update_scissor();
// Compute the new clip zoom factor
self.ndc_to_clip = P::compute_ndc_to_clip_factor(width as f64, height as f64);
@@ -256,6 +258,17 @@ impl CameraViewPort {
self.is_allsky = !P::is_included_inside_projection(
&crate::renderable::projection::ndc_to_clip_space(&Vector2::new(-1.0, -1.0), self),
);
self.update_scissor();
}
fn update_scissor(&mut self) {
let a = crate::renderable::projection::clip_to_screen_space(&Vector2::new(-1.0, 1.0), self);
let b = crate::renderable::projection::clip_to_screen_space(&Vector2::new(1.0, -1.0), self);
let w = (b.x - a.x).abs();
let h = (b.y - a.y).abs();
self.gl.scissor(a.x as i32, a.y as i32, w as i32, h as i32);
}
pub fn rotate<P: Projection>(&mut self, axis: &cgmath::Vector3<f64>, angle: Angle<f64>) {