Jengamon/rexweb - Change EEO6C4YSWFW3JOZ3JH6K7X4TKAUTVJD53CQNYZHI2QY6REGEXUCAC

setup cosync and get webgl working again

Created by Jengamon on February 7, 2024

EEO6C4YSWFW3JOZ3JH6K7X4TKAUTVJD53CQNYZHI2QY6REGEXUCAC

Dependencies

In channels

main

Change contents

Insertion in src/world_shader.wgsl at line 10 [6.42]
[5.41]
[5.41]
```
    _padding: vec3<f32>,
```
Replacement in src/screen.rs at line 11 [8.51]
∅:D[7.45] → [8.80:107]
∅:D[9.64] → [8.80:107]
∅:D[6.2898] → [8.80:107]
∅:D[10.3644] → [8.80:107]
B:BD[8.80] → [8.80:107]
```
use winit::window::Window;
```
[7.45]
[8.107]
```
use winit::{dpi::PhysicalSize, window::Window};
use crate::{WINDOW_HEIGHT, WINDOW_WIDTH};
```
Insertion in src/screen.rs at line 163 [8.51]
[5.516]
[5.516]
```
    #[size(16)]
```
Insertion in src/screen.rs at line 165 [8.51]
[5.536]
[5.536]
```
    _padding: glam::Vec3,
```

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

B:BD[5.599] → [5.599:627]

        Self { gamma: 1.0 }

[5.599]

[5.627]

        Self {
            gamma: 1.0,
            _padding: Default::default(),
        }

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

∅:D[4.814] → [8.453:493]

∅:D[11.3587] → [8.453:493]

B:BD[8.453] → [8.453:493]

        let size = window.inner_size();

[4.814]

[8.493]

        let size = {
            let actual_size = window.inner_size();
            if actual_size.width == 0 || actual_size.height == 0 {
                // Assume we are actually in-built height and notify
                let assumed_size = PhysicalSize::new(WINDOW_WIDTH, WINDOW_HEIGHT);
                window.set_min_inner_size(Some(assumed_size));
                assumed_size
            } else {
                // It's fine
                actual_size
            }
        };

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

B:BD[9.537] → [11.3663:3722]

                        wgpu::Limits::downlevel_defaults()

[9.537]

[8.1447]

                        if cfg!(feature = "webgpu") {
                            wgpu::Limits::downlevel_defaults()
                        } else if cfg!(feature = "webgl") {
                            wgpu::Limits::downlevel_webgl2_defaults()
                        } else {
                            unreachable!("for `web` feature, you must also enable a backend feature: `webgpu`, `webgl`")
                        }

Replacement in src/screen/middleware/world.rs at line 1 [12.69]

B:BD[12.69] → [2.103:162]

use std::{collections::HashMap, sync::atomic::AtomicBool};

[12.69]

[12.101]

use std::{collections::HashMap, num::NonZeroU64, sync::atomic::AtomicBool};

Insertion in src/main.rs at line 18 [8.5397]
[8.6311]
[8.6311]
```
#[cfg(feature = "desktop")]
```

Insertion in src/main.rs at line 29 [8.5397]

[4.1236]

[8.9600]

}
#[cfg(not(feature = "desktop"))]
fn main() {
    unreachable!("To build for desktop, the `desktop` feature must be enabled")

Replacement in src/lib.rs at line 36 [4.1268]

B:BD[4.2185] → [4.2185:2305]

    let mut builder =
        WindowBuilder::new().with_inner_size(dpi::LogicalSize::new(WINDOW_WIDTH, WINDOW_HEIGHT));

[4.2185]

[4.2305]

    #[cfg_attr(not(target_arch = "wasm32"), allow(unused_mut))] // the mut is used on web
    let mut builder = WindowBuilder::new()
        .with_inner_size(dpi::LogicalSize::new(WINDOW_WIDTH, WINDOW_HEIGHT))
        .with_min_inner_size(dpi::PhysicalSize::new(WINDOW_WIDTH, WINDOW_HEIGHT));

Insertion in src/game.rs at line 9 [8.9635]
[8.9695]
[13.79]
```
use cosync::Cosync;
```
Deletion in src/game.rs at line 22 [8.9635]
B:BD[4.6783] → [4.6783:6810]
∅:D[4.6810] → [8.9787:9811]
B:BD[8.9787] → [8.9787:9811]
```
    assets: AssetCache<S>,
    world: hecs::World,
```
Deletion in src/game.rs at line 28 [8.9635]
B:BD[14.426] → [6.19227:19248]
B:BD[6.19248] → [5.2999:3034]
```
    camera: Camera,
    render_options: RenderOptions,
```

Insertion in src/game.rs at line 31 [8.9635]

[4.6849]

[14.427]


    internal_state: GameState<S>,
    executor: Cosync<GameState<S>>,

Insertion in src/game.rs at line 41 [8.9635]

[13.245]

[9.2753]

}
pub struct GameState<S> {
    pub assets: AssetCache<S>,
    pub world: hecs::World,
    pub camera: Camera,
    pub render_options: RenderOptions,

Insertion in src/game.rs at line 55 [8.9635]
[5.3082]
[5.3082]
```
    pub executor: &'a mut Cosync<GameState<S>>,
```

Replacement in src/game.rs at line 61 [8.9635]

B:BD[5.3155] → [5.3155:3325]

            assets: &mut $game.assets,
            world: &mut $game.world,
            camera: &mut $game.camera,
            render_options: &mut $game.render_options,

[5.3155]

[5.3325]

            assets: &mut $game.internal_state.assets,
            world: &mut $game.internal_state.world,
            camera: &mut $game.internal_state.camera,
            render_options: &mut $game.internal_state.render_options,
            executor: &mut $game.executor,

Replacement in src/game.rs at line 73 [8.9635]

B:BD[4.7023] → [4.7023:7066]

        S: assets_manager::source::Source,

[4.7023]

[4.7066]

        S: assets_manager::source::Source + 'static,

Insertion in src/game.rs at line 80 [8.9635]
[5.3402]
[5.3402]
```
        let mut executor = Cosync::new();
```
Insertion in src/game.rs at line 87 [8.9635]
[5.3544]
[9.3092]
```
            executor: &mut executor,
```

Replacement in src/game.rs at line 97 [8.9635]

B:BD[9.3423] → [9.3423:3442]

            world,

[8.9925]

[9.3442]

            internal_state: GameState {
                world,
                assets,
                camera,
                render_options,
            },

Deletion in src/game.rs at line 106 [8.9635]
∅:D[4.7211] → [11.6160:6180]
B:BD[11.6160] → [11.6160:6180]
∅:D[11.6180] → [6.19290:19310]
B:BD[8.10074] → [6.19290:19310]
B:BD[6.19310] → [5.3545:3573]
```
            assets,
            camera,
            render_options,
```
Insertion in src/game.rs at line 112 [8.9635]
[14.615]
[14.615]
```
            executor,
```

Replacement in src/game.rs at line 159 [8.9635]

B:BD[3.28] → [3.28:128]

                        egui::Slider::new(&mut self.render_options.gamma, 0.0..=2.0).text("Gamma"),

[3.28]

[3.128]

                        egui::Slider::new(&mut self.internal_state.render_options.gamma, 0.0..=2.0)
                            .text("Gamma"),

Replacement in src/game.rs at line 222 [8.9635]

B:BD[4.7343] → [4.7343:7393]

        S: assets_manager::source::Source + Sync,

[4.7343]

[4.7393]

        S: assets_manager::source::Source + Sync + 'static,

Replacement in src/game.rs at line 227 [8.9635]

B:BD[15.63] → [15.63:97]

        self.assets.hot_reload();

[15.63]

[15.97]

        self.internal_state.assets.hot_reload();
        // Run any in-progress tasks from the async executor
        self.executor.run_until_stall(&mut self.internal_state);

Replacement in src/game.rs at line 250 [8.9635]

B:BD[10.7775] → [6.19459:19525]

        let text_data = TextSystemData::extract(&mut self.world);

[10.7775]

[10.7825]

        let text_data = TextSystemData::extract(&mut self.internal_state.world);

Replacement in src/game.rs at line 252 [8.9635]

B:BD[10.7826] → [11.6181:6234]

        self.text.prepare(&text_data, &self.assets);

[10.7826]

[10.7883]

        self.text.prepare(&text_data, &self.internal_state.assets);

Replacement in src/game.rs at line 256 [8.9635]

B:BD[16.6456] → [16.6456:6510]

            .produce_camera(&text_data, &self.assets)

[16.6456]

[16.6510]

            .produce_camera(&text_data, &self.internal_state.assets)

Replacement in src/game.rs at line 266 [8.9635]

B:BD[16.6626] → [16.6626:6679]

            .produce_world(&text_data, &self.assets)

[16.6626]

[16.6679]

            .produce_world(&text_data, &self.internal_state.assets)

Replacement in src/game.rs at line 280 [8.9635]

B:BD[10.8410] → [17.3499:3537]

B:BD[17.3537] → [5.3713:3763]

            camera: &mut self.camera,
            render_options: &self.render_options,

[10.8410]

            camera: &mut self.internal_state.camera,
            render_options: &self.internal_state.render_options,

Replacement in index.html at line 7 [4.8692]

B:BD[4.8883] → [4.8883:8973]

    <link data-trunk rel="rust" data-cargo-features="web" data-target-name="meowframe" />

[4.8883]

[4.8973]

    <link data-trunk rel="rust" data-cargo-features="web webgl" data-target-name="meowframe" />

Replacement in Cargo.toml at line 12 [8.12025]

B:BD[8.12204] → [16.6729:6871]

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

[8.12204]

[18.3401]

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

Replacement in Cargo.toml at line 34 [8.12025]
∅:D[4.10462] → [8.12503:12558]
B:BD[8.12503] → [8.12503:12558]
```
pollster = { version = "0.3.0", features = ["macro"] }
```
[4.10462]
[19.350]
```
pollster = { version = "0.3.0", features = ["macro"], optional = true }
```
Insertion in Cargo.toml at line 52 [8.12025]
[4.10665]
[4.10665]
```
cosync = "0.2.1"
```
Insertion in Cargo.toml at line 70 [8.12025]
[8.12938]
[4.10987]
```
# enable stuff to operate on web
```

Replacement in Cargo.toml at line 72 [8.12025]

B:BD[4.11048] → [4.11048:11116]

