From e1b9d42bf1443ae4958aa9303255ef19c635debb Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 3 Oct 2019 00:01:45 +0200 Subject: Start `iced_winit` and `iced_wgpu` --- src/lib.rs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index e69de29b..d1e98c4c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -0,0 +1,23 @@ +pub use iced_wgpu::Renderer; +pub use iced_winit::{ + button, slider, text, Align, Button, Checkbox, Color, Image, Justify, + Length, Radio, Slider, Text, +}; + +pub type Element<'a, Message> = iced_winit::Element<'a, Message, Renderer>; +pub type Row<'a, Message> = iced_winit::Row<'a, Message, Renderer>; +pub type Column<'a, Message> = iced_winit::Column<'a, Message, Renderer>; + +pub trait UserInterface { + type Message; + + fn update(&mut self, message: Self::Message); + + fn view(&mut self) -> Element; + + fn run(self) + where + Self: Sized, + { + } +} -- cgit From 63294088ad6e1523c6b7623c08f82af2812a5531 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 3 Oct 2019 00:08:16 +0200 Subject: Open a window using `winit` --- src/lib.rs | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index d1e98c4c..4344a50b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,7 @@ pub use iced_wgpu::Renderer; pub use iced_winit::{ - button, slider, text, Align, Button, Checkbox, Color, Image, Justify, - Length, Radio, Slider, Text, + button, slider, text, winit, Align, Button, Checkbox, Color, Image, + Justify, Length, Radio, Slider, Text, }; pub type Element<'a, Message> = iced_winit::Element<'a, Message, Renderer>; @@ -19,5 +19,32 @@ pub trait UserInterface { where Self: Sized, { + use winit::{ + event::{Event, WindowEvent}, + event_loop::{ControlFlow, EventLoop}, + window::WindowBuilder, + }; + + let event_loop = EventLoop::new(); + + // TODO: Ask for window settings and configure this properly + let window = WindowBuilder::new() + .build(&event_loop) + .expect("Open window"); + + event_loop.run(move |event, _, control_flow| match event { + Event::EventsCleared => { + window.request_redraw(); + } + Event::WindowEvent { + event: WindowEvent::CloseRequested, + .. + } => { + *control_flow = ControlFlow::Exit; + } + _ => { + *control_flow = ControlFlow::Poll; + } + }) } } -- cgit From 8bb33cd5a0b876a5e24108604be2cecd4efad3ef Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 3 Oct 2019 00:23:08 +0200 Subject: Initialize `wgpu` We only enable the `vulkan` feature for now. --- src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 4344a50b..197212e7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,6 +32,8 @@ pub trait UserInterface { .build(&event_loop) .expect("Open window"); + let renderer = Renderer::new(&window); + event_loop.run(move |event, _, control_flow| match event { Event::EventsCleared => { window.request_redraw(); -- cgit From fc38119be3ffccc35c90971e956e8866e8b97e85 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 3 Oct 2019 00:34:15 +0200 Subject: Clear the window properly on redraw --- src/lib.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 197212e7..74048fd8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,12 +32,24 @@ pub trait UserInterface { .build(&event_loop) .expect("Open window"); - let renderer = Renderer::new(&window); + let size = window.inner_size().to_physical(window.hidpi_factor());; + + let mut renderer = + Renderer::new(&window, size.width as u32, size.height as u32); + + window.request_redraw(); event_loop.run(move |event, _, control_flow| match event { Event::EventsCleared => { window.request_redraw(); } + Event::WindowEvent { + event: WindowEvent::RedrawRequested, + .. + } => { + println!("Redrawing"); + renderer.draw(); + } Event::WindowEvent { event: WindowEvent::CloseRequested, .. @@ -45,7 +57,7 @@ pub trait UserInterface { *control_flow = ControlFlow::Exit; } _ => { - *control_flow = ControlFlow::Poll; + *control_flow = ControlFlow::Wait; } }) } -- cgit From ebb8dbb065c2cb5390e35237eda122cbe9ef5f42 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 3 Oct 2019 01:59:16 +0200 Subject: Draft UI event loop --- src/lib.rs | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 74048fd8..3a7825bc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,9 +15,9 @@ pub trait UserInterface { fn view(&mut self) -> Element; - fn run(self) + fn run(mut self) where - Self: Sized, + Self: 'static + Sized, { use winit::{ event::{Event, WindowEvent}, @@ -37,10 +37,47 @@ pub trait UserInterface { let mut renderer = Renderer::new(&window, size.width as u32, size.height as u32); + let mut cache = Some(iced_winit::Cache::default()); + let mut events = Vec::new(); + window.request_redraw(); event_loop.run(move |event, _, control_flow| match event { Event::EventsCleared => { + // TODO: Once we remove lifetimes from widgets, we will be able + // to keep user interfaces alive between events. + // + // This will allow us to only rebuild when a message is handled. + let mut user_interface = iced_winit::UserInterface::build( + self.view(), + cache.take().unwrap(), + &mut renderer, + ); + + let messages = user_interface.update(events.drain(..)); + + if messages.is_empty() { + let _ = user_interface.draw(&mut renderer); + + cache = Some(user_interface.into_cache()); + } else { + let temp_cache = user_interface.into_cache(); + + for message in messages { + self.update(message); + } + + let user_interface = iced_winit::UserInterface::build( + self.view(), + temp_cache, + &mut renderer, + ); + + let _ = user_interface.draw(&mut renderer); + + cache = Some(user_interface.into_cache()); + }; + window.request_redraw(); } Event::WindowEvent { -- cgit From 5204cc8c8bc8361a11815d7c711b7da10a6ca8e5 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 4 Oct 2019 22:46:57 +0200 Subject: Count redraws and add a couple of TODOs --- src/lib.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 3a7825bc..93f8110e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -39,15 +39,19 @@ pub trait UserInterface { let mut cache = Some(iced_winit::Cache::default()); let mut events = Vec::new(); + let mut redraws = 0; window.request_redraw(); event_loop.run(move |event, _, control_flow| match event { Event::EventsCleared => { - // TODO: Once we remove lifetimes from widgets, we will be able - // to keep user interfaces alive between events. + // TODO: We should find out a way to keep a user interface + // alive between events while still being able to drop it and + // rebuild it only when a message is handled. // - // This will allow us to only rebuild when a message is handled. + // The borrow checker does not seem to like it when I try this, + // even though I am not technically double borrowing at any + // point. let mut user_interface = iced_winit::UserInterface::build( self.view(), cache.take().unwrap(), @@ -61,6 +65,8 @@ pub trait UserInterface { cache = Some(user_interface.into_cache()); } else { + // When there are messages, we are forced to rebuild twice + // for now :^) let temp_cache = user_interface.into_cache(); for message in messages { @@ -76,7 +82,7 @@ pub trait UserInterface { let _ = user_interface.draw(&mut renderer); cache = Some(user_interface.into_cache()); - }; + } window.request_redraw(); } @@ -84,8 +90,13 @@ pub trait UserInterface { event: WindowEvent::RedrawRequested, .. } => { - println!("Redrawing"); + println!("Redrawing {}", redraws); renderer.draw(); + + redraws += 1; + + // TODO: Handle animations! + // Maybe we can use `ControlFlow::WaitUntil` for this. } Event::WindowEvent { event: WindowEvent::CloseRequested, -- cgit From a7d11944039a1b5ea5b72256e8d15367d99e6010 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 5 Oct 2019 03:56:18 +0200 Subject: Add `Renderer` and `Primitive` concepts --- src/lib.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 93f8110e..5272549f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -45,13 +45,11 @@ pub trait UserInterface { event_loop.run(move |event, _, control_flow| match event { Event::EventsCleared => { - // TODO: We should find out a way to keep a user interface - // alive between events while still being able to drop it and - // rebuild it only when a message is handled. + // TODO: We should be able to keep a user interface alive + // between events once we remove state references. // - // The borrow checker does not seem to like it when I try this, - // even though I am not technically double borrowing at any - // point. + // This will allow us to rebuild it only when a message is + // handled. let mut user_interface = iced_winit::UserInterface::build( self.view(), cache.take().unwrap(), -- cgit From 0c3f78713d24b263e94cf6aebb8862926feaff23 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 5 Oct 2019 05:12:36 +0200 Subject: Draft basic text rendering using `wgpu_glyph` --- src/lib.rs | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 5272549f..f9860b37 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -pub use iced_wgpu::Renderer; +pub use iced_wgpu::{Primitive, Renderer}; pub use iced_winit::{ button, slider, text, winit, Align, Button, Checkbox, Color, Image, Justify, Length, Radio, Slider, Text, @@ -33,13 +33,15 @@ pub trait UserInterface { .expect("Open window"); let size = window.inner_size().to_physical(window.hidpi_factor());; + let (width, height) = (size.width as u16, size.height as u16); - let mut renderer = - Renderer::new(&window, size.width as u32, size.height as u32); + let mut renderer = Renderer::new(&window); + let mut target = renderer.target(width, height); let mut cache = Some(iced_winit::Cache::default()); let mut events = Vec::new(); let mut redraws = 0; + let mut primitive = Primitive::None; window.request_redraw(); @@ -51,7 +53,7 @@ pub trait UserInterface { // This will allow us to rebuild it only when a message is // handled. let mut user_interface = iced_winit::UserInterface::build( - self.view(), + document(&mut self, width, height), cache.take().unwrap(), &mut renderer, ); @@ -59,7 +61,7 @@ pub trait UserInterface { let messages = user_interface.update(events.drain(..)); if messages.is_empty() { - let _ = user_interface.draw(&mut renderer); + primitive = user_interface.draw(&mut renderer); cache = Some(user_interface.into_cache()); } else { @@ -72,12 +74,12 @@ pub trait UserInterface { } let user_interface = iced_winit::UserInterface::build( - self.view(), + document(&mut self, width, height), temp_cache, &mut renderer, ); - let _ = user_interface.draw(&mut renderer); + primitive = user_interface.draw(&mut renderer); cache = Some(user_interface.into_cache()); } @@ -89,7 +91,7 @@ pub trait UserInterface { .. } => { println!("Redrawing {}", redraws); - renderer.draw(); + renderer.draw(&mut target, &primitive); redraws += 1; @@ -108,3 +110,19 @@ pub trait UserInterface { }) } } + +fn document( + user_interface: &mut UserInterface, + width: u16, + height: u16, +) -> Element +where + UserInterface: self::UserInterface, + UserInterface::Message: 'static, +{ + Column::new() + .width(Length::Units(width)) + .height(Length::Units(height)) + .push(user_interface.view()) + .into() +} -- cgit From c9da3a10d9c4fcc9504b25eed873708406e3a9c7 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 7 Oct 2019 04:05:40 +0200 Subject: Use `log` crate instead of `dbg!` --- src/lib.rs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index f9860b37..77da5146 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -40,7 +40,6 @@ pub trait UserInterface { let mut cache = Some(iced_winit::Cache::default()); let mut events = Vec::new(); - let mut redraws = 0; let mut primitive = Primitive::None; window.request_redraw(); @@ -90,11 +89,8 @@ pub trait UserInterface { event: WindowEvent::RedrawRequested, .. } => { - println!("Redrawing {}", redraws); renderer.draw(&mut target, &primitive); - redraws += 1; - // TODO: Handle animations! // Maybe we can use `ControlFlow::WaitUntil` for this. } -- cgit From 67f8da4b34da9bae4858e335c37ddc18e1a6e2b7 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 7 Oct 2019 04:12:39 +0200 Subject: Initialize renderer primitive properly --- src/lib.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 77da5146..c5a34dcd 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -38,9 +38,15 @@ pub trait UserInterface { let mut renderer = Renderer::new(&window); let mut target = renderer.target(width, height); - let mut cache = Some(iced_winit::Cache::default()); + let user_interface = iced_winit::UserInterface::build( + document(&mut self, width, height), + iced_winit::Cache::default(), + &mut renderer, + ); + + let mut primitive = user_interface.draw(&mut renderer); + let mut cache = Some(user_interface.into_cache()); let mut events = Vec::new(); - let mut primitive = Primitive::None; window.request_redraw(); -- cgit From 10e10e5e06841574425d2633f1c2916733f7b4ff Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 8 Oct 2019 03:13:41 +0200 Subject: Make `iced_core::Button` customizable Now it supports: - Any kind of content - Custom border radius - Custom background --- src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index c5a34dcd..2e65ed6c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,12 +1,13 @@ pub use iced_wgpu::{Primitive, Renderer}; pub use iced_winit::{ - button, slider, text, winit, Align, Button, Checkbox, Color, Image, + button, slider, text, winit, Align, Background, Checkbox, Color, Image, Justify, Length, Radio, Slider, Text, }; pub type Element<'a, Message> = iced_winit::Element<'a, Message, Renderer>; pub type Row<'a, Message> = iced_winit::Row<'a, Message, Renderer>; pub type Column<'a, Message> = iced_winit::Column<'a, Message, Renderer>; +pub type Button<'a, Message> = iced_winit::Button<'a, Message, Renderer>; pub trait UserInterface { type Message; -- cgit From a92a0b73ed7ed935df762d06c4249894fd35b227 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 9 Oct 2019 05:36:49 +0200 Subject: Move `winit` logic from `iced` to `iced_winit` - Added new `renderer::Windowed` trait. This shoud allow users to easily try different renderers by simply changing one line. - Renamed `UserInterface` traits to `Application`, as the `run` method takes total control of the current thread. - Moved `MouseCursor` back to `iced_native`. The new `renderer::Windowed` trait returns one on `draw`. - Split `iced_native` renderer in multiple modules, for consistency. --- src/lib.rs | 122 +++++++++---------------------------------------------------- 1 file changed, 17 insertions(+), 105 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 2e65ed6c..46574285 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,123 +9,35 @@ pub type Row<'a, Message> = iced_winit::Row<'a, Message, Renderer>; pub type Column<'a, Message> = iced_winit::Column<'a, Message, Renderer>; pub type Button<'a, Message> = iced_winit::Button<'a, Message, Renderer>; -pub trait UserInterface { +pub trait Application { type Message; fn update(&mut self, message: Self::Message); fn view(&mut self) -> Element; - fn run(mut self) + fn run(self) where Self: 'static + Sized, { - use winit::{ - event::{Event, WindowEvent}, - event_loop::{ControlFlow, EventLoop}, - window::WindowBuilder, - }; - - let event_loop = EventLoop::new(); - - // TODO: Ask for window settings and configure this properly - let window = WindowBuilder::new() - .build(&event_loop) - .expect("Open window"); - - let size = window.inner_size().to_physical(window.hidpi_factor());; - let (width, height) = (size.width as u16, size.height as u16); - - let mut renderer = Renderer::new(&window); - let mut target = renderer.target(width, height); - - let user_interface = iced_winit::UserInterface::build( - document(&mut self, width, height), - iced_winit::Cache::default(), - &mut renderer, - ); - - let mut primitive = user_interface.draw(&mut renderer); - let mut cache = Some(user_interface.into_cache()); - let mut events = Vec::new(); - - window.request_redraw(); - - event_loop.run(move |event, _, control_flow| match event { - Event::EventsCleared => { - // TODO: We should be able to keep a user interface alive - // between events once we remove state references. - // - // This will allow us to rebuild it only when a message is - // handled. - let mut user_interface = iced_winit::UserInterface::build( - document(&mut self, width, height), - cache.take().unwrap(), - &mut renderer, - ); - - let messages = user_interface.update(events.drain(..)); - - if messages.is_empty() { - primitive = user_interface.draw(&mut renderer); - - cache = Some(user_interface.into_cache()); - } else { - // When there are messages, we are forced to rebuild twice - // for now :^) - let temp_cache = user_interface.into_cache(); - - for message in messages { - self.update(message); - } - - let user_interface = iced_winit::UserInterface::build( - document(&mut self, width, height), - temp_cache, - &mut renderer, - ); - - primitive = user_interface.draw(&mut renderer); - - cache = Some(user_interface.into_cache()); - } - - window.request_redraw(); - } - Event::WindowEvent { - event: WindowEvent::RedrawRequested, - .. - } => { - renderer.draw(&mut target, &primitive); - - // TODO: Handle animations! - // Maybe we can use `ControlFlow::WaitUntil` for this. - } - Event::WindowEvent { - event: WindowEvent::CloseRequested, - .. - } => { - *control_flow = ControlFlow::Exit; - } - _ => { - *control_flow = ControlFlow::Wait; - } - }) + iced_winit::Application::run(Instance(self)) } } -fn document( - user_interface: &mut UserInterface, - width: u16, - height: u16, -) -> Element +struct Instance(A); + +impl iced_winit::Application for Instance where - UserInterface: self::UserInterface, - UserInterface::Message: 'static, + A: Application, { - Column::new() - .width(Length::Units(width)) - .height(Length::Units(height)) - .push(user_interface.view()) - .into() + type Renderer = Renderer; + type Message = A::Message; + + fn update(&mut self, message: Self::Message) { + self.0.update(message); + } + + fn view(&mut self) -> Element { + self.0.view() + } } -- cgit From c7ef9d0da705d8f27011fe41d2103c73aae42d2d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 23 Oct 2019 02:33:07 +0200 Subject: Connect `iced_web` with `iced` properly --- src/lib.rs | 36 ++++++++++++++++++++++++++---------- src/web.rs | 1 + src/winit.rs | 11 +++++++++++ 3 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 src/web.rs create mode 100644 src/winit.rs (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 46574285..1bcdada2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,13 +1,8 @@ -pub use iced_wgpu::{Primitive, Renderer}; -pub use iced_winit::{ - button, slider, text, winit, Align, Background, Checkbox, Color, Image, - Justify, Length, Radio, Slider, Text, -}; +#[cfg_attr(target_arch = "wasm32", path = "web.rs")] +#[cfg_attr(not(target_arch = "wasm32"), path = "winit.rs")] +mod platform; -pub type Element<'a, Message> = iced_winit::Element<'a, Message, Renderer>; -pub type Row<'a, Message> = iced_winit::Row<'a, Message, Renderer>; -pub type Column<'a, Message> = iced_winit::Column<'a, Message, Renderer>; -pub type Button<'a, Message> = iced_winit::Button<'a, Message, Renderer>; +pub use platform::*; pub trait Application { type Message; @@ -20,12 +15,17 @@ pub trait Application { where Self: 'static + Sized, { - iced_winit::Application::run(Instance(self)) + #[cfg(not(target_arch = "wasm32"))] + iced_winit::Application::run(Instance(self)); + + #[cfg(target_arch = "wasm32")] + iced_web::Application::run(Instance(self)); } } struct Instance(A); +#[cfg(not(target_arch = "wasm32"))] impl iced_winit::Application for Instance where A: Application, @@ -41,3 +41,19 @@ where self.0.view() } } + +#[cfg(target_arch = "wasm32")] +impl iced_web::Application for Instance +where + A: Application, +{ + type Message = A::Message; + + fn update(&mut self, message: Self::Message) { + self.0.update(message); + } + + fn view(&mut self) -> Element { + self.0.view() + } +} diff --git a/src/web.rs b/src/web.rs new file mode 100644 index 00000000..31f1a6fc --- /dev/null +++ b/src/web.rs @@ -0,0 +1 @@ +pub use iced_web::*; diff --git a/src/winit.rs b/src/winit.rs new file mode 100644 index 00000000..64e301f4 --- /dev/null +++ b/src/winit.rs @@ -0,0 +1,11 @@ +pub use iced_wgpu::{Primitive, Renderer}; + +pub use iced_winit::{ + button, slider, text, winit, Align, Background, Checkbox, Color, Image, + Justify, Length, Radio, Slider, Text, +}; + +pub type Element<'a, Message> = iced_winit::Element<'a, Message, Renderer>; +pub type Row<'a, Message> = iced_winit::Row<'a, Message, Renderer>; +pub type Column<'a, Message> = iced_winit::Column<'a, Message, Renderer>; +pub type Button<'a, Message> = iced_winit::Button<'a, Message, Renderer>; -- cgit