Skip to content

Commit 32540db

Browse files
committed
Renames for Perlin listings
- ranfloat -> randfloat - ranvec -> randvec
1 parent 2884725 commit 32540db

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

books/RayTracingTheNextWeek.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,9 +1980,9 @@
19801980
class perlin {
19811981
public:
19821982
perlin() {
1983-
ranfloat = new double[point_count];
1983+
randfloat = new double[point_count];
19841984
for (int i = 0; i < point_count; i++) {
1985-
ranfloat[i] = random_double();
1985+
randfloat[i] = random_double();
19861986
}
19871987

19881988
perm_x = perlin_generate_perm();
@@ -1991,7 +1991,7 @@
19911991
}
19921992

19931993
~perlin() {
1994-
delete[] ranfloat;
1994+
delete[] randfloat;
19951995
delete[] perm_x;
19961996
delete[] perm_y;
19971997
delete[] perm_z;
@@ -2002,12 +2002,12 @@
20022002
auto j = int(4*p.y()) & 255;
20032003
auto k = int(4*p.z()) & 255;
20042004

2005-
return ranfloat[perm_x[i] ^ perm_y[j] ^ perm_z[k]];
2005+
return randfloat[perm_x[i] ^ perm_y[j] ^ perm_z[k]];
20062006
}
20072007

20082008
private:
20092009
static const int point_count = 256;
2010-
double* ranfloat;
2010+
double* randfloat;
20112011
int* perm_x;
20122012
int* perm_y;
20132013
int* perm_z;
@@ -2149,7 +2149,7 @@
21492149
for (int di=0; di < 2; di++)
21502150
for (int dj=0; dj < 2; dj++)
21512151
for (int dk=0; dk < 2; dk++)
2152-
c[di][dj][dk] = ranfloat[
2152+
c[di][dj][dk] = randfloat[
21532153
perm_x[(i+di) & 255] ^
21542154
perm_y[(j+dj) & 255] ^
21552155
perm_z[(k+dk) & 255]
@@ -2304,11 +2304,11 @@
23042304
public:
23052305
perlin() {
23062306
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
2307-
ranvec = new vec3[point_count];
2307+
randvec = new vec3[point_count];
23082308
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
23092309
for (int i = 0; i < point_count; i++) {
23102310
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
2311-
ranvec[i] = unit_vector(vec3::random(-1,1));
2311+
randvec[i] = unit_vector(vec3::random(-1,1));
23122312
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
23132313
}
23142314

@@ -2319,7 +2319,7 @@
23192319

23202320
~perlin() {
23212321
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
2322-
delete[] ranvec;
2322+
delete[] randvec;
23232323
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
23242324
delete[] perm_x;
23252325
delete[] perm_y;

src/TheNextWeek/perlin.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
class perlin {
1818
public:
1919
perlin() {
20-
ranvec = new vec3[point_count];
20+
randvec = new vec3[point_count];
2121
for (int i = 0; i < point_count; i++) {
22-
ranvec[i] = unit_vector(vec3::random(-1,1));
22+
randvec[i] = unit_vector(vec3::random(-1,1));
2323
}
2424

2525
perm_x = perlin_generate_perm();
@@ -28,7 +28,7 @@ class perlin {
2828
}
2929

3030
~perlin() {
31-
delete[] ranvec;
31+
delete[] randvec;
3232
delete[] perm_x;
3333
delete[] perm_y;
3434
delete[] perm_z;
@@ -46,7 +46,7 @@ class perlin {
4646
for (int di=0; di < 2; di++)
4747
for (int dj=0; dj < 2; dj++)
4848
for (int dk=0; dk < 2; dk++)
49-
c[di][dj][dk] = ranvec[
49+
c[di][dj][dk] = randvec[
5050
perm_x[(i+di) & 255] ^
5151
perm_y[(j+dj) & 255] ^
5252
perm_z[(k+dk) & 255]
@@ -71,7 +71,7 @@ class perlin {
7171

7272
private:
7373
static const int point_count = 256;
74-
vec3* ranvec;
74+
vec3* randvec;
7575
int* perm_x;
7676
int* perm_y;
7777
int* perm_z;

src/TheRestOfYourLife/perlin.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
class perlin {
1818
public:
1919
perlin() {
20-
ranvec = new vec3[point_count];
20+
randvec = new vec3[point_count];
2121
for (int i = 0; i < point_count; i++) {
22-
ranvec[i] = unit_vector(vec3::random(-1,1));
22+
randvec[i] = unit_vector(vec3::random(-1,1));
2323
}
2424

2525
perm_x = perlin_generate_perm();
@@ -28,7 +28,7 @@ class perlin {
2828
}
2929

3030
~perlin() {
31-
delete[] ranvec;
31+
delete[] randvec;
3232
delete[] perm_x;
3333
delete[] perm_y;
3434
delete[] perm_z;
@@ -46,7 +46,7 @@ class perlin {
4646
for (int di=0; di < 2; di++)
4747
for (int dj=0; dj < 2; dj++)
4848
for (int dk=0; dk < 2; dk++)
49-
c[di][dj][dk] = ranvec[
49+
c[di][dj][dk] = randvec[
5050
perm_x[(i+di) & 255] ^
5151
perm_y[(j+dj) & 255] ^
5252
perm_z[(k+dk) & 255]
@@ -71,7 +71,7 @@ class perlin {
7171

7272
private:
7373
static const int point_count = 256;
74-
vec3* ranvec;
74+
vec3* randvec;
7575
int* perm_x;
7676
int* perm_y;
7777
int* perm_z;

0 commit comments

Comments
 (0)