hodasemi/cgmath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Generalise noise methods to take generic Dimensioned types

Browse source
This commit is contained in:
Brendan Zabarauskas 2013-07-25 12:57:14 +10:00
parent df3ce2935c
commit 5fecb8fc81
3 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/perlin.rs
View file

@ -21,7 +21,6 @@ extern mod lmath;
use std::uint::range;
use lmath::noise::perlin::Perlin;
use lmath::math::Point2;
static WIDTH: uint = 100;
static HEIGHT: uint = 100;
@ -34,10 +33,9 @@ fn main() {
for range(0, HEIGHT) |y| {
for range(0, WIDTH) |x| {
pixels[y][x] = perlin.noise2(
Point2::new(x as f32 * 0.1f32,
y as f32 * 0.1f32)
) * 0.5f32 + 0.5f32;
pixels[y][x] = perlin.noise2([
x as f32 * 0.1f32, y as f32 * 0.1f32
]) * 0.5f32 + 0.5f32;
};
};

24
src/noise/perlin.rs
View file

@ -18,7 +18,7 @@
use std::num::cast;
use math::{Point2, Point3};
use math::Dimensioned;
pub struct Perlin<T> {
// permutation table
@ -31,24 +31,24 @@ impl<T:Clone + Float> Perlin<T> {
Perlin { ptable: P }
}
pub fn noise1(&self, t: T) -> T {
self.noise3(Point3::new(t, zero!(T), zero!(T)))
pub fn noise1<V:Dimensioned<T,[T,..1]>>(&self, v: V) -> T {
self.noise3([v.i(0).clone(), zero!(T), zero!(T)])
}
pub fn noise2(&self, pos: Point2<T>) -> T {
self.noise3(Point3::new(pos.x.clone(), pos.y.clone(), zero!(T)))
pub fn noise2<V:Dimensioned<T,[T,..2]>>(&self, v: V) -> T {
self.noise3([v.i(0).clone(), v.i(1).clone(), zero!(T)])
}
pub fn noise3(&self, pos: Point3<T>) -> T {
pub fn noise3<V:Dimensioned<T,[T,..3]>>(&self, v: V) -> T {
// Find the unit cube that contains the point
let X = pos.x.floor().to_uint() & 255;
let Y = pos.y.floor().to_uint() & 255;
let Z = pos.z.floor().to_uint() & 255;
let X = v.i(0).floor().to_uint() & 255;
let Y = v.i(1).floor().to_uint() & 255;
let Z = v.i(2).floor().to_uint() & 255;
// Find the relative X, Y, Z of point in the cube
let x = pos.x - pos.x.floor();
let y = pos.y - pos.y.floor();
let z = pos.z - pos.z.floor();
let x = *v.i(0) - v.i(0).floor();
let y = *v.i(1) - v.i(1).floor();
let z = *v.i(2) - v.i(2).floor();
// Compute the fade curves for X, Y, Z
let u = fade(x.clone());

9
src/noise/simplex.rs
View file

@ -13,8 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use math::Vec4;
use math::{Point2, Point3};
use math::Dimensioned;
pub struct Simplex<T>;
@ -23,15 +22,15 @@ impl<T> Simplex<T> {
fail!("Not yet implemented!")
}
pub fn noise2(&self, _pos: Point2<T>) -> T {
pub fn noise2<V:Dimensioned<T,[T,..2]>>(&self, _v: V) -> T {
fail!("Not yet implemented!")
}
pub fn noise3(&self, _pos: Point3<T>) -> T {
pub fn noise3<V:Dimensioned<T,[T,..3]>>(&self, _v: V) -> T {
fail!("Not yet implemented!")
}
pub fn noise4(&self, _vec: Vec4<T>) -> T {
pub fn noise4<V:Dimensioned<T,[T,..4]>>(&self, _v: V) -> T {
fail!("Not yet implemented!")
}
}