gitea-mirror/aladin-lite
1
0
Fork 0
mirror of https://github.com/cds-astro/aladin-lite.git synced 2025-12-24 03:59:14 -08:00
Code Issues Packages Projects Releases Wiki Activity

remove backface/frontface culling as it is done by the iterator

Browse Source
This commit is contained in:
Matthieu BAUMANN
2023-04-24 15:20:19 +02:00
parent b22f822f6a
commit 2e8ecb5fe6
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/src/app.rs
View File

@@ -906,6 +906,7 @@ impl App {
use web_sys::window;
use crate::renderable::image::Image;
use futures::TryStreamExt;
use futures::future::Either;
let window = window().unwrap();
let resp_value = JsFuture::from(window.fetch_with_str(&url))
@@ -917,11 +918,17 @@ impl App {
let body = ReadableStream::from_raw(raw_body.dyn_into()?);
// Convert the JS ReadableStream to a Rust stream
let bytes_reader = body
.into_stream()
.map_ok(|js_value| js_value.dyn_into::<Uint8Array>().unwrap_throw().to_vec())
.map_err(|_js_error| std::io::Error::new(std::io::ErrorKind::Other, "failed to read"))
.into_async_read();
let bytes_reader = match body.try_into_async_read() {
Ok(async_read) => Either::Left(async_read),
Err((_err, body)) => Either::Right(
body
.into_stream()
.map_ok(|js_value| js_value.dyn_into::<Uint8Array>().unwrap_throw().to_vec())
.map_err(|_js_error| std::io::Error::new(std::io::ErrorKind::Other, "failed to read"))
.into_async_read(),
),
};
let mut reader = BufReader::new(bytes_reader);
let AsyncFits { mut hdu } = AsyncFits::from_reader(&mut reader).await

18
src/core/src/renderable/image/grid.rs
View File

@@ -248,9 +248,9 @@ impl<'a> BuildPatchIndicesIter<'a> {
idx_x + idx_y * self.num_x_vertices
}
fn invalid_tri(&self, tri_ccw: bool) -> bool {
fn valid_tri(&self, tri_ccw: bool) -> bool {
let reversed_longitude = self.camera.get_longitude_reversed();
(!reversed_longitude && !tri_ccw) || (reversed_longitude && tri_ccw)
(!reversed_longitude && tri_ccw) || (reversed_longitude && !tri_ccw)
}
}
@@ -278,22 +278,18 @@ impl<'a> Iterator for BuildPatchIndicesIter<'a> {
let ndc_tr = &self.ndc[idx_tr];
let ndc_bl = &self.ndc[idx_bl];
let ndc_br = &self.ndc[idx_br];
match (ndc_tl, ndc_tr, ndc_bl, ndc_br) {
(Some(ndc_tl), Some(ndc_tr), Some(ndc_bl), Some(ndc_br)) => {
(Some(ndc_tl), Some(ndc_tr), Some(ndc_bl), Some(ndc_br)) => {
let ndc_tl = Vector2::new(ndc_tl[0] as f64, ndc_tl[1] as f64);
let ndc_tr = Vector2::new(ndc_tr[0] as f64, ndc_tr[1] as f64);
let ndc_bl = Vector2::new(ndc_bl[0] as f64, ndc_bl[1] as f64);
let ndc_br = Vector2::new(ndc_br[0] as f64, ndc_br[1] as f64);
let c_tl = crate::math::projection::ndc_to_screen_space(&ndc_tl, self.camera);
let c_tr = crate::math::projection::ndc_to_screen_space(&ndc_tr, self.camera);
let c_bl = crate::math::projection::ndc_to_screen_space(&ndc_bl, self.camera);
let c_br = crate::math::projection::ndc_to_screen_space(&ndc_br, self.camera);
let tri_ccw_1 = crate::math::vector::ccw_tri(&ndc_tl, &ndc_tr, &ndc_bl);
let tri_ccw_2 = crate::math::vector::ccw_tri(&ndc_tr, &ndc_br, &ndc_bl);
let tri_ccw_1 = !crate::math::vector::ccw_tri(&c_tl, &c_tr, &c_bl);
let tri_ccw_2 = !crate::math::vector::ccw_tri(&c_tr, &c_br, &c_bl);
if self.invalid_tri(tri_ccw_1) || self.invalid_tri(tri_ccw_2) {
if !self.valid_tri(tri_ccw_1) || !self.valid_tri(tri_ccw_2) {
self.next() // crossing projection tri
} else {
Some([

4
src/core/src/renderable/image/mod.rs
View File

@@ -518,6 +518,8 @@ impl Image {
_ => return Err(JsValue::from_str("Image format type not supported"))
};
self.gl.disable(WebGl2RenderingContext::CULL_FACE);
// 2. Draw it if its opacity is not null
blend_cfg.enable(&self.gl, || {
let mut off_indices = 0;
@@ -547,6 +549,8 @@ impl Image {
Ok(())
})?;
self.gl.enable(WebGl2RenderingContext::CULL_FACE);
self.gl.disable(WebGl2RenderingContext::BLEND);
Ok(())