Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve documentation of fj crate #411

Merged
merged 5 commits into from
Mar 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions fj/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,22 @@
//!
//! [Fornjot repository]: https://github.com/hannobraun/Fornjot

#![deny(missing_docs)]

pub mod syntax;

mod shape_2d;
mod shape_3d;
mod syntax;

pub mod prelude {
pub use crate::syntax::{
Difference as _, Group as _, Rotate as _, Sketch as _, Sweep as _,
Translate as _,
};
}

pub use self::{shape_2d::*, shape_3d::*};

/// A shape
#[derive(Clone, Debug)]
#[repr(C)]
pub enum Shape {
/// A 2D shape
Shape2d(Shape2d),

/// A 3D shape
Shape3d(Shape3d),
}
4 changes: 4 additions & 0 deletions fj/src/shape_2d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ impl Circle {
}
}

/// Access the circle's radius
pub fn radius(&self) -> f64 {
self.radius
}
Expand Down Expand Up @@ -91,6 +92,7 @@ pub struct Difference2d {
}

impl Difference2d {
/// Create a `Difference2d` from two shapes
pub fn from_objects(a: Shape2d, b: Shape2d) -> Self {
Self { a, b }
}
Expand All @@ -100,10 +102,12 @@ impl Difference2d {
self.a.color()
}

/// Access the original shape
pub fn a(&self) -> &Shape2d {
&self.a
}

/// Access the shape being subtracted
pub fn b(&self) -> &Shape2d {
&self.b
}
Expand Down
4 changes: 4 additions & 0 deletions fj/src/shape_3d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,22 @@ pub struct Sweep {
}

impl Sweep {
/// Create a `Sweep` from a shape and a length
pub fn from_shape_and_length(shape: Shape2d, length: f64) -> Self {
Self { shape, length }
}

/// Access the shape being swept
pub fn shape(&self) -> &Shape2d {
&self.shape
}

/// Access the length of the sweep
pub fn length(&self) -> f64 {
self.length
}

/// Access the color of the shape being swept
pub fn color(&self) -> [u8; 4] {
self.shape().color()
}
Expand Down
30 changes: 30 additions & 0 deletions fj/src/syntax.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
//! Convenient syntax for `fj` operations
//!
//! This model defines extension traits, which provide convenient syntax for
//! the various operations defined in this trait.

/// Convenient syntax to create an [`fj::Difference2d`]
///
/// [`fj::Difference2d`]: crate::Difference2d
pub trait Difference {
/// Create a difference between `self` and `other`
fn difference<Other>(&self, other: &Other) -> crate::Difference2d
where
Other: Clone + Into<crate::Shape2d>;
Expand All @@ -19,7 +28,11 @@ where
}
}

/// Convenient syntax to create an [`fj::Group`]
///
/// [`fj::Group`]: crate::Group
pub trait Group {
/// Create a group with `self` and `other`
fn group<Other>(&self, other: &Other) -> crate::Group
where
Other: Clone + Into<crate::Shape3d>;
Expand All @@ -40,6 +53,9 @@ where
}
}

/// Convenient syntax to create an [`fj::Transform`]
///
/// [`fj::Transform`]: crate::Transform
pub trait Rotate {
/// Create a rotation
///
Expand All @@ -63,7 +79,14 @@ where
}
}

/// Convenient syntax to create an [`fj::Sketch`]
///
/// [`fj::Sketch`]: crate::Sketch
pub trait Sketch {
/// Create a sketch from `self`
///
/// Can be called on any type that implements `AsRef<[[f64; 2]]`, which is
/// implemented for types like slices, arrays, or `Vec`.
fn sketch(&self) -> crate::Sketch;
}

Expand All @@ -76,7 +99,11 @@ where
}
}

/// Convenient syntax to create an [`fj::Sweep`]
///
/// [`fj::Sweep`]: crate::Sweep
pub trait Sweep {
/// Sweep `self` along the z-axis by `length`
fn sweep(&self, length: f64) -> crate::Sweep;
}

Expand All @@ -90,6 +117,9 @@ where
}
}

/// Convenient syntax to create an [`fj::Transform`]
///
/// [`fj::Transform`]: crate::Transform
pub trait Translate {
/// Create a translation
///
Expand Down
2 changes: 1 addition & 1 deletion models/group/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::HashMap;

use fj::prelude::*;
use fj::syntax::*;

#[no_mangle]
pub extern "C" fn model(_: &HashMap<String, String>) -> fj::Shape {
Expand Down
2 changes: 1 addition & 1 deletion models/spacer/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::HashMap;

use fj::prelude::*;
use fj::syntax::*;

#[no_mangle]
pub extern "C" fn model(args: &HashMap<String, String>) -> fj::Shape {
Expand Down