summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-03-22 01:53:48 +0100
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-03-22 01:53:48 +0100
commit85800c99ab285efd244c0addfdcf3c732a98de1d (patch)
tree7e8c785019ad0cf9729803c20a763976e605efff
parent53a183fe0d6aed460fbb8155ac9541757277aab3 (diff)
downloadiced-85800c99ab285efd244c0addfdcf3c732a98de1d.tar.gz
iced-85800c99ab285efd244c0addfdcf3c732a98de1d.tar.bz2
iced-85800c99ab285efd244c0addfdcf3c732a98de1d.zip
Fix broken links in documentation
-rw-r--r--graphics/src/cached.rs33
-rw-r--r--graphics/src/geometry.rs14
-rw-r--r--graphics/src/geometry/cache.rs33
-rw-r--r--graphics/src/geometry/frame.rs11
-rw-r--r--graphics/src/lib.rs6
-rw-r--r--graphics/src/mesh.rs2
-rw-r--r--graphics/src/renderer.rs12
-rw-r--r--renderer/src/fallback.rs7
-rw-r--r--widget/src/canvas/program.rs9
9 files changed, 73 insertions, 54 deletions
diff --git a/graphics/src/cached.rs b/graphics/src/cached.rs
new file mode 100644
index 00000000..f7968c9f
--- /dev/null
+++ b/graphics/src/cached.rs
@@ -0,0 +1,33 @@
+use crate::Primitive;
+
+use std::sync::Arc;
+
+/// A piece of data that can be cached.
+pub trait Cached: Sized {
+ /// The type of cache produced.
+ type Cache;
+
+ /// Loads the [`Cache`] into a proper instance.
+ ///
+ /// [`Cache`]: Self::Cache
+ fn load(cache: &Self::Cache) -> Self;
+
+ /// Caches this value, producing its corresponding [`Cache`].
+ ///
+ /// [`Cache`]: Self::Cache
+ fn cache(self) -> Self::Cache;
+}
+
+impl<T> Cached for Primitive<T> {
+ type Cache = Arc<Self>;
+
+ fn load(cache: &Arc<Self>) -> Self {
+ Self::Cache {
+ content: cache.clone(),
+ }
+ }
+
+ fn cache(self) -> Arc<Self> {
+ Arc::new(self)
+ }
+}
diff --git a/graphics/src/geometry.rs b/graphics/src/geometry.rs
index 2b18243e..cc2359b6 100644
--- a/graphics/src/geometry.rs
+++ b/graphics/src/geometry.rs
@@ -19,32 +19,28 @@ pub use text::Text;
pub use crate::gradient::{self, Gradient};
use crate::core::Size;
+use crate::Cached;
/// A renderer capable of drawing some [`Self::Geometry`].
pub trait Renderer: crate::core::Renderer {
/// The kind of geometry this renderer can draw.
- type Geometry: Geometry;
+ type Geometry: Cached;
/// The kind of [`Frame`] this renderer supports.
type Frame: frame::Backend<Geometry = Self::Geometry>;
+ /// Creates a new [`Self::Frame`].
fn new_frame(&self, size: Size) -> Self::Frame;
/// Draws the given [`Self::Geometry`].
fn draw_geometry(&mut self, geometry: Self::Geometry);
}
+/// The graphics backend of a geometry renderer.
pub trait Backend {
/// The kind of [`Frame`] this backend supports.
type Frame: frame::Backend;
+ /// Creates a new [`Self::Frame`].
fn new_frame(&self, size: Size) -> Self::Frame;
}
-
-pub trait Geometry: Sized {
- type Cache;
-
- fn load(cache: &Self::Cache) -> Self;
-
- fn cache(self) -> Self::Cache;
-}
diff --git a/graphics/src/geometry/cache.rs b/graphics/src/geometry/cache.rs
index 490e69e2..37d433c2 100644
--- a/graphics/src/geometry/cache.rs
+++ b/graphics/src/geometry/cache.rs
@@ -1,11 +1,10 @@
use crate::core::Size;
-use crate::geometry::{self, Frame, Geometry};
-use crate::Primitive;
+use crate::geometry::{self, Frame};
+use crate::Cached;
use std::cell::RefCell;
-use std::sync::Arc;
-/// A simple cache that stores generated [`Geometry`] to avoid recomputation.
+/// A simple cache that stores generated geometry to avoid recomputation.
///
/// A [`Cache`] will not redraw its geometry unless the dimensions of its layer
/// change or it is explicitly cleared.
@@ -32,16 +31,16 @@ where
*self.state.borrow_mut() = State::Empty;
}
- /// Draws [`Geometry`] using the provided closure and stores it in the
+ /// Draws geometry using the provided closure and stores it in the
/// [`Cache`].
///
/// The closure will only be called when
/// - the bounds have changed since the previous draw call.
/// - the [`Cache`] is empty or has been explicitly cleared.
///
- /// Otherwise, the previously stored [`Geometry`] will be returned. The
+ /// Otherwise, the previously stored geometry will be returned. The
/// [`Cache`] is not cleared in this case. In other words, it will keep
- /// returning the stored [`Geometry`] if needed.
+ /// returning the stored geometry if needed.
pub fn draw(
&self,
renderer: &Renderer,
@@ -56,7 +55,7 @@ where
} = self.state.borrow().deref()
{
if *cached_bounds == bounds {
- return Geometry::load(geometry);
+ return Cached::load(geometry);
}
}
@@ -64,7 +63,7 @@ where
draw_fn(&mut frame);
let geometry = frame.into_geometry().cache();
- let result = Geometry::load(&geometry);
+ let result = Cached::load(&geometry);
*self.state.borrow_mut() = State::Filled { bounds, geometry };
@@ -99,7 +98,7 @@ where
enum State<Geometry>
where
- Geometry: self::Geometry,
+ Geometry: Cached,
{
Empty,
Filled {
@@ -107,17 +106,3 @@ where
geometry: Geometry::Cache,
},
}
-
-impl<T> Geometry for Primitive<T> {
- type Cache = Arc<Self>;
-
- fn load(cache: &Arc<Self>) -> Self {
- Self::Cache {
- content: cache.clone(),
- }
- }
-
- fn cache(self) -> Arc<Self> {
- Arc::new(self)
- }
-}
diff --git a/graphics/src/geometry/frame.rs b/graphics/src/geometry/frame.rs
index e88c43b0..37e0df38 100644
--- a/graphics/src/geometry/frame.rs
+++ b/graphics/src/geometry/frame.rs
@@ -1,7 +1,10 @@
+//! Draw and generate geometry.
use crate::core::{Point, Radians, Rectangle, Size, Vector};
-use crate::geometry::{self, Geometry};
-use crate::geometry::{Fill, Path, Stroke, Text};
+use crate::geometry::{self, Fill, Path, Stroke, Text};
+use crate::Cached;
+/// The region of a surface that can be used to draw geometry.
+#[allow(missing_debug_implementations)]
pub struct Frame<Renderer>
where
Renderer: geometry::Renderer,
@@ -13,6 +16,7 @@ impl<Renderer> Frame<Renderer>
where
Renderer: geometry::Renderer,
{
+ /// Creates a new [`Frame`] with the given dimensions.
pub fn new(renderer: &Renderer, size: Size) -> Self {
Self {
raw: renderer.new_frame(size),
@@ -164,6 +168,7 @@ where
self.raw.scale_nonuniform(scale);
}
+ /// Turns the [`Frame`] into its underlying geometry.
pub fn into_geometry(self) -> Renderer::Geometry {
self.raw.into_geometry()
}
@@ -175,7 +180,7 @@ where
/// of each method.
#[allow(missing_docs)]
pub trait Backend: Sized {
- type Geometry: Geometry;
+ type Geometry: Cached;
fn width(&self) -> f32;
fn height(&self) -> f32;
diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index 6d0862ad..a682b89b 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -9,14 +9,15 @@
)]
#![forbid(rust_2018_idioms)]
#![deny(
- // missing_debug_implementations,
- // missing_docs,
+ missing_debug_implementations,
+ missing_docs,
unsafe_code,
unused_results,
rustdoc::broken_intra_doc_links
)]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
mod antialiasing;
+mod cached;
mod error;
mod primitive;
mod viewport;
@@ -38,6 +39,7 @@ pub mod image;
pub use antialiasing::Antialiasing;
pub use backend::Backend;
+pub use cached::Cached;
pub use compositor::Compositor;
pub use damage::Damage;
pub use error::Error;
diff --git a/graphics/src/mesh.rs b/graphics/src/mesh.rs
index 5be3ee5b..d671f494 100644
--- a/graphics/src/mesh.rs
+++ b/graphics/src/mesh.rs
@@ -75,6 +75,8 @@ pub struct GradientVertex2D {
pub gradient: gradient::Packed,
}
+/// A renderer capable of drawing a [`Mesh`].
pub trait Renderer: core::Renderer {
+ /// Draws the given [`Mesh`].
fn draw_mesh(&mut self, mesh: Mesh);
}
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 2fcb55aa..eb720495 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -58,18 +58,6 @@ impl<B: Backend> Renderer<B> {
) -> O {
f(&mut self.backend, &self.primitives)
}
-
- #[cfg(feature = "geometry")]
- pub fn draw_geometry<Geometry>(
- &mut self,
- layers: impl IntoIterator<Item = Geometry>,
- ) where
- Geometry: Into<Primitive<B::Primitive>>,
- {
- for layer in layers {
- self.draw_primitive(layer.into());
- }
- }
}
impl<B: Backend> iced_core::Renderer for Renderer<B> {
diff --git a/renderer/src/fallback.rs b/renderer/src/fallback.rs
index 659f253d..249da9e9 100644
--- a/renderer/src/fallback.rs
+++ b/renderer/src/fallback.rs
@@ -398,6 +398,7 @@ mod geometry {
use super::Renderer;
use crate::core::{Point, Radians, Size, Vector};
use crate::graphics::geometry::{self, Fill, Path, Stroke, Text};
+ use crate::graphics::Cached;
impl<L, R> geometry::Renderer for Renderer<L, R>
where
@@ -432,10 +433,10 @@ mod geometry {
Right(R),
}
- impl<L, R> geometry::Geometry for Geometry<L, R>
+ impl<L, R> Cached for Geometry<L, R>
where
- L: geometry::Geometry,
- R: geometry::Geometry,
+ L: Cached,
+ R: Cached,
{
type Cache = Geometry<L::Cache, R::Cache>;
diff --git a/widget/src/canvas/program.rs b/widget/src/canvas/program.rs
index 3ba31474..a7ded0f4 100644
--- a/widget/src/canvas/program.rs
+++ b/widget/src/canvas/program.rs
@@ -38,7 +38,14 @@ where
(event::Status::Ignored, None)
}
- /// Draws the state of the [`Program`] with the given [`Renderer`].
+ /// Draws the state of the [`Program`], producing a bunch of [`Geometry`].
+ ///
+ /// [`Geometry`] can be easily generated with a [`Frame`] or stored in a
+ /// [`Cache`].
+ ///
+ /// [`Geometry`]: crate::canvas::Geometry
+ /// [`Frame`]: crate::canvas::Frame
+ /// [`Cache`]: crate::canvas::Cache
fn draw(
&self,
state: &Self::State,