Support choosing display mode
This commit is contained in:
+52
-11
@@ -8,12 +8,16 @@ use egui::{
|
||||
};
|
||||
use winit::event_loop::EventLoopProxy;
|
||||
|
||||
use super::{game_screen::GameScreen, AppWindow};
|
||||
use super::{
|
||||
game_screen::{DisplayMode, GameScreen},
|
||||
AppWindow,
|
||||
};
|
||||
|
||||
pub struct GameWindow {
|
||||
client: EmulatorClient,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
sim_id: SimId,
|
||||
display_mode: DisplayMode,
|
||||
screen: Option<GameScreen>,
|
||||
}
|
||||
|
||||
@@ -23,6 +27,7 @@ impl GameWindow {
|
||||
client,
|
||||
proxy,
|
||||
sim_id,
|
||||
display_mode: DisplayMode::Anaglyph,
|
||||
screen: None,
|
||||
}
|
||||
}
|
||||
@@ -61,21 +66,44 @@ impl GameWindow {
|
||||
}
|
||||
});
|
||||
ui.menu_button("Video", |ui| {
|
||||
let current_dims = ctx.input(|i| i.viewport().inner_rect.unwrap());
|
||||
let current_dims = current_dims.max - current_dims.min;
|
||||
ui.menu_button("Screen Size", |ui| {
|
||||
let current_dims = ctx.input(|i| i.viewport().inner_rect.unwrap());
|
||||
let current_dims = current_dims.max - current_dims.min;
|
||||
|
||||
for scale in 1..=4 {
|
||||
let label = format!("x{scale}");
|
||||
let scale = scale as f32;
|
||||
let dims = (384.0 * scale, 224.0 * scale + 22.0).into();
|
||||
for scale in 1..=4 {
|
||||
let label = format!("x{scale}");
|
||||
let scale = scale as f32;
|
||||
let dims = (384.0 * scale, 224.0 * scale + 22.0).into();
|
||||
if ui
|
||||
.selectable_button((current_dims - dims).length() < 1.0, label)
|
||||
.clicked()
|
||||
{
|
||||
ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
|
||||
ui.close_menu();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
ui.menu_button("Display Mode", |ui| {
|
||||
if ui
|
||||
.selectable_button((current_dims - dims).length() < 1.0, label)
|
||||
.selectable_option(&mut self.display_mode, DisplayMode::Anaglyph, "Anaglyph")
|
||||
.clicked()
|
||||
{
|
||||
ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
|
||||
ui.close_menu();
|
||||
}
|
||||
}
|
||||
if ui
|
||||
.selectable_option(&mut self.display_mode, DisplayMode::LeftEye, "Left Eye")
|
||||
.clicked()
|
||||
{
|
||||
ui.close_menu();
|
||||
}
|
||||
if ui
|
||||
.selectable_option(&mut self.display_mode, DisplayMode::RightEye, "Right Eye")
|
||||
.clicked()
|
||||
{
|
||||
ui.close_menu();
|
||||
}
|
||||
});
|
||||
});
|
||||
ui.menu_button("Audio", |ui| {
|
||||
let p1_enabled = self.client.is_audio_enabled(SimId::Player1);
|
||||
@@ -146,7 +174,8 @@ impl AppWindow for GameWindow {
|
||||
});
|
||||
let frame = Frame::central_panel(&ctx.style()).fill(Color32::BLACK);
|
||||
CentralPanel::default().frame(frame).show(ctx, |ui| {
|
||||
if let Some(screen) = self.screen.as_ref() {
|
||||
if let Some(screen) = self.screen.as_mut() {
|
||||
screen.display_mode = self.display_mode;
|
||||
ui.add(screen);
|
||||
}
|
||||
});
|
||||
@@ -168,6 +197,18 @@ impl AppWindow for GameWindow {
|
||||
|
||||
trait UiExt {
|
||||
fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response;
|
||||
fn selectable_option<T: Eq>(
|
||||
&mut self,
|
||||
current_value: &mut T,
|
||||
selected_value: T,
|
||||
text: impl Into<WidgetText>,
|
||||
) -> Response {
|
||||
let response = self.selectable_button(*current_value == selected_value, text);
|
||||
if response.clicked() {
|
||||
*current_value = selected_value;
|
||||
}
|
||||
response
|
||||
}
|
||||
}
|
||||
|
||||
impl UiExt for Ui {
|
||||
|
||||
Reference in New Issue
Block a user