--- deliantra/server/common/noise.C 2011/04/30 05:41:17 1.13 +++ deliantra/server/common/noise.C 2011/04/30 11:02:25 1.14 @@ -269,12 +269,15 @@ value_t v = 0; - uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16); - uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8); + seed *= 3039177861; + uint8_t i1 = uint8_t (I[1]) + (seed >> 16); + uint8_t i0 = uint8_t (I[0]) + (seed >> 8); + + uint8_t h2 = rvmap[2](seed); for (int j = -1; j <= 2; ++j) { - uint8_t h1 = rvmap[1](i1 + j) ^ seed; + uint8_t h1 = rvmap[1](i1 + j) ^ h2; for (int i = -1; i <= 2; ++i) { @@ -309,15 +312,18 @@ vec3d I = floor (P); vec3d F = P - I; - uint8_t i2 = uint8_t (I[2]) ^ (seed >> 24); - uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16); - uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8); + seed *= 3039177861; + uint8_t i2 = uint8_t (I[2]) + (seed >> 24); + uint8_t i1 = uint8_t (I[1]) + (seed >> 16); + uint8_t i0 = uint8_t (I[0]) + (seed >> 8); + + uint8_t h3 = rvmap[3](seed); value_t v = 0; for (int k = -1; k <= 2; ++k) { - uint8_t h2 = rvmap[2](i2 + k) ^ seed; + uint8_t h2 = rvmap[2](i2 + k) ^ h3; for (int j = -1; j <= 2; ++j) { @@ -355,15 +361,18 @@ vec3d I = floor (P); vec3d F = P - I; - uint8_t i2 = uint8_t (I[2]) ^ (seed >> 24); - uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16); - uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8); + seed *= 3039177861; + uint8_t i2 = uint8_t (I[2]) + (seed >> 24); + uint8_t i1 = uint8_t (I[1]) + (seed >> 16); + uint8_t i0 = uint8_t (I[0]) + (seed >> 8); + + uint8_t h3 = rvmap[3](seed); value_t v = 0; for (int k = -1; k <= 2; ++k) { - uint8_t h2 = rvmap[2](i2 + k) ^ seed; + uint8_t h2 = rvmap[2](i2 + k) ^ h3; for (int j = -1; j <= 2; ++j) { @@ -605,126 +614,139 @@ ///////////////////////////////////////////////////////////////////////////// -void noise_test (); -void noise_test () +template +T +inline border_blend (T a, T b, vec2d P, U N, U W) { - frac2d gen; + U border = W; // within n places of the border - frac2d vec_gen1 (4, 2, 0.5, 1); - frac2d vec_gen2 (4, 2, 0.5, 2); + min_it (border, P [0]); + min_it (border, N - P [0]); + min_it (border, P [1]); + min_it (border, N - P [1]); -#if 1 - int N = 1024; + return blend (a, b,border, U(0), W); +} - printf ("P6 %d %d 255\n", N, N); - // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm - for (int y = 0; y < N; ++y) - { - if (!(y&63))fprintf (stderr, "y %d\n", y);//D - for (int x = 0; x < N; ++x) - { - vec2d P = vec2d (x, y) * (25000.f / N); - - //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout); - //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout); - //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout); - //putc (256 * gen.turbulence (vec2d (x * 0.004 - 1, y * 0.004 - 1), 10), stdout); - //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout); - - // mountais or somesuch(?) - //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout); - - // temperature - //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout); - // rain +static void +gen_height (int x, int y) +{ + vec2d P = vec2d (x, y); - float continent; + static frac2d gen(13); - { - const float continent_scale = 0.00008; + static frac2d vec_gen1 (6, 2, 0.5, 1); + static frac2d vec_gen2 (6, 2, 0.5, 2); - vec2d perturb ( - vec_gen1.fBm (P * 0.0004), - vec_gen2.fBm (P * 0.0004) - ); + const float continent_scale = 0.00008; - const float W = 1000 * continent_scale; - const float N = (25000 - 1) * continent_scale; + vec2d perturb_pos = pow (P, 1.4) * 1e-5; - static frac2d perturb_gen (4, 2, 0.5, 3); - float perturb_perturb = gen.fBm (P * 0.0004); - perturb_perturb = perturb_perturb * perturb_perturb * 0.004; + vec2d perturb ( + vec_gen1.fBm (perturb_pos), + vec_gen2.fBm (perturb_pos) + ); - vec2d P_perturb = P * continent_scale + perturb * min (W, gen.noise (P * perturb_perturb) * W * 8); + float perturb_perturb = 1 - (P[1] - P[0]) * (1. / 25000 / 2); + perturb_perturb = perturb_perturb * perturb_perturb * 0.4; + perturb *= perturb_perturb; - static frac2d continent_gen (13, 2.13, 0.5); - continent = continent_gen.fBm (P_perturb) + 0.05f; + vec2d P_continent = P * continent_scale + perturb; - float border = W; // within n places of the border + static frac2d continent_gen (13, 2.13, 0.5); + float continent = continent_gen.fBm (P_continent) + 0.05f; - min_it (border, P_perturb [0]); - min_it (border, N - P_perturb [0]); - min_it (border, P_perturb [1]); - min_it (border, N - P_perturb [1]); + float land_gradient = sigmoid1 (P[0] * (1. / 25000)); - continent = blend (-1.f, continent, border, 0.f, W); + const float W = 1000 * continent_scale; + const float N = (25000 - 1) * continent_scale; + + continent = border_blend (-1.f, continent, P_continent , N, 400 * continent_scale); + continent = border_blend (-1.f, continent, P * continent_scale + perturb * 0.1, N, 100 * continent_scale); + + vec3d c; + float v; + + if (continent < 0) + { + // ocean + + v = min (continent * 10, -0.2f); + c = vec3d (0, 0, 1); + } + else + { + // continent + + // big rivers + static frac2d river_gen (1); + float river1 = abs (river_gen.fBm (P * 0.001 + perturb * 4)); + float river2 = river_gen.ridgedmultifractal (P * 0.04 + vec2d (3, 5), 0.8, 10) - (P[1] / 25000) * 0.1; + + if (river1 < 0.03f) + { + v = min (-0.1f, -river1); + c = vec3d (0.2, 0.2, 1); } + else if (river1 < 0.2f && river2 > 0.1f) + { + v = -0.05f; + c = vec3d (0.4, 0.4, 1); + } + else + { + river1 += 0.07f; - vec3d c (1, 1, 1); - float v; + //c = river1 > 0 ? vec3d (0.8, 0.8, 0) : vec3d (0.8, 0, 0); + c = blend0 (vec3d (0.8, 0, 0), vec3d (0.8, 0.8, 0), 0.01f, river1);; - if (continent < 0) - { - // ocean - - v = min (continent * 10, -0.2f); - c = vec3d (0, 0, 1); - } - else - { - // continent - - // big rivers - static frac2d river_gen (2); - float river1 = river_gen.fBm (P * 0.0004);// - (P[0] / 25000) * 0.18 + 0.06; - float river2 = river_gen.ridgedmultifractal (P * 0.04 + vec2d (3, 5), 0.8, 10) - (P[1] / 25000) * 0.1; - - if (river1 > 0.05f) - { - v = -0.1f; - c = vec3d (0.4, 0.4, 1); - } - else if (river1 > 0.08f && river2 > 0.1f) - { - v = -0.05f; - c = vec3d (0.4, 0.4, 1); - } - else - { - river1 -= 0.07f; - - //c = river1 > 0 ? vec3d (0.8, 0.8, 0) : vec3d (0.8, 0, 0); - c = blend0 (vec3d (0.8, 0, 0), vec3d (0.8, 0.8, 0), river1, 0.01f);; - - static frac2d mountain_gen (8, 2.14, 0.5); - float mountain = mountain_gen.ridgedmultifractal (P * 0.004); - v = blend0 (mountain * 3 - 1, continent, river1, 0.05f); - } - - v=abs(river1) < 0.1; - c=vec3d(1,1,1); - } - - c *= v * 0.5 + 0.5; - - putc (clamp (255 * c[0], 0, 255), stdout); - putc (clamp (255 * c[1], 0, 255), stdout); - putc (clamp (255 * c[2], 0, 255), stdout); - - //cells - //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout); - } + static frac2d mountain_gen (8, 2.14, 0.5); + float mountain = mountain_gen.ridgedmultifractal (P * 0.004); + v = blend0 (mountain * 3 - 1, continent, 0.05f, river1); + } } + + c *= v * 0.5 + 0.5; + + putc (clamp (255 * c[0], 0, 255), stdout); + putc (clamp (255 * c[1], 0, 255), stdout); + putc (clamp (255 * c[2], 0, 255), stdout); +} + +void noise_test (); +void noise_test () +{ +#if 1 + int Nw = 700; + + printf ("P6 %d %d 255\n", Nw * 3, Nw * 2); + // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm + for (int y = 0; y < Nw; ++y) + { + if (!(y&63))fprintf (stderr, "y %d\n", y * 50 / Nw);//D + + for (int x = 0; x < Nw; ++x) gen_height (x * 25000 / Nw, y * 25000 / Nw); + + for (int x = 0; x < Nw; ++x) gen_height (x, y); + for (int x = 0; x < Nw; ++x) gen_height (x + 22000, y + 2000); + } + for (int y = 0; y < Nw; ++y) + { + if (!(y&63))fprintf (stderr, "y %d\n", y * 50 / Nw+50);//D + + for (int x = 0; x < Nw; ++x) gen_height (x + 1000, y + 22000); + for (int x = 0; x < Nw; ++x) gen_height (x + 12000, y + 12000); + for (int x = 0; x < Nw; ++x) gen_height (x + 22000, y + 22000); + } + + //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout); + //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout); + //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout); + //putc (256 * gen.turbulence (vec2d (x * 0.004 - 1, y * 0.004 - 1), 10), stdout); + //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout); + //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout); + //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout); + //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout); #else int N = 128;