Vectornaut/dyna3
1
0
Fork 0
forked from StudioInfinity/dyna3
Code Pull requests Activity

Highlight selected points

Browse source 
In the process, make points round, since the highlighting works better
visually that way.
This commit is contained in:
Aaron Fenyes 2025-04-27 22:23:41 -07:00
parent 0fbb071506
commit bbd4ee08b6
5 changed files with 45 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app-proto/src/add_remove.rs
View file

@ -138,7 +138,7 @@ fn load_pointed_assemb(assembly: &Assembly) {
Point::new(
format!("point_front"),
format!("Front point"),
[0.875_f32, 0.875_f32, 0.875_f32],
[0.75_f32, 0.75_f32, 0.75_f32],
engine::point(0.0, 0.0, FRAC_1_SQRT_2)
)
);
@ -146,7 +146,7 @@ fn load_pointed_assemb(assembly: &Assembly) {
Point::new(
format!("point_back"),
format!("Back point"),
[0.875_f32, 0.875_f32, 0.875_f32],
[0.75_f32, 0.75_f32, 0.75_f32],
engine::point(0.0, 0.0, -FRAC_1_SQRT_2)
)
);
@ -168,7 +168,7 @@ fn load_pointed_assemb(assembly: &Assembly) {
Point::new(
format!("point{index_x}{index_y}"),
format!("Point {index_x}{index_y}"),
[0.4*(2.0 + x) as f32, 0.4*(2.0 + y) as f32, 0.4*(2.0 - x*y) as f32],
[0.5*(1.0 + x) as f32, 0.5*(1.0 + y) as f32, 0.5*(1.0 - x*y) as f32],
engine::point(x, y, 0.0)
)
);

2
app-proto/src/assembly.rs
View file

@ -239,7 +239,7 @@ impl Element for Point {
Point::new(
id,
format!("Point {id_num}"),
[0.875_f32, 0.875_f32, 0.875_f32],
[0.75_f32, 0.75_f32, 0.75_f32],
point(0.0, 0.0, 0.0)
)
}

29
app-proto/src/display.rs
View file

@ -50,19 +50,25 @@ impl SceneSpheres {
struct ScenePoints {
representations: Vec<DVector<f64>>,
colors: Vec<ElementColor>,
highlights: Vec<f32>,
selections: Vec<f32>
}
impl ScenePoints {
fn new() -> ScenePoints {
ScenePoints {
representations: Vec::new(),
colors: Vec::new()
colors: Vec::new(),
highlights: Vec::new(),
selections: Vec::new()
}
}
fn push(&mut self, representation: DVector<f64>, color: ElementColor) {
fn push(&mut self, representation: DVector<f64>, color: ElementColor, highlight: f32, selected: bool) {
self.representations.push(representation);
self.colors.push(color);
self.highlights.push(highlight);
self.selections.push(if selected { 1.0 } else { 0.0 });
}
}
@ -140,9 +146,12 @@ impl DisplayItem for Sphere {
}
impl DisplayItem for Point {
fn show(&self, scene: &mut Scene, _selected: bool) {
fn show(&self, scene: &mut Scene, selected: bool) {
const HIGHLIGHT: f32 = 0.5; /* SCAFFOLDING */
let representation = self.representation.get_clone_untracked();
scene.points.push(representation, self.color);
let color = if selected { self.color.map(|channel| 0.2 + 0.8*channel) } else { self.color };
let highlight = if selected { 1.0 } else { HIGHLIGHT };
scene.points.push(representation, color, highlight, selected);
}
/* SCAFFOLDING */
@ -379,6 +388,10 @@ pub fn Display() -> View {
// disable depth testing
ctx.disable(WebGl2RenderingContext::DEPTH_TEST);
// set blend mode
ctx.enable(WebGl2RenderingContext::BLEND);
ctx.blend_func(WebGl2RenderingContext::SRC_ALPHA, WebGl2RenderingContext::ONE_MINUS_SRC_ALPHA);
// set up the sphere rendering program
let sphere_program = set_up_program(
&ctx,
@ -451,6 +464,8 @@ pub fn Display() -> View {
// find the point program's vertex attributes
let point_position_attr = ctx.get_attrib_location(&point_program, "position") as u32;
let point_color_attr = ctx.get_attrib_location(&point_program, "color") as u32;
let point_highlight_attr = ctx.get_attrib_location(&point_program, "highlight") as u32;
let point_selection_attr = ctx.get_attrib_location(&point_program, "selected") as u32;
// set up a repainting routine
let (_, start_animation_loop, _) = create_raf(move || {
@ -647,6 +662,8 @@ pub fn Display() -> View {
// enable the point program's vertex attributes
ctx.enable_vertex_attrib_array(point_position_attr);
ctx.enable_vertex_attrib_array(point_color_attr);
ctx.enable_vertex_attrib_array(point_highlight_attr);
ctx.enable_vertex_attrib_array(point_selection_attr);
// write the points in world coordinates
let asm_to_world_sp = asm_to_world.rows(0, SPACE_DIM);
@ -661,6 +678,8 @@ pub fn Display() -> View {
// shader
bind_new_buffer_to_attribute(&ctx, point_position_attr, SPACE_DIM as i32, point_positions.as_slice());
bind_new_buffer_to_attribute(&ctx, point_color_attr, COLOR_SIZE as i32, scene.points.colors.concat().as_slice());
bind_new_buffer_to_attribute(&ctx, point_highlight_attr, 1 as i32, scene.points.highlights.as_slice());
bind_new_buffer_to_attribute(&ctx, point_selection_attr, 1 as i32, scene.points.selections.as_slice());
// draw the scene
ctx.draw_arrays(WebGl2RenderingContext::POINTS, 0, point_positions.ncols() as i32);
@ -668,6 +687,8 @@ pub fn Display() -> View {
// disable the point program's vertex attributes
ctx.disable_vertex_attrib_array(point_position_attr);
ctx.disable_vertex_attrib_array(point_color_attr);
ctx.disable_vertex_attrib_array(point_highlight_attr);
ctx.disable_vertex_attrib_array(point_selection_attr);
}
// --- update the display state ---

9
app-proto/src/point.frag
View file

@ -3,9 +3,16 @@
precision highp float;
in vec3 point_color;
in float point_highlight;
in float total_radius;
out vec4 outColor;
void main() {
outColor = vec4(point_color, 1.);
float r = total_radius * length(2.*gl_PointCoord - vec2(1.));
const float POINT_RADIUS = 4.;
float border = smoothstep(POINT_RADIUS - 1., POINT_RADIUS, r);
vec3 color = mix(point_color, vec3(1.), border * point_highlight);
outColor = vec4(color, 1. - smoothstep(total_radius - 1., total_radius, r));
}

9
app-proto/src/point.vert
View file

@ -2,16 +2,23 @@
in vec4 position;
in vec3 color;
in float highlight;
in float selected;
out vec3 point_color;
out float point_highlight;
out float total_radius;
// camera
const float focal_slope = 0.3;
void main() {
total_radius = 5. + 0.5*selected;
float depth = -focal_slope * position.z;
gl_Position = vec4(position.xy / depth, 0., 1.);
gl_PointSize = 5.;
gl_PointSize = 2.*total_radius;
point_color = color;
point_highlight = highlight;
}