jengamon/catwaiter - Change DKGUNP6LG3DJ35VMHU42K3VJO5JJ5UVYI4PLM72HO5ZNAQ4P366AC

maybe some text shenanigans

Created by Jengamon on February 6, 2024

DKGUNP6LG3DJ35VMHU42K3VJO5JJ5UVYI4PLM72HO5ZNAQ4P366AC

Dependencies

In channels

main

Change contents

Replacement in src/world_shader.wgsl at line 66 [7.42]
∅:D[4.347] → [6.28:52]
B:BD[8.688] → [6.28:52]
```
    let strength = 6.0;
```
[4.347]
[8.712]
```
    let strength = 3.0;
```

Replacement in src/text.rs at line 6 [9.32]

B:BD[9.108] → [9.108:145]

    loader::{BytesLoader, LoadFrom},

[9.108]

[9.145]

    loader::{BytesLoader, LoadFrom, RonLoader},

Insertion in src/text.rs at line 56 [9.32]

[9.958]

}
#[derive(serde::Deserialize, Debug, Clone, Copy)]
struct TextColor(
    #[serde(deserialize_with = "palette::serde::deserialize_with_optional_alpha")] palette::Srgba,
);
#[derive(serde::Deserialize, Debug, Clone)]
struct Text {
    font_size: f32,
    #[serde(default)]
    text_dims: Option<glam::Vec2>,
    text: String,
    #[serde(default)]
    position: Option<glam::Vec2>,
    #[serde(default)]
    scale: Option<f32>,
    #[serde(default)]
    color: Option<TextColor>,
    #[serde(default)]
    lines: Option<usize>,

Insertion in src/text.rs at line 79 [9.32]

[9.961]

#[derive(serde::Deserialize)]
struct TextList(Vec<Text>);
impl Asset for TextList {
    const EXTENSION: &'static str = "textl";
    type Loader = RonLoader;
}

Insertion in src/text.rs at line 128 [9.32]
[9.2150]
[9.2150]
```
        assets: &AssetCache,
```

Replacement in src/text.rs at line 130 [9.32]

B:BD[9.2210] → [7.1292:1404]

B:BD[7.1790] → [7.1790:1866]

B:BD[7.1866] → [10.984:1026]

∅:D[10.1026] → [7.1908:1990]

B:BD[7.1908] → [7.1908:1990]

B:BD[7.1990] → [10.1027:1105]

∅:D[10.1105] → [7.2074:2125]

B:BD[7.2074] → [7.2074:2125]

B:BD[7.2125] → [10.1106:1153]

B:BD[10.1153] → [3.0:820]

        let metrics = Metrics::new(32.0, 20.0);
        let mut buffer = Buffer::new(&mut self.fonts, metrics);
        {
            let mut buffer = buffer.borrow_with(&mut self.fonts);
            buffer.set_size(250.0, 25.0);
            let attrs = Attrs::new().family(glyphon::Family::Name("Poiret One"));
            buffer.set_text("Hello, game! 🦀\n", attrs, Shaping::Advanced);
            buffer.shape_until_scroll();
        }
        let loc = glam::Vec2::new(32.0, 32.0);
        let mut buffer2 = Buffer::new(&mut self.fonts, metrics);
        {
            let mut buffer2 = buffer2.borrow_with(&mut self.fonts);
            buffer2.set_size(250.0, 25.0);
            let attrs = Attrs::new()
                .family(glyphon::Family::Name("Poiret One"))
                .color(glyphon::Color::rgb(255, 255, 255));
            buffer2.set_text("Hello, bloom! 🦀\n", attrs, Shaping::Advanced);
            buffer2.shape_until_scroll();
        }
        let loc2 = glam::Vec2::new(32.0, 64.0);
        vec![
            (
                buffer,
                BufferMapper::new(self.convert_world_to_glyphon_world(loc), 1.0),
            ),
            (
                buffer2,
                BufferMapper::new(self.convert_world_to_glyphon_world(loc2), 1.0),
            ),
        ]

[9.2210]

[9.2232]

