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.5 by root, Sat Apr 23 04:56:46 2011 UTC vs.
Revision 1.12 by root, Tue Apr 26 14:41:35 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
96// used as gradient vectors for noise3d
28static const float charges[256][3] = { 97static const float charges3[256][3] = {
29 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,
30 -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,
31 -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,
32 -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,
33 -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,
… …
154 4.98855035e-01, -3.98703643e-01, 7.69531714e-01, 2.55373649e-01, -7.56251592e-02, 9.63880249e-01, 223 4.98855035e-01, -3.98703643e-01, 7.69531714e-01, 2.55373649e-01, -7.56251592e-02, 9.63880249e-01,
155 -1.51053916e-01, 3.85469253e-01, -9.10272580e-01, 6.78644990e-01, -7.26064181e-01, 1.10778074e-01, 224 -1.51053916e-01, 3.85469253e-01, -9.10272580e-01, 6.78644990e-01, -7.26064181e-01, 1.10778074e-01,
156 -3.07350590e-01, -9.14677987e-01, 2.62487703e-01, 5.60298616e-01, 1.74821302e-01, 8.09631381e-01, 225 -3.07350590e-01, -9.14677987e-01, 2.62487703e-01, 5.60298616e-01, 1.74821302e-01, 8.09631381e-01,
157}; 226};
158 227
228/////////////////////////////////////////////////////////////////////////////
229
230template<int N, typename T>
231void
232permutation<N,T>::seed (seedable_rand_gen &rng)
233{
234 for (int i = 0; i < N; ++i)
235 pmap[i] = i;
236
237 // fisher-yates to randomly perturb
238 for (int i = N; --i; )
239 ::swap (pmap[i], pmap[rng (i + 1)]);
240}
241
242template class permutation<256, uint8_t>;
243
244/////////////////////////////////////////////////////////////////////////////
245
246// various s-shaped curves, smooth to, first, or second derivative
247// used for smooth interpolation from 0..1
248
249// linear
250template<typename T>
251inline T
252sigmoid0 (T x)
253{
254 return x;
255}
256
257// 3x²-2x³
258template<typename T>
259inline T
260sigmoid1 (T x)
261{
262 return (3 - 2 * x) * x * x;
263}
264
265// 6x⁵ - 15x⁴ + 10x³
266template<typename T>
267inline T
268sigmoid2 (T x)
269{
270#ifdef MORE_PARALLELITY
271 float x2 = x * x;
272 float x4 = x2 * x2;
273
274 return (6 * x4 + 10 * x2) * x - 15 * x4;
275#endif
276
277 // simple horner
278 return ((6 * x - 15) * x + 10) * x * x * x;
279}
280
281// blend between a and b
282// c is the control function - if lower than ca
283// then return a, if higher than cb, return b
284template<typename T, typename U>
285inline T
286blend (T a, T b, U c, U ca, U cb, T weight (U) = sigmoid1)
287{
288 if (c <= ca) return a;
289 if (c >= cb) return b;
290
291 T w = weight (lerp (c, ca, cb, T(0), T(1)));
292 return (T(1) - w) * a + w * b;
293}
294
295// blend between a and b
296// c is the control function - if lower than -c_w
297// then return a, if higher than +c_w then b.
298template<typename T, typename U>
299inline T
300blend0 (T a, T b, U c, U c_w, T weight (U) = sigmoid1)
301{
302 return blend<T,U> (a, b, c, -c_w, c_w, weight);
303}
304
305/////////////////////////////////////////////////////////////////////////////
306
159static vec2d 307static vec2d
160floor (vec2d v) 308floor (vec2d v)
161{ 309{
162 return vec2d (std::floor (v[0]), std::floor (v[1])); 310 return vec2d (fastfloor (v[0]), fastfloor (v[1]));
163} 311}
164 312
165static vec3d 313static vec3d
166floor (vec3d v) 314floor (vec3d v)
167{ 315{
168 return vec3d (std::floor (v[0]), std::floor (v[1]), std::floor (v[2])); 316 return vec3d (fastfloor (v[0]), fastfloor (v[1]), fastfloor (v[2]));
169} 317}
170 318
171noise_gen<vec2d>::noise_gen (uint32_t seed) 319template<class vec_t>
320void
321noise_gen_base<vec_t>::seed (seedable_rand_gen &rng)
322{
323 for (int i = 0; i < array_length (rvmap); ++i)
324 rvmap[i].seed (rng);
325}
326
327template<class vec_t>
328void
329noise_gen_base<vec_t>::seed (seed_t seed)
172{ 330{
173 seedable_rand_gen rng (seed); 331 seedable_rand_gen rng (seed);
174 332
175#if 1 333 this->seed (rng);
176 for (int i = 0; i < 256; ++i)
177 {
178 vec2d rv (rng () - 0.5f, rng () - 0.5f);
179
180 // normalise
181 float mag = 1.f / sqrtf (dot (rv, rv));
182
183 rv[0] *= mag;
184 rv[1] *= mag;
185
186 rvec[i] = rv;
187 }
188#endif
189
190#if 0
191 float offset = rng () * 3.14159265;
192
193 for (int i = 0; i < 256; ++i)
194 {
195 float phi = i * (3.14159265 * 2 / 256) + offset;
196
197 rvec[i][0] = sinf (phi);
198 rvec[i][1] = -cosf (phi);
199 }
200
201 // fisher-yates to randomly perturb
202 for (int i = 256; --i; )
203 ::swap (rvec [i], rvec [rng (i + 1)]);
204#endif
205
206 rvmap[0].seed (rng);
207 rvmap[1].seed (rng);
208} 334}
209 335
336template<>
210vec2d::T_numtype 337vec2d::T_numtype
211noise_gen<vec2d>::operator() (vec2d P) 338noise_gen_base<vec2d>::operator() (vec2d P)
212{ 339{
213 vec2d I = floor (P); 340 vec2d I = floor (P);
214 vec2d F = P - I; 341 vec2d F = P - I;
215 342
216 float v = 0; 343 float v = 0;
… …
228 float t2 = t1 * t1; 355 float t2 = t1 * t1;
229 float t4 = t2 * t2; 356 float t4 = t2 * t2;
230 357
231 float p = (4 * t1 - 3) * t4; 358 float p = (4 * t1 - 3) * t4;
232 359
233 int h = rvmap [0](I[0] + i) ^ rvmap [1](I[1] + j); 360 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j);
234 vec2d G = rvec [h & 0xff]; 361 vec2d G = charges2[h & 0xff];
235 362
236 v += dot (A, G) * p; 363 v += dot (A, G) * p;
237 } 364 }
238 } 365 }
239 366
240 return clamp (v, -.9999999f, .9999999f); 367 return v;
241} 368}
242 369
243///////////////////////////////////////////////////////////////////////////// 370/////////////////////////////////////////////////////////////////////////////
244 371
245noise_gen<vec3d>::noise_gen (uint32_t seed) 372template<>
246{
247 seedable_rand_gen rng (seed);
248
249 rvmap [0].seed (rng);
250 rvmap [1].seed (rng);
251 rvmap [2].seed (rng);
252}
253
254vec3d::T_numtype 373vec3d::T_numtype
255noise_gen<vec3d>::operator() (vec3d P) 374noise_gen_base<vec3d>::operator() (vec3d P)
256{ 375{
257 vec3d I = floor (P); 376 vec3d I = floor (P);
258 vec3d F = P - I; 377 vec3d F = P - I;
259 378
260 float v = 0; 379 float v = 0;
… …
274 393
275 // (4t⁵ - 3t⁴) 394 // (4t⁵ - 3t⁴)
276 float p = (4 * t1 - 3) * t4; 395 float p = (4 * t1 - 3) * t4;
277 396
278 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k); 397 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k);
279 const float *G = charges[h & 0xff]; 398 const float *G = charges3[h & 0xff];
280 399
281 v += dot (A, vec3d (G[0], G[1], G[2])) * p; 400 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
282 } 401 }
283 } 402 }
284 403
285 return clamp (v * 2, -.9999999f, .9999999f); 404 return v * 2;
286} 405}
287 406
288vec3d::T_numtype 407vec3d::T_numtype
289noise_gen<vec3d>::operator() (vec3d P, vec3d N) 408noise_gen<vec3d>::operator() (vec3d P, vec3d N)
290{ 409{
… …
317 // (4t⁵ - 3t⁴) * (3o³ - 2o²) 436 // (4t⁵ - 3t⁴) * (3o³ - 2o²)
318 // alternative? ((o * 6 - 15) * o + 10) * o³ 437 // alternative? ((o * 6 - 15) * o + 10) * o³
319 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o); 438 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o);
320 439
321 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k); 440 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k);
322 const float *G = charges[h & 0xff]; 441 const float *G = charges3[h & 0xff];
323 442
324 v += dot (A, vec3d (G[0], G[1], G[2])) * p; 443 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
325 } 444 }
326 } 445 }
327 } 446 }
328 447
329 return clamp (v, -.9999999f, .9999999f); 448 return v;
330} 449}
331 450
332template class noise_gen<vec2d>; 451template class noise_gen<vec2d>;
333template class noise_gen<vec3d>; 452template class noise_gen<vec3d>;
334 453
335///////////////////////////////////////////////////////////////////////////// 454/////////////////////////////////////////////////////////////////////////////
336 455
456// find some uncorrelated spot - we assume that noise 2 units away
457// is completely uncorrelated - this is not true for other coordinates,
458// but generally works well.
337template<class vec_t> 459template<class vec_t>
338static vec_t 460static vec_t
339ith_octave (vec_t P, int i) 461ith_octave (vec_t P, int i)
340{ 462{
341 vec_t r = P; 463 vec_t r = P;
342 r[0] += i; 464 r[0] += i;
465 r[1] += i * 2;
343 return r; 466 return r;
344} 467}
345 468
346template<class vec_t> 469template<class vec_t>
347frac_gen<vec_t>::frac_gen (value_t hurst_expo, value_t lacunarity) 470frac_gen<vec_t>::frac_gen (value_t hurst_expo, value_t lacunarity, seed_t seed)
348: h (hurst_expo), lac (lacunarity), noise_gen<vec_t> (0) 471: h (hurst_expo), lac (lacunarity)
349{ 472{
473 this->seed (seed);
474
350 value_t exsum = 0; 475 value_t exsum = 0;
476 value_t phi = noise (vec_t (value_t (0))) * 0.5 + 1;
351 477
352 for (int i = 0; i < MAX_OCTAVES; ++i) 478 for (int i = 0; i < MAX_OCTAVES; ++i)
353 { 479 {
354 ex [i] = powf (lac, -h * i); 480 ex [i] = pow (lac, -h * i);
355 exsum += ex [i]; 481 exsum += ex [i];
356 fbm_mul [i] = 0.5f / (exsum * 0.75f); // .75f is a heuristic 482 fbm_mul [i] = 0.5 / (exsum * 0.75); // .75 is a heuristic
357 rot [i].set (0.4488f * i); 483 rot [i].set (phi * i + 1);
358 } 484 }
359} 485}
360 486
361template<class vec_t> 487template<class vec_t>
362typename frac_gen<vec_t>::value_t 488typename frac_gen<vec_t>::value_t
363frac_gen<vec_t>::fBm (vec_t P, int octaves) 489frac_gen<vec_t>::fBm (vec_t P, int octaves)
364{ 490{
365 value_t v = 0.f; 491 value_t v = 0;
366 492
367 for (int i = 0; i < octaves; ++i) 493 for (int i = 0; i < octaves; ++i)
368 { 494 {
369 rot [i](P); 495 rot [i](P);
370 v += noise (ith_octave (P, i)) * ex [i]; 496 v += noise (ith_octave (P, i)) * ex [i];
371 P *= lac; 497 P *= lac;
372 } 498 }
373 499
374 return clamp (v * fbm_mul [octaves - 1] + 0.5f, 0.f, .9999999f); 500 return v * fbm_mul [octaves - 1];
375} 501}
376 502
377template<class vec_t> 503template<class vec_t>
378typename frac_gen<vec_t>::value_t 504typename frac_gen<vec_t>::value_t
379frac_gen<vec_t>::turbulence (vec_t P, int octaves) 505frac_gen<vec_t>::turbulence (vec_t P, int octaves)
380{ 506{
381 value_t v = 0.f; 507 value_t v = 0;
382 508
383 for (int i = 0; i < octaves; ++i) 509 for (int i = 0; i < octaves; ++i)
384 { 510 {
385 rot [i](P); 511 rot [i](P);
386 v += abs (noise (ith_octave (P, i))) * ex [i]; 512 v += abs (noise (ith_octave (P, i))) * ex [i];
387 P *= lac; 513 P *= lac;
388 } 514 }
389 515
390 return clamp (v * fbm_mul [octaves - 1] * 2.f, 0.f, .9999999f); 516 return v * fbm_mul [octaves - 1] * (0.5 / noise_gen<vec_t>::abs_avg ());
391} 517}
392 518
393template<class vec_t> 519template<class vec_t>
394typename frac_gen<vec_t>::value_t 520typename frac_gen<vec_t>::value_t
395frac_gen<vec_t>::multifractal (vec_t P, int octaves, value_t offset) 521frac_gen<vec_t>::multifractal (vec_t P, int octaves, value_t offset)
396{ 522{
397 value_t v = 1.f; 523 value_t v = 1;
398 524
399 for (int i = 0; i < octaves; ++i) 525 for (int i = 0; i < octaves; ++i)
400 { 526 {
401 rot [i](P); 527 rot [i](P);
402 v *= noise (P) * ex [i] + offset; 528 v *= noise (P) * ex [i] + offset;
403 P *= lac; 529 P *= lac;
404 } 530 }
405 531
406 return clamp (v * 0.5f, 0.f, .9999999f); 532 return v * value_t (0.5);
407} 533}
408 534
409template<class vec_t> 535template<class vec_t>
410typename frac_gen<vec_t>::value_t 536typename frac_gen<vec_t>::value_t
411frac_gen<vec_t>::heterofractal (vec_t P, int octaves, value_t offset) 537frac_gen<vec_t>::heterofractal (vec_t P, int octaves, value_t offset)
412{ 538{
413 value_t v = noise (P) + offset; 539 value_t v = noise (P) + offset;
414 int i;
415 540
416 for (i = 1; i < octaves; ++i) 541 for (int i = 1; i < octaves; ++i)
417 { 542 {
418 rot [i](P); 543 rot [i](P);
419 P *= lac; 544 P *= lac;
420 v += v * (noise (P) * ex [i] + offset); 545 v += v * (noise (P) * ex [i] + offset);
421 } 546 }
422 547
423 return v / powf (2., octaves); 548 return v / (1 << octaves);
424} 549}
425 550
426template<class vec_t> 551template<class vec_t>
427typename frac_gen<vec_t>::value_t 552typename frac_gen<vec_t>::value_t
428frac_gen<vec_t>::hybridfractal (vec_t P, int octaves, value_t offset, value_t gain) 553frac_gen<vec_t>::hybridfractal (vec_t P, int octaves, value_t offset, value_t gain)
429{ 554{
430 value_t v = (noise (P) + offset) * ex [0]; 555 value_t v = (noise (P) + offset) * ex [0];
431 value_t weight = v; 556 value_t weight = v;
432 int i;
433 557
434 for (i = 1; i < octaves; ++i) 558 for (int i = 1; i < octaves; ++i)
435 { 559 {
436 rot [i](P); 560 rot [i](P);
437 P *= lac; 561 P *= lac;
438 562
439 min_it (weight, 1.f); 563 min_it (weight, 1);
440 564
441 value_t sig = (noise (P) + offset) * ex [i]; 565 value_t sig = (noise (P) + offset) * ex [i];
442 v += weight * sig; 566 v += weight * sig;
443 weight *= gain * sig; 567 weight *= gain * sig;
444 } 568 }
445 569
446 return clamp (v * 0.5f + 0.5f, 0.f, .9999999f); 570 return v * value_t (0.5) + value_t (0.5);
447} 571}
448 572
449template<class vec_t> 573template<class vec_t>
450typename frac_gen<vec_t>::value_t 574typename frac_gen<vec_t>::value_t
451frac_gen<vec_t>::ridgedmultifractal (vec_t P, int octaves, value_t offset, value_t gain) 575frac_gen<vec_t>::ridgedmultifractal (vec_t P, int octaves, value_t offset, value_t gain)
… …
457 for (int i = 1; i < octaves; ++i) 581 for (int i = 1; i < octaves; ++i)
458 { 582 {
459 rot [i](P); 583 rot [i](P);
460 P *= lac; 584 P *= lac;
461 585
462 value_t w = clamp (sig * gain, 0.f, 1.f); 586 value_t w = clamp (sig * gain, 0, 1);
463 587
464 sig = offset - abs (noise (P)); 588 sig = offset - abs (noise (P));
465 sig *= sig; 589 sig *= sig;
466 sig *= w; 590 sig *= w;
467 591
468 v += sig * ex [i]; 592 v += sig * ex [i];
469 } 593 }
470 594
471 return clamp (v * 0.25f, 0.f, .9999999f); 595 return v * value_t (0.25);
596}
597
598template<class vec_t>
599typename frac_gen<vec_t>::value_t
600frac_gen<vec_t>::billowfractal (vec_t P, int octaves, value_t offset, value_t gain)
601{
602 value_t v = 0;
603
604 offset += 2 * noise_gen<vec_t>::abs_avg () - 1;
605
606 for (int i = 0; i < octaves; ++i)
607 {
608 rot [i](P);
609 v += (abs (noise (ith_octave (P, i))) * gain - offset) * ex [i];
610 P *= lac;
611 }
612
613 return v;
472} 614}
473 615
474// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2 616// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2
475template<class vec_t> 617template<class vec_t>
476typename frac_gen<vec_t>::value_t 618typename frac_gen<vec_t>::value_t
477frac_gen<vec_t>::terrain (vec_t P, int octaves) 619frac_gen<vec_t>::terrain (vec_t P, int octaves)
478{ 620{
479 value_t v = 0.f; 621 value_t v = 0;
480 622
481 for (int i = 0; i < octaves; ++i) 623 for (int i = 0; i < octaves; ++i)
482 { 624 {
483 rot [i](P); 625 rot [i](P);
484 v += noise (P) * ex [i]; 626 v += noise (P) * ex [i];
485 P *= lac; 627 P *= lac;
486 } 628 }
487 629
488 v *= fbm_mul [octaves - 1]; 630 v *= fbm_mul [octaves - 1];
489 631
490 return v <= 0.f ? - powf (-v, 0.7f) : powf (v, 1. + noise (P) * v); 632 return v <= 0 ? - pow (-v, 0.7) : pow (v, 1 + noise (P) * v);
491} 633}
492 634
493template<class vec_t> 635template<class vec_t>
494typename frac_gen<vec_t>::value_t 636typename frac_gen<vec_t>::value_t
495frac_gen<vec_t>::terrain2 (vec_t P, int octaves) 637frac_gen<vec_t>::terrain2 (vec_t P, int octaves)
496{ 638{
497 value_t a = fBm (P, octaves); 639 value_t a = fBm (P, octaves);
498 value_t b = ridgedmultifractal (P, octaves, 1, 8); 640 value_t b = ridgedmultifractal (P, octaves, 1, 8);
499 value_t fade = fBm (P + vec_t(10.3), octaves); 641 value_t fade = fBm (P + vec_t(10.3), octaves);
500 642
501 const value_t width = 0.05f; 643 const value_t width = 0.05;
502 644
503 if (fade > 0.5f + width) 645 if (fade > 0.5 + width)
504 return a; 646 return a;
505 else if (fade < 0.5f - width) 647 else if (fade < 0.5 - width)
506 return b; 648 return b;
507 649
508 fade = (fade - 0.5f + width) / (width * 2); 650 fade = (fade - 0.5 + width) / (width * 2);
509 651
510 // sigmoidal curve 652 // sigmoidal curve
511 fade = fade * fade * 2 * (1.5f - fade); 653 fade = fade * fade * 2 * (1.5 - fade);
512 654
513 return a * fade + b * (1 - fade); 655 return a * fade + b * (1 - fade);
514} 656}
515 657
516template class frac_gen<vec2d>; 658template class frac_gen<vec2d>;
517template class frac_gen<vec3d>; 659template class frac_gen<vec3d>;
518 660
519///////////////////////////////////////////////////////////////////////////// 661/////////////////////////////////////////////////////////////////////////////
520 662
521#if 0 663void noise_test ();
522void hack(); void hack() 664void noise_test ()
523{ 665{
524 frac_gen<vec2d> gen (0.5, 2); 666 frac_gen<vec2d> gen;
525 frac_gen<vec3d> gen3; 667 frac_gen<vec3d> gen3;
526 668
527#if 0 669#if 1
528 int N = 1024; 670 int N = 1024;
529 671
530 printf ("P5 %d %d 255\n", N, N); 672 printf ("P5 %d %d 255\n", N, N);
531 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm 673 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
532 for (int y = 0; y < N; ++y) 674 for (int y = 0; y < N; ++y)
533 { 675 {
534 if (!(y&63))fprintf (stderr, "y %d\n", y);//D 676 if (!(y&63))fprintf (stderr, "y %d\n", y);//D
535 for (int x = 0; x < N; ++x) 677 for (int x = 0; x < N; ++x)
536 { 678 {
679 vec2d P = vec2d (x, y) * (5000.f / N);
680
537 //putc (127 * n.noise (x * 0.1, y * 0.1, 0, 0,0,1) + 128, stdout); 681 //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout);
538 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout); 682 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout);
539 //putc (256 * gen.fBm (x * 0.01, y * 0.01, 3), stdout); 683 //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout);
540 //putc (256 * gen.turbulence (x * 0.004 - 1, y * 0.004 - 1, 8), stdout); 684 //putc (256 * gen.turbulence (vec2d (x * 0.004 - 1, y * 0.004 - 1), 10), stdout);
541 //putc (256 * gen.heterofractal (x * 0.008, y * 0.008, 8, 0.9), stdout); 685 //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout);
542 686
543 // mountais or somesuch(?) 687 // mountais or somesuch(?)
544 //putc (256 * gen.hybridfractal (x * 0.01, y * 0.01, 8, -.4, -4), stdout); 688 //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout);
545 689
546 // temperature 690 // temperature
547 //putc (256 * gen.fBm (x * 0.002, y * 0.002, 2), stdout); 691 //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout);
548 // rain 692 // rain
549 //putc (256 * gen.ridgedmultifractal (x * 0.01, y * 0.01, 3, 1.03, 2), stdout); 693
694 float continent = gen.fBm (P * 0.0004, 12) + 0.1f;
695 float mountain = gen.ridgedmultifractal (P * 0.004, 8, 0.8, 10) * 2;
696 float river = gen.ridgedmultifractal (P * 0.004, 3, 0.8, 10);
697 float sel1 = gen.noise (P * 0.001 + vec2d (5,0));
698
699 {
700 const float W = 100;
701 const float N = 5000 - 1;
702
703 float border = W; // within n places of the border
704
705 min_it (border, P [0]);
706 min_it (border, N - P [0]);
707 min_it (border, P [1]);
708 min_it (border, N - P [1]);
709
710 continent = blend (-1.f, continent, border, 0.f, W);
711 }
712
713 //float v = blend (mountain, 0.f, river + sel1 * 0.2f, 0.25f, 0.1f);
714 float v = blend0 (0.f, 1.f, continent, 0.05f);
715
716
717 putc (255 * clamp (v, 0.f, 1.f), stdout);
718
719 //cells
720 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout);
550 } 721 }
551 } 722 }
552#else 723#else
553 int N = 512; 724 int N = 512;
554 725
… …
590 } 761 }
591#endif 762#endif
592 763
593 exit (0); 764 exit (0);
594} 765}
595#endif

Diff Legend

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