me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added support for gradients to respect current frame transform.

Browse source
This commit is contained in:
shan 2022-10-06 16:57:38 -07:00
parent f4878a1a66
commit 9c7bf417ac
7 changed files with 93 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

33
examples/modern_art/src/main.rs
View file

@ -1,12 +1,11 @@
use rand::{Rng, thread_rng};
use crate::canvas::{Cursor, Geometry};
use iced::widget::canvas::{Cache, Fill, Frame, Gradient, fill};
use iced::widget::{canvas, Canvas};
use iced::Settings;
use iced::widget::canvas::{
self, fill, Cache, Canvas, Cursor, Fill, Frame, Geometry, Gradient,
};
use iced::{
executor, Application, Color, Command, Element, Length, Point, Rectangle,
Renderer, Size, Theme,
Renderer, Size, Theme, Settings
};
use rand::{thread_rng, Rng};
fn main() -> iced::Result {
ModernArt::run(Settings {
@ -41,7 +40,7 @@ impl Application for ModernArt {
String::from("Modern Art")
}
fn update(&mut self, _message: Self::Message) -> Command<Self::Message> {
fn update(&mut self, _message: Message) -> Command<Message> {
Command::none()
}
@ -94,10 +93,7 @@ fn generate_box(frame: &mut Frame, bounds: Size) -> bool {
let mut i = 0;
while i <= stops {
builder = builder.add_stop(
i as f32 / stops as f32,
random_color()
);
builder = builder.add_stop(i as f32 / stops as f32, random_color());
i += 1;
}
@ -106,7 +102,7 @@ fn generate_box(frame: &mut Frame, bounds: Size) -> bool {
let top_left = Point::new(
thread_rng().gen_range(0.0..bounds.width),
thread_rng().gen_range(0.0..bounds.height)
thread_rng().gen_range(0.0..bounds.height),
);
let size = Size::new(
@ -120,8 +116,8 @@ fn generate_box(frame: &mut Frame, bounds: Size) -> bool {
size,
Fill {
style: fill::Style::Solid(random_color()),
.. Default::default()
}
..Default::default()
},
);
} else {
frame.fill_rectangle(
@ -130,10 +126,13 @@ fn generate_box(frame: &mut Frame, bounds: Size) -> bool {
Fill {
style: fill::Style::Gradient(&gradient(
top_left,
Point::new(top_left.x + size.width, top_left.y + size.height)
Point::new(
top_left.x + size.width,
top_left.y + size.height,
),
)),
.. Default::default()
}
..Default::default()
},
);
};

40
examples/solar_system/src/main.rs
View file

@ -10,14 +10,14 @@ use iced::application;
use iced::executor;
use iced::theme::{self, Theme};
use iced::time;
use iced::widget::canvas;
use iced::widget::canvas::{Cursor, Path, Stroke, stroke};
use iced::widget::canvas::{self, stroke, Cursor, Path, Stroke};
use iced::window;
use iced::{
Application, Color, Command, Element, Length, Point, Rectangle, Settings,
Size, Subscription, Vector,
};
use crate::canvas::{fill, Fill, Gradient};
use std::time::Instant;
pub fn main() -> iced::Result {
@ -178,7 +178,9 @@ impl<Message> canvas::Program<Message> for State {
frame.stroke(
&orbit,
Stroke {
style: stroke::Style::Solid(Color::from_rgba8(0, 153, 255, 0.1)),
style: stroke::Style::Solid(Color::from_rgba8(
0, 153, 255, 0.1,
)),
width: 1.0,
line_dash: canvas::LineDash {
offset: 0,
@ -198,15 +200,23 @@ impl<Message> canvas::Program<Message> for State {
frame.translate(Vector::new(Self::ORBIT_RADIUS, 0.0));
let earth = Path::circle(Point::ORIGIN, Self::EARTH_RADIUS);
let shadow = Path::rectangle(
Point::new(0.0, -Self::EARTH_RADIUS),
Size::new(
Self::EARTH_RADIUS * 4.0,
Self::EARTH_RADIUS * 2.0,
),
);
frame.fill(&earth, Color::from_rgb8(0x6B, 0x93, 0xD6));
let earth_fill = Gradient::linear(
Point::new(-Self::EARTH_RADIUS, 0.0),
Point::new(Self::EARTH_RADIUS, 0.0),
)
.add_stop(0.2, Color::from_rgb(0.15, 0.50, 1.0))
.add_stop(0.8, Color::from_rgb(0.0, 0.20, 0.47))
.build()
.unwrap();
frame.fill(
&earth,
Fill {
style: fill::Style::Gradient(&earth_fill),
..Default::default()
},
);
frame.with_save(|frame| {
frame.rotate(rotation * 10.0);
@ -215,14 +225,6 @@ impl<Message> canvas::Program<Message> for State {
let moon = Path::circle(Point::ORIGIN, Self::MOON_RADIUS);
frame.fill(&moon, Color::WHITE);
});
frame.fill(
&shadow,
Color {
a: 0.7,
..Color::BLACK
},
);
});
});