ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/noise.h
(Generate patch)

Comparing deliantra/server/include/noise.h (file contents):
Revision 1.12 by root, Sun May 1 13:18:23 2011 UTC vs.
Revision 1.13 by root, Sun May 8 21:51:27 2011 UTC

… …
238typedef frac_gen<vec3d> frac3d; 238typedef frac_gen<vec3d> frac3d;
239 239
240///////////////////////////////////////////////////////////////////////////// 240/////////////////////////////////////////////////////////////////////////////
241 241
242template<typename T, typename U> 242template<typename T, typename U>
243T 243inline T
244inline border_blend (T a, T b, vec2d P, U N, U W) 244border_blend (T a, T b, vec2d P, U N, U W)
245{ 245{
246 U border = W; // within n places of the border 246 U border = W; // within n places of the border
247 247
248 min_it (border, P [0]); 248 min_it (border, P [0]);
249 min_it (border, N - P [0]); 249 min_it (border, N - P [0]);
250 min_it (border, P [1]); 250 min_it (border, P [1]);
251 min_it (border, N - P [1]); 251 min_it (border, N - P [1]);
252 252
253 return blend (a, b,border, U(0), W); 253 return blend (a, b, border, U(0), W);
254} 254}
255 255
256#endif 256#endif
257 257

Diff Legend

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