Compare commits
No commits in common. "cb2ff574ed142217da3f25828ba2ceecf4d2bc5c" and "5c477286f508302c7e0ecb7656cf504e394d7c1a" have entirely different histories.
cb2ff574ed
...
5c477286f5
|
@ -44,6 +44,7 @@
|
||||||
- JupiterRecording.ogg is an [actual Jupiter recording by NASA](https://archive.org/download/voyager-1-and-2-1990-jupiter-nasa-voyager-space-sounds-electronic), public domain.
|
- JupiterRecording.ogg is an [actual Jupiter recording by NASA](https://archive.org/download/voyager-1-and-2-1990-jupiter-nasa-voyager-space-sounds-electronic), public domain.
|
||||||
- Processed by cutting out min 1:47-3:47 and applying a 10s linear crossfade at the end. Exported as ogg with quality=3, see [.kdenlive file](src/audio/JupiterRecording.kdenlive).
|
- Processed by cutting out min 1:47-3:47 and applying a 10s linear crossfade at the end. Exported as ogg with quality=3, see [.kdenlive file](src/audio/JupiterRecording.kdenlive).
|
||||||
- The source file has been taken down, and generally, I can't find information on how exactly this was produced. Hoping it's not a hoax.
|
- The source file has been taken down, and generally, I can't find information on how exactly this was produced. Hoping it's not a hoax.
|
||||||
|
- [Cinematic Cello](https://pixabay.com/music/build-up-scenes-cinematic-cello-115667) by [Aleksey Chistilin](https://pixabay.com/users/lexin_music-28841948/), [Pixabay Content License](https://pixabay.com/service/license-summary)
|
||||||
- Star chart based on the [HYG Stellar database](https://github.com/astronexus/HYG-Database)
|
- Star chart based on the [HYG Stellar database](https://github.com/astronexus/HYG-Database)
|
||||||
- Font Yupiter-Regular.ttf is placed under the SIL OPEN FONT LICENSE Version 1.1 and is based on:
|
- Font Yupiter-Regular.ttf is placed under the SIL OPEN FONT LICENSE Version 1.1 and is based on:
|
||||||
- Noto Sans Symbols 2, Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols)
|
- Noto Sans Symbols 2, Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols)
|
||||||
|
|
BIN
assets/music/Aleksey Chistilin - Cinematic Cello.ogg
Normal file
BIN
assets/music/Aleksey Chistilin - Cinematic Cello.ogg
Normal file
Binary file not shown.
|
@ -47,6 +47,11 @@ impl Plugin for AudioPlugin {
|
||||||
pub struct ZoomTimer(Timer);
|
pub struct ZoomTimer(Timer);
|
||||||
|
|
||||||
const PATHS: &[(SfxType, Sfx, &str)] = &[
|
const PATHS: &[(SfxType, Sfx, &str)] = &[
|
||||||
|
(
|
||||||
|
SfxType::Radio,
|
||||||
|
Sfx::BGM,
|
||||||
|
"music/Aleksey Chistilin - Cinematic Cello.ogg",
|
||||||
|
),
|
||||||
(
|
(
|
||||||
SfxType::Radio,
|
SfxType::Radio,
|
||||||
Sfx::BGMActualJupiterRecording,
|
Sfx::BGMActualJupiterRecording,
|
||||||
|
@ -81,6 +86,7 @@ const PATHS: &[(SfxType, Sfx, &str)] = &[
|
||||||
#[derive(Component, PartialEq, Hash, Eq, Copy, Clone)]
|
#[derive(Component, PartialEq, Hash, Eq, Copy, Clone)]
|
||||||
pub enum Sfx {
|
pub enum Sfx {
|
||||||
Achieve,
|
Achieve,
|
||||||
|
BGM,
|
||||||
BGMActualJupiterRecording,
|
BGMActualJupiterRecording,
|
||||||
Click,
|
Click,
|
||||||
Connect,
|
Connect,
|
||||||
|
|
12
src/var.rs
12
src/var.rs
|
@ -174,13 +174,15 @@ impl Default for Settings {
|
||||||
noise_cancellation_mode: 0,
|
noise_cancellation_mode: 0,
|
||||||
noise_cancellation_modes: vec![
|
noise_cancellation_modes: vec![
|
||||||
"Off".to_string(),
|
"Off".to_string(),
|
||||||
"On".to_string(),
|
"Ambience".to_string(),
|
||||||
|
"Mechanical".to_string(),
|
||||||
|
"Max".to_string(),
|
||||||
],
|
],
|
||||||
radio_mode: 1,
|
radio_mode: 1,
|
||||||
radio_modes: vec![
|
radio_modes: vec![
|
||||||
// see also: settings.is_radio_playing()
|
// see also: settings.is_radio_playing()
|
||||||
"Off".to_string(),
|
"Off".to_string(),
|
||||||
"Amplify outside recordings".to_string(),
|
"Cinematic Frequency".to_string(),
|
||||||
],
|
],
|
||||||
volume_sfx: 100,
|
volume_sfx: 100,
|
||||||
volume_music: 100,
|
volume_music: 100,
|
||||||
|
@ -334,8 +336,10 @@ impl Settings {
|
||||||
|
|
||||||
pub fn is_radio_playing(&self, sfx: audio::Sfx) -> Option<bool> {
|
pub fn is_radio_playing(&self, sfx: audio::Sfx) -> Option<bool> {
|
||||||
let radio = self.radio_mode;
|
let radio = self.radio_mode;
|
||||||
|
let ambience = self.noise_cancellation_mode != 1 && self.noise_cancellation_mode != 3;
|
||||||
match sfx {
|
match sfx {
|
||||||
audio::Sfx::BGMActualJupiterRecording => Some(radio == 1),
|
audio::Sfx::BGM => Some(radio == 1),
|
||||||
|
audio::Sfx::BGMActualJupiterRecording => Some(radio == 0 && ambience),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -348,7 +352,7 @@ impl Settings {
|
||||||
value
|
value
|
||||||
};
|
};
|
||||||
self.noise_cancellation_mode = value;
|
self.noise_cancellation_mode = value;
|
||||||
self.mute_sfx = value >= 1;
|
self.mute_sfx = value >= 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue