Skip to content

Commit

Permalink
potential fix for incorrect dpi scaling on linux
Browse files Browse the repository at this point in the history 
- #453
  • Loading branch information
@mrDIMAS
mrDIMAS committed Jan 30, 2024
1 parent 37a2aac commit 811a134
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 89 deletions.
4 changes: 1 addition & 3 deletions editor-standalone/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ use fyrox::event_loop::EventLoop;
use fyroxed_base::Editor;

fn main() {
let event_loop = EventLoop::new().unwrap();
let editor = Editor::new(&event_loop, None);
editor.run(event_loop)
Editor::new(None).run(EventLoop::new().unwrap())
}
161 changes: 89 additions & 72 deletions editor/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ use crate::{
utils::{doc::DocWindow, path_fixer::PathFixer, ragdoll::RagdollWizard},
world::{graph::menu::SceneNodeContextMenu, graph::EditorSceneWrapper, WorldViewer},
};
use fyrox::dpi::LogicalSize;
use fyrox::{
asset::{io::FsResourceIo, manager::ResourceManager, untyped::UntypedResource},
core::{
Expand All @@ -102,7 +103,7 @@ use fyrox::{
watcher::FileSystemWatcher,
TypeUuidProvider,
},
dpi::{PhysicalPosition, PhysicalSize},
dpi::PhysicalPosition,
engine::{Engine, EngineInitParams, GraphicsContextParams, SerializationContext},
event::{Event, WindowEvent},
event_loop::{EventLoop, EventLoopWindowTarget},
Expand Down Expand Up @@ -502,7 +503,6 @@ pub struct Editor {
pub animation_editor: AnimationEditor,
pub particle_system_control_panel: ParticleSystemPreviewControlPanel,
pub camera_control_panel: CameraPreviewControlPanel,
pub overlay_pass: Rc<RefCell<OverlayRenderPass>>,
pub audio_preview_panel: AudioPreviewPanel,
pub doc_window: DocWindow,
pub docking_manager: Handle<UiNode>,
Expand All @@ -517,11 +517,12 @@ pub struct Editor {
pub widget_context_menu: Rc<RefCell<WidgetContextMenu>>,
pub widget_constructors: Arc<WidgetConstructorContainer>,
pub collider_control_panel: ColliderControlPanel,
pub highlighter: Rc<RefCell<HighlightRenderPass>>,
pub overlay_pass: Option<Rc<RefCell<OverlayRenderPass>>>,
pub highlighter: Option<Rc<RefCell<HighlightRenderPass>>>,
}

impl Editor {
pub fn new(event_loop: &EventLoop<()>, startup_data: Option<StartupData>) -> Self {
pub fn new(startup_data: Option<StartupData>) -> Self {
let (log_message_sender, log_message_receiver) = channel();

Log::add_listener(log_message_sender);
Expand All @@ -540,7 +541,7 @@ impl Editor {
)),
}

let inner_size = PhysicalSize::new(
let inner_size = LogicalSize::new(
settings.windows.window_size.x,
settings.windows.window_size.y,
);
Expand Down Expand Up @@ -571,55 +572,6 @@ impl Editor {
})
.unwrap();

// Editor cannot run on Android so we can safely initialize graphics context here.
engine.initialize_graphics_context(event_loop).unwrap();

let graphics_context = engine.graphics_context.as_initialized_mut();

if let Ok(icon_img) = TextureResource::load_from_memory(
"../resources/icon.png".into(),
include_bytes!("../resources/icon.png"),
TextureImportOptions::default()
.with_compression(CompressionOptions::NoCompression)
.with_minification_filter(TextureMinificationFilter::Linear),
) {
let data = icon_img.data_ref();
if let TextureKind::Rectangle { width, height } = data.kind() {
if let Ok(img) = Icon::from_rgba(data.data().to_vec(), width, height) {
graphics_context.window.set_window_icon(Some(img));
}
}
}

// High-DPI screen support
Log::info(format!(
"UI scaling of your OS is: {}",
graphics_context.window.scale_factor()
));

let logical_size = graphics_context
.window
.inner_size()
.to_logical(graphics_context.window.scale_factor());
set_ui_scaling(
&engine.user_interface,
graphics_context.window.scale_factor() as f32,
);

let overlay_pass = OverlayRenderPass::new(graphics_context.renderer.pipeline_state());
graphics_context
.renderer
.add_render_pass(overlay_pass.clone());

let highlighter = HighlightRenderPass::new(
&graphics_context.renderer.state,
settings.windows.window_size.x as usize,
settings.windows.window_size.y as usize,
);
graphics_context
.renderer
.add_render_pass(highlighter.clone());

let (message_sender, message_receiver) = mpsc::channel();
let message_sender = MessageSender(message_sender);

Expand All @@ -636,19 +588,6 @@ impl Editor {
&mut engine.user_interface.build_ctx(),
);

match graphics_context
.renderer
.set_quality_settings(&settings.graphics.quality)
{
Ok(_) => {
Log::info("Graphics settings were applied successfully!");
}
Err(e) => Log::err(format!(
"Failed to apply graphics settings! Reason: {:?}",
e
)),
}

let scene_viewer = SceneViewer::new(&mut engine, message_sender.clone());
let asset_browser = AssetBrowser::new(&mut engine);
let menu = Menu::new(&mut engine, message_sender.clone(), &settings);
Expand Down Expand Up @@ -677,8 +616,8 @@ impl Editor {
let docking_manager;
let root_grid = GridBuilder::new(
WidgetBuilder::new()
.with_width(logical_size.width)
.with_height(logical_size.height)
.with_width(inner_size.width)
.with_height(inner_size.height)
.with_child(menu.menu)
.with_child({
docking_manager =
Expand Down Expand Up @@ -892,7 +831,6 @@ impl Editor {
scene_settings,
particle_system_control_panel,
camera_control_panel,
overlay_pass,
audio_preview_panel,
node_removal_dialog,
doc_window,
Expand All @@ -908,7 +846,8 @@ impl Editor {
widget_constructors: Arc::new(WidgetConstructorContainer::new()),
widget_context_menu,
collider_control_panel,
highlighter,
overlay_pass: None,
highlighter: None,
};

if let Some(data) = startup_data {
Expand Down Expand Up @@ -2136,7 +2075,9 @@ impl Editor {
}
}

self.overlay_pass.borrow_mut().pictogram_size = self.settings.debugging.pictogram_size;
if let Some(overlay_pass) = self.overlay_pass.as_ref() {
overlay_pass.borrow_mut().pictogram_size = self.settings.debugging.pictogram_size;
}

let mut iterations = 1;
while iterations > 0 {
Expand Down Expand Up @@ -2429,6 +2370,76 @@ impl Editor {
|| self.engine.user_interface.captured_node().is_some()
}

fn on_resumed(&mut self, evt: &EventLoopWindowTarget<()>) {
let engine = &mut self.engine;

engine.initialize_graphics_context(evt).unwrap();

let graphics_context = engine.graphics_context.as_initialized_mut();

if let Ok(icon_img) = TextureResource::load_from_memory(
"../resources/icon.png".into(),
include_bytes!("../resources/icon.png"),
TextureImportOptions::default()
.with_compression(CompressionOptions::NoCompression)
.with_minification_filter(TextureMinificationFilter::Linear),
) {
let data = icon_img.data_ref();
if let TextureKind::Rectangle { width, height } = data.kind() {
if let Ok(img) = Icon::from_rgba(data.data().to_vec(), width, height) {
graphics_context.window.set_window_icon(Some(img));
}
}
}

// High-DPI screen support
Log::info(format!(
"UI scaling of your OS is: {}",
graphics_context.window.scale_factor()
));

set_ui_scaling(
&engine.user_interface,
graphics_context.window.scale_factor() as f32,
);

let overlay_pass = OverlayRenderPass::new(graphics_context.renderer.pipeline_state());
graphics_context
.renderer
.add_render_pass(overlay_pass.clone());
self.overlay_pass = Some(overlay_pass);

let highlighter = HighlightRenderPass::new(
&graphics_context.renderer.state,
self.settings.windows.window_size.x as usize,
self.settings.windows.window_size.y as usize,
);
graphics_context
.renderer
.add_render_pass(highlighter.clone());
self.highlighter = Some(highlighter);

match graphics_context
.renderer
.set_quality_settings(&self.settings.graphics.quality)
{
Ok(_) => {
Log::info("Graphics settings were applied successfully!");
}
Err(e) => Log::err(format!(
"Failed to apply graphics settings! Reason: {:?}",
e
)),
}
}

fn on_suspended(&mut self) {
self.overlay_pass.take();
self.highlighter.take();

self.engine.destroy_graphics_context().unwrap();
}

pub fn run(mut self, event_loop: EventLoop<()>) {
for_each_plugin!(self.plugins => on_start(&mut self));

Expand All @@ -2454,6 +2465,12 @@ impl Editor {
}
}
}
Event::Resumed => {
self.on_resumed(window_target);
}
Event::Suspended => {
self.on_suspended();
}
Event::WindowEvent { ref event, .. } => {
match event {
WindowEvent::CloseRequested => {
Expand Down
2 changes: 1 addition & 1 deletion editor/src/scene/container.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ impl EditorSceneEntry {
settings: &Settings,
message_sender: MessageSender,
scene_viewer: &SceneViewer,
highlighter: Rc<RefCell<HighlightRenderPass>>,
highlighter: Option<Rc<RefCell<HighlightRenderPass>>>,
) -> Self {
let game_scene = GameScene::from_native_scene(
scene,
Expand Down
31 changes: 18 additions & 13 deletions editor/src/scene/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub struct GameScene {
pub sender: MessageSender,
pub camera_state: Vec<(Handle<Node>, bool)>,
pub node_property_changed_handler: SceneNodePropertyChangedHandler,
pub highlighter: Rc<RefCell<HighlightRenderPass>>,
pub highlighter: Option<Rc<RefCell<HighlightRenderPass>>>,
}

impl GameScene {
Expand All @@ -118,7 +118,7 @@ impl GameScene {
path: Option<&Path>,
settings: &Settings,
sender: MessageSender,
highlighter: Rc<RefCell<HighlightRenderPass>>,
highlighter: Option<Rc<RefCell<HighlightRenderPass>>>,
) -> Self {
scene.rendering_options.render_target = Some(TextureResource::new_render_target(0, 0));

Expand Down Expand Up @@ -809,11 +809,14 @@ impl SceneController for GameScene {
new_render_target = scene.rendering_options.render_target.clone();

let gc = engine.graphics_context.as_initialized_mut();
self.highlighter.borrow_mut().resize(
&gc.renderer.state,
frame_size.x as usize,
frame_size.y as usize,
);

if let Some(highlighter) = self.highlighter.as_ref() {
highlighter.borrow_mut().resize(
&gc.renderer.state,
frame_size.x as usize,
frame_size.y as usize,
);
}
}
}

Expand All @@ -830,13 +833,15 @@ impl SceneController for GameScene {
self.camera_controller
.update(&mut scene.graph, settings, path, dt);

let mut highlighter = self.highlighter.borrow_mut();
highlighter.nodes_to_highlight.clear();
if let Some(highlighter) = self.highlighter.as_ref() {
let mut highlighter = highlighter.borrow_mut();
highlighter.nodes_to_highlight.clear();

highlighter.scene_handle = self.scene;
if let Selection::Graph(ref selection) = editor_selection {
for &handle in selection.nodes() {
highlighter.nodes_to_highlight.insert(handle);
highlighter.scene_handle = self.scene;
if let Selection::Graph(ref selection) = editor_selection {
for &handle in selection.nodes() {
highlighter.nodes_to_highlight.insert(handle);
}
}
}

Expand Down

0 comments on commit 811a134

Please sign in to comment.