From 7c19ad46dbea20d2c9af4e535f3bc6855fbbedaf Mon Sep 17 00:00:00 2001 From: bmatthieu3 Date: Tue, 15 Dec 2020 14:09:32 +0100 Subject: [PATCH] Catalog sources multiplied by inv_model instead of model --- src/render/src/renderable/catalog/manager.rs | 2 -- src/render/src/renderable/grid.rs | 4 ++-- src/render/src/shaders/catalogs/aitoff.vert | 3 ++- src/render/src/shaders/catalogs/arc.vert | 4 ++-- src/render/src/shaders/catalogs/mercator.vert | 4 ++-- src/render/src/shaders/catalogs/mollweide.vert | 4 ++-- src/render/src/shaders/catalogs/ortho.vert | 4 ++-- src/render/src/shaders/catalogs/tan.vert | 4 ++-- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/render/src/renderable/catalog/manager.rs b/src/render/src/renderable/catalog/manager.rs index 2ab89eb8..a1cb9b27 100644 --- a/src/render/src/renderable/catalog/manager.rs +++ b/src/render/src/renderable/catalog/manager.rs @@ -513,11 +513,9 @@ impl Catalog { // Attach catalog specialized uniforms .attach_uniform("kernel_texture", &manager.kernel_texture) // Gaussian kernel texture .attach_uniform("strength", &self.strength) // Strengh of the kernel - .attach_uniform("model", camera.get_m2w()) .attach_uniform("current_time", &utils::get_current_time()) .attach_uniform("kernel_size", &manager.kernel_size) .attach_uniform("max_density", &self.max_density) - .attach_uniform("fov", &camera.get_aperture().0) .bind_vertex_array_object_ref(&self.vertex_array_object_catalog) .draw_elements_instanced_with_i32( WebGl2RenderingContext::TRIANGLES, diff --git a/src/render/src/renderable/grid.rs b/src/render/src/renderable/grid.rs index 468cde65..976913ca 100644 --- a/src/render/src/renderable/grid.rs +++ b/src/render/src/renderable/grid.rs @@ -253,7 +253,7 @@ impl ProjetedGrid { } } - pub fn draw_lines_GPU( + fn draw_lines_GPU( &self, camera: &CameraViewPort, shaders: &mut ShaderManager, @@ -293,7 +293,7 @@ impl ProjetedGrid { Ok(()) } - pub fn draw_lines_CPU( + fn draw_lines_CPU( &self,camera: &CameraViewPort, shaders: &mut ShaderManager, ) -> Result<(), JsValue> { diff --git a/src/render/src/shaders/catalogs/aitoff.vert b/src/render/src/shaders/catalogs/aitoff.vert index b1bce0bd..fe20a3a3 100644 --- a/src/render/src/shaders/catalogs/aitoff.vert +++ b/src/render/src/shaders/catalogs/aitoff.vert @@ -8,6 +8,7 @@ layout (location = 3) in vec2 center_lonlat; uniform float current_time; uniform mat4 model; +uniform mat4 inv_model; uniform vec2 ndc_to_clip; uniform float czf; @@ -19,7 +20,7 @@ out vec3 out_p; @import ../hips/projection; void main() { - vec3 p = vec3(model * vec4(center, 1.0f)); + vec3 p = vec3(inv_model * vec4(center, 1.0f)); p = check_inversed_longitude(p); vec2 center_pos_clip_space = world2clip_aitoff(p); diff --git a/src/render/src/shaders/catalogs/arc.vert b/src/render/src/shaders/catalogs/arc.vert index 713022cd..11213550 100644 --- a/src/render/src/shaders/catalogs/arc.vert +++ b/src/render/src/shaders/catalogs/arc.vert @@ -7,7 +7,7 @@ layout (location = 2) in vec3 center; layout (location = 3) in vec2 center_lonlat; uniform float current_time; -uniform mat4 model; +uniform mat4 inv_model; uniform vec2 ndc_to_clip; uniform float czf; @@ -19,7 +19,7 @@ out vec3 out_p; @import ../hips/projection; void main() { - vec3 p = vec3(model * vec4(center, 1.0f)); + vec3 p = vec3(inv_model * vec4(center, 1.0f)); p = check_inversed_longitude(p); vec2 center_pos_clip_space = world2clip_arc(p); diff --git a/src/render/src/shaders/catalogs/mercator.vert b/src/render/src/shaders/catalogs/mercator.vert index efa7a869..7a010faa 100644 --- a/src/render/src/shaders/catalogs/mercator.vert +++ b/src/render/src/shaders/catalogs/mercator.vert @@ -7,7 +7,7 @@ layout (location = 2) in vec3 center; layout (location = 3) in vec2 center_lonlat; uniform float current_time; -uniform mat4 model; +uniform mat4 inv_model; uniform vec2 ndc_to_clip; uniform float czf; @@ -19,7 +19,7 @@ out vec3 out_p; @import ../hips/projection; void main() { - vec3 p = vec3(model * vec4(center, 1.0f)); + vec3 p = vec3(inv_model * vec4(center, 1.0f)); p = check_inversed_longitude(p); vec2 center_pos_clip_space = world2clip_mercator(p); diff --git a/src/render/src/shaders/catalogs/mollweide.vert b/src/render/src/shaders/catalogs/mollweide.vert index 40e08000..f4c781f1 100644 --- a/src/render/src/shaders/catalogs/mollweide.vert +++ b/src/render/src/shaders/catalogs/mollweide.vert @@ -7,7 +7,7 @@ layout (location = 2) in vec3 center; layout (location = 3) in vec2 center_lonlat; uniform float current_time; -uniform mat4 model; +uniform mat4 inv_model; uniform vec2 ndc_to_clip; uniform float czf; @@ -19,7 +19,7 @@ out vec3 out_p; @import ../hips/projection; void main() { - vec3 p = vec3(model * vec4(center, 1.0f)); + vec3 p = vec3(inv_model * vec4(center, 1.0f)); p = check_inversed_longitude(p); vec2 center_pos_clip_space = world2clip_mollweide(p); diff --git a/src/render/src/shaders/catalogs/ortho.vert b/src/render/src/shaders/catalogs/ortho.vert index c8bda399..a0910a2d 100644 --- a/src/render/src/shaders/catalogs/ortho.vert +++ b/src/render/src/shaders/catalogs/ortho.vert @@ -8,7 +8,7 @@ layout (location = 3) in vec2 center_lonlat; uniform float current_time; -uniform mat4 model; +uniform mat4 inv_model; uniform vec2 ndc_to_clip; uniform float czf; @@ -20,7 +20,7 @@ out vec3 out_p; @import ../hips/projection; void main() { - vec3 p = vec3(model * vec4(center, 1.0f)); + vec3 p = vec3(inv_model * vec4(center, 1.0f)); p = check_inversed_longitude(p); vec2 center_pos_clip_space = world2clip_orthographic(p); diff --git a/src/render/src/shaders/catalogs/tan.vert b/src/render/src/shaders/catalogs/tan.vert index b513f6c7..8e1564fa 100644 --- a/src/render/src/shaders/catalogs/tan.vert +++ b/src/render/src/shaders/catalogs/tan.vert @@ -8,7 +8,7 @@ layout (location = 3) in vec2 center_lonlat; uniform float current_time; -uniform mat4 model; +uniform mat4 inv_model; uniform vec2 ndc_to_clip; uniform float czf; @@ -20,7 +20,7 @@ out vec3 out_p; @import ../hips/projection; void main() { - vec3 p = vec3(model * vec4(center, 1.0f)); + vec3 p = vec3(inv_model * vec4(center, 1.0f)); p = check_inversed_longitude(p); vec2 center_pos_clip_space = world2clip_gnomonic(p);