jengamon/catwaiter - Change 7B5SB3V7YC4HKFX6PIX6IHJ4U3BKYLD5EBMEY6O5FQ7YGN4VVI4AC

camera true fix maybe

Created by Jengamon on February 6, 2024

7B5SB3V7YC4HKFX6PIX6IHJ4U3BKYLD5EBMEY6O5FQ7YGN4VVI4AC

Dependencies

In channels

main

Change contents

Replacement in src/world_shader.wgsl at line 23 [5.42]

B:BD[5.584] → [5.584:668]

    out.tex_coords = (camera.view_proj * vec4<f32>(model.tex_coords, 0.0, 1.0)).xy;

[5.584]

[5.668]

    let tc = camera.view_proj * vec4<f32>(model.tex_coords, 0.0, 1.0);
    out.tex_coords = tc.xy / tc.w;

Insertion in src/world_shader.wgsl at line 29 [5.42]
[5.873]
[5.873]
```
    // out.color = vec4<f32>(out.tex_coords, 0.0, 1.0);
```

Insertion in src/world_shader.wgsl at line 55 [5.42]

[5.1056]

[6.534]

    // let textureDims = vec2<f32>(textureDimensions(t_world));
    let t_tex_coords = in.tex_coords;

Replacement in src/world_shader.wgsl at line 59 [5.42]

B:BD[6.612] → [6.612:688]

    var result = in.color * textureSample(t_world, s_world, in.tex_coords);

[6.612]

[2.28]

    var result = in.color * textureSample(t_world, s_world, t_tex_coords);

Replacement in src/world_shader.wgsl at line 67 [5.42]

∅:D[3.38] → [6.945:1133]

B:BD[6.945] → [6.945:1133]

        let new_color_a = textureSample(t_world, s_world, in.tex_coords + offset_x * f32(i));
        let new_color_b = textureSample(t_world, s_world, in.tex_coords - offset_x * f32(i));

[3.38]

[6.1133]

        let new_color_a = textureSample(t_world, s_world, t_tex_coords + offset_x * f32(i));
        let new_color_b = textureSample(t_world, s_world, t_tex_coords - offset_x * f32(i));

Replacement in src/world_shader.wgsl at line 77 [5.42]

B:BD[6.1557] → [2.53:241]

        let new_color_c = textureSample(t_world, s_world, in.tex_coords + offset_y * f32(i));
        let new_color_d = textureSample(t_world, s_world, in.tex_coords - offset_y * f32(i));

[6.1557]

[6.1761]

        let new_color_c = textureSample(t_world, s_world, t_tex_coords + offset_y * f32(i));
        let new_color_d = textureSample(t_world, s_world, t_tex_coords - offset_y * f32(i));

Replacement in src/world_shader.wgsl at line 87 [5.42]

B:BD[2.252] → [2.252:480]

        let new_color_e = textureSample(t_world, s_world, in.tex_coords + offset_x * f32(i) + offset_y * f32(i));
        let new_color_f = textureSample(t_world, s_world, in.tex_coords + offset_x * f32(i) - offset_y * f32(i));

[2.252]

[2.480]

        let new_color_e = textureSample(t_world, s_world, t_tex_coords + offset_x * f32(i) + offset_y * f32(i));
        let new_color_f = textureSample(t_world, s_world, t_tex_coords + offset_x * f32(i) - offset_y * f32(i));

Replacement in src/world_shader.wgsl at line 97 [5.42]

B:BD[2.904] → [2.904:1132]

        let new_color_g = textureSample(t_world, s_world, in.tex_coords + offset_x * f32(i) + offset_y * f32(i));
        let new_color_h = textureSample(t_world, s_world, in.tex_coords - offset_x * f32(i) + offset_y * f32(i));

[2.904]

[2.1132]

        let new_color_g = textureSample(t_world, s_world, t_tex_coords + offset_x * f32(i) + offset_y * f32(i));
        let new_color_h = textureSample(t_world, s_world, t_tex_coords - offset_x * f32(i) + offset_y * f32(i));

Replacement in src/screen.rs at line 58 [8.51]
B:BD[5.3952] → [7.18:34]
```
    width: f32,
```
[5.3952]
[5.3972]
```
    pub width: f32,
```
Replacement in src/screen.rs at line 60 [8.51]
B:BD[5.4011] → [7.35:52]
```
    height: f32,
```
[5.4011]
[7.52]
```
    pub height: f32,
```

Replacement in src/screen.rs at line 131 [8.51]

B:BD[4.47] → [4.47:147]

            glam::Vec3::new(-0.5, -0.5, 0.0),
            glam::Vec3::Z,
            glam::Vec3::Y,

[4.47]

[4.147]

            glam::Vec3::new(-1.0, -1.0, 0.0),
            glam::Vec3::NEG_Z,
            glam::Vec3::NEG_Y,

Replacement in src/screen.rs at line 136 [8.51]

B:BD[5.4919] → [4.229:286]

        // Why does this work? rn i haven't the foggiest

[5.4919]

[4.286]

        let view_vector = glam::Vec2::new(self.width, self.height)
            * WORLD_HALF_EXTENTS.as_vec2().recip() // 1 / (GW / 2) = 2 / GW
            * 0.25;
        // VW * 2 / (GW * 4) = (VW / GW) * 1/2
        // dbg!(view_vector);
        // rotate about the translation point

