lisk77/comet
1
0
Fork 0
mirror of https://github.com/lisk77/comet.git synced 2025-10-23 21:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(math): moved the common permutation function outside the impls

Browse source
This commit is contained in:
lisk77 2025-08-03 02:06:50 +02:00
parent b290f98b11
commit ae9918c9b9
1 changed files with 286 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

138
crates/comet_math/src/noise.rs
View file

@ -1,8 +1,26 @@
use image::{DynamicImage, GenericImage, GenericImageView, Rgba};
use rand::Rng;
use comet_log::debug;
use crate::v2;
use crate::lerp;
use image::{DynamicImage, GenericImage, Rgba};
use rand::Rng;
fn permutation(seed: i32, value: i32) -> i32 {
const P: [i32; 256] = [
151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, 30,
69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94,
252, 219, 203, 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171,
168, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60,
211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102, 143, 54, 65, 25, 63, 161, 1,
216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86,
164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118,
126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170,
213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39,
253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218, 246, 97, 228, 251, 34,
242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, 14, 239, 107, 49,
192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254,
138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, 180,
];
P[((value ^ seed) & 255) as usize]
}
// TODO
// Make noise struct keep their generated noise
@ -22,7 +40,7 @@ impl WhiteNoise {
/// Creates a white noise generator ideal for multiple uses.
pub fn new(width: usize, height: usize) -> Self {
Self {
size: (width, height)
size: (width, height),
}
}
@ -139,7 +157,7 @@ impl PerlinNoise {
let nx = x as f64 / self.size.0 as f64;
let ny = y as f64 / self.size.1 as f64;
let value = self.perlin(nx * self.frequency, ny * self.frequency);
noise.push((value+1.0) * 0.5);
noise.push((value + 1.0) * 0.5);
}
}
@ -158,7 +176,8 @@ impl PerlinNoise {
for x in 0..self.size.0 {
let nx = x as f64 / self.size.0 as f64;
let ny = y as f64 / self.size.1 as f64;
noise[y * self.size.0 + x] += self.perlin(nx * frequency, ny * frequency) as f32 * amplitude as f32;
noise[y * self.size.0 + x] +=
self.perlin(nx * frequency, ny * frequency) as f32 * amplitude as f32;
}
}
max_value += amplitude;
@ -167,14 +186,17 @@ impl PerlinNoise {
}
// Normalize the noise to the range [0, 1]
noise.iter_mut().for_each(|value| *value /= max_value as f32);
noise
.iter_mut()
.for_each(|value| *value /= max_value as f32);
noise.iter_mut().for_each(|value| *value = (*value + 1.0) * 0.5);
noise
.iter_mut()
.for_each(|value| *value = (*value + 1.0) * 0.5);
noise
}
/// A raw Perlin noise function implementation.
fn perlin(&self, x: f64, y: f64) -> f32 {
let xi = x.floor() as i32 & 255;
@ -186,16 +208,32 @@ impl PerlinNoise {
let u = Self::fade(xf);
let v = Self::fade(yf);
let a = self.permutation(xi) + yi;
let b = self.permutation(xi + 1) + yi;
let a = permutation(self.seed as i32, xi) + yi;
let b = permutation(self.seed as i32, xi + 1) + yi;
let aa = self.permutation(a);
let ab = self.permutation(a + 1);
let ba = self.permutation(b);
let bb = self.permutation(b + 1);
let aa = permutation(self.seed as i32, a);
let ab = permutation(self.seed as i32, a + 1);
let ba = permutation(self.seed as i32, b);
let bb = permutation(self.seed as i32, b + 1);
let x1 = lerp(u as f32, Self::grad(self.permutation(aa), xf, yf) as f32, Self::grad(self.permutation(ba), xf - 1.0, yf) as f32);
let x2 = lerp(u as f32, Self::grad(self.permutation(ab), xf, yf - 1.0) as f32, Self::grad(self.permutation(bb), xf - 1.0, yf - 1.0) as f32);
let x1 = lerp(
u as f32,
Self::grad(permutation(self.seed as i32, aa), xf, yf) as f32,
Self::grad(permutation(self.seed as i32, ba), xf - 1.0, yf) as f32,
);
let x2 = lerp(
u as f32,
Self::grad(
permutation(self.seed as i32, permutation(self.seed as i32, ab)),
xf,
yf - 1.0,
) as f32,
Self::grad(
permutation(self.seed as i32, permutation(self.seed as i32, bb)),
xf - 1.0,
yf - 1.0,
) as f32,
);
lerp(v as f32, x1, x2)
}
@ -204,34 +242,12 @@ impl PerlinNoise {
t * t * t * (t * (t * 6.0 - 15.0) + 10.0)
}
fn lerp(t: f64, a: f64, b: f64) -> f64 {
a + t * (b - a)
}
fn grad(hash: i32, x: f64, y: f64) -> f64 {
let h = hash & 3;
let u = if h & 2 == 0 { x } else { -x };
let v = if h & 1 == 0 { y } else { -y };
u + v
}
fn permutation(&self, value: i32) -> i32 {
const P: [i32; 256] = [
151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, 30, 69, 142, 8, 99, 37, 240,
21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, 35, 11, 32, 57, 177, 33, 88,
237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, 158, 231,
83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102, 143, 54, 65, 25, 63, 161,
1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86, 164, 100, 109,
198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206,
59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153,
101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218,
246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, 14, 239, 107,
49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205,
93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, 180
];
P[((value ^ self.seed as i32) & 255) as usize]
}
}
pub struct ValueNoise {
@ -249,49 +265,28 @@ impl ValueNoise {
}
}
fn permutation(&self, value: i32) -> i32 {
const P: [i32; 256] = [
151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, 30, 69, 142, 8, 99, 37, 240,
21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, 35, 11, 32, 57, 177, 33, 88,
237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, 158, 231,
83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102, 143, 54, 65, 25, 63, 161,
1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86, 164, 100, 109,
198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206,
59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153,
101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218,
246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, 14, 239, 107,
49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205,
93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, 180
];
P[((value ^ self.seed as i32) & 255) as usize]
}
fn noise(&self, p: (f32, f32)) -> f32 {
let i = (p.0.floor() as i32, p.1.floor() as i32);
let f = (p.0.fract(), p.1.fract());
// cubic interpolant
let u = (
f.0 * f.0 * (3.0 - 2.0 * f.0),
f.1 * f.1 * (3.0 - 2.0 * f.1)
);
let u = (f.0 * f.0 * (3.0 - 2.0 * f.0), f.1 * f.1 * (3.0 - 2.0 * f.1));
let a = self.permutation(i.0) + i.1;
let b = self.permutation(i.0 + 1) + i.1;
let a = permutation(self.seed as i32, i.0) + i.1;
let b = permutation(self.seed as i32, i.0 + 1) + i.1;
lerp(
lerp(
self.permutation(a) as f32 / 255.0 * 2.0 - 1.0,
self.permutation(b) as f32 / 255.0 * 2.0 - 1.0,
u.0
permutation(self.seed as i32, a) as f32 / 255.0 * 2.0 - 1.0,
permutation(self.seed as i32, b) as f32 / 255.0 * 2.0 - 1.0,
u.0,
),
lerp(
self.permutation(a + 1) as f32 / 255.0 * 2.0 - 1.0,
self.permutation(b + 1) as f32 / 255.0 * 2.0 - 1.0,
u.0
permutation(self.seed as i32, a + 1) as f32 / 255.0 * 2.0 - 1.0,
permutation(self.seed as i32, b + 1) as f32 / 255.0 * 2.0 - 1.0,
u.0,
),
u.1
u.1,
)
}
@ -336,7 +331,6 @@ impl ValueNoise {
noise
}
pub fn generate_with_octaves(&self, octaves: u32, persistence: f64) -> Vec<f32> {
let mut noise = Vec::with_capacity(self.size.0 * self.size.1);
let mut max_amplitude = 0.0;