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

Add cone generator #309

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 2 additions & 1 deletion src/noise_fns/generators.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
pub use self::{
checkerboard::*, constant::*, cylinders::*, fractals::*, open_simplex::*, perlin::*,
perlin_surflet::*, simplex::*, super_simplex::*, value::*, worley::*,
perlin_surflet::*, simplex::*, super_simplex::*, value::*, worley::*, cone::*,
};

mod checkerboard;
mod constant;
mod cylinders;
mod cone;
mod fractals;
mod open_simplex;
mod perlin;
Expand Down
47 changes: 47 additions & 0 deletions src/noise_fns/generators/cone.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
use crate::noise_fns::NoiseFn;

/// Noise function that outputs a cone.
///
/// This noise function takes a 2d point and outputs a cone that is aligned along the z axis.
/// The origin has a value of 1 and points with a distance from the origin beyond the radius
/// of the cone are -1.
#[derive(Clone, Copy, Debug)]
pub struct Cone {
/// radius of the cone.
pub radius: f64,
}

impl Cone {
pub const DEFAULT_RADIUS: f64 = 1.0;

pub fn new() -> Self {
Self {
radius: Self::DEFAULT_RADIUS,
}
}

pub fn set_radius(self, radius: f64) -> Self {
Self { radius }
}
}

impl Default for Cone {
fn default() -> Self {
Self::new()
}
}

impl NoiseFn<f64, 2> for Cone {
fn get(&self, point: [f64; 2]) -> f64 {
let x = point[0];
let y = point[1];

// Calculate the distance of the point from the origin.
let dist_from_center = (x.powi(2) + y.powi(2)).sqrt();

match dist_from_center > self.radius{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should square the radius (you could even store the squared version) so you can avoid the sqrt() call above.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, I've moved the sqrt call inside the match expression so that it is only computed for case false.

true => -1f64,
false => 1.0 - 2.0*(dist_from_center / self.radius)
}
}
}