sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplex & Perlin fully work now (all dimensions) + dynaTerrain removed temp

Browse Source
This commit is contained in:
Remi Beges
2012-06-07 13:10:58 +02:00
parent 5d7f8acbc8
commit ebba6adae4
23 changed files with 354 additions and 1124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
include/Nazara/Noise/Simplex3D.inl
View File

@@ -5,21 +5,19 @@
//#include <Nazara/Noise/Error.hpp>
//#include <Nazara/Noise/Config.hpp>
//#include <Nazara/Noise/Debug.hpp>
#include <iostream>
template <typename T>
NzSimplex3D<T>::NzSimplex3D()
{
SkewCoeff3D = 1/3;
UnskewCoeff3D = 1/6;
SkewCoeff3D = 1/3.;
UnskewCoeff3D = 1/6.;
int grad3Temp[][3] = {
{1,1,0},{-1,1,0},{1,-1,0},{-1,-1,0},
{1,0,1},{-1,0,1},{1,0,-1},{-1,0,-1},
{0,1,1},{0,-1,1},{0,1,-1},{0,-1,-1},
{1,1,0},{-1,1,0},{0,-1,1},{0,-1,-1}
};
int grad3Temp[][3] = {{1,1,0},{-1,1,0},{1,-1,0},{-1,-1,0},
{1,0,1},{-1,0,1},{1,0,-1},{-1,0,-1},
{0,1,1},{0,-1,1},{0,1,-1},{0,-1,-1}};
for(int i(0) ; i < 16 ; ++i)
for(int i(0) ; i < 12 ; ++i)
for(int j(0) ; j < 3 ; ++j)
gradient3[i][j] = grad3Temp[i][j];
}
@@ -31,21 +29,23 @@ T NzSimplex3D<T>::GetValue(T x, T y, T z, T res)
y /= res;
z /= res;
Origin.x = fastfloor(x + (x + y + z) * SkewCoeff3D);
Origin.y = fastfloor(y + (x + y + z) * SkewCoeff3D);
Origin.z = fastfloor(z + (x + y + z) * SkewCoeff3D);
sum = (x + y + z) * SkewCoeff3D;
skewedCubeOrigin.x = fastfloor(x + sum);
skewedCubeOrigin.y = fastfloor(y + sum);
skewedCubeOrigin.z = fastfloor(z + sum);
A.x = Origin.x - (Origin.x + Origin.y + Origin.z) * UnskewCoeff3D;
A.y = Origin.y - (Origin.x + Origin.y + Origin.z) * UnskewCoeff3D;
A.z = Origin.z - (Origin.x + Origin.y + Origin.z) * UnskewCoeff3D;
sum = (skewedCubeOrigin.x + skewedCubeOrigin.y + skewedCubeOrigin.z) * UnskewCoeff3D;
unskewedCubeOrigin.x = skewedCubeOrigin.x - sum;
unskewedCubeOrigin.y = skewedCubeOrigin.y - sum;
unskewedCubeOrigin.z = skewedCubeOrigin.z - sum;
IsoOriginDist.x = x - A.x;
IsoOriginDist.y = y - A.y;
IsoOriginDist.z = z - A.z;
unskewedDistToOrigin.x = x - unskewedCubeOrigin.x;
unskewedDistToOrigin.y = y - unskewedCubeOrigin.y;
unskewedDistToOrigin.z = z - unskewedCubeOrigin.z;
if(IsoOriginDist.x >= IsoOriginDist.y)
if(unskewedDistToOrigin.x >= unskewedDistToOrigin.y)
{
if(IsoOriginDist.y >= IsoOriginDist.z)
if(unskewedDistToOrigin.y >= unskewedDistToOrigin.z)
{
off1.x = 1;
off1.y = 0;
@@ -54,7 +54,7 @@ T NzSimplex3D<T>::GetValue(T x, T y, T z, T res)
off2.y = 1;
off2.z = 0;
}
else if(IsoOriginDist.x >= IsoOriginDist.z)
else if(unskewedDistToOrigin.x >= unskewedDistToOrigin.z)
{
off1.x = 1;
off1.y = 0;
@@ -75,7 +75,7 @@ T NzSimplex3D<T>::GetValue(T x, T y, T z, T res)
}
else
{
if(IsoOriginDist.y < IsoOriginDist.z)
if(unskewedDistToOrigin.y < unskewedDistToOrigin.z)
{
off1.x = 0;
off1.y = 0;
@@ -84,7 +84,7 @@ T NzSimplex3D<T>::GetValue(T x, T y, T z, T res)
off2.y = 1;
off2.z = 1;
}
else if(IsoOriginDist.x < IsoOriginDist.z)
else if(unskewedDistToOrigin.x < unskewedDistToOrigin.z)
{
off1.x = 0;
off1.y = 1;
@@ -104,35 +104,28 @@ T NzSimplex3D<T>::GetValue(T x, T y, T z, T res)
}
}
d1.x = A.x - x;
d1.y = A.y - y;
d1.z = A.z - z;
d1 = unskewedDistToOrigin;
d2.x = d1.x + off1.x - UnskewCoeff3D;
d2.y = d1.y + off1.y - UnskewCoeff3D;
d2.z = d1.z + off1.z - UnskewCoeff3D;
d2.x = d1.x - off1.x + UnskewCoeff3D;
d2.y = d1.y - off1.y + UnskewCoeff3D;
d2.z = d1.z - off1.z + UnskewCoeff3D;
d3.x = d1.x + off2.x - 2*UnskewCoeff3D;
d3.y = d1.y + off2.y - 2*UnskewCoeff3D;
d3.z = d1.z + off2.z - 2*UnskewCoeff3D;
d3.x = d1.x - off2.x + 2*UnskewCoeff3D;
d3.y = d1.y - off2.y + 2*UnskewCoeff3D;
d3.z = d1.z - off2.z + 2*UnskewCoeff3D;
d4.x = d1.x + 1.0 - 3*UnskewCoeff3D;
d4.y = d1.y + 1.0 - 3*UnskewCoeff3D;
d4.z = d1.z + 1.0 - 3*UnskewCoeff3D;
d4.x = d1.x - 1.0 + 3*UnskewCoeff3D;
d4.y = d1.y - 1.0 + 3*UnskewCoeff3D;
d4.z = d1.z - 1.0 + 3*UnskewCoeff3D;
ii = Origin.x & 255;
jj = Origin.y & 255;
kk = Origin.z & 255;
ii = skewedCubeOrigin.x & 255;
jj = skewedCubeOrigin.y & 255;
kk = skewedCubeOrigin.z & 255;
gi0 = perm[ii + perm[jj + perm[kk]]] % 12;
gi0 = perm[ii + perm[jj + perm[kk ]]] % 12;
gi1 = perm[ii + off1.x + perm[jj + off1.y + perm[kk + off1.z]]] % 12;
gi2 = perm[ii + off2.x + perm[jj + off2.y + perm[kk + off2.z]]] % 12;
gi3 = perm[ii + 1 + perm[jj + 1 + perm[kk + 1]]] % 12;
n1 = gradient3[gi0][0] * d1.x + gradient3[gi0][1] * d1.y + gradient3[gi0][2] * d1.z;
n2 = gradient3[gi1][0] * d2.x + gradient3[gi1][1] * d2.y + gradient3[gi1][2] * d2.z;
n3 = gradient3[gi2][0] * d3.x + gradient3[gi2][1] * d3.y + gradient3[gi2][2] * d3.z;
n4 = gradient3[gi3][0] * d4.x + gradient3[gi3][1] * d4.y + gradient3[gi3][2] * d4.z;
gi3 = perm[ii + 1 + perm[jj + 1 + perm[kk + 1 ]]] % 12;
c1 = 0.6 - d1.x * d1.x - d1.y * d1.y - d1.z * d1.z;
c2 = 0.6 - d2.x * d2.x - d2.y * d2.y - d2.z * d2.z;
@@ -140,19 +133,25 @@ T NzSimplex3D<T>::GetValue(T x, T y, T z, T res)
c4 = 0.6 - d4.x * d4.x - d4.y * d4.y - d4.z * d4.z;
if(c1 < 0)
c1 = 0;
n1 = 0;
else
n1 = c1*c1*c1*c1*(gradient3[gi0][0] * d1.x + gradient3[gi0][1] * d1.y + gradient3[gi0][2] * d1.z);
if(c2 < 0)
c2 = 0;
n2 = 0;
else
n2 = c2*c2*c2*c2*(gradient3[gi1][0] * d2.x + gradient3[gi1][1] * d2.y + gradient3[gi1][2] * d2.z);
if(c3 < 0)
c3 = 0;
n3 = 0;
else
n3 = c3*c3*c3*c3*(gradient3[gi2][0] * d3.x + gradient3[gi2][1] * d3.y + gradient3[gi2][2] * d3.z);
if(c4 < 0)
c4 = 0;
n4 = 0;
else
n4 = c4*c4*c4*c4*(gradient3[gi3][0] * d4.x + gradient3[gi3][1] * d4.y + gradient3[gi3][2] * d4.z);
n1 = c1*c1*c1*n1;
n2 = c2*c2*c2*n2;
n3 = c3*c3*c3*n3;
n4 = c4*c4*c4*n4;
return (n1+n2+n3+n4)*17.6995;
return (n1+n2+n3+n4)*32;
}