remove Rotational Stabilizer feature (or what was left of it)
This commit is contained in:
parent
fdc7f3c214
commit
578ccd6bcb
6 changed files with 0 additions and 151 deletions
Binary file not shown.
Before Width: | Height: | Size: 32 KiB |
|
@ -409,7 +409,6 @@ pub fn update_fov(
|
||||||
pub fn handle_input(
|
pub fn handle_input(
|
||||||
keyboard_input: Res<ButtonInput<KeyCode>>,
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
||||||
settings: Res<var::Settings>,
|
settings: Res<var::Settings>,
|
||||||
mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
|
|
||||||
mut ew_game: EventWriter<GameEvent>,
|
mut ew_game: EventWriter<GameEvent>,
|
||||||
) {
|
) {
|
||||||
if keyboard_input.just_pressed(settings.key_camera) {
|
if keyboard_input.just_pressed(settings.key_camera) {
|
||||||
|
@ -418,10 +417,6 @@ pub fn handle_input(
|
||||||
if keyboard_input.just_pressed(settings.key_map) {
|
if keyboard_input.just_pressed(settings.key_map) {
|
||||||
ew_game.send(GameEvent::SetMap(Toggle));
|
ew_game.send(GameEvent::SetMap(Toggle));
|
||||||
}
|
}
|
||||||
if keyboard_input.just_pressed(settings.key_rotation_stabilizer) {
|
|
||||||
ew_game.send(GameEvent::SetRotationStabilizer(Toggle));
|
|
||||||
ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn manage_player_actor(
|
fn manage_player_actor(
|
||||||
|
|
|
@ -111,7 +111,6 @@ pub enum GameEvent {
|
||||||
SetFullscreen(Turn),
|
SetFullscreen(Turn),
|
||||||
SetMenu(Turn),
|
SetMenu(Turn),
|
||||||
SetThirdPerson(Turn),
|
SetThirdPerson(Turn),
|
||||||
SetRotationStabilizer(Turn),
|
|
||||||
SetShadows(Turn),
|
SetShadows(Turn),
|
||||||
UpdateFlashlight,
|
UpdateFlashlight,
|
||||||
Achievement(String),
|
Achievement(String),
|
||||||
|
@ -291,10 +290,6 @@ pub fn handle_game_event(
|
||||||
prefs.third_person = settings.third_person;
|
prefs.third_person = settings.third_person;
|
||||||
prefs.save();
|
prefs.save();
|
||||||
}
|
}
|
||||||
GameEvent::SetRotationStabilizer(turn) => {
|
|
||||||
settings.rotation_stabilizer_active =
|
|
||||||
turn.to_bool(settings.rotation_stabilizer_active);
|
|
||||||
}
|
|
||||||
GameEvent::SetShadows(turn) => {
|
GameEvent::SetShadows(turn) => {
|
||||||
settings.shadows_sun = turn.to_bool(settings.shadows_sun);
|
settings.shadows_sun = turn.to_bool(settings.shadows_sun);
|
||||||
for mut light in &mut q_light {
|
for mut light in &mut q_light {
|
||||||
|
|
|
@ -37,7 +37,6 @@ pub const REPLY_NUMBERS: [char; 10] = ['➀', '➁', '➂', '➃', '➄', '➅',
|
||||||
pub const DASHBOARD_DEF: &[(Dashboard, &str)] = &[
|
pub const DASHBOARD_DEF: &[(Dashboard, &str)] = &[
|
||||||
(Dashboard::Flashlight, "highbeams"),
|
(Dashboard::Flashlight, "highbeams"),
|
||||||
(Dashboard::Leak, "leak"),
|
(Dashboard::Leak, "leak"),
|
||||||
(Dashboard::RotationStabiliser, "rotation_stabiliser"),
|
|
||||||
(Dashboard::CruiseControl, "cruise_control"),
|
(Dashboard::CruiseControl, "cruise_control"),
|
||||||
(Dashboard::Battery, "battery"),
|
(Dashboard::Battery, "battery"),
|
||||||
(Dashboard::Radioactivity, "radioactivity"),
|
(Dashboard::Radioactivity, "radioactivity"),
|
||||||
|
@ -167,7 +166,6 @@ pub struct PointOfInterestMarker(pub Entity);
|
||||||
pub enum Dashboard {
|
pub enum Dashboard {
|
||||||
Leak,
|
Leak,
|
||||||
Flashlight,
|
Flashlight,
|
||||||
RotationStabiliser,
|
|
||||||
CruiseControl,
|
CruiseControl,
|
||||||
Radioactivity,
|
Radioactivity,
|
||||||
Battery,
|
Battery,
|
||||||
|
@ -828,7 +826,6 @@ fn update_dashboard(
|
||||||
Dashboard::Flashlight => settings.flashlight_active,
|
Dashboard::Flashlight => settings.flashlight_active,
|
||||||
Dashboard::Leak => suit.integrity < 0.5,
|
Dashboard::Leak => suit.integrity < 0.5,
|
||||||
Dashboard::Battery => battery.overloaded_recovering,
|
Dashboard::Battery => battery.overloaded_recovering,
|
||||||
Dashboard::RotationStabiliser => !settings.rotation_stabilizer_active,
|
|
||||||
Dashboard::CruiseControl => settings.cruise_control_active,
|
Dashboard::CruiseControl => settings.cruise_control_active,
|
||||||
Dashboard::Radioactivity => lifeform.is_radioactively_damaged,
|
Dashboard::Radioactivity => lifeform.is_radioactively_damaged,
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,133 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
||||||
|
|
||||||
<svg
|
|
||||||
width="256"
|
|
||||||
height="256"
|
|
||||||
viewBox="0 0 67.733334 67.733334"
|
|
||||||
version="1.1"
|
|
||||||
id="svg1"
|
|
||||||
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
|
|
||||||
sodipodi:docname="dashboard_rotation_stabiliser.svg"
|
|
||||||
xml:space="preserve"
|
|
||||||
inkscape:export-filename="../../assets/sprites/dashboard_rotation_stabiliser.png"
|
|
||||||
inkscape:export-xdpi="96"
|
|
||||||
inkscape:export-ydpi="96"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
|
|
||||||
id="namedview1"
|
|
||||||
pagecolor="#000000"
|
|
||||||
bordercolor="#252525"
|
|
||||||
borderopacity="1"
|
|
||||||
inkscape:showpageshadow="0"
|
|
||||||
inkscape:pageopacity="0"
|
|
||||||
inkscape:pagecheckerboard="0"
|
|
||||||
inkscape:deskcolor="#000000"
|
|
||||||
inkscape:document-units="px"
|
|
||||||
inkscape:zoom="1.6542969"
|
|
||||||
inkscape:cx="211.87249"
|
|
||||||
inkscape:cy="197.9693"
|
|
||||||
inkscape:window-width="2880"
|
|
||||||
inkscape:window-height="1673"
|
|
||||||
inkscape:window-x="0"
|
|
||||||
inkscape:window-y="92"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:current-layer="g227"
|
|
||||||
showgrid="true"
|
|
||||||
inkscape:export-bgcolor="#00000000"><inkscape:grid
|
|
||||||
id="grid1"
|
|
||||||
units="px"
|
|
||||||
originx="0"
|
|
||||||
originy="0"
|
|
||||||
spacingx="0.26458334"
|
|
||||||
spacingy="0.26458334"
|
|
||||||
empcolor="#0099e5"
|
|
||||||
empopacity="0.30196078"
|
|
||||||
color="#0099e5"
|
|
||||||
opacity="0.14901961"
|
|
||||||
empspacing="8"
|
|
||||||
dotted="false"
|
|
||||||
gridanglex="30"
|
|
||||||
gridanglez="30"
|
|
||||||
visible="true" /></sodipodi:namedview><defs
|
|
||||||
id="defs1"><marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="ConcaveTriangle"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto-start-reverse"
|
|
||||||
inkscape:stockid="Concave triangle arrow"
|
|
||||||
markerWidth="0.5"
|
|
||||||
markerHeight="0.5"
|
|
||||||
viewBox="0 0 1 1"
|
|
||||||
inkscape:isstock="true"
|
|
||||||
inkscape:collect="always"
|
|
||||||
preserveAspectRatio="xMidYMid"><path
|
|
||||||
transform="scale(0.7)"
|
|
||||||
d="M -2,-4 9,0 -2,4 c 2,-2.33 2,-5.66 0,-8 z"
|
|
||||||
style="fill:context-stroke;fill-rule:evenodd;stroke:none"
|
|
||||||
id="path7" /></marker><filter
|
|
||||||
style="color-interpolation-filters:sRGB"
|
|
||||||
id="filter1"
|
|
||||||
inkscape:label="bloom"
|
|
||||||
x="-0.1605499"
|
|
||||||
y="-0.1605499"
|
|
||||||
width="1.3210998"
|
|
||||||
height="1.3210998"><feConvolveMatrix
|
|
||||||
order="1 1"
|
|
||||||
kernelMatrix="1.0000000 "
|
|
||||||
id="feConvolveMatrix1"
|
|
||||||
result="result1"
|
|
||||||
bias="0.090000000000000024"
|
|
||||||
preserveAlpha="true"
|
|
||||||
edgeMode="none"
|
|
||||||
divisor="0" /><feGaussianBlur
|
|
||||||
stdDeviation="2"
|
|
||||||
id="feGaussianBlur1"
|
|
||||||
in="SourceGraphic" /><feComposite
|
|
||||||
id="feComposite1"
|
|
||||||
operator="arithmetic"
|
|
||||||
k1="1"
|
|
||||||
k2="0.99999999999999922"
|
|
||||||
k3="1"
|
|
||||||
k4="0"
|
|
||||||
in2="result1" /></filter></defs><g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1"><g
|
|
||||||
id="g227"
|
|
||||||
style="filter:url(#filter1)"><circle
|
|
||||||
style="fill:none;stroke:#007e43;stroke-width:2.64583336;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
id="path1"
|
|
||||||
cx="33.848091"
|
|
||||||
cy="33.848091"
|
|
||||||
r="19.068579"
|
|
||||||
inkscape:label="circle" /><path
|
|
||||||
style="fill:none;stroke:#007e43;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#ConcaveTriangle)"
|
|
||||||
id="circle2"
|
|
||||||
inkscape:label="circle"
|
|
||||||
sodipodi:type="arc"
|
|
||||||
sodipodi:cx="33.848091"
|
|
||||||
sodipodi:cy="33.848091"
|
|
||||||
sodipodi:rx="25.4"
|
|
||||||
sodipodi:ry="25.4"
|
|
||||||
sodipodi:start="2.6179939"
|
|
||||||
sodipodi:end="3.8397244"
|
|
||||||
sodipodi:open="true"
|
|
||||||
sodipodi:arc-type="arc"
|
|
||||||
d="M 11.851046,46.54809 A 25.4,25.4 0 0 1 14.390563,17.521285" /><path
|
|
||||||
style="fill:none;stroke:#007e43;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#ConcaveTriangle)"
|
|
||||||
id="path2"
|
|
||||||
inkscape:label="circle"
|
|
||||||
sodipodi:type="arc"
|
|
||||||
sodipodi:cx="33.848091"
|
|
||||||
sodipodi:cy="33.848091"
|
|
||||||
sodipodi:rx="25.4"
|
|
||||||
sodipodi:ry="25.4"
|
|
||||||
sodipodi:start="5.7595865"
|
|
||||||
sodipodi:end="0.6981317"
|
|
||||||
sodipodi:open="true"
|
|
||||||
sodipodi:arc-type="arc"
|
|
||||||
d="M 55.845136,21.148091 A 25.4,25.4 0 0 1 53.30562,50.174896" /></g></g></svg>
|
|
Before Width: | Height: | Size: 4.6 KiB |
|
@ -101,7 +101,6 @@ pub struct Settings {
|
||||||
pub death_cause: String,
|
pub death_cause: String,
|
||||||
pub is_zooming: bool,
|
pub is_zooming: bool,
|
||||||
pub third_person: bool,
|
pub third_person: bool,
|
||||||
pub rotation_stabilizer_active: bool,
|
|
||||||
pub cruise_control_active: bool,
|
pub cruise_control_active: bool,
|
||||||
pub shadows_sun: bool,
|
pub shadows_sun: bool,
|
||||||
pub shadows_pointlights: bool,
|
pub shadows_pointlights: bool,
|
||||||
|
@ -133,7 +132,6 @@ pub struct Settings {
|
||||||
pub key_flashlight: KeyCode,
|
pub key_flashlight: KeyCode,
|
||||||
pub key_cruise_control: KeyCode,
|
pub key_cruise_control: KeyCode,
|
||||||
pub key_rotate: KeyCode,
|
pub key_rotate: KeyCode,
|
||||||
pub key_rotation_stabilizer: KeyCode,
|
|
||||||
pub key_mouseup: KeyCode,
|
pub key_mouseup: KeyCode,
|
||||||
pub key_mousedown: KeyCode,
|
pub key_mousedown: KeyCode,
|
||||||
pub key_mouseleft: KeyCode,
|
pub key_mouseleft: KeyCode,
|
||||||
|
@ -251,7 +249,6 @@ impl Default for Settings {
|
||||||
death_cause: "Unknown".to_string(),
|
death_cause: "Unknown".to_string(),
|
||||||
is_zooming: false,
|
is_zooming: false,
|
||||||
third_person: true,
|
third_person: true,
|
||||||
rotation_stabilizer_active: true,
|
|
||||||
cruise_control_active: false,
|
cruise_control_active: false,
|
||||||
shadows_sun: true,
|
shadows_sun: true,
|
||||||
shadows_pointlights: false,
|
shadows_pointlights: false,
|
||||||
|
@ -283,7 +280,6 @@ impl Default for Settings {
|
||||||
key_flashlight: KeyCode::KeyF,
|
key_flashlight: KeyCode::KeyF,
|
||||||
key_cruise_control: KeyCode::KeyT,
|
key_cruise_control: KeyCode::KeyT,
|
||||||
key_rotate: KeyCode::KeyR,
|
key_rotate: KeyCode::KeyR,
|
||||||
key_rotation_stabilizer: KeyCode::KeyY,
|
|
||||||
key_mouseup: KeyCode::KeyI,
|
key_mouseup: KeyCode::KeyI,
|
||||||
key_mousedown: KeyCode::KeyK,
|
key_mousedown: KeyCode::KeyK,
|
||||||
key_mouseleft: KeyCode::KeyJ,
|
key_mouseleft: KeyCode::KeyJ,
|
||||||
|
@ -330,7 +326,6 @@ impl Settings {
|
||||||
pub fn reset_player_settings(&mut self) {
|
pub fn reset_player_settings(&mut self) {
|
||||||
println!("Resetting player settings!");
|
println!("Resetting player settings!");
|
||||||
let default = Self::default();
|
let default = Self::default();
|
||||||
self.rotation_stabilizer_active = default.rotation_stabilizer_active;
|
|
||||||
self.is_zooming = default.is_zooming;
|
self.is_zooming = default.is_zooming;
|
||||||
self.flashlight_active = default.flashlight_active;
|
self.flashlight_active = default.flashlight_active;
|
||||||
self.cruise_control_active = default.cruise_control_active;
|
self.cruise_control_active = default.cruise_control_active;
|
||||||
|
|
Loading…
Add table
Reference in a new issue