Revert "change default settings to more release-friendly values"
This reverts commit ee63a4e9c6
.
This commit is contained in:
parent
ee63a4e9c6
commit
871da1be78
10
Cargo.lock
generated
10
Cargo.lock
generated
|
@ -294,6 +294,7 @@ version = "0.13.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "611dd99f412e862610adb43e2243b16436c6d8009f6d9dbe8ce3d6d840b34029"
|
checksum = "611dd99f412e862610adb43e2243b16436c6d8009f6d9dbe8ce3d6d840b34029"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"bevy_dylib",
|
||||||
"bevy_internal",
|
"bevy_internal",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -470,6 +471,15 @@ dependencies = [
|
||||||
"sysinfo",
|
"sysinfo",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bevy_dylib"
|
||||||
|
version = "0.13.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c3b3b76f0d7a4da8f944e5316f2d2d2af3bbb40d87508355993ea69afbc9411c"
|
||||||
|
dependencies = [
|
||||||
|
"bevy_internal",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bevy_ecs"
|
name = "bevy_ecs"
|
||||||
version = "0.13.0"
|
version = "0.13.0"
|
||||||
|
|
|
@ -6,8 +6,8 @@ edition = "2021"
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
#bevy = { version = "0.13.0", features = ["dynamic_linking"] }
|
bevy = { version = "0.13.0", features = ["dynamic_linking"] }
|
||||||
bevy = "0.13.0"
|
#bevy = "0.13.0"
|
||||||
|
|
||||||
# Enable a small amount of optimization in debug mode
|
# Enable a small amount of optimization in debug mode
|
||||||
[profile.dev]
|
[profile.dev]
|
||||||
|
|
12
src/hud.rs
12
src/hud.rs
|
@ -1,7 +1,7 @@
|
||||||
use crate::{settings, actor, audio};
|
use crate::{settings, actor, audio};
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
|
use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
|
||||||
//use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
|
use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
|
||||||
use std::collections::VecDeque;
|
use std::collections::VecDeque;
|
||||||
use std::time::SystemTime;
|
use std::time::SystemTime;
|
||||||
|
|
||||||
|
@ -238,25 +238,25 @@ fn handle_input(
|
||||||
keyboard_input: Res<ButtonInput<KeyCode>>,
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
||||||
mut settings: ResMut<settings::Settings>,
|
mut settings: ResMut<settings::Settings>,
|
||||||
mut query: Query<&mut Visibility, With<GaugesText>>,
|
mut query: Query<&mut Visibility, With<GaugesText>>,
|
||||||
//mut query_bloomsettings: Query<&mut BloomSettings>,
|
mut query_bloomsettings: Query<&mut BloomSettings>,
|
||||||
mut evwriter: EventWriter<audio::AudioSwitchEvent>,
|
mut evwriter: EventWriter<audio::AudioSwitchEvent>,
|
||||||
mut evwriter_togglemusic: EventWriter<audio::ToggleMusicEvent>,
|
mut evwriter_togglemusic: EventWriter<audio::ToggleMusicEvent>,
|
||||||
) {
|
) {
|
||||||
if keyboard_input.just_pressed(settings.key_togglehud) {
|
if keyboard_input.just_pressed(settings.key_togglehud) {
|
||||||
for mut vis in &mut query {
|
for mut vis in &mut query {
|
||||||
//if let Ok(mut bloomsettings) = query_bloomsettings.get_single_mut() {
|
if let Ok(mut bloomsettings) = query_bloomsettings.get_single_mut() {
|
||||||
if *vis == Visibility::Inherited {
|
if *vis == Visibility::Inherited {
|
||||||
*vis = Visibility::Hidden;
|
*vis = Visibility::Hidden;
|
||||||
settings.hud_active = false;
|
settings.hud_active = false;
|
||||||
//bloomsettings.composite_mode = BloomCompositeMode::EnergyConserving;
|
bloomsettings.composite_mode = BloomCompositeMode::EnergyConserving;
|
||||||
} else {
|
} else {
|
||||||
*vis = Visibility::Inherited;
|
*vis = Visibility::Inherited;
|
||||||
settings.hud_active = true;
|
settings.hud_active = true;
|
||||||
//bloomsettings.composite_mode = BloomCompositeMode::Additive;
|
bloomsettings.composite_mode = BloomCompositeMode::Additive;
|
||||||
}
|
}
|
||||||
evwriter.send(audio::AudioSwitchEvent());
|
evwriter.send(audio::AudioSwitchEvent());
|
||||||
evwriter_togglemusic.send(audio::ToggleMusicEvent());
|
evwriter_togglemusic.send(audio::ToggleMusicEvent());
|
||||||
//}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,8 +26,8 @@ pub struct Settings {
|
||||||
impl Default for Settings {
|
impl Default for Settings {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Settings {
|
Settings {
|
||||||
mute_sfx: false,
|
mute_sfx: true,
|
||||||
mute_music: false,
|
mute_music: true,
|
||||||
volume_sfx: 100,
|
volume_sfx: 100,
|
||||||
volume_music: 100,
|
volume_music: 100,
|
||||||
font_size_hud: 32.0,
|
font_size_hud: 32.0,
|
||||||
|
|
|
@ -13,7 +13,7 @@ const MARS_SIZE: f32 = 10.0;
|
||||||
const SUN_SIZE: f32 = 5000.0;
|
const SUN_SIZE: f32 = 5000.0;
|
||||||
const ASTRONAUT_SIZE: f32 = 5.0;
|
const ASTRONAUT_SIZE: f32 = 5.0;
|
||||||
|
|
||||||
const SUN_BRIGHTNESS: f32 = 1e6;
|
const SUN_BRIGHTNESS: f32 = 1e5;
|
||||||
const SKYBOX_BRIGHTNESS: f32 = 300.0;
|
const SKYBOX_BRIGHTNESS: f32 = 300.0;
|
||||||
|
|
||||||
const ASSET_CUBEMAP: &str = "textures/stars_cubemap.png";
|
const ASSET_CUBEMAP: &str = "textures/stars_cubemap.png";
|
||||||
|
|
Loading…
Reference in a new issue