Jengamon/acerola_jam0_gam - Change 3PEU6H5YDCRN2O7IIORFPJRKDE6FOJVMBOXSAGU7CJWOHULYNEAQC

feat: load my buttons

Created by Jengamon on March 2, 2024

3PEU6H5YDCRN2O7IIORFPJRKDE6FOJVMBOXSAGU7CJWOHULYNEAQC

Dependencies

In channels

main

Change contents

Replacement in src/main.rs at line 5 [6.49]
∅:D[4.18] → [5.0:22]
B:BD[6.49] → [5.0:22]
```
use bevy::prelude::*;
```
[4.18]
[5.22]
```
use bevy::{prelude::*, sprite::Anchor};
```

Insertion in src/main.rs at line 20 [6.49]

[7.161]

[8.0]

// How big is our screen in game?
const LOGICAL_WIDTH: u32 = 800;
const LOGICAL_HEIGHT: u32 = 600;

Replacement in src/main.rs at line 83 [6.49]

B:BD[5.383] → [9.246:335]

                LoadingState::new(GameState::Booting).load_collection::<PlayerAssets>(),

[5.383]

[5.472]

                LoadingState::new(GameState::Booting)
                    .load_collection::<PlayerAssets>()
                    .load_collection::<AudioLoadTest>()
                    .on_failure_continue_to_state(GameState::FailBoot),

Insertion in src/main.rs at line 88 [6.49]

[5.486]

[9.336]

            .add_systems(OnEnter(GameState::FailBoot), fail_boot)

Insertion in src/main.rs at line 91 [6.49]

[9.473]

[10.769]

            .add_systems(
                Update,
                (loading_screen_progress,)
                    .run_if(in_state(GameState::Booting))
                    .after(LoadingStateSet(GameState::Booting)),
            )
            .add_systems(OnEnter(GameState::Booting), create_loading_screen_bar)
            .add_systems(OnExit(GameState::Booting), clean_loading_screen_bar)

Insertion in src/main.rs at line 119 [6.49]

[2.158]

#[derive(Component)]
struct LoadingScreenBar;
fn create_loading_screen_bar(mut commands: Commands) {
    commands
        .spawn((
            LoadingScreenBar,
            ShapeBundle {
                path: GeometryBuilder::build_as(&shapes::Rectangle {
                    origin: shapes::RectangleOrigin::TopLeft,
                    extents: Vec2::new(LOGICAL_WIDTH as f32, 40.0),
                }),
                spatial: SpatialBundle {
                    transform: Transform::default()
                        .with_translation(Vec3::new(
                            LOGICAL_WIDTH as f32 / -2.0,
                            // LOGICAL_HEIGHT as f32 / 2.0,
                            LOGICAL_HEIGHT as f32 / -2.0 + 80.0 * 1.5,
                            -1.0,
                        ))
                        .with_scale(Vec3::ONE - Vec3::X),
                    ..default()
                },
                ..default()
            },
            Fill::color(Color::ANTIQUE_WHITE),
        ))
        .with_children(|cb| {
            cb.spawn(Text2dBundle {
                text: Text::from_section(
                    "Loading...",
                    TextStyle {
                        font_size: 30.0,
                        color: Color::BLACK,
                        ..default()
                    },
                ),
                text_anchor: Anchor::CenterLeft,
                transform: Transform::from_translation(Vec3::Z + Vec3::NEG_Y * 20.0),
                ..default()
            });
        });
}
fn clean_loading_screen_bar(mut commands: Commands, bar: Query<Entity, With<LoadingScreenBar>>) {
    let entity = bar.single();
    commands.entity(entity).despawn_recursive();
}
fn loading_screen_progress(
    progress: Option<Res<ProgressCounter>>,
    mut last_done: Local<u32>,
    mut lb: Query<&mut Transform, With<LoadingScreenBar>>,
) {
    if let Some(progress) = progress.map(|counter| counter.progress()) {
        if progress.done > *last_done {
            let mut lbt = lb.single_mut();
            *last_done = progress.done;
            info!("Changed progress: {:?}", progress);
            lbt.scale.x = progress.done as f32 / progress.total as f32;
        }
    }
}

Replacement in src/main.rs at line 180 [6.49]

B:BD[2.159] → [2.159:231]

fn test_audio_loop(asset_server: Res<AssetServer>, audio: Res<Audio>) {

[2.159]

[2.231]

fn fail_boot(mut commands: Commands) {
    commands.spawn(Text2dBundle {
        text: Text::from_section(
            "Something failed to load",
            TextStyle {
                font_size: 30.0,
                color: Color::RED,
                ..default()
            },
        ),
        ..default()
    });
}
#[derive(Resource, AssetCollection)]
struct AudioLoadTest {
    #[asset(path = "SDJA Orbit25 - Duo (w: alixi) 2023-08-05 1306.flac")]
    test_audio: Handle<AudioSource>,
}
fn test_audio_loop(audio: Res<Audio>, audio_load_test: Res<AudioLoadTest>) {

Replacement in src/main.rs at line 202 [6.49]

B:BD[2.241] → [2.241:328]

        .play(asset_server.load("SDJA Orbit25 - Duo (w: alixi) 2023-08-05 1306.flac"))

[2.241]

[2.328]

        .play(audio_load_test.test_audio.clone())

Insertion in src/main.rs at line 211 [6.49]
[9.627]
[9.627]
```
    FailBoot,
```

Replacement in src/main.rs at line 544 [6.49]

B:BD[11.207] → [11.207:264]

            max_width: 800,
            max_height: 600,

[11.207]

[10.6028]

            max_width: LOGICAL_WIDTH,
            max_height: LOGICAL_HEIGHT,

Replacement in src/main.rs at line 548 [6.49]
B:BD[12.11010] → [11.265:294]
```
            intensity: 0.02,
```
[12.11010]
[12.11038]
```
            // intensity: 0.02,
```
Replacement in justfile at line 4 [7.2818]
B:BD[13.360] → [14.57:64]
```
serve:
```
[13.360]
[11.368]
```
watch:
```
Insertion in justfile at line 7 [7.2818]
[15.67]
[11.416]
```
    trunk watch -i.pijul -itarget-desktop
serve:
```

Replacement in justfile at line 11 [7.2818]

B:BD[11.434] → [3.0:68]

    simple-http-server dist & trunk watch -i.pijul -itarget-desktop

[11.434]

[14.132]

    simple-http-server dist

Replacement in Cargo.toml at line 47 [6.131]

B:BD[16.1533] → [16.1533:1572]

bevy_kira_audio = { version = "0.19" }

[16.1533]

[4.158]

bevy_kira_audio = { version = "0.19", features = ["flac"] }