Skip to content

Commit 20eed2f

Browse files
committed
Changes in perlin.h, and update img 2.13
1 parent 32540db commit 20eed2f

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

books/RayTracingTheNextWeek.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,12 +2325,13 @@
23252325
delete[] perm_y;
23262326
delete[] perm_z;
23272327
}
2328+
23282329
...
23292330

23302331
private:
23312332
static const int point_count = 256;
23322333
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
2333-
vec3* ranvec;
2334+
vec3* randvec;
23342335
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
23352336
int* perm_x;
23362337
int* perm_y;
@@ -2356,6 +2357,7 @@
23562357
v = v*v*(3-2*v);
23572358
w = w*w*(3-2*w);
23582359
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
2360+
23592361
auto i = int(floor(p.x()));
23602362
auto j = int(floor(p.y()));
23612363
auto k = int(floor(p.z()));
@@ -2367,18 +2369,19 @@
23672369
for (int dj=0; dj < 2; dj++)
23682370
for (int dk=0; dk < 2; dk++)
23692371
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
2370-
c[di][dj][dk] = ranvec[
2372+
c[di][dj][dk] = randvec[
2373+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
23712374
perm_x[(i+di) & 255] ^
23722375
perm_y[(j+dj) & 255] ^
23732376
perm_z[(k+dk) & 255]
23742377
];
2375-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
23762378

23772379

23782380
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++ highlight
23792381
return perlin_interp(c, u, v, w);
23802382
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++
23812383
}
2384+
23822385
...
23832386
};
23842387
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

images/img-2.13-perlin-shift.png

-10.4 KB
Loading

src/TheNextWeek/perlin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class perlin {
3838
auto u = p.x() - floor(p.x());
3939
auto v = p.y() - floor(p.y());
4040
auto w = p.z() - floor(p.z());
41+
4142
auto i = int(floor(p.x()));
4243
auto j = int(floor(p.y()));
4344
auto k = int(floor(p.z()));

src/TheRestOfYourLife/perlin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class perlin {
3838
auto u = p.x() - floor(p.x());
3939
auto v = p.y() - floor(p.y());
4040
auto w = p.z() - floor(p.z());
41+
4142
auto i = int(floor(p.x()));
4243
auto j = int(floor(p.y()));
4344
auto k = int(floor(p.z()));

0 commit comments

Comments
 (0)