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.10 by root, Tue Apr 26 03:35:23 2011 UTC vs.
Revision 1.18 by root, Sun May 1 13:18:23 2011 UTC

226}; 226};
227 227
228///////////////////////////////////////////////////////////////////////////// 228/////////////////////////////////////////////////////////////////////////////
229 229
230template<int N, typename T> 230template<int N, typename T>
231template<class random_generator>
232void 231void
233permutation<N,T>::seed (random_generator &rng) 232permutation<N,T>::seed (seedable_rand_gen &rng)
234{ 233{
235 for (int i = 0; i < N; ++i) 234 for (int i = 0; i < N; ++i)
236 pmap[i] = i; 235 pmap[i] = i;
237 236
238 // fisher-yates to randomly perturb 237 // fisher-yates to randomly perturb
242 241
243template class permutation<256, uint8_t>; 242template class permutation<256, uint8_t>;
244 243
245///////////////////////////////////////////////////////////////////////////// 244/////////////////////////////////////////////////////////////////////////////
246 245
247static vec2d 246template<class vec_t>
248floor (vec2d v) 247void
248noise_gen_base<vec_t>::seed (seedable_rand_gen &rng)
249{ 249{
250 return vec2d (std::floor (v[0]), std::floor (v[1])); 250 for (int i = 0; i < array_length (rvmap); ++i)
251 rvmap[i].seed (rng);
251} 252}
252 253
253static vec3d 254template<class vec_t>
254floor (vec3d v) 255void
255{ 256noise_gen_base<vec_t>::seed (seed_t seed)
256 return vec3d (std::floor (v[0]), std::floor (v[1]), std::floor (v[2]));
257}
258
259noise_gen<vec2d>::noise_gen (uint32_t seed)
260{ 257{
261 seedable_rand_gen rng (seed); 258 seedable_rand_gen rng (seed);
262 259
263 rvmap[0].seed (rng); 260 this->seed (rng);
264 rvmap[1].seed (rng);
265} 261}
266 262
263template<>
267vec2d::T_numtype 264vec2d::T_numtype
268noise_gen<vec2d>::operator() (vec2d P) 265noise_gen_base<vec2d>::operator() (vec2d P, uint32_t seed)
269{ 266{
270 vec2d I = floor (P); 267 vec2d I = floor (P);
271 vec2d F = P - I; 268 vec2d F = P - I;
272 269
273 float v = 0; 270 value_t v = 0;
271
272 seed *= 3039177861;
273 uint8_t i1 = uint8_t (I[1]) + (seed >> 16);
274 uint8_t i0 = uint8_t (I[0]) + (seed >> 8);
275
276 uint8_t h2 = rvmap[2](seed);
274 277
275 for (int j = -1; j <= 2; ++j) 278 for (int j = -1; j <= 2; ++j)
279 {
280 uint8_t h1 = rvmap[1](i1 + j) ^ h2;
281
276 for (int i = -1; i <= 2; ++i) 282 for (int i = -1; i <= 2; ++i)
277 { 283 {
278 vec2d A = F - vec2d (i, j); 284 vec2d A = F - vec2d (i, j);
279
280 float d = dot (A, A); 285 value_t d = dot (A, A);
281 286
282 if (d < 4) 287 if (d < 4)
283 { 288 {
284 float t1 = 1 - d / 4; 289 value_t t1 = 1 - d / 4;
285 float t2 = t1 * t1; 290 value_t t2 = t1 * t1;
286 float t4 = t2 * t2; 291 value_t t4 = t2 * t2;
287 292
288 float p = (4 * t1 - 3) * t4; 293 value_t p = (4 * t1 - 3) * t4;
289 294
290 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j); 295 uint8_t h = rvmap[0](i0 + i) ^ h1;
291 vec2d G = charges2[h & 0xff]; 296 vec2d G = charges2[h & 0xff];
292 297
293 v += dot (A, G) * p; 298 v += dot (A, G) * p;
294 } 299 }
295 } 300 }
301 }
296 302
297 return clamp (v, -.9999999, .9999999); 303 return v;
298} 304}
299 305
300///////////////////////////////////////////////////////////////////////////// 306/////////////////////////////////////////////////////////////////////////////
301 307
302noise_gen<vec3d>::noise_gen (uint32_t seed) 308template<>
303{
304 seedable_rand_gen rng (seed);
305
306 rvmap [0].seed (rng);
307 rvmap [1].seed (rng);
308 rvmap [2].seed (rng);
309}
310
311vec3d::T_numtype 309vec3d::T_numtype
312noise_gen<vec3d>::operator() (vec3d P) 310noise_gen_base<vec3d>::operator() (vec3d P, uint32_t seed)
313{ 311{
314 vec3d I = floor (P); 312 vec3d I = floor (P);
315 vec3d F = P - I; 313 vec3d F = P - I;
316 314
317 float v = 0; 315 seed *= 3039177861;
316 uint8_t i2 = uint8_t (I[2]) + (seed >> 24);
317 uint8_t i1 = uint8_t (I[1]) + (seed >> 16);
318 uint8_t i0 = uint8_t (I[0]) + (seed >> 8);
318 319
319 for (int j = -1; j <= 2; ++j) 320 uint8_t h3 = rvmap[3](seed);
320 for (int i = -1; i <= 2; ++i) 321
322 value_t v = 0;
323
321 for (int k = -1; k <= 2; ++k) 324 for (int k = -1; k <= 2; ++k)
325 {
326 uint8_t h2 = rvmap[2](i2 + k) ^ h3;
327
328 for (int j = -1; j <= 2; ++j)
322 { 329 {
323 vec3d A = F - vec3d (i, j, k); 330 uint8_t h1 = rvmap[1](i1 + j) ^ h2;
324 float d = dot (A, A);
325 331
326 if (d < 4) 332 for (int i = -1; i <= 2; ++i)
327 { 333 {
328 float t1 = 1 - d / 4;
329 float t2 = t1 * t1;
330 float t4 = t2 * t2;
331
332 // (4t⁵ - 3t⁴)
333 float p = (4 * t1 - 3) * t4;
334
335 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k);
336 const float *G = charges3[h & 0xff];
337
338 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
339 }
340 }
341
342 return clamp (v * 2, -.9999999, .9999999);
343}
344
345vec3d::T_numtype
346noise_gen<vec3d>::operator() (vec3d P, vec3d N)
347{
348 vec3d I = floor (P);
349 vec3d F = P - I;
350
351 float v = 0;
352
353 for (int j = -1; j <= 2; ++j)
354 for (int i = -1; i <= 2; ++i)
355 for (int k = -1; k <= 2; ++k)
356 {
357 vec3d D = F - vec3d (i, j, k); 334 vec3d A = F - vec3d (i, j, k);
358 float e = dot (D, N);
359 float o = 1 - abs (e);
360
361 if (o > 0)
362 {
363 vec3d A = D - e * N;
364 float d = dot (A, A); 335 value_t d = dot (A, A);
365 336
366 if (d < 4) 337 if (d < 4)
367 { 338 {
368 float t1 = 1 - d / 4; 339 value_t t1 = 1 - d / 4;
369 float t2 = t1 * t1; 340 value_t t2 = t1 * t1;
370 float t4 = t2 * t2; 341 value_t t4 = t2 * t2;
371 342
372 float o2 = o * o;
373
374 // (4t⁵ - 3t⁴) * (3o³ - 2o²) 343 // (4t⁵ - 3t⁴)
375 // alternative? ((o * 6 - 15) * o + 10) * o³ 344 value_t p = (4 * t1 - 3) * t4;
376 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o);
377 345
378 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k); 346 uint8_t h = rvmap[0](i0 + i) ^ h1;
379 const float *G = charges3[h & 0xff]; 347 const value_t *G = charges3[h & 0xff];
380 348
381 v += dot (A, vec3d (G[0], G[1], G[2])) * p; 349 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
382 } 350 }
383 } 351 }
384 } 352 }
353 }
385 354
386 return clamp (v, -.9999999, .9999999); 355 return v * 2;
356}
357
358vec3d::T_numtype
359noise_gen<vec3d>::operator() (vec3d P, vec3d N, uint32_t seed)
360{
361 vec3d I = floor (P);
362 vec3d F = P - I;
363
364 seed *= 3039177861;
365 uint8_t i2 = uint8_t (I[2]) + (seed >> 24);
366 uint8_t i1 = uint8_t (I[1]) + (seed >> 16);
367 uint8_t i0 = uint8_t (I[0]) + (seed >> 8);
368
369 uint8_t h3 = rvmap[3](seed);
370
371 value_t v = 0;
372
373 for (int k = -1; k <= 2; ++k)
374 {
375 uint8_t h2 = rvmap[2](i2 + k) ^ h3;
376
377 for (int j = -1; j <= 2; ++j)
378 {
379 uint8_t h1 = rvmap[1](i1 + j) ^ h2;
380
381 for (int i = -1; i <= 2; ++i)
382 {
383 vec3d D = F - vec3d (i, j, k);
384 value_t e = dot (D, N);
385 value_t o = 1 - abs (e);
386
387 if (o > 0)
388 {
389 vec3d A = D - e * N;
390 value_t d = dot (A, A);
391
392 if (d < 4)
393 {
394 value_t t1 = 1 - d / 4;
395 value_t t2 = t1 * t1;
396 value_t t4 = t2 * t2;
397
398 value_t o2 = o * o;
399
400 // (4t⁵ - 3t⁴) * (3o³ - 2o²)
401 // alternative? ((o * 6 - 15) * o + 10) * o³
402 value_t p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o);
403
404 uint8_t h = rvmap[0](i0 + i) ^ h1;
405 const value_t *G = charges3[h & 0xff];
406
407 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
408 }
409 }
410 }
411 }
412 }
413
414 return v;
387} 415}
388 416
389template class noise_gen<vec2d>; 417template class noise_gen<vec2d>;
390template class noise_gen<vec3d>; 418template class noise_gen<vec3d>;
391 419
392///////////////////////////////////////////////////////////////////////////// 420/////////////////////////////////////////////////////////////////////////////
393 421
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.
397template<class vec_t> 422template<class vec_t>
398static vec_t 423frac_gen<vec_t>::frac_gen (int octaves, value_t lacunarity, value_t hurst_expo, seed_t seed)
399ith_octave (vec_t P, int i) 424: octaves (octaves), lac (lacunarity), h (hurst_expo)
400{ 425{
401 vec_t r = P; 426 this->seed (seed);
402 r[0] += i;
403 r[1] += i * 2;
404 return r;
405}
406 427
407template<class vec_t>
408frac_gen<vec_t>::frac_gen (value_t hurst_expo, value_t lacunarity)
409: h (hurst_expo), lac (lacunarity), noise_gen<vec_t> (0)
410{
411 value_t exsum = 0; 428 value_t exsum = 0;
412 value_t phi = noise (vec_t (value_t (0))) * 0.5 + 1; 429 value_t phi = noise (vec_t (value_t (0))) * 0.5 + 1;
413 430
414 for (int i = 0; i < MAX_OCTAVES; ++i) 431 for (int i = 0; i < octaves; ++i)
415 { 432 {
416 ex [i] = pow (lac, -h * i); 433 ex [i] = pow (lac, -h * i);
417 exsum += ex [i]; 434 exsum += ex [i];
418 fbm_mul [i] = 0.5 / (exsum * 0.75); // .75 is a heuristic 435 fbm_mul [i] = 0.5 / (exsum * 0.75); // .75 is a heuristic
419 rot [i].set (phi * i + 1); 436 rot [i].set (phi * i + 1);
420 } 437 }
421} 438}
422 439
423template<class vec_t> 440template<class vec_t>
424typename frac_gen<vec_t>::value_t 441typename frac_gen<vec_t>::value_t
425frac_gen<vec_t>::fBm (vec_t P, int octaves) 442frac_gen<vec_t>::fBm (vec_t P)
426{ 443{
427 value_t v = 0; 444 value_t v = 0;
428 445
429 for (int i = 0; i < octaves; ++i) 446 for (int i = 0; i < octaves; ++i)
430 { 447 {
431 rot [i](P); 448 rot [i](P);
432 v += noise (ith_octave (P, i)) * ex [i]; 449 v += noise (P, i) * ex [i];
433 P *= lac; 450 P *= lac;
434 } 451 }
435 452
436 return clamp<value_t> (v * fbm_mul [octaves - 1] + 0.5, 0, .9999999); 453 return v * fbm_mul [octaves - 1];
437} 454}
438 455
439template<class vec_t> 456template<class vec_t>
440typename frac_gen<vec_t>::value_t 457typename frac_gen<vec_t>::value_t
441frac_gen<vec_t>::turbulence (vec_t P, int octaves) 458frac_gen<vec_t>::turbulence (vec_t P)
442{ 459{
443 value_t v = 0; 460 value_t v = 0;
444 461
445 for (int i = 0; i < octaves; ++i) 462 for (int i = 0; i < octaves; ++i)
446 { 463 {
447 rot [i](P); 464 rot [i](P);
448 v += abs (noise (ith_octave (P, i))) * ex [i]; 465 v += abs (noise (P, i)) * ex [i];
449 P *= lac; 466 P *= lac;
450 } 467 }
451 468
452 return clamp<value_t> (v * fbm_mul [octaves - 1] * (0.5 / noise_gen<vec_t>::abs_avg ()), 0, .9999999); 469 return v * fbm_mul [octaves - 1] * (0.5 / noise_gen<vec_t>::abs_avg ());
453} 470}
454 471
455template<class vec_t> 472template<class vec_t>
456typename frac_gen<vec_t>::value_t 473typename frac_gen<vec_t>::value_t
457frac_gen<vec_t>::multifractal (vec_t P, int octaves, value_t offset) 474frac_gen<vec_t>::multifractal (vec_t P, value_t offset)
458{ 475{
459 value_t v = 1; 476 value_t v = 1;
460 477
461 for (int i = 0; i < octaves; ++i) 478 for (int i = 0; i < octaves; ++i)
462 { 479 {
463 rot [i](P); 480 rot [i](P);
464 v *= noise (P) * ex [i] + offset; 481 v *= noise (P) * ex [i] + offset;
465 P *= lac; 482 P *= lac;
466 } 483 }
467 484
468 return clamp<value_t> (v * 0.5, 0, .9999999); 485 return v * value_t (0.5);
469} 486}
470 487
471template<class vec_t> 488template<class vec_t>
472typename frac_gen<vec_t>::value_t 489typename frac_gen<vec_t>::value_t
473frac_gen<vec_t>::heterofractal (vec_t P, int octaves, value_t offset) 490frac_gen<vec_t>::heterofractal (vec_t P, value_t offset)
474{ 491{
475 value_t v = noise (P) + offset; 492 value_t v = noise (P) + offset;
476 493
477 for (int i = 1; i < octaves; ++i) 494 for (int i = 1; i < octaves; ++i)
478 { 495 {
484 return v / (1 << octaves); 501 return v / (1 << octaves);
485} 502}
486 503
487template<class vec_t> 504template<class vec_t>
488typename frac_gen<vec_t>::value_t 505typename frac_gen<vec_t>::value_t
489frac_gen<vec_t>::hybridfractal (vec_t P, int octaves, value_t offset, value_t gain) 506frac_gen<vec_t>::hybridfractal (vec_t P, value_t offset, value_t gain)
490{ 507{
491 value_t v = (noise (P) + offset) * ex [0]; 508 value_t v = (noise (P) + offset) * ex [0];
492 value_t weight = v; 509 value_t weight = v;
493 510
494 for (int i = 1; i < octaves; ++i) 511 for (int i = 1; i < octaves; ++i)
501 value_t sig = (noise (P) + offset) * ex [i]; 518 value_t sig = (noise (P) + offset) * ex [i];
502 v += weight * sig; 519 v += weight * sig;
503 weight *= gain * sig; 520 weight *= gain * sig;
504 } 521 }
505 522
506 return clamp<value_t> (v * 0.5 + 0.5, 0, .9999999); 523 return v * value_t (0.5) + value_t (0.5);
507} 524}
508 525
509template<class vec_t> 526template<class vec_t>
510typename frac_gen<vec_t>::value_t 527typename frac_gen<vec_t>::value_t
511frac_gen<vec_t>::ridgedmultifractal (vec_t P, int octaves, value_t offset, value_t gain) 528frac_gen<vec_t>::ridgedmultifractal (vec_t P, value_t offset, value_t gain)
512{ 529{
513 value_t sig = offset - abs (noise (P)); 530 value_t sig = offset - abs (noise (P));
514 sig *= sig; 531 sig *= sig;
515 value_t v = sig; 532 value_t v = sig;
516 533
517 for (int i = 1; i < octaves; ++i) 534 for (int i = 1; i < octaves; ++i)
518 { 535 {
519 rot [i](P); 536 rot [i](P);
520 P *= lac; 537 P *= lac;
521 538
539 // weight higher octaves by previous signal
522 value_t w = clamp (sig * gain, 0, 1); 540 value_t w = clamp (sig * gain, 0, 1);
523 541
524 sig = offset - abs (noise (P)); 542 sig = offset - abs (noise (P));
525 sig *= sig; 543 sig *= sig;
526 sig *= w; 544 sig *= w;
527 545
528 v += sig * ex [i]; 546 v += sig * ex [i];
529 } 547 }
530 548
531 return clamp<value_t> (v * 0.25, 0, .9999999); 549 return v * value_t (0.25);
532} 550}
533 551
534template<class vec_t> 552template<class vec_t>
535typename frac_gen<vec_t>::value_t 553typename frac_gen<vec_t>::value_t
536frac_gen<vec_t>::billowfractal (vec_t P, int octaves, value_t offset, value_t gain) 554frac_gen<vec_t>::billowfractal (vec_t P, value_t offset, value_t gain)
537{ 555{
538 value_t v = 0; 556 value_t v = 0;
539 557
540 offset += 2 * noise_gen<vec_t>::abs_avg () - 1; 558 offset += 2 * noise_gen<vec_t>::abs_avg () - 1;
541 559
542 for (int i = 0; i < octaves; ++i) 560 for (int i = 0; i < octaves; ++i)
543 { 561 {
544 rot [i](P); 562 rot [i](P);
545 v += (abs (noise (ith_octave (P, i))) * gain - offset) * ex [i]; 563 v += (abs (noise (P, i)) * gain - offset) * ex [i];
546 P *= lac; 564 P *= lac;
547 } 565 }
548 566
549 return clamp<value_t> (v, -.9999999, .9999999); 567 return v;
550} 568}
551 569
552// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2 570// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2
553template<class vec_t> 571template<class vec_t>
554typename frac_gen<vec_t>::value_t 572typename frac_gen<vec_t>::value_t
555frac_gen<vec_t>::terrain (vec_t P, int octaves) 573frac_gen<vec_t>::terrain (vec_t P)
556{ 574{
557 value_t v = 0; 575 value_t v = 0;
558 576
559 for (int i = 0; i < octaves; ++i) 577 for (int i = 0; i < octaves; ++i)
560 { 578 {
568 return v <= 0 ? - pow (-v, 0.7) : pow (v, 1 + noise (P) * v); 586 return v <= 0 ? - pow (-v, 0.7) : pow (v, 1 + noise (P) * v);
569} 587}
570 588
571template<class vec_t> 589template<class vec_t>
572typename frac_gen<vec_t>::value_t 590typename frac_gen<vec_t>::value_t
573frac_gen<vec_t>::terrain2 (vec_t P, int octaves) 591frac_gen<vec_t>::terrain2 (vec_t P)
574{ 592{
575 value_t a = fBm (P, octaves); 593 value_t a = fBm (P);
576 value_t b = ridgedmultifractal (P, octaves, 1, 8); 594 value_t b = ridgedmultifractal (P, 1, 8);
577 value_t fade = fBm (P + vec_t(10.3), octaves); 595 value_t fade = fBm (P + vec_t(10.3));
578 596
579 const value_t width = 0.05; 597 const value_t width = 0.05;
580 598
581 if (fade > 0.5 + width) 599 if (fade > 0.5 + width)
582 return a; 600 return a;
592} 610}
593 611
594template class frac_gen<vec2d>; 612template class frac_gen<vec2d>;
595template class frac_gen<vec3d>; 613template class frac_gen<vec3d>;
596 614
597/////////////////////////////////////////////////////////////////////////////
598
599void noise_test ();
600void noise_test ()
601{
602 frac_gen<vec2d> gen (0.5, 1.9);
603 frac_gen<vec3d> gen3;
604
605#if 1
606 int N = 1024;
607
608 printf ("P5 %d %d 255\n", N, N);
609 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
610 for (int y = 0; y < N; ++y)
611 {
612 if (!(y&63))fprintf (stderr, "y %d\n", y);//D
613 for (int x = 0; x < N; ++x)
614 {
615 //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout);
616 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout);
617 //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout);
618 putc (256 * gen.turbulence (vec2d (x * 0.004 - 1, y * 0.004 - 1), 10), stdout);
619 //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout);
620
621 // mountais or somesuch(?)
622 //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout);
623
624 // temperature
625 //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout);
626 // rain
627
628 putc (255 * gen.ridgedmultifractal (vec2d (x * 0.01, y * 0.01), 1, 1, 1), stdout);
629
630 //cells
631 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout);
632 }
633 }
634#else
635 int N = 512;
636
637 //printf ("P6 %d %d 255\n", N, N);
638 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
639 for (int z = 0; z < N; ++z)
640 {
641 if (!(z&7))fprintf (stderr, "z %d\n", z);//D
642 for (int y = 0; y < N; ++y)
643 for (int x = 0; x < N; ++x)
644 {
645 float v = gen3.ridgedmultifractal (vec3d (x * 0.01 + 0.2, y * 0.01 + 0.2, z * 0.01 + 0.2), 3, 1.03, 2) * 2;
646
647#if 0
648 if (z < 64)
649 v = v * (z * z) / (64 * 64);
650#endif
651
652 if (v <= 0.9999)
653 continue;
654
655 float r[4];
656 int i[4];
657
658 r[0] = x;
659 r[1] = y;
660 r[2] = z;
661 r[3] = v;
662
663 memcpy (i, r, 16);
664
665 i[0] = htonl (i[0]);
666 i[1] = htonl (i[1]);
667 i[2] = htonl (i[2]);
668 i[3] = htonl (i[3]);
669
670 fwrite (i, 4*4, 1, stdout);
671 }
672 }
673#endif
674
675 exit (0);
676}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines