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.8 by root, Tue Apr 26 03:18:06 2011 UTC vs.
Revision 1.13 by root, Sat Apr 30 05:41:17 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 uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16);
273 uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8);
274 274
275 for (int j = -1; j <= 2; ++j) 275 for (int j = -1; j <= 2; ++j)
276 {
277 uint8_t h1 = rvmap[1](i1 + j) ^ seed;
278
276 for (int i = -1; i <= 2; ++i) 279 for (int i = -1; i <= 2; ++i)
277 { 280 {
278 vec2d A = F - vec2d (i, j); 281 vec2d A = F - vec2d (i, j);
279
280 float d = dot (A, A); 282 value_t d = dot (A, A);
281 283
282 if (d < 4) 284 if (d < 4)
283 { 285 {
284 float t1 = 1 - d / 4; 286 value_t t1 = 1 - d / 4;
285 float t2 = t1 * t1; 287 value_t t2 = t1 * t1;
286 float t4 = t2 * t2; 288 value_t t4 = t2 * t2;
287 289
288 float p = (4 * t1 - 3) * t4; 290 value_t p = (4 * t1 - 3) * t4;
289 291
290 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j); 292 uint8_t h = rvmap[0](i0 + i) ^ h1;
291 vec2d G = charges2[h & 0xff]; 293 vec2d G = charges2[h & 0xff];
292 294
293 v += dot (A, G) * p; 295 v += dot (A, G) * p;
294 } 296 }
295 } 297 }
298 }
296 299
297 return clamp (v, -.9999999, .9999999); 300 return v;
298} 301}
299 302
300///////////////////////////////////////////////////////////////////////////// 303/////////////////////////////////////////////////////////////////////////////
301 304
302noise_gen<vec3d>::noise_gen (uint32_t seed) 305template<>
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 306vec3d::T_numtype
312noise_gen<vec3d>::operator() (vec3d P) 307noise_gen_base<vec3d>::operator() (vec3d P, uint32_t seed)
313{ 308{
314 vec3d I = floor (P); 309 vec3d I = floor (P);
315 vec3d F = P - I; 310 vec3d F = P - I;
316 311
317 float v = 0; 312 uint8_t i2 = uint8_t (I[2]) ^ (seed >> 24);
313 uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16);
314 uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8);
318 315
319 for (int j = -1; j <= 2; ++j) 316 value_t v = 0;
320 for (int i = -1; i <= 2; ++i) 317
321 for (int k = -1; k <= 2; ++k) 318 for (int k = -1; k <= 2; ++k)
319 {
320 uint8_t h2 = rvmap[2](i2 + k) ^ seed;
321
322 for (int j = -1; j <= 2; ++j)
322 { 323 {
323 vec3d A = F - vec3d (i, j, k); 324 uint8_t h1 = rvmap[1](i1 + j) ^ h2;
324 float d = dot (A, A);
325 325
326 if (d < 4) 326 for (int i = -1; i <= 2; ++i)
327 { 327 {
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); 328 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); 329 value_t d = dot (A, A);
365 330
366 if (d < 4) 331 if (d < 4)
367 { 332 {
368 float t1 = 1 - d / 4; 333 value_t t1 = 1 - d / 4;
369 float t2 = t1 * t1; 334 value_t t2 = t1 * t1;
370 float t4 = t2 * t2; 335 value_t t4 = t2 * t2;
371 336
372 float o2 = o * o;
373
374 // (4t⁵ - 3t⁴) * (3o³ - 2o²) 337 // (4t⁵ - 3t⁴)
375 // alternative? ((o * 6 - 15) * o + 10) * o³ 338 value_t p = (4 * t1 - 3) * t4;
376 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o);
377 339
378 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k); 340 uint8_t h = rvmap[0](i0 + i) ^ h1;
379 const float *G = charges3[h & 0xff]; 341 const value_t *G = charges3[h & 0xff];
380 342
381 v += dot (A, vec3d (G[0], G[1], G[2])) * p; 343 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
382 } 344 }
383 } 345 }
384 } 346 }
347 }
385 348
386 return clamp (v, -.9999999, .9999999); 349 return v * 2;
350}
351
352vec3d::T_numtype
353noise_gen<vec3d>::operator() (vec3d P, vec3d N, uint32_t seed)
354{
355 vec3d I = floor (P);
356 vec3d F = P - I;
357
358 uint8_t i2 = uint8_t (I[2]) ^ (seed >> 24);
359 uint8_t i1 = uint8_t (I[1]) ^ (seed >> 16);
360 uint8_t i0 = uint8_t (I[0]) ^ (seed >> 8);
361
362 value_t v = 0;
363
364 for (int k = -1; k <= 2; ++k)
365 {
366 uint8_t h2 = rvmap[2](i2 + k) ^ seed;
367
368 for (int j = -1; j <= 2; ++j)
369 {
370 uint8_t h1 = rvmap[1](i1 + j) ^ h2;
371
372 for (int i = -1; i <= 2; ++i)
373 {
374 vec3d D = F - vec3d (i, j, k);
375 value_t e = dot (D, N);
376 value_t o = 1 - abs (e);
377
378 if (o > 0)
379 {
380 vec3d A = D - e * N;
381 value_t d = dot (A, A);
382
383 if (d < 4)
384 {
385 value_t t1 = 1 - d / 4;
386 value_t t2 = t1 * t1;
387 value_t t4 = t2 * t2;
388
389 value_t o2 = o * o;
390
391 // (4t⁵ - 3t⁴) * (3o³ - 2o²)
392 // alternative? ((o * 6 - 15) * o + 10) * o³
393 value_t p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o);
394
395 uint8_t h = rvmap[0](i0 + i) ^ h1;
396 const value_t *G = charges3[h & 0xff];
397
398 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
399 }
400 }
401 }
402 }
403 }
404
405 return v;
387} 406}
388 407
389template class noise_gen<vec2d>; 408template class noise_gen<vec2d>;
390template class noise_gen<vec3d>; 409template class noise_gen<vec3d>;
391 410
392///////////////////////////////////////////////////////////////////////////// 411/////////////////////////////////////////////////////////////////////////////
393 412
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> 413template<class vec_t>
398static vec_t 414frac_gen<vec_t>::frac_gen (int octaves, value_t lacunarity, value_t hurst_expo, seed_t seed)
399ith_octave (vec_t P, int i) 415: octaves (octaves), lac (lacunarity), h (hurst_expo)
400{ 416{
401 vec_t r = P; 417 this->seed (seed);
402 r[0] += i;
403 r[1] += i * 2;
404 return r;
405}
406 418
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; 419 value_t exsum = 0;
412 value_t phi = noise (vec_t (value_t (0))) * 0.5 + 1; 420 value_t phi = noise (vec_t (value_t (0))) * 0.5 + 1;
413 421
414 for (int i = 0; i < MAX_OCTAVES; ++i) 422 for (int i = 0; i < octaves; ++i)
415 { 423 {
416 ex [i] = pow (lac, -h * i); 424 ex [i] = pow (lac, -h * i);
417 exsum += ex [i]; 425 exsum += ex [i];
418 fbm_mul [i] = 0.5 / (exsum * 0.75); // .75 is a heuristic 426 fbm_mul [i] = 0.5 / (exsum * 0.75); // .75 is a heuristic
419 rot [i].set (phi * i + 1); 427 rot [i].set (phi * i + 1);
420 } 428 }
421} 429}
422 430
423template<class vec_t> 431template<class vec_t>
424typename frac_gen<vec_t>::value_t 432typename frac_gen<vec_t>::value_t
425frac_gen<vec_t>::fBm (vec_t P, int octaves) 433frac_gen<vec_t>::fBm (vec_t P)
426{ 434{
427 value_t v = 0; 435 value_t v = 0;
428 436
429 for (int i = 0; i < octaves; ++i) 437 for (int i = 0; i < octaves; ++i)
430 { 438 {
431 rot [i](P); 439 rot [i](P);
432 v += noise (ith_octave (P, i)) * ex [i]; 440 v += noise (P, i) * ex [i];
433 P *= lac; 441 P *= lac;
434 } 442 }
435 443
436 return clamp<value_t> (v * fbm_mul [octaves - 1] + 0.5, 0, .9999999); 444 return v * fbm_mul [octaves - 1];
437} 445}
438 446
439template<class vec_t> 447template<class vec_t>
440typename frac_gen<vec_t>::value_t 448typename frac_gen<vec_t>::value_t
441frac_gen<vec_t>::turbulence (vec_t P, int octaves) 449frac_gen<vec_t>::turbulence (vec_t P)
442{ 450{
443 value_t v = 0; 451 value_t v = 0;
444 452
445 for (int i = 0; i < octaves; ++i) 453 for (int i = 0; i < octaves; ++i)
446 { 454 {
447 rot [i](P); 455 rot [i](P);
448 v += abs (noise (ith_octave (P, i))) * ex [i]; 456 v += abs (noise (P, i)) * ex [i];
449 P *= lac; 457 P *= lac;
450 } 458 }
451 459
452 return clamp<value_t> (v * fbm_mul [octaves - 1] * (0.5 / noise_gen<vec_t>::abs_avg ()), 0, .9999999); 460 return v * fbm_mul [octaves - 1] * (0.5 / noise_gen<vec_t>::abs_avg ());
453} 461}
454 462
455template<class vec_t> 463template<class vec_t>
456typename frac_gen<vec_t>::value_t 464typename frac_gen<vec_t>::value_t
457frac_gen<vec_t>::multifractal (vec_t P, int octaves, value_t offset) 465frac_gen<vec_t>::multifractal (vec_t P, value_t offset)
458{ 466{
459 value_t v = 1; 467 value_t v = 1;
460 468
461 for (int i = 0; i < octaves; ++i) 469 for (int i = 0; i < octaves; ++i)
462 { 470 {
463 rot [i](P); 471 rot [i](P);
464 v *= noise (P) * ex [i] + offset; 472 v *= noise (P) * ex [i] + offset;
465 P *= lac; 473 P *= lac;
466 } 474 }
467 475
468 return clamp<value_t> (v * 0.5, 0, .9999999); 476 return v * value_t (0.5);
469} 477}
470 478
471template<class vec_t> 479template<class vec_t>
472typename frac_gen<vec_t>::value_t 480typename frac_gen<vec_t>::value_t
473frac_gen<vec_t>::heterofractal (vec_t P, int octaves, value_t offset) 481frac_gen<vec_t>::heterofractal (vec_t P, value_t offset)
474{ 482{
475 value_t v = noise (P) + offset; 483 value_t v = noise (P) + offset;
476 484
477 for (int i = 1; i < octaves; ++i) 485 for (int i = 1; i < octaves; ++i)
478 { 486 {
… …
484 return v / (1 << octaves); 492 return v / (1 << octaves);
485} 493}
486 494
487template<class vec_t> 495template<class vec_t>
488typename frac_gen<vec_t>::value_t 496typename frac_gen<vec_t>::value_t
489frac_gen<vec_t>::hybridfractal (vec_t P, int octaves, value_t offset, value_t gain) 497frac_gen<vec_t>::hybridfractal (vec_t P, value_t offset, value_t gain)
490{ 498{
491 value_t v = (noise (P) + offset) * ex [0]; 499 value_t v = (noise (P) + offset) * ex [0];
492 value_t weight = v; 500 value_t weight = v;
493 501
494 for (int i = 1; i < octaves; ++i) 502 for (int i = 1; i < octaves; ++i)
… …
501 value_t sig = (noise (P) + offset) * ex [i]; 509 value_t sig = (noise (P) + offset) * ex [i];
502 v += weight * sig; 510 v += weight * sig;
503 weight *= gain * sig; 511 weight *= gain * sig;
504 } 512 }
505 513
506 return clamp<value_t> (v * 0.5 + 0.5, 0, .9999999); 514 return v * value_t (0.5) + value_t (0.5);
507} 515}
508 516
509template<class vec_t> 517template<class vec_t>
510typename frac_gen<vec_t>::value_t 518typename frac_gen<vec_t>::value_t
511frac_gen<vec_t>::ridgedmultifractal (vec_t P, int octaves, value_t offset, value_t gain) 519frac_gen<vec_t>::ridgedmultifractal (vec_t P, value_t offset, value_t gain)
512{ 520{
513 value_t sig = offset - abs (noise (P)); 521 value_t sig = offset - abs (noise (P));
514 sig *= sig; 522 sig *= sig;
515 value_t v = sig; 523 value_t v = sig;
516 524
517 for (int i = 1; i < octaves; ++i) 525 for (int i = 1; i < octaves; ++i)
518 { 526 {
519 rot [i](P); 527 rot [i](P);
520 P *= lac; 528 P *= lac;
521 529
530 // weight higher octaves by previous signal
522 value_t w = clamp (sig * gain, 0, 1); 531 value_t w = clamp (sig * gain, 0, 1);
523 532
524 sig = offset - abs (noise (P)); 533 sig = offset - abs (noise (P));
525 sig *= sig; 534 sig *= sig;
526 sig *= w; 535 sig *= w;
527 536
528 v += sig * ex [i]; 537 v += sig * ex [i];
529 } 538 }
530 539
531 return clamp<value_t> (v * 0.25, 0, .9999999); 540 return v * value_t (0.25);
532} 541}
533 542
534template<class vec_t> 543template<class vec_t>
535typename frac_gen<vec_t>::value_t 544typename frac_gen<vec_t>::value_t
536frac_gen<vec_t>::billowfractal (vec_t P, int octaves, value_t offset, value_t gain) 545frac_gen<vec_t>::billowfractal (vec_t P, value_t offset, value_t gain)
537{ 546{
538 value_t v = 0; 547 value_t v = 0;
539 548
540 offset += 2 * noise_gen<vec_t>::abs_avg () - 1; 549 offset += 2 * noise_gen<vec_t>::abs_avg () - 1;
541 550
542 for (int i = 0; i < octaves; ++i) 551 for (int i = 0; i < octaves; ++i)
543 { 552 {
544 rot [i](P); 553 rot [i](P);
545 v += (abs (noise (ith_octave (P, i))) * gain - offset) * ex [i]; 554 v += (abs (noise (P, i)) * gain - offset) * ex [i];
546 P *= lac; 555 P *= lac;
547 } 556 }
548 557
549 return clamp<value_t> (v, -.9999999, .9999999); 558 return v;
550} 559}
551 560
552// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2 561// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2
553template<class vec_t> 562template<class vec_t>
554typename frac_gen<vec_t>::value_t 563typename frac_gen<vec_t>::value_t
555frac_gen<vec_t>::terrain (vec_t P, int octaves) 564frac_gen<vec_t>::terrain (vec_t P)
556{ 565{
557 value_t v = 0; 566 value_t v = 0;
558 567
559 for (int i = 0; i < octaves; ++i) 568 for (int i = 0; i < octaves; ++i)
560 { 569 {
… …
568 return v <= 0 ? - pow (-v, 0.7) : pow (v, 1 + noise (P) * v); 577 return v <= 0 ? - pow (-v, 0.7) : pow (v, 1 + noise (P) * v);
569} 578}
570 579
571template<class vec_t> 580template<class vec_t>
572typename frac_gen<vec_t>::value_t 581typename frac_gen<vec_t>::value_t
573frac_gen<vec_t>::terrain2 (vec_t P, int octaves) 582frac_gen<vec_t>::terrain2 (vec_t P)
574{ 583{
575 value_t a = fBm (P, octaves); 584 value_t a = fBm (P);
576 value_t b = ridgedmultifractal (P, octaves, 1, 8); 585 value_t b = ridgedmultifractal (P, 1, 8);
577 value_t fade = fBm (P + vec_t(10.3), octaves); 586 value_t fade = fBm (P + vec_t(10.3));
578 587
579 const value_t width = 0.05; 588 const value_t width = 0.05;
580 589
581 if (fade > 0.5 + width) 590 if (fade > 0.5 + width)
582 return a; 591 return a;
… …
597///////////////////////////////////////////////////////////////////////////// 606/////////////////////////////////////////////////////////////////////////////
598 607
599void noise_test (); 608void noise_test ();
600void noise_test () 609void noise_test ()
601{ 610{
602 frac_gen<vec2d> gen (0.5, 1.9); 611 frac2d gen;
603 frac_gen<vec3d> gen3; 612
613 frac2d vec_gen1 (4, 2, 0.5, 1);
614 frac2d vec_gen2 (4, 2, 0.5, 2);
604 615
605#if 1 616#if 1
606 int N = 1024; 617 int N = 1024;
607 618
608 printf ("P5 %d %d 255\n", N, N); 619 printf ("P6 %d %d 255\n", N, N);
609 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm 620 // 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) 621 for (int y = 0; y < N; ++y)
611 { 622 {
612 if (!(y&63))fprintf (stderr, "y %d\n", y);//D 623 if (!(y&63))fprintf (stderr, "y %d\n", y);//D
613 for (int x = 0; x < N; ++x) 624 for (int x = 0; x < N; ++x)
614 { 625 {
626 vec2d P = vec2d (x, y) * (25000.f / N);
627
615 //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout); 628 //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); 629 //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); 630 //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); 631 //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); 632 //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout);
620 633
621 // mountais or somesuch(?) 634 // mountais or somesuch(?)
622 //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout); 635 //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout);
623 636
624 // temperature 637 // temperature
625 //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout); 638 //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout);
626 // rain 639 // rain
627 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
628 //cells 724 //cells
629 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout); 725 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout);
630 } 726 }
631 } 727 }
632#else 728#else
633 int N = 512; 729 int N = 128;
634 730
635 //printf ("P6 %d %d 255\n", N, N); 731 //printf ("P6 %d %d 255\n", N, N);
636 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm 732 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
733 frac3d gen3 (3);;
637 for (int z = 0; z < N; ++z) 734 for (int z = 0; z < N; ++z)
638 { 735 {
639 if (!(z&7))fprintf (stderr, "z %d\n", z);//D 736 if (!(z&7))fprintf (stderr, "z %d\n", z);//D
640 for (int y = 0; y < N; ++y) 737 for (int y = 0; y < N; ++y)
641 for (int x = 0; x < N; ++x) 738 for (int x = 0; x < N; ++x)
642 { 739 {
643 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; 740 float v = gen3.ridgedmultifractal (vec3d (x * 0.001 + 0.2, y * 0.001 + 0.2, z * 0.01 + 0.2), 1.03, 2) * 2;
644 741
645#if 0 742#if 0
646 if (z < 64) 743 if (z < 64)
647 v = v * (z * z) / (64 * 64); 744 v = v * (z * z) / (64 * 64);
648#endif 745#endif
649 746
650 if (v <= 0.9999) 747 if (v <= 0.9)
651 continue; 748 continue;
652 749
653 float r[4]; 750 float r[4];
654 int i[4]; 751 int i[4];
655 752

Diff Legend

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