Make arguments of Renderer::new explicit in iced_wgpu
This commit is contained in:
parent
f88488543f
commit
2c6fd9ac14
4 changed files with 17 additions and 17 deletions
|
|
@ -63,16 +63,7 @@ fn benchmark(
|
||||||
Some(Antialiasing::MSAAx4),
|
Some(Antialiasing::MSAAx4),
|
||||||
);
|
);
|
||||||
|
|
||||||
let mut renderer = Renderer::new(
|
let mut renderer = Renderer::new(&engine, Font::DEFAULT, Pixels::from(16));
|
||||||
iced_wgpu::Settings {
|
|
||||||
present_mode: wgpu::PresentMode::Immediate,
|
|
||||||
backends: wgpu::Backends::all(),
|
|
||||||
default_font: Font::DEFAULT,
|
|
||||||
default_text_size: Pixels::from(16),
|
|
||||||
antialiasing: Some(Antialiasing::MSAAx4),
|
|
||||||
},
|
|
||||||
&engine,
|
|
||||||
);
|
|
||||||
|
|
||||||
let viewport =
|
let viewport =
|
||||||
graphics::Viewport::with_physical_size(Size::new(3840, 2160), 2.0);
|
graphics::Viewport::with_physical_size(Size::new(3840, 2160), 2.0);
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,12 @@ use controls::Controls;
|
||||||
use scene::Scene;
|
use scene::Scene;
|
||||||
|
|
||||||
use iced_wgpu::graphics::Viewport;
|
use iced_wgpu::graphics::Viewport;
|
||||||
use iced_wgpu::{wgpu, Engine, Renderer, Settings};
|
use iced_wgpu::{wgpu, Engine, Renderer};
|
||||||
use iced_winit::conversion;
|
use iced_winit::conversion;
|
||||||
use iced_winit::core::mouse;
|
use iced_winit::core::mouse;
|
||||||
use iced_winit::core::renderer;
|
use iced_winit::core::renderer;
|
||||||
use iced_winit::core::window;
|
use iced_winit::core::window;
|
||||||
use iced_winit::core::{Color, Size, Theme};
|
use iced_winit::core::{Color, Font, Pixels, Size, Theme};
|
||||||
use iced_winit::futures;
|
use iced_winit::futures;
|
||||||
use iced_winit::runtime::program;
|
use iced_winit::runtime::program;
|
||||||
use iced_winit::runtime::Debug;
|
use iced_winit::runtime::Debug;
|
||||||
|
|
@ -156,7 +156,8 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
// Initialize iced
|
// Initialize iced
|
||||||
let mut debug = Debug::new();
|
let mut debug = Debug::new();
|
||||||
let mut engine = Engine::new(&adapter, &device, &queue, format, None);
|
let mut engine = Engine::new(&adapter, &device, &queue, format, None);
|
||||||
let mut renderer = Renderer::new(Settings::default(), &engine);
|
let mut renderer =
|
||||||
|
Renderer::new(&engine, Font::default(), Pixels::from(16));
|
||||||
|
|
||||||
let mut state = program::State::new(
|
let mut state = program::State::new(
|
||||||
controls,
|
controls,
|
||||||
|
|
|
||||||
|
|
@ -87,10 +87,14 @@ pub struct Renderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Renderer {
|
impl Renderer {
|
||||||
pub fn new(settings: Settings, _engine: &Engine) -> Self {
|
pub fn new(
|
||||||
|
_engine: &Engine,
|
||||||
|
default_font: Font,
|
||||||
|
default_text_size: Pixels,
|
||||||
|
) -> Self {
|
||||||
Self {
|
Self {
|
||||||
default_font: settings.default_font,
|
default_font,
|
||||||
default_text_size: settings.default_text_size,
|
default_text_size,
|
||||||
layers: layer::Stack::new(),
|
layers: layer::Stack::new(),
|
||||||
|
|
||||||
triangle_storage: triangle::Storage::new(),
|
triangle_storage: triangle::Storage::new(),
|
||||||
|
|
|
||||||
|
|
@ -289,7 +289,11 @@ impl graphics::Compositor for Compositor {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn create_renderer(&self) -> Self::Renderer {
|
fn create_renderer(&self) -> Self::Renderer {
|
||||||
Renderer::new(self.settings, &self.engine)
|
Renderer::new(
|
||||||
|
&self.engine,
|
||||||
|
self.settings.default_font,
|
||||||
|
self.settings.default_text_size,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn create_surface<W: compositor::Window>(
|
fn create_surface<W: compositor::Window>(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue