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.13 by root, Sat Apr 30 05:41:17 2011 UTC vs.
Revision 1.14 by root, Sat Apr 30 11:02:25 2011 UTC

… …
267 vec2d I = floor (P); 267 vec2d I = floor (P);
268 vec2d F = P - I; 268 vec2d F = P - I;
269 269
270 value_t v = 0; 270 value_t v = 0;
271 271
272 seed *= 3039177861;
272 uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16); 273 uint8_t i1 = uint8_t (I[1]) + (seed >> 16);
273 uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8); 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)
276 { 279 {
277 uint8_t h1 = rvmap[1](i1 + j) ^ seed; 280 uint8_t h1 = rvmap[1](i1 + j) ^ h2;
278 281
279 for (int i = -1; i <= 2; ++i) 282 for (int i = -1; i <= 2; ++i)
280 { 283 {
281 vec2d A = F - vec2d (i, j); 284 vec2d A = F - vec2d (i, j);
282 value_t d = dot (A, A); 285 value_t d = dot (A, A);
… …
307noise_gen_base<vec3d>::operator() (vec3d P, uint32_t seed) 310noise_gen_base<vec3d>::operator() (vec3d P, uint32_t seed)
308{ 311{
309 vec3d I = floor (P); 312 vec3d I = floor (P);
310 vec3d F = P - I; 313 vec3d F = P - I;
311 314
315 seed *= 3039177861;
312 uint8_t i2 = uint8_t (I[2]) ^ (seed >> 24); 316 uint8_t i2 = uint8_t (I[2]) + (seed >> 24);
313 uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16); 317 uint8_t i1 = uint8_t (I[1]) + (seed >> 16);
314 uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8); 318 uint8_t i0 = uint8_t (I[0]) + (seed >> 8);
319
320 uint8_t h3 = rvmap[3](seed);
315 321
316 value_t v = 0; 322 value_t v = 0;
317 323
318 for (int k = -1; k <= 2; ++k) 324 for (int k = -1; k <= 2; ++k)
319 { 325 {
320 uint8_t h2 = rvmap[2](i2 + k) ^ seed; 326 uint8_t h2 = rvmap[2](i2 + k) ^ h3;
321 327
322 for (int j = -1; j <= 2; ++j) 328 for (int j = -1; j <= 2; ++j)
323 { 329 {
324 uint8_t h1 = rvmap[1](i1 + j) ^ h2; 330 uint8_t h1 = rvmap[1](i1 + j) ^ h2;
325 331
… …
353noise_gen<vec3d>::operator() (vec3d P, vec3d N, uint32_t seed) 359noise_gen<vec3d>::operator() (vec3d P, vec3d N, uint32_t seed)
354{ 360{
355 vec3d I = floor (P); 361 vec3d I = floor (P);
356 vec3d F = P - I; 362 vec3d F = P - I;
357 363
364 seed *= 3039177861;
358 uint8_t i2 = uint8_t (I[2]) ^ (seed >> 24); 365 uint8_t i2 = uint8_t (I[2]) + (seed >> 24);
359 uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16); 366 uint8_t i1 = uint8_t (I[1]) + (seed >> 16);
360 uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8); 367 uint8_t i0 = uint8_t (I[0]) + (seed >> 8);
368
369 uint8_t h3 = rvmap[3](seed);
361 370
362 value_t v = 0; 371 value_t v = 0;
363 372
364 for (int k = -1; k <= 2; ++k) 373 for (int k = -1; k <= 2; ++k)
365 { 374 {
366 uint8_t h2 = rvmap[2](i2 + k) ^ seed; 375 uint8_t h2 = rvmap[2](i2 + k) ^ h3;
367 376
368 for (int j = -1; j <= 2; ++j) 377 for (int j = -1; j <= 2; ++j)
369 { 378 {
370 uint8_t h1 = rvmap[1](i1 + j) ^ h2; 379 uint8_t h1 = rvmap[1](i1 + j) ^ h2;
371 380
… …
603template class frac_gen<vec2d>; 612template class frac_gen<vec2d>;
604template class frac_gen<vec3d>; 613template class frac_gen<vec3d>;
605 614
606///////////////////////////////////////////////////////////////////////////// 615/////////////////////////////////////////////////////////////////////////////
607 616
617template<typename T, typename U>
618T
619inline border_blend (T a, T b, vec2d P, U N, U W)
620{
621 U border = W; // within n places of the border
622
623 min_it (border, P [0]);
624 min_it (border, N - P [0]);
625 min_it (border, P [1]);
626 min_it (border, N - P [1]);
627
628 return blend (a, b,border, U(0), W);
629}
630
631static void
632gen_height (int x, int y)
633{
634 vec2d P = vec2d (x, y);
635
636 static frac2d gen(13);
637
638 static frac2d vec_gen1 (6, 2, 0.5, 1);
639 static frac2d vec_gen2 (6, 2, 0.5, 2);
640
641 const float continent_scale = 0.00008;
642
643 vec2d perturb_pos = pow (P, 1.4) * 1e-5;
644
645 vec2d perturb (
646 vec_gen1.fBm (perturb_pos),
647 vec_gen2.fBm (perturb_pos)
648 );
649
650 float perturb_perturb = 1 - (P[1] - P[0]) * (1. / 25000 / 2);
651 perturb_perturb = perturb_perturb * perturb_perturb * 0.4;
652 perturb *= perturb_perturb;
653
654 vec2d P_continent = P * continent_scale + perturb;
655
656 static frac2d continent_gen (13, 2.13, 0.5);
657 float continent = continent_gen.fBm (P_continent) + 0.05f;
658
659 float land_gradient = sigmoid1 (P[0] * (1. / 25000));
660
661 const float W = 1000 * continent_scale;
662 const float N = (25000 - 1) * continent_scale;
663
664 continent = border_blend (-1.f, continent, P_continent , N, 400 * continent_scale);
665 continent = border_blend (-1.f, continent, P * continent_scale + perturb * 0.1, N, 100 * continent_scale);
666
667 vec3d c;
668 float v;
669
670 if (continent < 0)
671 {
672 // ocean
673
674 v = min (continent * 10, -0.2f);
675 c = vec3d (0, 0, 1);
676 }
677 else
678 {
679 // continent
680
681 // big rivers
682 static frac2d river_gen (1);
683 float river1 = abs (river_gen.fBm (P * 0.001 + perturb * 4));
684 float river2 = river_gen.ridgedmultifractal (P * 0.04 + vec2d (3, 5), 0.8, 10) - (P[1] / 25000) * 0.1;
685
686 if (river1 < 0.03f)
687 {
688 v = min (-0.1f, -river1);
689 c = vec3d (0.2, 0.2, 1);
690 }
691 else if (river1 < 0.2f && river2 > 0.1f)
692 {
693 v = -0.05f;
694 c = vec3d (0.4, 0.4, 1);
695 }
696 else
697 {
698 river1 += 0.07f;
699
700 //c = river1 > 0 ? vec3d (0.8, 0.8, 0) : vec3d (0.8, 0, 0);
701 c = blend0 (vec3d (0.8, 0, 0), vec3d (0.8, 0.8, 0), 0.01f, river1);;
702
703 static frac2d mountain_gen (8, 2.14, 0.5);
704 float mountain = mountain_gen.ridgedmultifractal (P * 0.004);
705 v = blend0 (mountain * 3 - 1, continent, 0.05f, river1);
706 }
707 }
708
709 c *= v * 0.5 + 0.5;
710
711 putc (clamp<int> (255 * c[0], 0, 255), stdout);
712 putc (clamp<int> (255 * c[1], 0, 255), stdout);
713 putc (clamp<int> (255 * c[2], 0, 255), stdout);
714}
715
608void noise_test (); 716void noise_test ();
609void noise_test () 717void noise_test ()
610{ 718{
611 frac2d gen;
612
613 frac2d vec_gen1 (4, 2, 0.5, 1);
614 frac2d vec_gen2 (4, 2, 0.5, 2);
615
616#if 1 719#if 1
617 int N = 1024; 720 int Nw = 700;
618 721
619 printf ("P6 %d %d 255\n", N, N); 722 printf ("P6 %d %d 255\n", Nw * 3, Nw * 2);
620 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm 723 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
621 for (int y = 0; y < N; ++y) 724 for (int y = 0; y < Nw; ++y)
622 { 725 {
623 if (!(y&63))fprintf (stderr, "y %d\n", y);//D 726 if (!(y&63))fprintf (stderr, "y %d\n", y * 50 / Nw);//D
727
728 for (int x = 0; x < Nw; ++x) gen_height (x * 25000 / Nw, y * 25000 / Nw);
729
730 for (int x = 0; x < Nw; ++x) gen_height (x, y);
731 for (int x = 0; x < Nw; ++x) gen_height (x + 22000, y + 2000);
732 }
624 for (int x = 0; x < N; ++x) 733 for (int y = 0; y < Nw; ++y)
625 { 734 {
626 vec2d P = vec2d (x, y) * (25000.f / N); 735 if (!(y&63))fprintf (stderr, "y %d\n", y * 50 / Nw+50);//D
627 736
737 for (int x = 0; x < Nw; ++x) gen_height (x + 1000, y + 22000);
738 for (int x = 0; x < Nw; ++x) gen_height (x + 12000, y + 12000);
739 for (int x = 0; x < Nw; ++x) gen_height (x + 22000, y + 22000);
740 }
741
628 //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout); 742 //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout);
629 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout); 743 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout);
630 //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout); 744 //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout);
631 //putc (256 * gen.turbulence (vec2d (x * 0.004 - 1, y * 0.004 - 1), 10), stdout); 745 //putc (256 * gen.turbulence (vec2d (x * 0.004 - 1, y * 0.004 - 1), 10), stdout);
632 //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout); 746 //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout);
633
634 // mountais or somesuch(?)
635 //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout); 747 //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout);
636
637 // temperature
638 //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout); 748 //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout);
639 // rain
640
641 float continent;
642
643 {
644 const float continent_scale = 0.00008;
645
646 vec2d perturb (
647 vec_gen1.fBm (P * 0.0004),
648 vec_gen2.fBm (P * 0.0004)
649 );
650
651 const float W = 1000 * continent_scale;
652 const float N = (25000 - 1) * continent_scale;
653
654 static frac2d perturb_gen (4, 2, 0.5, 3);
655 float perturb_perturb = gen.fBm (P * 0.0004);
656 perturb_perturb = perturb_perturb * perturb_perturb * 0.004;
657
658 vec2d P_perturb = P * continent_scale + perturb * min (W, gen.noise (P * perturb_perturb) * W * 8);
659
660 static frac2d continent_gen (13, 2.13, 0.5);
661 continent = continent_gen.fBm (P_perturb) + 0.05f;
662
663 float border = W; // within n places of the border
664
665 min_it (border, P_perturb [0]);
666 min_it (border, N - P_perturb [0]);
667 min_it (border, P_perturb [1]);
668 min_it (border, N - P_perturb [1]);
669
670 continent = blend (-1.f, continent, border, 0.f, W);
671 }
672
673 vec3d c (1, 1, 1);
674 float v;
675
676 if (continent < 0)
677 {
678 // ocean
679
680 v = min (continent * 10, -0.2f);
681 c = vec3d (0, 0, 1);
682 }
683 else
684 {
685 // continent
686
687 // big rivers
688 static frac2d river_gen (2);
689 float river1 = river_gen.fBm (P * 0.0004);// - (P[0] / 25000) * 0.18 + 0.06;
690 float river2 = river_gen.ridgedmultifractal (P * 0.04 + vec2d (3, 5), 0.8, 10) - (P[1] / 25000) * 0.1;
691
692 if (river1 > 0.05f)
693 {
694 v = -0.1f;
695 c = vec3d (0.4, 0.4, 1);
696 }
697 else if (river1 > 0.08f && river2 > 0.1f)
698 {
699 v = -0.05f;
700 c = vec3d (0.4, 0.4, 1);
701 }
702 else
703 {
704 river1 -= 0.07f;
705
706 //c = river1 > 0 ? vec3d (0.8, 0.8, 0) : vec3d (0.8, 0, 0);
707 c = blend0 (vec3d (0.8, 0, 0), vec3d (0.8, 0.8, 0), river1, 0.01f);;
708
709 static frac2d mountain_gen (8, 2.14, 0.5);
710 float mountain = mountain_gen.ridgedmultifractal (P * 0.004);
711 v = blend0 (mountain * 3 - 1, continent, river1, 0.05f);
712 }
713
714 v=abs(river1) < 0.1;
715 c=vec3d(1,1,1);
716 }
717
718 c *= v * 0.5 + 0.5;
719
720 putc (clamp<int> (255 * c[0], 0, 255), stdout);
721 putc (clamp<int> (255 * c[1], 0, 255), stdout);
722 putc (clamp<int> (255 * c[2], 0, 255), stdout);
723
724 //cells
725 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout); 749 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout);
726 }
727 }
728#else 750#else
729 int N = 128; 751 int N = 128;
730 752
731 //printf ("P6 %d %d 255\n", N, N); 753 //printf ("P6 %d %d 255\n", N, N);
732 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm 754 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm

Diff Legend

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