--- ray/src/px/normpat.csh	1991/01/08 12:28:05	1.7
+++ ray/src/px/normpat.csh	2003/02/22 02:07:27	2.4
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-# SCCSid "$SunId$ LBL"
+# RCSid: $Id: normpat.csh,v 2.4 2003/02/22 02:07:27 greg Exp $
 #
 # Normalize a pattern for tiling (-b option blends edges) by removing
 # lowest frequencies from image (-f option) and reducing to
@@ -12,7 +12,7 @@ while ($#argv > 0)
 	switch ($argv[1])
 	case -r:
 		shift argv
-		set pf="$pf -x $argv[1] -y $argv[1] -p 1"
+		set pf="$pf -x $argv[1] -y $argv[1] -p 1 -r .67"
 		breaksw
 	case -f:
 		set ha="$ha -f"
@@ -38,15 +38,15 @@ onintr quit
 set td=/usr/tmp/np$$
 mkdir $td
 cat > $td/coef.fmt << '_EOF_'
-   rm=${  $25   };    gm=${  $26   };    bm=${  $27   };
-  rcx=${   $1   };   gcx=${   $9   };   bcx=${  $17   };
-  rcy=${   $2   };   gcy=${  $10   };   bcy=${  $18   };
-  rsx=${   $3   };   gsx=${  $11   };   bsx=${  $19   };
-  rsy=${   $4   };   gsy=${  $12   };   bsy=${  $20   };
-rcxcy=${   $5   }; gcxcy=${  $13   }; bcxcy=${  $21   };
-rcxsy=${   $6   }; gcxsy=${  $14   }; bcxsy=${  $22   };
-rsxcy=${   $7   }; gsxcy=${  $15   }; bsxcy=${  $23   };
-rsxsy=${   $8   }; gsxsy=${  $16   }; bsxsy=${  $24   };
+   rm:${  $25   };    gm:${  $26   };    bm:${  $27   };
+  rcx:${   $1   };   gcx:${   $9   };   bcx:${  $17   };
+  rcy:${   $2   };   gcy:${  $10   };   bcy:${  $18   };
+  rsx:${   $3   };   gsx:${  $11   };   bsx:${  $19   };
+  rsy:${   $4   };   gsy:${  $12   };   bsy:${  $20   };
+rcxcy:${   $5   }; gcxcy:${  $13   }; bcxcy:${  $21   };
+rcxsy:${   $6   }; gcxsy:${  $14   }; bcxsy:${  $22   };
+rsxcy:${   $7   }; gsxcy:${  $15   }; bsxcy:${  $23   };
+rsxsy:${   $8   }; gsxsy:${  $16   }; bsxsy:${  $24   };
 '_EOF_'
 cat > $td/coef.cal << '_EOF_'
 $1=$3*2*cx; $2=$3*2*cy; $3=$3*2*sx; $4=$3*2*sy;
@@ -58,9 +58,10 @@ $21=$5*4*cx*cy; $22=$5*4*cx*sy; $23=$5*4*sx*cy; $24=$5
 $25=$3; $26=$4; $27=$5;
 cx=cos(wx); cy=cos(wy);
 sx=sin(wx); sy=sin(wy);
-wx=2*PI*($1+.5)/xres; wy=2*PI*($2+.5)/yres;
+wx=2*PI/xres*($1+.5); wy=2*PI/yres*($2+.5);
 '_EOF_'
 cat > $td/fsub.cal << '_EOF_'
+PI:3.14159265358979323846;
 ro=ri(1)*rm/(rm+rcx*cx+rcy*cy+rsx*sx+rsy*sy
 		+rcxcy*cx*cy+rcxsy*cx*sy+rsxcy*sx*cy+rsxsy*sx*sy);
 go=gi(1)*gm/(gm+gcx*cx+gcy*cy+gsx*sx+gsy*sy
@@ -69,8 +70,7 @@ bo=bi(1)*bm/(bm+bcx*cx+bcy*cy+bsx*sx+bsy*sy
 		+bcxcy*cx*cy+bcxsy*cx*sy+bsxcy*sx*cy+bsxsy*sx*sy);
 cx=cos(wx); cy=cos(wy);
 sx=sin(wx); sy=sin(wy);
-wx=2*PI*(x+.5)/xres; wy=2*PI*(y+.5)/yres;
-PI=3.14159265358979323846;
+wx=2*PI/xres*(x+.5); wy=2*PI/yres*(y+.5);
 '_EOF_'
 foreach f ($*)
 	if ( $?verb ) then
@@ -95,16 +95,14 @@ _EOF_
 		echo computing Fourier coefficients...
 	endif
 	pfilt -1 -x 32 -y 32 $td/pf | pvalue -h \
-		| rcalc -f $td/coef.cal -e 'xres=32;yres=32' \
+		| rcalc -e 'xres:32;yres:32' -f $td/coef.cal \
 		| total -m | rcalc -o $td/coef.fmt \
 		> $td/coef
 	if ( $?verb ) then
 		cat $td/coef
 		echo removing low frequencies...
 	endif
-	pcomb -f $td/fsub.cal -f $td/coef \
-		-e "xres=$resolu[1];yres=$resolu[2]" \
-		$td/pf > $td/hf
+	pcomb -f $td/coef -f $td/fsub.cal $td/pf > $td/hf
 	donefsub:
 	if ( $?blend ) then
 		if ( $?verb ) then