Merge Develop

Author: dudochkin-victor

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ux-primitives"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["Victor Dudochkin <dudochkin.victor@gmail.com>"]
 readme = "README.md"
 homepage = "https://angular-rust.github.io/ux-primitives"
@@ -19,19 +19,16 @@ maintenance = { status = "actively-developed" }
 name = "primitives"
 
 [features]
-canvas = ["euclid", "lyon_geom", "lyon_path"]
-geom = ["euclid", "lyon_geom", "lyon_path"]
 color_from_css = []
 color_quantization = []
 experimental = []
 
 [dependencies]
 intmap = "0.7"
-lyon_geom = { version = "0.17", optional = true }
-lyon_path = { version = "0.17", optional = true }
-euclid = { version = "0.22", optional = true }
 lazy_static = "1.4.0"
 bytes = "1.0"
+num-traits = "0.2.14"
+# cgmath = "0.18"
 
 [dev-dependencies]
 libmath = "0.2.1"

Makefile

@@ -29,7 +29,7 @@
 
 UX Primitives is a core graphic and color abstraction for Angular Rust.
 
-**Angular Rust** is a high productivity, `platform-agnostic` frontend framework for the [Rust language](https://www.rust-lang.org/). It now supports desktop and web development. Angular Rust currently uses GTK for desktop development and WebAssembly for web development. We are planning to add support for mobile development.
+**Angular Rust** is a high productivity, `platform-agnostic` frontend framework for the [Rust language](https://www.rust-lang.org/). It now supports desktop and web development. Angular Rust currently uses Clutter for desktop development and WebAssembly for web development. We are planning to add support for mobile development.
 
 ![Angular Rust structure](https://dudochkin-victor.github.io/assets/angular-rust/structure.svg)
 

Makefile.toml

@@ -0,0 +1,41 @@
+use super::Point;
+
+/// A 2d axis aligned rectangle represented by its minimum and maximum coordinates.
+///
+/// # Representation
+///
+/// This struct is similar to [`Rect`], but stores rectangle as two endpoints
+/// instead of origin point and size. Such representation has several advantages over
+/// [`Rect`] representation:
+/// - Several operations are more efficient with `Box2D`, including [`intersection`],
+///   [`union`], and point-in-rect.
+/// - The representation is less susceptible to overflow. With [`Rect`], computation
+///   of second point can overflow for a large range of values of origin and size.
+///   However, with `Box2D`, computation of [`size`] cannot overflow if the coordinates
+///   are signed and the resulting size is unsigned.
+///
+/// A known disadvantage of `Box2D` is that translating the rectangle requires translating
+/// both points, whereas translating [`Rect`] only requires translating one point.
+///
+/// # Empty box
+///
+/// A box is considered empty (see [`is_empty`]) if any of the following is true:
+/// - it's area is empty,
+/// - it's area is negative (`min.x > max.x` or `min.y > max.y`),
+/// - it contains NaNs.
+///
+/// [`Rect`]: struct.Rect.html
+/// [`intersection`]: #method.intersection
+/// [`is_empty`]: #method.is_empty
+/// [`union`]: #method.union
+/// [`size`]: #method.size
+#[repr(C)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(
+    feature = "serde",
+    serde(bound(serialize = "T: Serialize", deserialize = "T: Deserialize<'de>"))
+)]
+pub struct Box2D<T> {
+    pub min: Point<T>,
+    pub max: Point<T>,
+}

README.md

@@ -0,0 +1,13 @@
+use crate::Point3D;
+
+/// An axis aligned 3D box represented by its minimum and maximum coordinates.
+#[repr(C)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(
+    feature = "serde",
+    serde(bound(serialize = "T: Serialize", deserialize = "T: Deserialize<'de>"))
+)]
+pub struct Box3D<T> {
+    pub min: Point3D<T>,
+    pub max: Point3D<T>,
+}

src/angle.rs

@@ -1,20 +1,19 @@
-#![cfg(feature = "canvas")]
-#![allow(unused_imports)]
 #![allow(clippy::too_many_arguments)]
 
-use crate::{BaseLine, Color, TextAlign, TextStyle, TextWeight};
+use crate::{colorspace::Color, BaseLine, Gradient, TextAlign, FontStyle, FontWeight};
 
-mod style;
-pub use style::*;
-
-mod image;
-pub use image::*;
-
-mod direction;
-pub use direction::*;
+#[derive(Copy, Clone, Debug)]
+pub enum Direction {
+    Ltr,
+    Rtl,
+    Inherit,
+}
 
-mod text_metrics;
-pub use text_metrics::*;
+#[derive(Copy, Clone, Debug)]
+pub struct TextMetrics {
+    pub width: f64,
+    pub height: f64,
+}
 
 #[derive(Clone, Copy, Debug)]
 pub enum LineCap {
@@ -57,7 +56,8 @@ impl Default for PatternExtend {
     }
 }
 
-pub trait CanvasContext<P> {
+pub trait CanvasContext {
+    type Pattern;
     // /// Get current global transformation matrix
     // fn get_current_transform(&self) -> Matrix<f64>;
 
@@ -77,7 +77,7 @@ pub trait CanvasContext<P> {
     fn set_fill_gradient(&self, value: &Gradient);
 
     /// Set fill pattern
-    fn set_fill_pattern(&self, value: &P);
+    fn set_fill_pattern(&self, value: &Self::Pattern);
 
     /// Get filter
     fn get_filter(&self) -> String;
@@ -89,7 +89,7 @@ pub trait CanvasContext<P> {
     fn get_font(&self) -> String;
 
     /// Set direction
-    fn set_font(&self, family: &str, style: TextStyle, weight: TextWeight, size: f64);
+    fn set_font(&self, family: &str, style: FontStyle, weight: FontWeight, size: f64);
 
     /// Get global alpha
     fn get_global_alpha(&self) -> f64;
@@ -177,7 +177,7 @@ pub trait CanvasContext<P> {
     fn set_stroke_gradient(&self, value: &Gradient);
 
     /// Set stroke pattern
-    fn set_stroke_pattern(&self, value: &P);
+    fn set_stroke_pattern(&self, value: &Self::Pattern);
 
     /// Get text align
     fn get_text_align(&self) -> TextAlign;
@@ -322,7 +322,7 @@ pub trait CanvasContext<P> {
     // fn scrollPathIntoView(path: Path2D); // TODO:
 
     /// Set line dash
-    fn set_line_dash(&self, dash: Vec<f64>);
+    fn set_line_dash(&self, dash: &[f64]);
 
     /// Set transform matrix
     fn set_transform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64);