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.14 by root, Sat Apr 30 11:02:25 2011 UTC vs.
Revision 1.15 by root, Sat Apr 30 11:03:46 2011 UTC

693 v = -0.05f; 693 v = -0.05f;
694 c = vec3d (0.4, 0.4, 1); 694 c = vec3d (0.4, 0.4, 1);
695 } 695 }
696 else 696 else
697 { 697 {
698 river1 += 0.07f;
699
700 //c = river1 > 0 ? vec3d (0.8, 0.8, 0) : vec3d (0.8, 0, 0); 698 //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);; 699 c = blend0 (vec3d (0.8, 0, 0), vec3d (0.8, 0.8, 0), 0.01f, river1);
702 700
703 static frac2d mountain_gen (8, 2.14, 0.5); 701 static frac2d mountain_gen (8, 2.14, 0.5);
704 float mountain = mountain_gen.ridgedmultifractal (P * 0.004); 702 float mountain = mountain_gen.ridgedmultifractal (P * 0.004);
705 v = blend0 (mountain * 3 - 1, continent, 0.05f, river1); 703 v = blend0 (mountain * 3 - 1, continent, 0.05f, river1);
706 } 704 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines