ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/noise.C
(Generate patch)

Comparing deliantra/server/common/noise.C (file contents):
Revision 1.4 by root, Sat Apr 23 04:46:25 2011 UTC vs.
Revision 1.8 by root, Tue Apr 26 03:18:06 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
22 22
23#include "noise.h" 23#include "noise.h"
24 24
25///////////////////////////////////////////////////////////////////////////// 25/////////////////////////////////////////////////////////////////////////////
26 26
27// perl -e 'for(0..255) { $p = (atan2 1,0) / 64 * $_; printf " %10g, %10g,\n", sin $p, cos $p }' | sort -R
28static const float charges2[256][2] = {
29 -.975702, -.219101, .893224, .449611, .870087, -.492898, .595699, -.803208,
30 .14673, .989177, .995185, .0980171, .91421, -.405241, -.514103, .857729,
31 -.985278, -.170962, -.689541, -.724247, -.427555, .903989, .83147, -.55557,
32 .999699, -.0245412, .634393, .77301, -.514103, -.857729, -.0735646, -.99729,
33 .514103, -.857729, -.595699, -.803208, -.290285, .95694, .595699, .803208,
34 .266713, .963776, -.33689, .941544, .492898, -.870087, -.471397, -.881921,
35 -.99729, -.0735646, .615232, -.788346, -.91421, -.405241, -.575808, .817585,
36 .0980171, .995185, -.980785, .19509, -.122411, -.99248, .0735646, .99729,
37 -.634393, .77301, -.91421, .405241, .99248, .122411, .903989, -.427555,
38 -.24298, .970031, -.857729, .514103, -.359895, .932993, .382683, .92388,
39 .740951, -.671559, -.893224, .449611, -.95694, -.290285, -.975702, .219101,
40 -.970031, .24298, .999699, .0245412, -.405241, .91421, .985278, .170962,
41 .382683, -.92388, .95694, -.290285, .707107, -.707107, -.817585, -.575808,
42 -.989177, .14673, -.19509, -.980785, -.359895, -.932993, .313682, .949528,
43 -.0980171, .995185, 1, 6.12323e-17, .963776, -.266713, .998795, -.0490677,
44 -.998795, -.0490677, -.970031, -.24298, -.55557, .83147, -.14673, .989177,
45 -.83147, -.55557, -.995185, -.0980171, .870087, .492898, .941544, -.33689,
46 .575808, -.817585, .33689, .941544, .19509, -.980785, 0, 1,
47 .219101, -.975702, -.83147, .55557, .757209, -.653173, -.95694, .290285,
48 -.266713, .963776, -.0490677, .998795, .405241, .91421, -.405241, -.91421,
49 -.689541, .724247, -.534998, -.844854, -.99248, -.122411, .724247, .689541,
50 .492898, .870087, .817585, -.575808, .740951, .671559, -.33689, -.941544,
51 .95694, .290285, .77301, -.634393, .0245412, -.999699, -.77301, -.634393,
52 -.382683, .92388, -.24298, -.970031, -.893224, -.449611, .449611, .893224,
53 .975702, -.219101, -.382683, -.92388, .844854, .534998, -.803208, -.595699,
54 .941544, .33689, .963776, .266713, .932993, .359895, -.0735646, .99729,
55 .634393, -.77301, .405241, -.91421, .33689, -.941544, .99729, .0735646,
56 1.22465e-16, -1, -.941544, -.33689, .0490677, -.998795, -.313682, .949528,
57 .92388, .382683, -.999699, .0245412, .0245412, .999699, .653173, .757209,
58 -.803208, .595699, .980785, -.19509, .817585, .575808, .975702, .219101,
59 -.615232, -.788346, .99248, -.122411, .998795, .0490677, -.707107, .707107,
60 .803208, -.595699, .671559, .740951, -.757209, -.653173, -.949528, .313682,
61 -.989177, -.14673, -.817585, .575808, -.14673, -.989177, -1, -1.83697e-16,
62 .290285, .95694, -.932993, -.359895, .24298, -.970031, .170962, .985278,
63 -.671559, -.740951, .427555, .903989, .427555, -.903989, -.941544, .33689,
64 -.492898, -.870087, -.266713, -.963776, .857729, -.514103, -.724247, .689541,
65 .724247, -.689541, -.653173, .757209, .689541, -.724247, .949528, -.313682,
66 -.19509, .980785, -.740951, .671559, -.999699, -.0245412, .689541, .724247,
67 .803208, .595699, -.170962, .985278, .0735646, -.99729, .970031, -.24298,
68 -.170962, -.985278, .471397, .881921, .91421, .405241, .893224, -.449611,
69 .0490677, .998795, -.615232, .788346, -.998795, .0490677, -.427555, -.903989,
70 -.0245412, .999699, -.534998, .844854, -.313682, -.949528, -.55557, -.83147,
71 -.903989, -.427555, -.724247, -.689541, -.740951, -.671559, .985278, -.170962,
72 -.857729, -.514103, -.99729, .0735646, .881921, -.471397, .534998, .844854,
73 .359895, -.932993, .77301, .634393, .99729, -.0735646, .290285, -.95694,
74 .575808, .817585, .757209, .653173, .903989, .427555, -.995185, .0980171,
75 -.903989, .427555, -.844854, .534998, -.707107, -.707107, -.92388, .382683,
76 -.653173, -.757209, -.881921, -.471397, -.219101, .975702, -.595699, .803208,
77 .0980171, -.995185, -.788346, .615232, -.0980171, -.995185, -.985278, .170962,
78 .122411, .99248, -.449611, -.893224, .170962, -.985278, .788346, .615232,
79 -.492898, .870087, .671559, -.740951, .449611, -.893224, -.757209, .653173,
80 .83147, .55557, -.290285, -.95694, -.932993, .359895, -.870087, -.492898,
81 .266713, -.963776, -.881921, .471397, -.77301, .634393, -.471397, .881921,
82 .844854, -.534998, .707107, .707107, .534998, -.844854, .514103, .857729,
83 .14673, -.989177, .980785, .19509, -.122411, .99248, -.449611, .893224,
84 .995185, -.0980171, -.634393, -.77301, .857729, .514103, .55557, .83147,
85 -.92388, -.382683, -.844854, -.534998, -.963776, .266713, .989177, -.14673,
86 .313682, -.949528, .359895, .932993, .24298, .970031, -.949528, -.313682,
87 .932993, -.359895, .55557, -.83147, .615232, .788346, -.788346, -.615232,
88 -.0245412, -.999699, -.219101, -.975702, .788346, -.615232, -.99248, .122411,
89 -.671559, .740951, -.870087, .492898, .970031, .24298, .881921, .471397,
90 .122411, -.99248, .471397, -.881921, .19509, .980785, -.963776, -.266713,
91 .92388, -.382683, .989177, .14673, -.575808, -.817585, .219101, .975702,
92 -.0490677, -.998795, -.980785, -.19509, .949528, .313682, .653173, -.757209,
93};
94
27// http://www-wales.ch.cam.ac.uk/~wales/CCD/Thomson/table.html, random permutation 95// http://www-wales.ch.cam.ac.uk/~wales/CCD/Thomson/table.html, random permutation
96// used as gradient vectors for noise3d
28static const float charges[256][3] = { 97static const float charges3[256][3] = {
29 6.32096444e-01, -6.11406706e-01, 4.76062943e-01, 5.19172442e-01, 8.08229585e-01, -2.77893708e-01, 98 6.32096444e-01, -6.11406706e-01, 4.76062943e-01, 5.19172442e-01, 8.08229585e-01, -2.77893708e-01,
30 -8.81072422e-01, -4.68301230e-01, 6.63727731e-02, -1.92122323e-01, 9.81341519e-01, -7.60505942e-03, 99 -8.81072422e-01, -4.68301230e-01, 6.63727731e-02, -1.92122323e-01, 9.81341519e-01, -7.60505942e-03,
31 -2.57478265e-01, 9.34157733e-01, -2.47091628e-01, 8.75501090e-01, -1.48087600e-01, -4.59965112e-01, 100 -2.57478265e-01, 9.34157733e-01, -2.47091628e-01, 8.75501090e-01, -1.48087600e-01, -4.59965112e-01,
32 -6.44086082e-01, 3.21868600e-01, 6.93940720e-01, -4.42053435e-01, -1.94962529e-01, -8.75544615e-01, 101 -6.44086082e-01, 3.21868600e-01, 6.93940720e-01, -4.42053435e-01, -1.94962529e-01, -8.75544615e-01,
33 -6.86776297e-01, 5.34610386e-01, -4.92473403e-01, -8.45541961e-01, -2.41708225e-01, 4.76062943e-01, 102 -6.86776297e-01, 5.34610386e-01, -4.92473403e-01, -8.45541961e-01, -2.41708225e-01, 4.76062943e-01,
154 4.98855035e-01, -3.98703643e-01, 7.69531714e-01, 2.55373649e-01, -7.56251592e-02, 9.63880249e-01, 223 4.98855035e-01, -3.98703643e-01, 7.69531714e-01, 2.55373649e-01, -7.56251592e-02, 9.63880249e-01,
155 -1.51053916e-01, 3.85469253e-01, -9.10272580e-01, 6.78644990e-01, -7.26064181e-01, 1.10778074e-01, 224 -1.51053916e-01, 3.85469253e-01, -9.10272580e-01, 6.78644990e-01, -7.26064181e-01, 1.10778074e-01,
156 -3.07350590e-01, -9.14677987e-01, 2.62487703e-01, 5.60298616e-01, 1.74821302e-01, 8.09631381e-01, 225 -3.07350590e-01, -9.14677987e-01, 2.62487703e-01, 5.60298616e-01, 1.74821302e-01, 8.09631381e-01,
157}; 226};
158 227
228/////////////////////////////////////////////////////////////////////////////
229
230template<int N, typename T>
231template<class random_generator>
232void
233permutation<N,T>::seed (random_generator &rng)
234{
235 for (int i = 0; i < N; ++i)
236 pmap[i] = i;
237
238 // fisher-yates to randomly perturb
239 for (int i = N; --i; )
240 ::swap (pmap[i], pmap[rng (i + 1)]);
241}
242
243template class permutation<256, uint8_t>;
244
245/////////////////////////////////////////////////////////////////////////////
246
159static vec2d 247static vec2d
160floor (vec2d v) 248floor (vec2d v)
161{ 249{
162 return vec2d (std::floor (v[0]), std::floor (v[1])); 250 return vec2d (std::floor (v[0]), std::floor (v[1]));
163} 251}
169} 257}
170 258
171noise_gen<vec2d>::noise_gen (uint32_t seed) 259noise_gen<vec2d>::noise_gen (uint32_t seed)
172{ 260{
173 seedable_rand_gen rng (seed); 261 seedable_rand_gen rng (seed);
174
175#if 1
176 for (int i = 0; i < 256; ++i)
177 {
178 vec2d rv (rng () - 0.5f, rng () - 0.5f);
179
180 // normalise
181 float mag = 1.f / sqrtf (dot (rv, rv));
182
183 rv[0] *= mag;
184 rv[1] *= mag;
185
186 rvec[i] = rv;
187 }
188#endif
189
190#if 0
191 float offset = rng () * 3.14159265;
192
193 for (int i = 0; i < 256; ++i)
194 {
195 float phi = i * (3.14159265 * 2 / 256) + offset;
196
197 rvec[i][0] = sinf (phi);
198 rvec[i][1] = -cosf (phi);
199 }
200
201 // fisher-yates to randomly perturb
202 for (int i = 256; --i; )
203 ::swap (rvec [i], rvec [rng (i + 1)]);
204#endif
205 262
206 rvmap[0].seed (rng); 263 rvmap[0].seed (rng);
207 rvmap[1].seed (rng); 264 rvmap[1].seed (rng);
208} 265}
209 266
228 float t2 = t1 * t1; 285 float t2 = t1 * t1;
229 float t4 = t2 * t2; 286 float t4 = t2 * t2;
230 287
231 float p = (4 * t1 - 3) * t4; 288 float p = (4 * t1 - 3) * t4;
232 289
233 int h = rvmap [0](I[0] + i) ^ rvmap [1](I[1] + j); 290 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j);
234 vec2d G = rvec [h & 0xff]; 291 vec2d G = charges2[h & 0xff];
235 292
236 v += dot (A, G) * p; 293 v += dot (A, G) * p;
237 } 294 }
238 } 295 }
239 296
240 return clamp (v, -.9999999f, .9999999f); 297 return clamp (v, -.9999999, .9999999);
241} 298}
242 299
243///////////////////////////////////////////////////////////////////////////// 300/////////////////////////////////////////////////////////////////////////////
244 301
245noise_gen<vec3d>::noise_gen (uint32_t seed) 302noise_gen<vec3d>::noise_gen (uint32_t seed)
274 331
275 // (4t⁵ - 3t⁴) 332 // (4t⁵ - 3t⁴)
276 float p = (4 * t1 - 3) * t4; 333 float p = (4 * t1 - 3) * t4;
277 334
278 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k); 335 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k);
279 const float *G = charges[h & 0xff]; 336 const float *G = charges3[h & 0xff];
280 337
281 v += dot (A, vec3d (G[0], G[1], G[2])) * p; 338 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
282 } 339 }
283 } 340 }
284 341
285 return clamp (v * 2, -.9999999f, .9999999f); 342 return clamp (v * 2, -.9999999, .9999999);
286} 343}
287 344
288vec3d::T_numtype 345vec3d::T_numtype
289noise_gen<vec3d>::operator() (vec3d P, vec3d N) 346noise_gen<vec3d>::operator() (vec3d P, vec3d N)
290{ 347{
317 // (4t⁵ - 3t⁴) * (3o³ - 2o²) 374 // (4t⁵ - 3t⁴) * (3o³ - 2o²)
318 // alternative? ((o * 6 - 15) * o + 10) * o³ 375 // alternative? ((o * 6 - 15) * o + 10) * o³
319 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o); 376 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o);
320 377
321 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k); 378 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k);
322 const float *G = charges[h & 0xff]; 379 const float *G = charges3[h & 0xff];
323 380
324 v += dot (A, vec3d (G[0], G[1], G[2])) * p; 381 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
325 } 382 }
326 } 383 }
327 } 384 }
328 385
329 return clamp (v, -.9999999f, .9999999f); 386 return clamp (v, -.9999999, .9999999);
330} 387}
331 388
332template class noise_gen<vec2d>; 389template class noise_gen<vec2d>;
333template class noise_gen<vec3d>; 390template class noise_gen<vec3d>;
334 391
335///////////////////////////////////////////////////////////////////////////// 392/////////////////////////////////////////////////////////////////////////////
336 393
394// find some uncorrelated spot - we assume that noise 2 units away
395// is completely uncorrelated - this is not true for other coordinates,
396// but generally works well.
337template<class vec_t> 397template<class vec_t>
338static vec_t 398static vec_t
339ith_octave (vec_t P, int i) 399ith_octave (vec_t P, int i)
340{ 400{
341 vec_t r = P; 401 vec_t r = P;
342 r[0] += i; 402 r[0] += i;
403 r[1] += i * 2;
343 return r; 404 return r;
344} 405}
345 406
346template<class vec_t> 407template<class vec_t>
347frac_gen<vec_t>::frac_gen (value_t hurst_expo, value_t lacunarity) 408frac_gen<vec_t>::frac_gen (value_t hurst_expo, value_t lacunarity)
348: h (hurst_expo), lac (lacunarity), noise_gen<vec_t> (0) 409: h (hurst_expo), lac (lacunarity), noise_gen<vec_t> (0)
349{ 410{
350 value_t exsum = 0; 411 value_t exsum = 0;
412 value_t phi = noise (vec_t (value_t (0))) * 0.5 + 1;
351 413
352 for (int i = 0; i < MAX_OCTAVES; ++i) 414 for (int i = 0; i < MAX_OCTAVES; ++i)
353 { 415 {
354 ex [i] = powf (lac, -h * i); 416 ex [i] = pow (lac, -h * i);
355 exsum += ex [i]; 417 exsum += ex [i];
356 fbm_mul [i] = 0.5f / (exsum * 0.75f); // .75f is a heuristic 418 fbm_mul [i] = 0.5 / (exsum * 0.75); // .75 is a heuristic
357 rot [i].set (0.4488f * i); 419 rot [i].set (phi * i + 1);
358 } 420 }
359} 421}
360 422
361template<class vec_t> 423template<class vec_t>
362typename frac_gen<vec_t>::value_t 424typename frac_gen<vec_t>::value_t
363frac_gen<vec_t>::fBm (vec_t P, int octaves) 425frac_gen<vec_t>::fBm (vec_t P, int octaves)
364{ 426{
365 value_t v = 0.f; 427 value_t v = 0;
366 428
367 for (int i = 0; i < octaves; ++i) 429 for (int i = 0; i < octaves; ++i)
368 { 430 {
369 rot [i](P); 431 rot [i](P);
370 v += noise (ith_octave (P, i)) * ex [i]; 432 v += noise (ith_octave (P, i)) * ex [i];
371 P *= lac; 433 P *= lac;
372 } 434 }
373 435
374 return clamp (v * fbm_mul [octaves - 1] + 0.5f, 0.f, .9999999f); 436 return clamp<value_t> (v * fbm_mul [octaves - 1] + 0.5, 0, .9999999);
375} 437}
376 438
377template<class vec_t> 439template<class vec_t>
378typename frac_gen<vec_t>::value_t 440typename frac_gen<vec_t>::value_t
379frac_gen<vec_t>::turbulence (vec_t P, int octaves) 441frac_gen<vec_t>::turbulence (vec_t P, int octaves)
380{ 442{
381 value_t v = 0.f; 443 value_t v = 0;
382 444
383 for (int i = 0; i < octaves; ++i) 445 for (int i = 0; i < octaves; ++i)
384 { 446 {
385 rot [i](P); 447 rot [i](P);
386 v += abs (noise (ith_octave (P, i))) * ex [i]; 448 v += abs (noise (ith_octave (P, i))) * ex [i];
387 P *= lac; 449 P *= lac;
388 } 450 }
389 451
390 return clamp (v * fbm_mul [octaves - 1] * 2.f, 0.f, .9999999f); 452 return clamp<value_t> (v * fbm_mul [octaves - 1] * (0.5 / noise_gen<vec_t>::abs_avg ()), 0, .9999999);
391} 453}
392 454
393template<class vec_t> 455template<class vec_t>
394typename frac_gen<vec_t>::value_t 456typename frac_gen<vec_t>::value_t
395frac_gen<vec_t>::multifractal (vec_t P, int octaves, value_t offset) 457frac_gen<vec_t>::multifractal (vec_t P, int octaves, value_t offset)
396{ 458{
397 value_t v = 1.f; 459 value_t v = 1;
398 460
399 for (int i = 0; i < octaves; ++i) 461 for (int i = 0; i < octaves; ++i)
400 { 462 {
401 rot [i](P); 463 rot [i](P);
402 v *= noise (P) * ex [i] + offset; 464 v *= noise (P) * ex [i] + offset;
403 P *= lac; 465 P *= lac;
404 } 466 }
405 467
406 return clamp (v * 0.5f, 0.f, .9999999f); 468 return clamp<value_t> (v * 0.5, 0, .9999999);
407} 469}
408 470
409template<class vec_t> 471template<class vec_t>
410typename frac_gen<vec_t>::value_t 472typename frac_gen<vec_t>::value_t
411frac_gen<vec_t>::heterofractal (vec_t P, int octaves, value_t offset) 473frac_gen<vec_t>::heterofractal (vec_t P, int octaves, value_t offset)
412{ 474{
413 value_t v = noise (P) + offset; 475 value_t v = noise (P) + offset;
414 int i;
415 476
416 for (i = 1; i < octaves; ++i) 477 for (int i = 1; i < octaves; ++i)
417 { 478 {
418 rot [i](P); 479 rot [i](P);
419 P *= lac; 480 P *= lac;
420 v += v * (noise (P) * ex [i] + offset); 481 v += v * (noise (P) * ex [i] + offset);
421 } 482 }
422 483
423 return v / powf (2., octaves); 484 return v / (1 << octaves);
424} 485}
425 486
426template<class vec_t> 487template<class vec_t>
427typename frac_gen<vec_t>::value_t 488typename frac_gen<vec_t>::value_t
428frac_gen<vec_t>::hybridfractal (vec_t P, int octaves, value_t offset, value_t gain) 489frac_gen<vec_t>::hybridfractal (vec_t P, int octaves, value_t offset, value_t gain)
429{ 490{
430 value_t v = (noise (P) + offset) * ex [0]; 491 value_t v = (noise (P) + offset) * ex [0];
431 value_t weight = v; 492 value_t weight = v;
432 int i;
433 493
434 for (i = 1; i < octaves; ++i) 494 for (int i = 1; i < octaves; ++i)
435 { 495 {
436 rot [i](P); 496 rot [i](P);
437 P *= lac; 497 P *= lac;
438 498
439 min_it (weight, 1.f); 499 min_it (weight, 1);
440 500
441 value_t sig = (noise (P) + offset) * ex [i]; 501 value_t sig = (noise (P) + offset) * ex [i];
442 v += weight * sig; 502 v += weight * sig;
443 weight *= gain * sig; 503 weight *= gain * sig;
444 } 504 }
445 505
446 return clamp (v * 0.5f + 0.5f, 0.f, .9999999f); 506 return clamp<value_t> (v * 0.5 + 0.5, 0, .9999999);
447} 507}
448 508
449template<class vec_t> 509template<class vec_t>
450typename frac_gen<vec_t>::value_t 510typename frac_gen<vec_t>::value_t
451frac_gen<vec_t>::ridgedmultifractal (vec_t P, int octaves, value_t offset, value_t gain) 511frac_gen<vec_t>::ridgedmultifractal (vec_t P, int octaves, value_t offset, value_t gain)
457 for (int i = 1; i < octaves; ++i) 517 for (int i = 1; i < octaves; ++i)
458 { 518 {
459 rot [i](P); 519 rot [i](P);
460 P *= lac; 520 P *= lac;
461 521
462 value_t w = clamp (sig * gain, 0.f, 1.f); 522 value_t w = clamp (sig * gain, 0, 1);
463 523
464 sig = offset - abs (noise (P)); 524 sig = offset - abs (noise (P));
465 sig *= sig; 525 sig *= sig;
466 sig *= w; 526 sig *= w;
467 527
468 v += sig * ex [i]; 528 v += sig * ex [i];
469 } 529 }
470 530
471 return clamp (v * 0.25f, 0.f, .9999999f); 531 return clamp<value_t> (v * 0.25, 0, .9999999);
532}
533
534template<class vec_t>
535typename frac_gen<vec_t>::value_t
536frac_gen<vec_t>::billowfractal (vec_t P, int octaves, value_t offset, value_t gain)
537{
538 value_t v = 0;
539
540 offset += 2 * noise_gen<vec_t>::abs_avg () - 1;
541
542 for (int i = 0; i < octaves; ++i)
543 {
544 rot [i](P);
545 v += (abs (noise (ith_octave (P, i))) * gain - offset) * ex [i];
546 P *= lac;
547 }
548
549 return clamp<value_t> (v, -.9999999, .9999999);
472} 550}
473 551
474// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2 552// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2
475template<class vec_t> 553template<class vec_t>
476typename frac_gen<vec_t>::value_t 554typename frac_gen<vec_t>::value_t
477frac_gen<vec_t>::terrain (vec_t P, int octaves) 555frac_gen<vec_t>::terrain (vec_t P, int octaves)
478{ 556{
479 value_t v = 0.f; 557 value_t v = 0;
480 558
481 for (int i = 0; i < octaves; ++i) 559 for (int i = 0; i < octaves; ++i)
482 { 560 {
483 rot [i](P); 561 rot [i](P);
484 v += noise (P) * ex [i]; 562 v += noise (P) * ex [i];
485 P *= lac; 563 P *= lac;
486 } 564 }
487 565
488 v *= fbm_mul [octaves - 1]; 566 v *= fbm_mul [octaves - 1];
489 567
490 return v <= 0.f ? - powf (-v, 0.7f) : powf (v, 1. + noise (P) * v); 568 return v <= 0 ? - pow (-v, 0.7) : pow (v, 1 + noise (P) * v);
491} 569}
492 570
493template<class vec_t> 571template<class vec_t>
494typename frac_gen<vec_t>::value_t 572typename frac_gen<vec_t>::value_t
495frac_gen<vec_t>::terrain2 (vec_t P, int octaves) 573frac_gen<vec_t>::terrain2 (vec_t P, int octaves)
496{ 574{
497 value_t a = fBm (P, octaves); 575 value_t a = fBm (P, octaves);
498 value_t b = ridgedmultifractal (P, octaves, 1, 8); 576 value_t b = ridgedmultifractal (P, octaves, 1, 8);
499 value_t fade = fBm (P + vec_t(10.3), octaves); 577 value_t fade = fBm (P + vec_t(10.3), octaves);
500 578
501 const value_t width = 0.05f; 579 const value_t width = 0.05;
502 580
503 if (fade > 0.5f + width) 581 if (fade > 0.5 + width)
504 return a; 582 return a;
505 else if (fade < 0.5f - width) 583 else if (fade < 0.5 - width)
506 return b; 584 return b;
507 585
508 fade = (fade - 0.5f + width) / (width * 2); 586 fade = (fade - 0.5 + width) / (width * 2);
509 587
510 // sigmoidal curve 588 // sigmoidal curve
511 fade = fade * fade * 2 * (1.5f - fade); 589 fade = fade * fade * 2 * (1.5 - fade);
512 590
513 return a * fade + b * (1 - fade); 591 return a * fade + b * (1 - fade);
514} 592}
515 593
516template class frac_gen<vec2d>; 594template class frac_gen<vec2d>;
517template class frac_gen<vec3d>; 595template class frac_gen<vec3d>;
518 596
519///////////////////////////////////////////////////////////////////////////// 597/////////////////////////////////////////////////////////////////////////////
520 598
521#if 0 599void noise_test ();
522void hack(); void hack() 600void noise_test ()
523{ 601{
524 frac_gen<vec2d> gen (0.5, 2); 602 frac_gen<vec2d> gen (0.5, 1.9);
525 frac_gen<vec3d> gen3; 603 frac_gen<vec3d> gen3;
526 604
527#if 0 605#if 1
528 int N = 1024; 606 int N = 1024;
529 607
530 printf ("P5 %d %d 255\n", N, N); 608 printf ("P5 %d %d 255\n", N, N);
531 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm 609 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
532 for (int y = 0; y < N; ++y) 610 for (int y = 0; y < N; ++y)
533 { 611 {
534 if (!(y&63))fprintf (stderr, "y %d\n", y);//D 612 if (!(y&63))fprintf (stderr, "y %d\n", y);//D
535 for (int x = 0; x < N; ++x) 613 for (int x = 0; x < N; ++x)
536 { 614 {
537 //putc (127 * n.noise (x * 0.1, y * 0.1, 0, 0,0,1) + 128, stdout); 615 //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout);
538 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout); 616 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout);
539 //putc (256 * gen.fBm (x * 0.01, y * 0.01, 3), stdout); 617 //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout);
540 //putc (256 * gen.turbulence (x * 0.004 - 1, y * 0.004 - 1, 8), stdout); 618 putc (256 * gen.turbulence (vec2d (x * 0.004 - 1, y * 0.004 - 1), 10), stdout);
541 //putc (256 * gen.heterofractal (x * 0.008, y * 0.008, 8, 0.9), stdout); 619 //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout);
542 620
543 // mountais or somesuch(?) 621 // mountais or somesuch(?)
544 //putc (256 * gen.hybridfractal (x * 0.01, y * 0.01, 8, -.4, -4), stdout); 622 //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout);
545 623
546 // temperature 624 // temperature
547 //putc (256 * gen.fBm (x * 0.002, y * 0.002, 2), stdout); 625 //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout);
548 // rain 626 // rain
549 //putc (256 * gen.ridgedmultifractal (x * 0.01, y * 0.01, 3, 1.03, 2), stdout); 627
628 //cells
629 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout);
550 } 630 }
551 } 631 }
552#else 632#else
553 int N = 512; 633 int N = 512;
554 634
590 } 670 }
591#endif 671#endif
592 672
593 exit (0); 673 exit (0);
594} 674}
595#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines