--- ray/src/rt/rpict.c 2005/06/13 20:07:56 2.76 +++ ray/src/rt/rpict.c 2008/04/27 17:22:49 2.80 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rpict.c,v 2.76 2005/06/13 20:07:56 greg Exp $"; +static const char RCSid[] = "$Id: rpict.c,v 2.80 2008/04/27 17:22:49 schorsch Exp $"; #endif /* * rpict.c - routines and variables for picture generation. @@ -9,20 +9,24 @@ static const char RCSid[] = "$Id: rpict.c,v 2.76 2005/ #include -#ifndef NON_POSIX -#ifdef BSD -#include -#include +#include "platform.h" +#ifdef NON_POSIX + #ifdef MINGW + #include + #endif #else -#include -#include + #ifdef BSD + #include + #include + #else + #include + #include + #endif #endif -#endif #include #include -#include "platform.h" #include "ray.h" #include "paths.h" #include "ambient.h" @@ -677,12 +681,8 @@ pixvalue( /* compute pixel value */ return(0.0); } vdist = ourview.vdist; - - if (rand_samp) /* set pixel index */ - samplendx = random(); - else - samplendx = pixnumber(x,y,hres,vres); - + /* set pixel index */ + samplendx = pixnumber(x,y,hres,vres); /* optional motion blur */ if (lastview.type && mblur > FTINY && (lmax = viewray(lorg, ldir, &lastview, hpos, vpos)) >= -FTINY) { @@ -714,7 +714,7 @@ pixvalue( /* compute pixel value */ } } else { /* non-standard view case */ double dfd = PI/4.*dblur*(.5 - frandom()); - if (ourview.type != VT_ANG) { + if (ourview.type != VT_ANG && ourview.type != VT_PLS) { if (ourview.type != VT_CYL) dfh /= sqrt(ourview.hn2); dfv /= sqrt(ourview.vn2);