stuff

Author: raldone01

shaders/src/shaders/loading_repeating_circles.rs

@@ -787,7 +787,6 @@ impl LayerAlphas {
 
 struct AnimationParameters {
   // --- General ---
-  uv: Vec2,
   aa_width: f32,
 
   // --- Debugging ---
@@ -799,35 +798,52 @@ struct AnimationParameters {
   start_circle_stroke: f32,
   num_circles: i32,
   angle_between_circles: f32,
+  middle_circle_start_radius: f32,
 }
 
-fn anim_discrete_circle_transition(
+struct AnimMid {
+  center: Vec2,
+}
+
+/// Terminus animation.
+fn anim_discrete_circle_terminus(
   layers: &mut LayerAlphas,
   params: &AnimationParameters,
   t_master: f32,
-  middle_circle_radius: f32,
+  uv: Vec2,
 ) {
-  let uv = params.uv;
   let aa_width = params.aa_width;
 
   let &mut LayerAlphas {
     ref mut alpha_black,
     ..
   } = layers;
 
-  let start_circle_radius = params.start_circle_radius;
-  let start_circle_stroke = params.start_circle_stroke;
-  let num_circles = params.num_circles;
-  let angle_between_circles = params.angle_between_circles;
+  let &AnimationParameters {
+    start_circle_radius,
+    start_circle_stroke,
+    num_circles,
+    angle_between_circles,
+    middle_circle_start_radius,
+    ..
+  } = params;
 
-  let t_rotation = exp_time(t_master, 0.8);
-  let t_trail_delayed = remap_time(t_master, 0.4, 1.0);
+  let t_radii = (remap_time(t_master, 0.0, 0.9).powf(2.0)
+    + exp_time(remap_time(t_master, 0.3, 1.0), 0.2) * 0.5)
+    .clamp(0.0, 1.0);
+  let t_rotation = remap_time(t_master, 0.4, 1.0).powf(2.5);
+  let t_trail_delayed = remap_time(t_master, 0.6, 1.0);
   let t_trail = exp_time(t_trail_delayed, 0.4);
-  let t_assist_circle_delayed = remap_time(t_master, 0.5, 0.95);
-  let t_assist_circle = exp_time(t_assist_circle_delayed, 0.4);
-  let t_border_circle_radii = exp_time(remap_time(t_master, 0.3, 1.0), -0.4);
 
-  let outer_circle_outer_radius = mix(start_circle_radius, 0.0, t_border_circle_radii);
+  let t_assist_circle_delayed = remap_time(t_master, 0.65, 0.98);
+  let t_assist_circle = exp_time(t_assist_circle_delayed, 0.5);
+
+  //let t_rotation = 0.0;
+  //let t_trail = 0.0;
+  //let t_assist_circle = 0.0;
+
+  let middle_circle_radius = mix(middle_circle_start_radius, start_circle_radius, t_radii);
+  let outer_circle_outer_radius = mix(start_circle_radius, 0.0, t_radii);
   let trail_angular_extent = mix(0.0, angle_between_circles, t_trail);
   let outer_circle_fade = mix(1.0, 0.4, t_trail);
 
@@ -836,7 +852,7 @@ fn anim_discrete_circle_transition(
     let outer_discrete_circle = rotating_discrete_circle(
       Vec2::ZERO,
       middle_circle_radius,
-      -t_master * PI - t_rotation * TWO_PI * 5.0,
+      -t_master * PI - t_master * t_rotation * TWO_PI * 2.0,
       num_circles,
       i,
     );
@@ -951,9 +967,6 @@ impl Inputs {
     )
     .position;
 
-    // TODO FIXME MATHSE
-    let middle_circle_radius = middle_circle_position.y.abs().max(start_circle_radius);
-
     if debug {
       let m_middle_circle_position_path = sdf_circle_filled(
         uv - (middle_circle_start_position / 2.0),
@@ -963,18 +976,7 @@ impl Inputs {
       layers
         .alpha_blue
         .draw_sdf(m_middle_circle_position_path, aa_width);
-    }
-
-    let middle_circle_moved_distance =
-      (middle_circle_start_position - middle_circle_position).length();
-    // (middle_circle_start_radius + target_radius)
-    //  - (middle_circle_radius + middle_circle_moved_distance);
 
-    // y adjust to follow the middle circle
-    //middle_circle_position.y -=
-    //  (middle_circle_position.y + middle_circle_radius) * (1.0 - t_master);
-
-    if debug {
       let m_start_circle =
         sdf_circle_filled(uv, start_circle_radius).to_outline(start_circle_stroke);
       layers.alpha_red.draw_sdf(m_start_circle, aa_width);
@@ -995,17 +997,26 @@ impl Inputs {
     }
 
     let params = AnimationParameters {
-      uv,
       aa_width,
       debug,
       debug_stroke,
       start_circle_radius,
       start_circle_stroke,
       num_circles,
       angle_between_circles,
+      middle_circle_start_radius,
     };
 
-    anim_discrete_circle_transition(&mut layers, &params, t_master, middle_circle_radius);
+    /*anim_discrete_circle_transition(
+      &mut layers,
+      &params,
+      mix(0.0, 1.0, remap_time(t_master, 0.0, 0.9)),
+      uv,
+    );*/
+
+    const DEPTH: usize = 20;
+
+    anim_discrete_circle_terminus(&mut layers, &params, t_master, uv - middle_circle_position);
 
     if debug && false {
       let sdf_arc_test = sdf_arc_outline(uv, -PI / 4.0, PI / 4.0, 1.0, 0.0, 0.5, -PI / 4.0, 1.0);