        let Ok(world_text) = assets.load::<TextList>("text_data.world") else {
            let metrics = Metrics::new(32.0, 20.0);
            let mut buffer = Buffer::new(&mut self.fonts, metrics);
            {
                let mut buffer = buffer.borrow_with(&mut self.fonts);
                buffer.set_size(250.0, 25.0);
                let attrs = Attrs::new().family(glyphon::Family::Name("Poiret One"));
                buffer.set_text("Hello, game! 🦀\n", attrs, Shaping::Advanced);
                buffer.shape_until_scroll();
            }
            let loc = glam::Vec2::new(32.0, 32.0);
            let mut buffer2 = Buffer::new(&mut self.fonts, metrics);
            {
                let mut buffer2 = buffer2.borrow_with(&mut self.fonts);
                buffer2.set_size(250.0, 25.0);
                let attrs = Attrs::new()
                    .family(glyphon::Family::Name("Poiret One"))
                    .color(glyphon::Color::rgb(255, 255, 255));
                buffer2.set_text("Y tho? 🦀\n", attrs, Shaping::Advanced);
                buffer2.shape_until_scroll();
            }
            let loc2 = glam::Vec2::new(32.0, 64.0);
            return vec![
                (
                    buffer,
                    BufferMapper::new(self.convert_world_to_glyphon_world(loc), 1.0),
                ),
                (
                    buffer2,
                    BufferMapper::new(self.convert_world_to_glyphon_world(loc2), 1.0),
                ),
            ];
        };
        world_text
            .read()
            .0
            .iter()
            .map(|text| {
                let metrics = Metrics::new(text.font_size, 20.0);
                let mut buffer = Buffer::new(&mut self.fonts, metrics);
                {
                    let mut buffer = buffer.borrow_with(&mut self.fonts);
                    if let Some(text_dims) = text.text_dims {
                        buffer.set_size(text_dims.x, text_dims.y);
                    }
                    let attrs = Attrs::new().family(glyphon::Family::Name("Poiret One"));
                    buffer.set_text(
                        &text.text,
                        if let Some(color) = text.color {
                            let color: palette::Srgba<u8> = color.0.into_format();
                            attrs.color(glyphon::Color::rgba(
                                color.red,
                                color.green,
                                color.blue,
                                color.alpha,
                            ))
                        } else {
                            attrs
                        },
                        Shaping::Advanced,
                    );
                    for line_idx in 0..text.lines.unwrap_or(1) {
                        buffer.line_shape(line_idx);
                        buffer.line_layout(line_idx);
                    }
                }
                (
                    buffer,
                    BufferMapper::new(
                        self.convert_world_to_glyphon_world(text.position.unwrap_or_default()),
                        text.scale.unwrap_or(1.0),
                    ),
                )
            })
            .collect()

Insertion in src/text.rs at line 215 [9.32]
[9.2420]
[9.2420]
```
        assets: &AssetCache,
```

Replacement in src/text.rs at line 217 [9.32]

B:BD[9.2480] → [9.2480:2602]

B:BD[9.2684] → [9.2684:2792]

B:BD[9.2792] → [2.0:82]

∅:D[2.82] → [9.2793:2922]

B:BD[9.2793] → [9.2793:2922]

B:BD[9.2922] → [7.2340:2408]

        let metrics = Metrics::new(32.0, 20.0);
        let mut buffer = Buffer::new(&mut self.fonts, metrics);
        {
            let mut buffer = buffer.borrow_with(&mut self.fonts);
            buffer.set_size(200.0, 25.0);
            let attrs = Attrs::new().family(glyphon::Family::Name("Poiret One"));
            buffer.set_text("Hello, Rust! 🦀\n", attrs, Shaping::Advanced);
            buffer.shape_until_scroll();
        }
        vec![(buffer, BufferMapper::new((32.0, 32.0).into(), 1.0))]

[9.2480]

[9.2959]

        let Ok(cam_text) = assets.load::<TextList>("text_data.camera") else {
            let metrics = Metrics::new(32.0, 20.0);
            let mut buffer = Buffer::new(&mut self.fonts, metrics);
            {
                let mut buffer = buffer.borrow_with(&mut self.fonts);
                buffer.set_size(200.0, 25.0);
                let attrs = Attrs::new().family(glyphon::Family::Name("Poiret One"));
                buffer.set_text("Hello, Rust! 🦀\n", attrs, Shaping::Advanced);
                buffer.shape_until_scroll();
            }
            return vec![(buffer, BufferMapper::new((32.0, 32.0).into(), 1.0))];
        };
        cam_text
            .read()
            .0
            .iter()
            .map(|text| {
                let metrics = Metrics::new(text.font_size, 20.0);
                let mut buffer = Buffer::new(&mut self.fonts, metrics);
                {
                    let mut buffer = buffer.borrow_with(&mut self.fonts);
                    if let Some(text_dims) = text.text_dims {
                        buffer.set_size(text_dims.x, text_dims.y);
                    }
                    let attrs = Attrs::new().family(glyphon::Family::Name("Poiret One"));
                    buffer.set_text(
                        &text.text,
                        if let Some(color) = text.color {
                            let color: palette::Srgba<u8> = color.0.into_format();
                            attrs.color(glyphon::Color::rgba(
                                color.red,
                                color.green,
                                color.blue,
                                color.alpha,
                            ))
                        } else {
                            attrs
                        },
                        Shaping::Advanced,
                    );
                    buffer.shape_until_scroll();
                }
                (
                    buffer,
                    BufferMapper::new(text.position.unwrap_or_default(), text.scale.unwrap_or(1.0)),
                )
            })
            .collect()

Replacement in src/screen.rs at line 50 [11.51]

B:BD[7.4153] → [5.0:53]