Replacement in src/screen.rs at line 145 [8.51]

B:BD[4.391] → [4.391:1061]

            glam::Vec3::new(
                (self.transform.translation.x * self.width + self.width * 0.25)
                    / WORLD_HALF_EXTENTS.x as f32,
                (self.transform.translation.y * self.height + self.height * 0.25)
                    / WORLD_HALF_EXTENTS.y as f32,
                0.0,
            ),
        ) * glam::Affine3A::from_translation(glam::Vec3::new(
            -(self.transform.translation.x * self.width + self.width * 0.25)
                / WORLD_HALF_EXTENTS.x as f32,
            -(self.transform.translation.y * self.height + self.height * 0.25)
                / WORLD_HALF_EXTENTS.y as f32,
            0.0,
        ));

[4.391]

[4.1061]

            view_vector.extend(0.0),
        ) * glam::Affine3A::from_translation(-view_vector.extend(0.0));

Insertion in src/screen.rs at line 149 [8.51]

[4.1110]

            // -self.width * 0.5,
            // self.width * 0.5,

Replacement in src/screen.rs at line 152 [8.51]

B:BD[4.1158] → [4.1158:1199]

            WORLD_HALF_EXTENTS.x as f32,

[4.1158]

[4.1199]

            1.0 * WORLD_HALF_EXTENTS.x as f32,

Replacement in src/screen.rs at line 154 [8.51]

B:BD[4.1247] → [4.1247:1288]

            WORLD_HALF_EXTENTS.y as f32,

[4.1247]

[4.1288]

            1.0 * WORLD_HALF_EXTENTS.y as f32,

Replacement in src/screen.rs at line 159 [8.51]

B:BD[4.1336] → [4.1336:1468]

        let display_to_texture =
            glam::Affine3A::from_scale(glam::Vec3::new(self.width * 0.5, self.height * 0.5, 1.0));

[4.1336]

[4.1468]

        let world_to_camera = glam::Affine3A::from_scale(glam::Vec3::new(0.5, -0.5, 1.0));

Replacement in src/screen.rs at line 161 [8.51]

B:BD[4.1469] → [4.1469:1521]

        view * rotation * proj * display_to_texture

[4.1469]

[5.4948]

        world_to_camera
            * view
            * rotation
            * proj
            * glam::Affine3A::from_scale(
                WORLD_HALF_EXTENTS.as_vec2().extend(1.0) * 0.5
                    / glam::Vec3::new(
                        WORLD_HALF_EXTENTS.x as f32 / self.width,
                        WORLD_HALF_EXTENTS.y as f32 / self.height,
                        1.0,
                    ),
            )

Deletion in src/screen/tests.rs at line 9 [9.79]
B:BD[9.279] → [9.279:280]

Replacement in src/screen/tests.rs at line 10 [9.79]

B:BD[9.314] → [9.314:362]

            width: WORLD_HALF_EXTENTS.x as f32,

[9.314]

[9.362]

            width: WORLD_HALF_EXTENTS.x as f32 / 0.5,

Replacement in src/screen/tests.rs at line 22 [9.79]

B:BD[9.738] → [9.738:781]

            glam::Vec3::new(1.0, 1.0, 0.0)

[9.738]

[9.781]

            glam::Vec3::new(1.0, 0.75, 0.0)

Replacement in src/screen/tests.rs at line 25 [9.79]

B:BD[9.793] → [9.793:889]

        camera.transform.translation.x = -0.25;
        camera.transform.translation.y = -0.25;

[9.793]

[9.889]

        camera.transform.translation.x = -0.5;
        camera.transform.translation.y = -0.5;

Replacement in src/screen/tests.rs at line 35 [9.79]

B:BD[9.1174] → [9.1174:1219]

            glam::Vec3::new(0.75, 0.75, 0.0)

[9.1174]

[9.1219]

            glam::Vec3::new(0.75, 0.5, 0.0)
        );
        camera.transform *= glam::Affine3A::from_axis_angle(glam::Vec3::Z, std::f32::consts::PI);
        let vpjm = camera.build_view_projection_matrix();
        assert_abs_diff_eq!(
            vpjm.project_point3(glam::Vec3::new(0.0, 0.0, 0.0)),
            glam::Vec3::new(0.75, 0.5, 0.0)
        );
        assert_abs_diff_eq!(
            vpjm.project_point3(glam::Vec3::new(1.0, 1.0, 0.0)),
            glam::Vec3::new(0.25, 0.25, 0.0)
        );
        camera.transform.translation.x = 0.0;
        camera.transform.translation.y = 0.0;
        let vpjm = camera.build_view_projection_matrix();
        assert_abs_diff_eq!(
            vpjm.project_point3(glam::Vec3::new(0.0, 0.0, 0.0)),
            glam::Vec3::new(1.0, 0.75, 0.0),

Insertion in src/screen/tests.rs at line 58 [9.79]

[9.1230]

        assert_abs_diff_eq!(
            vpjm.project_point3(glam::Vec3::new(1.0, 1.0, 0.0)),
            glam::Vec3::new(0.5, 0.5, 0.0)
        );

Replacement in src/game/scene.rs at line 83 [10.5158]

B:BD[4.2092] → [4.2092:2178]

                game.camera.transform.translation.x -= negativity * dt_secs * 0.0025;

[4.2092]

[4.2178]

                game.camera.transform.translation.x += negativity * dt_secs * 0.0025;