  "tracing-subscriber/time", "wgpu/webgpu", "instant/wasm-bindgen"]

[4.11048]

[4.11116]

  "tracing-subscriber/time", "instant/wasm-bindgen"]
# selects the webgpu backend for wgpu
webgpu = ["wgpu/webgpu"]
# selects the webgl backend for wgpu
webgl = ["wgpu/webgl"]

Replacement in Cargo.toml at line 79 [8.12025]
B:BD[4.11269] → [4.11269:11304]
```
  "tracing-subscriber/env-filter"]
```
[4.11269]
[20.3856]
```
  "tracing-subscriber/env-filter", "dep:pollster"]
```
Deletion in Cargo.lock at line 189 [8.12974]
B:BD[15.438] → [9.7308:7323]
```
 "basic-toml",
```
Deletion in Cargo.lock at line 197 [8.12974]
B:BD[15.517] → [15.517:539]
```
 "sync_file",
 "zip",
```

Deletion in Cargo.lock at line 248 [8.12974]

∅:D[21.206] → [9.7326:7547]

B:BD[9.7326] → [9.7326:7547]

∅:D[9.7547] → [8.19262:19264]

B:BD[8.19262] → [8.19262:19264]


[[package]]
name = "basic-toml"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5"
dependencies = [
 "serde",
]

Insertion in Cargo.lock at line 414 [8.12974]
[4.11449]
[8.24095]
```
 "cosync",
```

Insertion in Cargo.lock at line 720 [8.12974]

[8.31759]


[[package]]
name = "cosync"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d47649af58ee81899f9b6236e99e8231af0437f7d6171728c6098d93018cc2a"

Deletion in Cargo.lock at line 3363 [8.12974]

B:BD[15.6645] → [15.6645:6851]

∅:D[15.6851] → [8.97234:97249]

B:BD[8.97234] → [8.97234:97249]

name = "sync_file"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a49b72df45d9c2d5fbb13b02c97437a3175d8c9860297297597d3ed715e0f046"
dependencies = [
 "wasi",
]
[[package]]

Deletion in Cargo.lock at line 4579 [8.12974]

B:BD[15.8423] → [15.8423:8662]

∅:D[15.8662] → [8.135721:135736]

B:BD[8.135721] → [8.135721:135736]

name = "zip"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
dependencies = [
 "byteorder",
 "crc32fast",
 "crossbeam-utils",
]
[[package]]

setup cosync and get webgl working again

Dependencies

In channels

Change contents

Insertion in src/world_shader.wgsl at line 10 [6.42]

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

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

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

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

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

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

Replacement in src/screen/middleware/world.rs at line 1 [12.69]

Insertion in src/main.rs at line 18 [8.5397]

Insertion in src/main.rs at line 29 [8.5397]

Replacement in src/lib.rs at line 36 [4.1268]

Insertion in src/game.rs at line 9 [8.9635]

Deletion in src/game.rs at line 22 [8.9635]

Deletion in src/game.rs at line 28 [8.9635]

Insertion in src/game.rs at line 31 [8.9635]

Insertion in src/game.rs at line 41 [8.9635]

Insertion in src/game.rs at line 55 [8.9635]

Replacement in src/game.rs at line 61 [8.9635]

Replacement in src/game.rs at line 73 [8.9635]

Insertion in src/game.rs at line 80 [8.9635]

Insertion in src/game.rs at line 87 [8.9635]

Replacement in src/game.rs at line 97 [8.9635]

Deletion in src/game.rs at line 106 [8.9635]

Insertion in src/game.rs at line 112 [8.9635]

Replacement in src/game.rs at line 159 [8.9635]

Replacement in src/game.rs at line 222 [8.9635]

Replacement in src/game.rs at line 227 [8.9635]

Replacement in src/game.rs at line 250 [8.9635]

Replacement in src/game.rs at line 252 [8.9635]

Replacement in src/game.rs at line 256 [8.9635]

Replacement in src/game.rs at line 266 [8.9635]

Replacement in src/game.rs at line 280 [8.9635]

Replacement in index.html at line 7 [4.8692]

Replacement in Cargo.toml at line 12 [8.12025]

Replacement in Cargo.toml at line 34 [8.12025]

Insertion in Cargo.toml at line 52 [8.12025]

Insertion in Cargo.toml at line 70 [8.12025]

Replacement in Cargo.toml at line 72 [8.12025]

Replacement in Cargo.toml at line 79 [8.12025]

Deletion in Cargo.lock at line 189 [8.12974]

Deletion in Cargo.lock at line 197 [8.12974]

Deletion in Cargo.lock at line 248 [8.12974]

Insertion in Cargo.lock at line 414 [8.12974]

Insertion in Cargo.lock at line 720 [8.12974]

Deletion in Cargo.lock at line 3363 [8.12974]

Deletion in Cargo.lock at line 4579 [8.12974]