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.7 by root, Sat Apr 23 06:35:55 2011 UTC vs.
Revision 1.8 by root, Tue Apr 26 03:18:06 2011 UTC

… …
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
28// used as gradient vectors for noise3d 96// used as gradient vectors for noise3d
29static const float charges[256][3] = { 97static const float charges3[256][3] = {
30 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,
31 -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,
32 -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,
33 -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,
34 -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,
… …
190 258
191noise_gen<vec2d>::noise_gen (uint32_t seed) 259noise_gen<vec2d>::noise_gen (uint32_t seed)
192{ 260{
193 seedable_rand_gen rng (seed); 261 seedable_rand_gen rng (seed);
194 262
195#if 0
196 for (int i = 0; i < 256; ++i)
197 {
198 vec2d rv (rng () - 0.5f, rng () - 0.5f);
199
200 // normalise
201 float mag = 1.f / sqrtf (dot (rv, rv));
202
203 rv[0] *= mag;
204 rv[1] *= mag;
205
206 rvec[i] = rv;
207 }
208#endif
209
210#if 1
211 float offset = rng () * M_PI;
212
213 for (int i = 0; i < 256; ++i)
214 {
215 float phi = i * (M_PI * 2 / 256) + offset;
216
217 rvec[i][0] = sinf (phi);
218 rvec[i][1] = -cosf (phi);
219 }
220
221 // fisher-yates to randomly perturb
222 for (int i = 256; --i; )
223 ::swap (rvec [i], rvec [rng (i + 1)]);
224#endif
225
226 rvmap[0].seed (rng); 263 rvmap[0].seed (rng);
227 rvmap[1].seed (rng); 264 rvmap[1].seed (rng);
228} 265}
229 266
230vec2d::T_numtype 267vec2d::T_numtype
… …
248 float t2 = t1 * t1; 285 float t2 = t1 * t1;
249 float t4 = t2 * t2; 286 float t4 = t2 * t2;
250 287
251 float p = (4 * t1 - 3) * t4; 288 float p = (4 * t1 - 3) * t4;
252 289
253 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);
254 vec2d G = rvec [h & 0xff]; 291 vec2d G = charges2[h & 0xff];
255 292
256 v += dot (A, G) * p; 293 v += dot (A, G) * p;
257 } 294 }
258 } 295 }
259 296
260 return clamp (v, -.9999999f, .9999999f); 297 return clamp (v, -.9999999, .9999999);
261} 298}
262 299
263///////////////////////////////////////////////////////////////////////////// 300/////////////////////////////////////////////////////////////////////////////
264 301
265noise_gen<vec3d>::noise_gen (uint32_t seed) 302noise_gen<vec3d>::noise_gen (uint32_t seed)
… …
294 331
295 // (4t⁵ - 3t⁴) 332 // (4t⁵ - 3t⁴)
296 float p = (4 * t1 - 3) * t4; 333 float p = (4 * t1 - 3) * t4;
297 334
298 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);
299 const float *G = charges[h & 0xff]; 336 const float *G = charges3[h & 0xff];
300 337
301 v += dot (A, vec3d (G[0], G[1], G[2])) * p; 338 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
302 } 339 }
303 } 340 }
304 341
305 return clamp (v * 2, -.9999999f, .9999999f); 342 return clamp (v * 2, -.9999999, .9999999);
306} 343}
307 344
308vec3d::T_numtype 345vec3d::T_numtype
309noise_gen<vec3d>::operator() (vec3d P, vec3d N) 346noise_gen<vec3d>::operator() (vec3d P, vec3d N)
310{ 347{
… …
337 // (4t⁵ - 3t⁴) * (3o³ - 2o²) 374 // (4t⁵ - 3t⁴) * (3o³ - 2o²)
338 // alternative? ((o * 6 - 15) * o + 10) * o³ 375 // alternative? ((o * 6 - 15) * o + 10) * o³
339 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o); 376 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o);
340 377
341 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);
342 const float *G = charges[h & 0xff]; 379 const float *G = charges3[h & 0xff];
343 380
344 v += dot (A, vec3d (G[0], G[1], G[2])) * p; 381 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
345 } 382 }
346 } 383 }
347 } 384 }
348 385
349 return clamp (v, -.9999999f, .9999999f); 386 return clamp (v, -.9999999, .9999999);
350} 387}
351 388
352template class noise_gen<vec2d>; 389template class noise_gen<vec2d>;
353template class noise_gen<vec3d>; 390template class noise_gen<vec3d>;
354 391
355///////////////////////////////////////////////////////////////////////////// 392/////////////////////////////////////////////////////////////////////////////
356 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.
357template<class vec_t> 397template<class vec_t>
358static vec_t 398static vec_t
359ith_octave (vec_t P, int i) 399ith_octave (vec_t P, int i)
360{ 400{
361 vec_t r = P; 401 vec_t r = P;
362 r[0] += i; 402 r[0] += i;
403 r[1] += i * 2;
363 return r; 404 return r;
364} 405}
365 406
366template<class vec_t> 407template<class vec_t>
367frac_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)
368: h (hurst_expo), lac (lacunarity), noise_gen<vec_t> (0) 409: h (hurst_expo), lac (lacunarity), noise_gen<vec_t> (0)
369{ 410{
370 value_t exsum = 0; 411 value_t exsum = 0;
412 value_t phi = noise (vec_t (value_t (0))) * 0.5 + 1;
371 413
372 for (int i = 0; i < MAX_OCTAVES; ++i) 414 for (int i = 0; i < MAX_OCTAVES; ++i)
373 { 415 {
374 ex [i] = powf (lac, -h * i); 416 ex [i] = pow (lac, -h * i);
375 exsum += ex [i]; 417 exsum += ex [i];
376 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
377 rot [i].set (0.4488f * i); 419 rot [i].set (phi * i + 1);
378 } 420 }
379} 421}
380 422
381template<class vec_t> 423template<class vec_t>
382typename frac_gen<vec_t>::value_t 424typename frac_gen<vec_t>::value_t
383frac_gen<vec_t>::fBm (vec_t P, int octaves) 425frac_gen<vec_t>::fBm (vec_t P, int octaves)
384{ 426{
385 value_t v = 0.f; 427 value_t v = 0;
386 428
387 for (int i = 0; i < octaves; ++i) 429 for (int i = 0; i < octaves; ++i)
388 { 430 {
389 rot [i](P); 431 rot [i](P);
390 v += noise (ith_octave (P, i)) * ex [i]; 432 v += noise (ith_octave (P, i)) * ex [i];
391 P *= lac; 433 P *= lac;
392 } 434 }
393 435
394 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);
395} 437}
396 438
397template<class vec_t> 439template<class vec_t>
398typename frac_gen<vec_t>::value_t 440typename frac_gen<vec_t>::value_t
399frac_gen<vec_t>::turbulence (vec_t P, int octaves) 441frac_gen<vec_t>::turbulence (vec_t P, int octaves)
400{ 442{
401 value_t v = 0.f; 443 value_t v = 0;
402 444
403 for (int i = 0; i < octaves; ++i) 445 for (int i = 0; i < octaves; ++i)
404 { 446 {
405 rot [i](P); 447 rot [i](P);
406 v += abs (noise (ith_octave (P, i))) * ex [i]; 448 v += abs (noise (ith_octave (P, i))) * ex [i];
407 P *= lac; 449 P *= lac;
408 } 450 }
409 451
410 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);
411} 453}
412 454
413template<class vec_t> 455template<class vec_t>
414typename frac_gen<vec_t>::value_t 456typename frac_gen<vec_t>::value_t
415frac_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)
416{ 458{
417 value_t v = 1.f; 459 value_t v = 1;
418 460
419 for (int i = 0; i < octaves; ++i) 461 for (int i = 0; i < octaves; ++i)
420 { 462 {
421 rot [i](P); 463 rot [i](P);
422 v *= noise (P) * ex [i] + offset; 464 v *= noise (P) * ex [i] + offset;
423 P *= lac; 465 P *= lac;
424 } 466 }
425 467
426 return clamp (v * 0.5f, 0.f, .9999999f); 468 return clamp<value_t> (v * 0.5, 0, .9999999);
427} 469}
428 470
429template<class vec_t> 471template<class vec_t>
430typename frac_gen<vec_t>::value_t 472typename frac_gen<vec_t>::value_t
431frac_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)
432{ 474{
433 value_t v = noise (P) + offset; 475 value_t v = noise (P) + offset;
434 int i;
435 476
436 for (i = 1; i < octaves; ++i) 477 for (int i = 1; i < octaves; ++i)
437 { 478 {
438 rot [i](P); 479 rot [i](P);
439 P *= lac; 480 P *= lac;
440 v += v * (noise (P) * ex [i] + offset); 481 v += v * (noise (P) * ex [i] + offset);
441 } 482 }
442 483
443 return v / powf (2., octaves); 484 return v / (1 << octaves);
444} 485}
445 486
446template<class vec_t> 487template<class vec_t>
447typename frac_gen<vec_t>::value_t 488typename frac_gen<vec_t>::value_t
448frac_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)
449{ 490{
450 value_t v = (noise (P) + offset) * ex [0]; 491 value_t v = (noise (P) + offset) * ex [0];
451 value_t weight = v; 492 value_t weight = v;
452 int i;
453 493
454 for (i = 1; i < octaves; ++i) 494 for (int i = 1; i < octaves; ++i)
455 { 495 {
456 rot [i](P); 496 rot [i](P);
457 P *= lac; 497 P *= lac;
458 498
459 min_it (weight, 1.f); 499 min_it (weight, 1);
460 500
461 value_t sig = (noise (P) + offset) * ex [i]; 501 value_t sig = (noise (P) + offset) * ex [i];
462 v += weight * sig; 502 v += weight * sig;
463 weight *= gain * sig; 503 weight *= gain * sig;
464 } 504 }
465 505
466 return clamp (v * 0.5f + 0.5f, 0.f, .9999999f); 506 return clamp<value_t> (v * 0.5 + 0.5, 0, .9999999);
467} 507}
468 508
469template<class vec_t> 509template<class vec_t>
470typename frac_gen<vec_t>::value_t 510typename frac_gen<vec_t>::value_t
471frac_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)
… …
477 for (int i = 1; i < octaves; ++i) 517 for (int i = 1; i < octaves; ++i)
478 { 518 {
479 rot [i](P); 519 rot [i](P);
480 P *= lac; 520 P *= lac;
481 521
482 value_t w = clamp (sig * gain, 0.f, 1.f); 522 value_t w = clamp (sig * gain, 0, 1);
483 523
484 sig = offset - abs (noise (P)); 524 sig = offset - abs (noise (P));
485 sig *= sig; 525 sig *= sig;
486 sig *= w; 526 sig *= w;
487 527
488 v += sig * ex [i]; 528 v += sig * ex [i];
489 } 529 }
490 530
491 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);
492} 550}
493 551
494// 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
495template<class vec_t> 553template<class vec_t>
496typename frac_gen<vec_t>::value_t 554typename frac_gen<vec_t>::value_t
497frac_gen<vec_t>::terrain (vec_t P, int octaves) 555frac_gen<vec_t>::terrain (vec_t P, int octaves)
498{ 556{
499 value_t v = 0.f; 557 value_t v = 0;
500 558
501 for (int i = 0; i < octaves; ++i) 559 for (int i = 0; i < octaves; ++i)
502 { 560 {
503 rot [i](P); 561 rot [i](P);
504 v += noise (P) * ex [i]; 562 v += noise (P) * ex [i];
505 P *= lac; 563 P *= lac;
506 } 564 }
507 565
508 v *= fbm_mul [octaves - 1]; 566 v *= fbm_mul [octaves - 1];
509 567
510 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);
511} 569}
512 570
513template<class vec_t> 571template<class vec_t>
514typename frac_gen<vec_t>::value_t 572typename frac_gen<vec_t>::value_t
515frac_gen<vec_t>::terrain2 (vec_t P, int octaves) 573frac_gen<vec_t>::terrain2 (vec_t P, int octaves)
516{ 574{
517 value_t a = fBm (P, octaves); 575 value_t a = fBm (P, octaves);
518 value_t b = ridgedmultifractal (P, octaves, 1, 8); 576 value_t b = ridgedmultifractal (P, octaves, 1, 8);
519 value_t fade = fBm (P + vec_t(10.3), octaves); 577 value_t fade = fBm (P + vec_t(10.3), octaves);
520 578
521 const value_t width = 0.05f; 579 const value_t width = 0.05;
522 580
523 if (fade > 0.5f + width) 581 if (fade > 0.5 + width)
524 return a; 582 return a;
525 else if (fade < 0.5f - width) 583 else if (fade < 0.5 - width)
526 return b; 584 return b;
527 585
528 fade = (fade - 0.5f + width) / (width * 2); 586 fade = (fade - 0.5 + width) / (width * 2);
529 587
530 // sigmoidal curve 588 // sigmoidal curve
531 fade = fade * fade * 2 * (1.5f - fade); 589 fade = fade * fade * 2 * (1.5 - fade);
532 590
533 return a * fade + b * (1 - fade); 591 return a * fade + b * (1 - fade);
534} 592}
535 593
536template class frac_gen<vec2d>; 594template class frac_gen<vec2d>;
… …
552 for (int y = 0; y < N; ++y) 610 for (int y = 0; y < N; ++y)
553 { 611 {
554 if (!(y&63))fprintf (stderr, "y %d\n", y);//D 612 if (!(y&63))fprintf (stderr, "y %d\n", y);//D
555 for (int x = 0; x < N; ++x) 613 for (int x = 0; x < N; ++x)
556 { 614 {
557 //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);
558 //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);
559 //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);
560 putc (256 * gen.turbulence (vec2d (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);
561 //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);
562 620
563 // mountais or somesuch(?) 621 // mountais or somesuch(?)
564 //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);
565 623
566 // temperature 624 // temperature
567 //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);
568 // rain 626 // rain
569 627
570 //cells 628 //cells
571 //putc (256 * gen.ridgedmultifractal (vec2d (x * 0.01, y * 0.01), 3, 0.5 + gen.noise(vec2d(x*0.01,y*0.01)), 2), stdout); 629 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout);
572 } 630 }
573 } 631 }
574#else 632#else
575 int N = 512; 633 int N = 512;
576 634

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines