--- ray/src/px/normpat.csh	1991/01/04 23:36:35	1.5
+++ ray/src/px/normpat.csh	1992/01/05 18:14:47	2.2
@@ -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,12 +38,15 @@ onintr quit
 set td=/usr/tmp/np$$
 mkdir $td
 cat > $td/coef.fmt << '_EOF_'
-  rcx=${   $1   };   rcy=${   $2   };   rsx=${   $3   };   rsy=${   $4   };
-rcxcy=${   $5   }; rcxsy=${   $6   }; rsxcy=${   $7   }; rsxsy=${   $8   };
-  gcx=${   $9   };   gcy=${  $10   };   gsx=${  $11   };   gsy=${  $12   };
-gcxcy=${  $13   }; gcxsy=${  $14   }; gsxcy=${  $15   }; gsxsy=${  $16   };
-  bcx=${  $17   };   bcy=${  $18   };   bsx=${  $19   };   bsy=${  $20   };
-bcxcy=${  $21   }; bcxsy=${  $22   }; bsxcy=${  $23   }; 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;
@@ -52,21 +55,22 @@ $9=$4*2*cx; $10=$4*2*cy; $11=$4*2*sx; $12=$4*2*sy;
 $13=$4*4*cx*cy; $14=$4*4*cx*sy; $15=$4*4*sx*cy; $16=$4*4*sx*sy;
 $17=$5*2*cx; $18=$5*2*cy; $19=$5*2*sx; $20=$5*2*sy;
 $21=$5*4*cx*cy; $22=$5*4*cx*sy; $23=$5*4*sx*cy; $24=$5*4*sx*sy;
+$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;
 '_EOF_'
 cat > $td/fsub.cal << '_EOF_'
-ro=ri(1)-rcx*cx-rcy*cy-rsx*sx-rsy*sy
-	-rcxcy*cx*cy-rcxsy*cx*sy-rsxcy*sx*cy-rsxsy*sx*sy;
-go=gi(1)-gcx*cx-gcy*cy-gsx*sx-gsy*sy
-	-gcxcy*cx*cy-gcxsy*cx*sy-gsxcy*sx*cy-gsxsy*sx*sy;
-bo=bi(1)-bcx*cx-bcy*cy-bsx*sx-bsy*sy
-	-bcxcy*cx*cy-bcxsy*cx*sy-bsxcy*sx*cy-bsxsy*sx*sy;
+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
+		+gcxcy*cx*cy+gcxsy*cx*sy+gsxcy*sx*cy+gsxsy*sx*sy);
+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;
 '_EOF_'
 foreach f ($*)
 	if ( $?verb ) then
@@ -98,7 +102,7 @@ _EOF_
 		cat $td/coef
 		echo removing low frequencies...
 	endif
-	pcomb -f $td/fsub.cal -f $td/coef \
+	pcomb -f $td/coef -f $td/fsub.cal \
 		-e "xres=$resolu[1];yres=$resolu[2]" \
 		$td/pf > $td/hf
 	donefsub:
@@ -107,8 +111,9 @@ _EOF_
 			echo blending edges...
 		endif
 		@ mar= $resolu[1] - 3
-		pcompos -x 3 $td/hf 0 0 > $td/left
-		pcompos $td/hf -$mar 0 > $td/right
+		@ les= $resolu[1] - 1
+		pcompos -x 1 $td/hf 0 0 | pfilt -1 -x 3 > $td/left
+		pcompos $td/hf -$les 0 | pfilt -1 -x 3 > $td/right
 		pcomb -e 'ro=f(ri);go=f(gi);bo=f(bi)' \
 			-e 'f(p)=(3-x)/7*p(1)+(4+x)/7*p(2)' \
 			$td/right $td/left > $td/left.patch
@@ -118,8 +123,9 @@ _EOF_
 		pcompos $td/hf 0 0 $td/left.patch 0 0 $td/right.patch $mar 0 \
 			> $td/hflr
 		@ mar= $resolu[2] - 3
-		pcompos -y 3 $td/hflr 0 0 > $td/bottom
-		pcompos $td/hflr 0 -$mar > $td/top
+		@ les= $resolu[2] - 1
+		pcompos -y 1 $td/hflr 0 0 | pfilt -1 -y 3 > $td/bottom
+		pcompos $td/hflr 0 -$les | pfilt -1 -y 3 > $td/top
 		pcomb -e 'ro=f(ri);go=f(gi);bo=f(bi)' \
 			-e 'f(p)=(3-y)/7*p(1)+(4+y)/7*p(2)' \
 			$td/top $td/bottom > $td/bottom.patch