Jengamon/acerola_jam0_gam - Change HYJ4HJQVLLDTE6JYKEYQK2LBWREOQUATESGB3QP7WDJB3IMVS6OAC

fix: make pointer more dynamic

Created by Jengamon on March 2, 2024

HYJ4HJQVLLDTE6JYKEYQK2LBWREOQUATESGB3QP7WDJB3IMVS6OAC

Dependencies

In channels

main

Change contents

Insertion in src/main.rs at line 81 [4.49]
[3.1473]
[3.1473]
```
/// The highest speed something is capable of moving
```

Insertion in src/main.rs at line 100 [4.49]

[3.2062]

                md.1 = dad.xy().length() * SPEED;

Replacement in src/main.rs at line 154 [4.49]

B:BD[3.2861] → [3.2861:2915]

            movement_dir: MovementDirection(Vec2::X),

[3.2861]

[3.2915]

            movement_dir: MovementDirection(Vec2::X, 0.0),

Replacement in src/main.rs at line 203 [4.49]
B:BD[3.4274] → [3.4274:4306]
```
struct MovementDirection(Vec2);
```
[3.4274]
[3.4306]
```
struct MovementDirection(Vec2, f32);
```

Insertion in src/main.rs at line 213 [4.49]

[3.4504]

[5.1813]

}
/// alpha is clamped to [0.0, 1.0]
fn lerp_mix(a: Color, b: Color, alpha: f32) -> Color {
    use palette::{
        blend::{BlendWith, PreAlpha},
        LinSrgb, Srgba,
    };
    type PreRgba = PreAlpha<LinSrgb<f32>>;
    let alpha = alpha.clamp(0.0, 1.0);
    let a_rgb = Srgba::from(a.as_rgba_f32()).into_linear();
    let b_rgb = Srgba::from(b.as_rgba_f32()).into_linear();
    let mixed = a_rgb.blend_with(b_rgb, |a: PreRgba, b: PreRgba| {
        // lerp em colors togethter
        PreAlpha {
            color: LinSrgb::new(
                a.red + (b.red - a.red) * alpha,
                a.green + (b.green - a.green) * alpha,
                a.blue + (b.blue - a.blue) * alpha,
            ),
            alpha: a.alpha + (b.alpha - a.alpha) * alpha,
        }
    });
    Color::rgba(mixed.red, mixed.green, mixed.blue, mixed.alpha)

Replacement in src/main.rs at line 241 [4.49]

B:BD[3.4534] → [3.4534:4622]

    mut query: Query<(Entity, &mut Transform, &mut Visibility), With<MovementPointer>>,

[3.4534]

[3.4622]

    mut query: Query<
        (
            Entity,
            &mut Transform,
            &mut Visibility,
            Option<&Handle<ColorMaterial>>,
        ),
        With<MovementPointer>,
    >,

Insertion in src/main.rs at line 252 [4.49]
[3.4707]
[3.4707]
```
    mut materials: ResMut<Assets<ColorMaterial>>,
```

Replacement in src/main.rs at line 254 [4.49]

B:BD[3.4711] → [3.4711:4774]

    for (entity, mut transform, mut vis) in query.iter_mut() {

[3.4711]

[3.4774]

    // highest speed we exact movement-pointered stuff to move at
    const MAX_SPEED: f32 = 1000.0;
    for (entity, mut transform, mut vis, maybe_tex) in query.iter_mut() {

Replacement in src/main.rs at line 262 [4.49]

B:BD[5.1816] → [3.4943:5026]

            // TODO let this scale
            const POINTER_DISTANCE: f32 = 45.0;

[5.1816]

[3.5026]

            // Color shenanigans
            const MIN_COLOR: Color = Color::BLUE;
            const MAX_COLOR: Color = Color::RED;
            if let Some(tex) = maybe_tex {
                let mixed = lerp_mix(MIN_COLOR, MAX_COLOR, md.1 / MAX_SPEED);
                // tex handle is present, so expect it points to a valid color material
                materials
                    .get_mut(tex)
                    .expect("MP Color Texture handle exists, but doesn't point to valid handle")
                    .color = mixed;
            }
            const MIN_POINTER_DISTANCE: f32 = 45.0;
            // How big is the pointer range between fastest and slowest
            const MAX_POINTER_DELTA: f32 = 35.0;

Replacement in src/main.rs at line 281 [4.49]

B:BD[3.5181] → [3.5181:5260]

                transform.translation = (norm * POINTER_DISTANCE).extend(0.0);

[3.5181]

[3.5260]

                transform.translation = (norm
                    * (MIN_POINTER_DISTANCE + MAX_POINTER_DELTA * (md.1 / MAX_SPEED)))
                    .extend(0.0);

Insertion in Cargo.toml at line 58 [4.131]
[2.16]
[5.6602]
```
palette = "0.7.5"
```
Insertion in Cargo.lock at line 93 [4.363]
[3.72747]
[6.1857]
```
 "palette",
```

Insertion in Cargo.lock at line 2086 [4.363]

[2.726]

[4.39520]

name = "fast-srgb8"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
[[package]]

Insertion in Cargo.lock at line 3482 [4.363]

[4.64643]

]
[[package]]
name = "palette"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a"
dependencies = [
 "approx",
 "fast-srgb8",
 "palette_derive",
 "phf",
]
[[package]]
name = "palette_derive"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d"
dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.52",

Insertion in Cargo.lock at line 3568 [4.363]

[4.66016]

[2.2729]

]
[[package]]
name = "phf"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
dependencies = [
 "phf_macros",
 "phf_shared",
]
[[package]]
name = "phf_generator"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
dependencies = [
 "phf_shared",
 "rand",
]
[[package]]
name = "phf_macros"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
 "phf_generator",
 "phf_shared",
 "proc-macro2",
 "quote",
 "syn 2.0.52",

Insertion in Cargo.lock at line 3604 [4.363]

[2.2744]

name = "phf_shared"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
dependencies = [
 "siphasher",
]
[[package]]