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.

Sign up for GitHub

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

Re-Implement f32 #272

Draft
wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft

Re-Implement f32 #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
20f71e1
Use generics for NoiseHasher in the core functions
Razaekel Jul 24, 2021
2661704
Missed one
Razaekel Jul 29, 2021
1742f7b
First pass: make generic where possible
Razaekel Jul 30, 2021
a1c0096
Add f32 implementation to Simplex
Razaekel Jul 31, 2021
2ca52d8
Add f32 implementation to Perlin
Razaekel Sep 12, 2021
456407c
Add f32 to the fractal generators
Razaekel Sep 12, 2021
c6db354
Add f32 to turbulence
Razaekel Sep 12, 2021
84977a2
Use f32 for image generation instead of f64
Razaekel Sep 12, 2021
a27798d
Cleanup
Razaekel Sep 12, 2021
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
2 changes: 1 addition & 1 deletion examples/power.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
extern crate noise;

use noise::{utils::*, Perlin, Power, Seedable};
use noise::{utils::*, Perlin, Power};

fn main() {
let perlin1 = Perlin::default();
Expand Down
58 changes: 33 additions & 25 deletions src/core/open_simplex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@ use crate::{
permutationtable::NoiseHasher,
};

pub fn open_simplex_2d(point: [f64; 2], hasher: &impl NoiseHasher) -> f64 {
pub fn open_simplex_2d<NH>(point: [f64; 2], hasher: &NH) -> f64
where
NH: NoiseHasher + ?Sized,
{
const STRETCH_CONSTANT: f64 = -0.211_324_865_405_187; //(1/sqrt(2+1)-1)/2;
const SQUISH_CONSTANT: f64 = 0.366_025_403_784_439; //(sqrt(2+1)-1)/2;
const NORM_CONSTANT: f64 = 1.0 / 14.0;

fn gradient(hasher: &impl NoiseHasher, vertex: Vector2<f64>, pos: Vector2<f64>) -> f64 {
let attn = 2.0 - pos.magnitude_squared();
fn surflet(index: usize, point: Vector2<f64>) -> f64 {
let t = 2.0 - point.magnitude_squared();

if attn > 0.0 {
let index = hasher.hash(&vertex.numcast().unwrap().into_array());
let vec = Vector2::from(gradient::grad2(index));
attn.powi(4) * pos.dot(vec)
if t > 0.0 {
let gradient = Vector2::from(gradient::grad2(index));
t.powi(4) * point.dot(gradient)
} else {
0.0
}
Expand Down Expand Up @@ -48,9 +50,10 @@ pub fn open_simplex_2d(point: [f64; 2], hasher: &impl NoiseHasher) -> f64 {
{
let offset = Vector2::new($x, $y);
let vertex = stretched_floor + offset;
let index = hasher.hash(&vertex.numcast().unwrap().into_array());
let dpos = rel_pos - (Vector2::broadcast(SQUISH_CONSTANT) * offset.sum()) - offset;

gradient(hasher, vertex, dpos)
surflet(index, dpos)
}
}
);
Expand Down Expand Up @@ -82,18 +85,20 @@ pub fn open_simplex_2d(point: [f64; 2], hasher: &impl NoiseHasher) -> f64 {
value * NORM_CONSTANT
}

pub fn open_simplex_3d(point: [f64; 3], hasher: &impl NoiseHasher) -> f64 {
pub fn open_simplex_3d<NH>(point: [f64; 3], hasher: &NH) -> f64
where
NH: NoiseHasher,
{
const STRETCH_CONSTANT: f64 = -1.0 / 6.0; //(1/Math.sqrt(3+1)-1)/3;
const SQUISH_CONSTANT: f64 = 1.0 / 3.0; //(Math.sqrt(3+1)-1)/3;
const NORM_CONSTANT: f64 = 1.0 / 14.0;

fn gradient(hasher: &impl NoiseHasher, vertex: Vector3<f64>, pos: Vector3<f64>) -> f64 {
let attn = 2.0 - pos.magnitude_squared();
fn surflet(index: usize, point: Vector3<f64>) -> f64 {
let t = 2.0 - point.magnitude_squared();

if attn > 0.0 {
let index = hasher.hash(&vertex.numcast().unwrap().into_array());
let vec = Vector3::from(gradient::grad3(index));
attn.powi(4) * pos.dot(vec)
if t > 0.0 {
let gradient = Vector3::from(gradient::grad3(index));
t.powi(4) * point.dot(gradient)
} else {
0.0
}
Expand Down Expand Up @@ -128,9 +133,10 @@ pub fn open_simplex_3d(point: [f64; 3], hasher: &impl NoiseHasher) -> f64 {
{
let offset = Vector3::new($x, $y, $z);
let vertex = stretched_floor + offset;
let index = hasher.hash(&vertex.numcast().unwrap().into_array());
let dpos = rel_pos - (Vector3::broadcast(SQUISH_CONSTANT) * offset.sum()) - offset;

gradient(hasher, vertex, dpos)
surflet(index, dpos)
}
}
);
Expand Down Expand Up @@ -190,20 +196,21 @@ pub fn open_simplex_3d(point: [f64; 3], hasher: &impl NoiseHasher) -> f64 {
value * NORM_CONSTANT
}

pub fn open_simplex_4d(point: [f64; 4], hasher: &impl NoiseHasher) -> f64 {
pub fn open_simplex_4d<NH>(point: [f64; 4], hasher: &NH) -> f64
where
NH: NoiseHasher + ?Sized,
{
const STRETCH_CONSTANT: f64 = -0.138_196_601_125_011; //(Math.sqrt(4+1)-1)/4;
const SQUISH_CONSTANT: f64 = 0.309_016_994_374_947; //(Math.sqrt(4+1)-1)/4;

const NORM_CONSTANT: f64 = 1.0 / 6.869_909_007_095_662_5;

#[inline(always)]
fn gradient(hasher: &impl NoiseHasher, vertex: Vector4<f64>, pos: Vector4<f64>) -> f64 {
let attn = 2.0 - pos.magnitude_squared();
fn surflet(index: usize, point: Vector4<f64>) -> f64 {
let t = 2.0 - point.magnitude_squared();

if attn > 0.0 {
let index = hasher.hash(&vertex.numcast().unwrap().into_array());
let vec = Vector4::from(gradient::grad4(index));
attn.powi(4) * pos.dot(vec)
if t > 0.0 {
let gradient = Vector4::from(gradient::grad4(index));
t.powi(4) * point.dot(gradient)
} else {
0.0
}
Expand Down Expand Up @@ -240,9 +247,10 @@ pub fn open_simplex_4d(point: [f64; 4], hasher: &impl NoiseHasher) -> f64 {
{
let offset = Vector4::new($x, $y, $z, $w);
let vertex = stretched_floor + offset;
let index = hasher.hash(&vertex.numcast().unwrap().into_array());
let dpos = rel_pos - (Vector4::broadcast(SQUISH_CONSTANT) * offset.sum()) - offset;

gradient(hasher, vertex, dpos)
surflet(index, dpos)
}
}
);
Expand Down
Loading