--- deliantra/server/common/noise.C 2011/04/30 05:41:17 1.13 +++ deliantra/server/common/noise.C 2018/12/05 19:03:26 1.25 @@ -1,22 +1,23 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. - * - * Copyright (©) 2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * + * + * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team + * Copyright (©) 2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or (at your * option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the Affero GNU General Public License * and the GNU General Public License along with this program. If not, see * . - * + * * The authors can be reached via e-mail to */ @@ -247,7 +248,7 @@ void noise_gen_base::seed (seedable_rand_gen &rng) { - for (int i = 0; i < array_length (rvmap); ++i) + for (int i = 0; i < ecb_array_length (rvmap); ++i) rvmap[i].seed (rng); } @@ -269,12 +270,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) { @@ -298,7 +302,7 @@ } return v; -} +} ///////////////////////////////////////////////////////////////////////////// @@ -309,15 +313,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 +362,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) { @@ -405,9 +415,6 @@ return v; } -template class noise_gen; -template class noise_gen; - ///////////////////////////////////////////////////////////////////////////// template @@ -603,169 +610,3 @@ template class frac_gen; template class frac_gen; -///////////////////////////////////////////////////////////////////////////// - -void noise_test (); -void noise_test () -{ - frac2d gen; - - frac2d vec_gen1 (4, 2, 0.5, 1); - frac2d vec_gen2 (4, 2, 0.5, 2); - -#if 1 - int N = 1024; - - 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 - - float continent; - - { - const float continent_scale = 0.00008; - - vec2d perturb ( - vec_gen1.fBm (P * 0.0004), - vec_gen2.fBm (P * 0.0004) - ); - - const float W = 1000 * continent_scale; - const float N = (25000 - 1) * continent_scale; - - 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 P_perturb = P * continent_scale + perturb * min (W, gen.noise (P * perturb_perturb) * W * 8); - - static frac2d continent_gen (13, 2.13, 0.5); - continent = continent_gen.fBm (P_perturb) + 0.05f; - - float border = W; // within n places of the border - - 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]); - - continent = blend (-1.f, continent, border, 0.f, W); - } - - vec3d c (1, 1, 1); - 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 (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); - } - } -#else - int N = 128; - - //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 - frac3d gen3 (3);; - for (int z = 0; z < N; ++z) - { - if (!(z&7))fprintf (stderr, "z %d\n", z);//D - for (int y = 0; y < N; ++y) - for (int x = 0; x < N; ++x) - { - float v = gen3.ridgedmultifractal (vec3d (x * 0.001 + 0.2, y * 0.001 + 0.2, z * 0.01 + 0.2), 1.03, 2) * 2; - -#if 0 - if (z < 64) - v = v * (z * z) / (64 * 64); -#endif - - if (v <= 0.9) - continue; - - float r[4]; - int i[4]; - - r[0] = x; - r[1] = y; - r[2] = z; - r[3] = v; - - memcpy (i, r, 16); - - i[0] = htonl (i[0]); - i[1] = htonl (i[1]); - i[2] = htonl (i[2]); - i[3] = htonl (i[3]); - - fwrite (i, 4*4, 1, stdout); - } - } -#endif - - exit (0); -}