Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/sounds/zoom.wav
Binary file not shown.
29 changes: 26 additions & 3 deletions src/screens/gameplay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use bevy::input::common_conditions::input_just_pressed;
use bevy::input::mouse::MouseWheel;
use bevy::input::touch::{TouchInput, TouchPhase};
use crate::sun_system::{init_sun_system};
use crate::sun_system::{init_sun_system, SolarSystemAssets};
use bevy::prelude::*;
use crate::GameplaySystem;
use crate::screens::Screen;
Expand Down Expand Up @@ -51,19 +51,30 @@ fn change_time_speed<const DELTA: i8>(mut time: ResMut<Time<Virtual>>) {
}

fn camera_zoom(
mut scroll_evr: MessageReader<MouseWheel>,
mut ev_scroll: EventReader<MouseWheel>,
mut query: Query<(&mut Transform, &mut CameraZoom), With<Camera>>,
mut commands: Commands,
assets: Res<SolarSystemAssets>,
) {
//stepped zoom with predefined levels
let zoom_levels = [0.1, 0.15, 0.25, 0.5, 0.75];

if let Ok((mut transform, mut camera_zoom)) = query.single_mut() {
for ev in scroll_evr.read() {
for ev in ev_scroll.read() {
let old_level = camera_zoom.level;
if ev.y > 0.0 && camera_zoom.level > 0 {
camera_zoom.level -= 1;
} else if ev.y < 0.0 && camera_zoom.level < zoom_levels.len() - 1 {
camera_zoom.level += 1;
}

// Play zoom sound if level changed
if old_level != camera_zoom.level {
commands.spawn((
AudioPlayer::new(assets.warning_sound.clone()),
PlaybackSettings::DESPAWN,
));
}
}

let zoom_level = zoom_levels[camera_zoom.level];
Expand All @@ -75,6 +86,8 @@ fn camera_pinch_zoom(
mut pinch: ResMut<PinchZoomState>,
mut er_touch: EventReader<TouchInput>,
mut query: Query<(&mut Transform, &mut CameraZoom), With<Camera>>,
mut commands: Commands,
assets: Res<SolarSystemAssets>,
) {
// Update active touches map
for ev in er_touch.read() {
Expand Down Expand Up @@ -107,11 +120,21 @@ fn camera_pinch_zoom(
if let Ok((mut transform, mut camera_zoom)) = query.single_mut() {
// same zoom levels as mouse
let zoom_levels = [0.1, 0.15, 0.25, 0.5, 0.75];
let old_level = camera_zoom.level;
if delta > 0.0 && camera_zoom.level < zoom_levels.len() - 1 {
camera_zoom.level -= 1;
} else if delta < 0.0 && camera_zoom.level > 0 {
camera_zoom.level += 1;
}

// Play zoom sound if level changed
if old_level != camera_zoom.level {
commands.spawn((
AudioPlayer::new(assets.warning_sound.clone()),
PlaybackSettings::DESPAWN,
));
}

let zoom_level = zoom_levels[camera_zoom.level];
transform.scale = Vec3::splat(zoom_level);
}
Expand Down
2 changes: 1 addition & 1 deletion src/sun_system/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ impl FromWorld for SolarSystemAssets {
bg: assets.load("retro_grid_bg.png"),
font: assets.load("fonts/lucon.ttf"),
crash_sound: assets.load("sounds/collision.wav"),
warning_sound: assets.load("sounds/beepx3.wav"),
warning_sound: assets.load("sounds/zoom.wav"),
music_loop: assets.load("sounds/music_loop.wav"),
}
}
Expand Down