Skip to content

Commit

Permalink
Reformat: xrParticles
Browse files Browse the repository at this point in the history
  • Loading branch information
@invokr
invokr committed Jan 15, 2017
1 parent 848c60d commit cad7b7c
Show file tree
Hide file tree
Showing 16 changed files with 3,374 additions and 3,312 deletions.
333 changes: 170 additions & 163 deletions src/xrParticles/noise.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,197 +6,204 @@
#ifndef _EDITOR
#include <xmmintrin.h>

__forceinline int iFloor_SSE( float const x )
__forceinline int iFloor_SSE(float const x)
{
return _mm_cvtt_ss2si( _mm_set_ss( x ) );
return _mm_cvtt_ss2si(_mm_set_ss(x));
}
#endif

//==============================================================================
// Perlin's noise from Texturing and Modeling...
#define B 256

#define DOT(a,b) ( a[0]*b[0] + a[1]*b[1] + a[2]*b[2])
#define AT(rx,ry,rz) (rx*q[0] + ry*q[1] + rz*q[2] );
#define S_CURVE(t) ( t*t*(3.f-2.f*t) )
#define LERP(t, a, b) ( a + t*(b-a) )
#define DOT(a, b) (a[0] * b[0] + a[1] * b[1] + a[2] * b[2])
#define AT(rx, ry, rz) (rx * q[0] + ry * q[1] + rz * q[2]);
#define S_CURVE(t) (t * t * (3.f - 2.f * t))
#define LERP(t, a, b) (a + t * (b - a))

#ifndef _EDITOR
#define PN_SETUP(i,b0,b1,r0,r1) \
t = vec[i] + 10000.f;\
tt = iFloor_SSE(t); \
b0 = tt & (B-1);\
b1 = (b0+1) & (B-1);\
r0 = t - float(tt);\
r1 = r0 - 1.f;
#define PN_SETUP(i, b0, b1, r0, r1) \
t = vec[i] + 10000.f; \
tt = iFloor_SSE(t); \
b0 = tt & (B - 1); \
b1 = (b0 + 1) & (B - 1); \
r0 = t - float(tt); \
r1 = r0 - 1.f;
#else

#define PN_SETUP(i,b0,b1,r0,r1) \
t = vec[i] + 10000.f;\
b0 = iFloor(t) & (B-1);\
b1 = (b0+1) & (B-1);\
r0 = t - iFloor(t);\
r1 = r0 - 1.f;
#define PN_SETUP(i, b0, b1, r0, r1) \
t = vec[i] + 10000.f; \
b0 = iFloor(t) & (B - 1); \
b1 = (b0 + 1) & (B - 1); \
r0 = t - iFloor(t); \
r1 = r0 - 1.f;

#endif

static int p[B+B+2];
static float g[B+B+2][3];
static int p[B + B + 2];
static float g[B + B + 2][3];

//--------------------------------------------------------------------
void noise3Init()
void noise3Init()
{
int i, j, k;
float v[3], s;
int rnd;
srand(1);
for(i = 0; i < B; i++ )
{
do
{
for(j = 0; j < 3; j++)
{
rnd = rand();
v[j] = float((rnd % (B+B)) - B) / B;
}
s = DOT(v,v);
} while ( s > 1.0 );
s = _sqrt(s);
for (j = 0; j < 3; j++)
g[i][j] = v[j] / s;
}
for (i = 0; i < B; i++)
p[i] = i;
for (i = B; i > 0; i -= 2)
{
rnd = rand();
k = p[i];
p[i] = p[ (j = rnd%B) ];
p[j] = k;
}
for (i = 0; i < B+2; i++)
{
p[B+i] = p[i];
for (j = 0; j < 3; j++)
g[B+i][j] = g[i][j];
}
int i, j, k;
float v[3], s;
int rnd;

srand(1);

for (i = 0; i < B; i++)
{
do
{
for (j = 0; j < 3; j++)
{
rnd = rand();
v[j] = float((rnd % (B + B)) - B) / B;
}
s = DOT(v, v);
} while (s > 1.0);
s = _sqrt(s);
for (j = 0; j < 3; j++)
g[i][j] = v[j] / s;
}

for (i = 0; i < B; i++)
p[i] = i;

for (i = B; i > 0; i -= 2)
{
rnd = rand();
k = p[i];
p[i] = p[(j = rnd % B)];
p[j] = k;
}

for (i = 0; i < B + 2; i++)
{
p[B + i] = p[i];
for (j = 0; j < 3; j++)
g[B + i][j] = g[i][j];
}
}

//--------------------------------------------------------------------

float noise3(const Fvector& vec)
float noise3(const Fvector& vec)
{
int bx0, bx1;
int by0, by1;
int bz0, bz1;
int b00, b10, b01, b11;
float rx0, rx1;
float ry0, ry1;
float rz0, rz1;
float *q;
float sx, sy, sz;
float a, b, c, d, t, u, v;
int i, j, tt;

PN_SETUP(0, bx0, bx1, rx0, rx1);
PN_SETUP(1, by0, by1, ry0, ry1);
PN_SETUP(2, bz0, bz1, rz0, rz1);

i = p[bx0];
j = p[bx1];

b00 = p[ i+by0 ];
b10 = p[ j+by0 ];
b01 = p[ i+by1 ];
b11 = p[ j+by1 ];

sx = S_CURVE(rx0);
sy = S_CURVE(ry0);
sz = S_CURVE(rz0);

q = g[ b00+bz0 ]; u = AT(rx0, ry0, rz0);
q = g[ b10+bz0 ]; v = AT(rx1, ry0, rz0);
a = LERP( sx, u, v );

q = g[ b01+bz0 ]; u = AT(rx0, ry1, rz0);
q = g[ b11+bz0 ]; v = AT(rx1, ry1, rz0);
b = LERP( sx, u, v );

c = LERP(sy, a, b);

q = g[ b00+bz1 ]; u = AT(rx0, ry0, rz1);
q = g[ b10+bz1 ]; v = AT(rx1, ry0, rz1);
a = LERP( sx, u, v );

q = g[ b01+bz1 ]; u = AT(rx0, ry1, rz1);
q = g[ b11+bz1 ]; v = AT(rx1, ry1, rz1);
b = LERP( sx, u, v );

d = LERP(sy, a, b);

return 1.5f * LERP(sz, c, d);
int bx0, bx1;
int by0, by1;
int bz0, bz1;
int b00, b10, b01, b11;
float rx0, rx1;
float ry0, ry1;
float rz0, rz1;
float* q;
float sx, sy, sz;
float a, b, c, d, t, u, v;
int i, j, tt;

PN_SETUP(0, bx0, bx1, rx0, rx1);
PN_SETUP(1, by0, by1, ry0, ry1);
PN_SETUP(2, bz0, bz1, rz0, rz1);

i = p[bx0];
j = p[bx1];

b00 = p[i + by0];
b10 = p[j + by0];
b01 = p[i + by1];
b11 = p[j + by1];

sx = S_CURVE(rx0);
sy = S_CURVE(ry0);
sz = S_CURVE(rz0);

q = g[b00 + bz0];
u = AT(rx0, ry0, rz0);
q = g[b10 + bz0];
v = AT(rx1, ry0, rz0);
a = LERP(sx, u, v);

q = g[b01 + bz0];
u = AT(rx0, ry1, rz0);
q = g[b11 + bz0];
v = AT(rx1, ry1, rz0);
b = LERP(sx, u, v);

c = LERP(sy, a, b);

q = g[b00 + bz1];
u = AT(rx0, ry0, rz1);
q = g[b10 + bz1];
v = AT(rx1, ry0, rz1);
a = LERP(sx, u, v);

q = g[b01 + bz1];
u = AT(rx0, ry1, rz1);
q = g[b11 + bz1];
v = AT(rx1, ry1, rz1);
b = LERP(sx, u, v);

d = LERP(sy, a, b);

return 1.5f * LERP(sz, c, d);
}

//--------------------------------------------------------------------
float fractalsum3(const Fvector& v, float freq, int octaves)
float fractalsum3(const Fvector& v, float freq, int octaves)
{
/* already initialized somewhere
if (start) {
start = 0;
noise3Init();
}
*/

int i;
float sum = 0.0;
Fvector v_;
float boost = freq;
v_[0] = v[0]*freq;
v_[1] = v[1]*freq;
v_[2] = v[2]*freq;
for (i = 0; i < octaves; i++ )
{
sum += noise3(v_)/freq;
freq *= 2.059f;
v_[0] = v[0]*freq;
v_[1] = v[1]*freq;
v_[2] = v[2]*freq;
}
return sum*boost;
/* already initialized somewhere
if (start) {
start = 0;
noise3Init();
}
*/

int i;
float sum = 0.0;
Fvector v_;
float boost = freq;
v_[0] = v[0] * freq;
v_[1] = v[1] * freq;
v_[2] = v[2] * freq;

for (i = 0; i < octaves; i++)
{
sum += noise3(v_) / freq;
freq *= 2.059f;
v_[0] = v[0] * freq;
v_[1] = v[1] * freq;
v_[2] = v[2] * freq;
}
return sum * boost;
}

//--------------------------------------------------------------------
float turbulence3(const Fvector& v, float freq, int octaves)
float turbulence3(const Fvector& v, float freq, int octaves)
{
/* Not used now
if (start) {
start = 0;
noise3Init();
}
*/

int i;
float sum = 0.0;
Fvector v_;
float boost = freq;
v_[0] = v[0]*freq;
v_[1] = v[1]*freq;
v_[2] = v[2]*freq;
for (i = 0; i < octaves; i++ )
{
sum += _abs(noise3(v_))/freq;
freq *= 2.059f;
v_[0] = v[0]*freq;
v_[1] = v[1]*freq;
v_[2] = v[2]*freq;
}
return sum*boost;
/* Not used now
if (start) {
start = 0;
noise3Init();
}
*/

int i;
float sum = 0.0;
Fvector v_;
float boost = freq;
v_[0] = v[0] * freq;
v_[1] = v[1] * freq;
v_[2] = v[2] * freq;

for (i = 0; i < octaves; i++)
{
sum += _abs(noise3(v_)) / freq;
freq *= 2.059f;
v_[0] = v[0] * freq;
v_[1] = v[1] * freq;
v_[2] = v[2] * freq;
}
return sum * boost;
}

6 changes: 3 additions & 3 deletions src/xrParticles/noise.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef noiseH
#define noiseH

float noise3(const Fvector& vec);
float fractalsum3(const Fvector& v, float freq, int octaves);
float turbulence3(const Fvector& v, float freq, int octaves);
float noise3(const Fvector& vec);
float fractalsum3(const Fvector& v, float freq, int octaves);
float turbulence3(const Fvector& v, float freq, int octaves);

#endif
1 change: 0 additions & 1 deletion src/xrParticles/particle_actions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
#pragma hdrstop

#include "particle_actions.h"

Loading

0 comments on commit cad7b7c

Please sign in to comment.