mirror of
https://github.com/cds-astro/aladin-lite.git
synced 2025-12-12 15:49:18 -08:00
fix commit
This commit is contained in:
committed by
Matthieu Baumann
parent
a19a050ee7
commit
7512adf900
@@ -5,6 +5,7 @@ pub enum UserAction {
|
|||||||
Moving = 3,
|
Moving = 3,
|
||||||
Starting = 4,
|
Starting = 4,
|
||||||
}
|
}
|
||||||
|
use web_sys::WebGl2RenderingContext;
|
||||||
|
|
||||||
// Longitude reversed identity matrix
|
// Longitude reversed identity matrix
|
||||||
const ID_R: &Matrix4<f64> = &Matrix4::new(
|
const ID_R: &Matrix4<f64> = &Matrix4::new(
|
||||||
@@ -548,6 +549,13 @@ impl CameraViewPort {
|
|||||||
if self.reversed_longitude != reversed_longitude {
|
if self.reversed_longitude != reversed_longitude {
|
||||||
self.reversed_longitude = reversed_longitude;
|
self.reversed_longitude = reversed_longitude;
|
||||||
|
|
||||||
|
// Change the cull face, this fixes the display of MOC hpx cells when longitude is reversed
|
||||||
|
if self.reversed_longitude {
|
||||||
|
self.gl.cull_face(WebGl2RenderingContext::FRONT);
|
||||||
|
} else {
|
||||||
|
self.gl.cull_face(WebGl2RenderingContext::BACK);
|
||||||
|
}
|
||||||
|
|
||||||
self.update_rot_matrices(proj);
|
self.update_rot_matrices(proj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -671,9 +671,6 @@ impl HiPS2D {
|
|||||||
..
|
..
|
||||||
} = cfg;
|
} = cfg;
|
||||||
|
|
||||||
// Add starting fading
|
|
||||||
//let fading = self.get_fading_factor();
|
|
||||||
//let opacity = opacity * fading;
|
|
||||||
// Get the colormap from the color
|
// Get the colormap from the color
|
||||||
let cmap = colormaps.get(color.cmap_name.as_ref());
|
let cmap = colormaps.get(color.cmap_name.as_ref());
|
||||||
|
|
||||||
|
|||||||
@@ -496,14 +496,6 @@ impl MOCIntern {
|
|||||||
0,
|
0,
|
||||||
num_instances as i32,
|
num_instances as i32,
|
||||||
);
|
);
|
||||||
|
|
||||||
/*rasterizer.add_stroke_paths(
|
|
||||||
,
|
|
||||||
thickness,
|
|
||||||
&color,
|
|
||||||
&super::line::Style::None,
|
|
||||||
CooSpace::LonLat,
|
|
||||||
);*/
|
|
||||||
}
|
}
|
||||||
RenderModeType::Filled { color } => {
|
RenderModeType::Filled { color } => {
|
||||||
let mut off_idx = 0;
|
let mut off_idx = 0;
|
||||||
@@ -523,11 +515,11 @@ impl MOCIntern {
|
|||||||
];
|
];
|
||||||
|
|
||||||
indices.extend_from_slice(&[
|
indices.extend_from_slice(&[
|
||||||
|
off_idx + 0,
|
||||||
|
off_idx + 2,
|
||||||
off_idx + 1,
|
off_idx + 1,
|
||||||
off_idx + 0,
|
off_idx + 0,
|
||||||
off_idx + 3,
|
off_idx + 3,
|
||||||
off_idx + 1,
|
|
||||||
off_idx + 3,
|
|
||||||
off_idx + 2,
|
off_idx + 2,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -553,7 +545,7 @@ impl MOCIntern {
|
|||||||
let view2world = camera.get_m2w();
|
let view2world = camera.get_m2w();
|
||||||
let icrs2world = view2world * icrs2view;
|
let icrs2world = view2world * icrs2view;
|
||||||
|
|
||||||
//self.gl.enable(WebGl2RenderingContext::BLEND);
|
self.gl.enable(WebGl2RenderingContext::CULL_FACE);
|
||||||
|
|
||||||
crate::shader::get_shader(&self.gl, shaders, "moc_base.vert", "moc_base.frag")?
|
crate::shader::get_shader(&self.gl, shaders, "moc_base.vert", "moc_base.frag")?
|
||||||
.bind(&self.gl)
|
.bind(&self.gl)
|
||||||
@@ -569,11 +561,11 @@ impl MOCIntern {
|
|||||||
0,
|
0,
|
||||||
);
|
);
|
||||||
|
|
||||||
//self.gl.disable(WebGl2RenderingContext::BLEND);
|
self.gl.disable(WebGl2RenderingContext::CULL_FACE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
//});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn compute_edge_paths_iter<'a>(
|
fn compute_edge_paths_iter<'a>(
|
||||||
|
|||||||
@@ -143,16 +143,12 @@ impl MOCRenderer {
|
|||||||
shaders: &mut ShaderManager,
|
shaders: &mut ShaderManager,
|
||||||
) -> Result<(), JsValue> {
|
) -> Result<(), JsValue> {
|
||||||
if !self.is_empty() {
|
if !self.is_empty() {
|
||||||
self.gl.enable(WebGl2RenderingContext::CULL_FACE);
|
|
||||||
|
|
||||||
for (hmoc, cfg) in self.mocs.iter_mut().zip(self.cfgs.iter()) {
|
for (hmoc, cfg) in self.mocs.iter_mut().zip(self.cfgs.iter()) {
|
||||||
if cfg.show {
|
if cfg.show {
|
||||||
let moc = hmoc.select_moc_from_view(camera);
|
let moc = hmoc.select_moc_from_view(camera);
|
||||||
moc.draw(camera, proj, shaders)?;
|
moc.draw(camera, proj, shaders)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
self.gl.disable(WebGl2RenderingContext::CULL_FACE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ void main() {
|
|||||||
vec2 p_b_clip = proj(p_b_w.xyz);
|
vec2 p_b_clip = proj(p_b_w.xyz);
|
||||||
|
|
||||||
vec2 da = p_a_clip - p_b_clip;
|
vec2 da = p_a_clip - p_b_clip;
|
||||||
l = da.x*da.x + da.y*da.y;
|
l = dot(da, da);
|
||||||
|
|
||||||
vec2 p_a_ndc = p_a_clip / (ndc_to_clip * czf);
|
vec2 p_a_ndc = p_a_clip / (ndc_to_clip * czf);
|
||||||
vec2 p_b_ndc = p_b_clip / (ndc_to_clip * czf);
|
vec2 p_b_ndc = p_b_clip / (ndc_to_clip * czf);
|
||||||
|
|||||||
Reference in New Issue
Block a user