            width: 600.0,
            height: 400.0,

[7.4153]

[12.335]

            width: 800.0,
            height: 600.0,

Replacement in src/screen.rs at line 363 [11.51]

B:BD[7.16867] → [7.16867:16961]

                // TODO Retry after executing atlas.trim, which removes all glyph claims iigc

[7.16867]

[7.16961]

                // TODO Retry after executing atlas.trim, which removes all glyph claims (maybe dont quote me)

Replacement in src/game.rs at line 225 [11.9635]

B:BD[9.7884] → [9.7884:8000]

        let camera_text_data_info: Vec<_> =
            self.text.produce_camera(&text_data).into_iter().collect();

[9.7884]

[9.8000]

        let camera_text_data_info: Vec<_> = self
            .text
            .produce_camera(&text_data, &self.assets)
            .into_iter()
            .collect();

Replacement in src/game.rs at line 235 [11.9635]

B:BD[9.8152] → [7.19526:19640]

        let world_text_data_info: Vec<_> =
            self.text.produce_world(&text_data).into_iter().collect();

[9.8152]

[7.19640]

        let world_text_data_info: Vec<_> = self
            .text
            .produce_world(&text_data, &self.assets)
            .into_iter()
            .collect();

Replacement in Cargo.toml at line 9 [11.12025]

B:BD[11.12204] → [13.99:234]

assets_manager = { version = "0.11.2", features = ["hot-reloading", "embedded", "zip", "json", "toml", "flac", "wav", "jpeg", "png"] }

[11.12204]

[14.3401]

assets_manager = { version = "0.11.2", features = ["hot-reloading", "embedded", "zip", "json", "toml", "flac", "wav", "jpeg", "png", "ron"] }

Replacement in Cargo.toml at line 18 [11.12025]

B:BD[11.12389] → [15.2193:2287]

glam = { version = "0.25.0", features = ["bytemuck", "debug-glam-assert", "mint", "approx"] }

[11.12389]

[16.7210]

glam = { version = "0.25.0", features = ["bytemuck", "debug-glam-assert", "mint", "approx", "serde"] }

Insertion in Cargo.toml at line 26 [11.12025]

[8.6321]

[11.12485]

palette = { version = "0.7.4", features = ["serde", "serializing"] }

Insertion in Cargo.lock at line 195 [11.12974]
[13.492]
[13.492]
```
 "ron",
```
Insertion in Cargo.lock at line 437 [11.12974]
[8.6403]
[11.24203]
```
 "palette",
```

Insertion in Cargo.lock at line 1043 [11.12974]

[11.41070]

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 1267 [11.12974]
[14.353]
[17.626]
```
 "serde",
```

Insertion in Cargo.lock at line 2213 [11.12974]

[11.75212]

[11.75486]

name = "palette"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d38e6e5ca1612e2081cc31188f08c3cba630ce4ba44709a153f1a0f38d678f2"
dependencies = [
 "approx",
 "fast-srgb8",
 "palette_derive",
 "phf",
 "serde",
]
[[package]]
name = "palette_derive"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e05d1c929301fee6830dafa764341118829b2535c216b0571e3821ecac5c885b"
dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.48",
]
[[package]]

Insertion in Cargo.lock at line 2282 [11.12974]

[8.7450]

[11.77624]

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.48",
]
[[package]]
name = "phf_shared"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
dependencies = [
 "siphasher",
]
[[package]]

Insertion in Cargo.lock at line 2836 [11.12974]

[11.91169]

[11.91363]


[[package]]
name = "siphasher"
version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"