ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/normpat.csh
(Generate patch)

Comparing ray/src/px/normpat.csh (file contents):
Revision 1.6 by greg, Sat Jan 5 08:38:50 1991 UTC vs.
Revision 2.5 by greg, Thu Jan 29 22:18:26 2004 UTC

# Line 1 | Line 1
1   #!/bin/csh -f
2 < # SCCSid "$SunId$ LBL"
2 > # RCSid: $Id$
3   #
4   # Normalize a pattern for tiling (-b option blends edges) by removing
5   # lowest frequencies from image (-f option) and reducing to
# Line 12 | Line 12 | while ($#argv > 0)
12          switch ($argv[1])
13          case -r:
14                  shift argv
15 <                set pf="$pf -x $argv[1] -y $argv[1] -p 1"
15 >                set pf="$pf -x $argv[1] -y $argv[1] -p 1 -r .67"
16                  breaksw
17          case -f:
18                  set ha="$ha -f"
# Line 37 | Line 37 | dofiles:
37   onintr quit
38   set td=/usr/tmp/np$$
39   mkdir $td
40 + goto skipthis
41   cat > $td/coef.fmt << '_EOF_'
42 <   rm=${  $25   };    gm=${  $26   };    bm=${  $27   };
43 <  rcx=${   $1   };   gcx=${   $9   };   bcx=${  $17   };
44 <  rcy=${   $2   };   gcy=${  $10   };   bcy=${  $18   };
45 <  rsx=${   $3   };   gsx=${  $11   };   bsx=${  $19   };
46 <  rsy=${   $4   };   gsy=${  $12   };   bsy=${  $20   };
47 < rcxcy=${   $5   }; gcxcy=${  $13   }; bcxcy=${  $21   };
48 < rcxsy=${   $6   }; gcxsy=${  $14   }; bcxsy=${  $22   };
49 < rsxcy=${   $7   }; gsxcy=${  $15   }; bsxcy=${  $23   };
50 < rsxsy=${   $8   }; gsxsy=${  $16   }; bsxsy=${  $24   };
42 >   rm:${  $25   };    gm:${  $26   };    bm:${  $27   };
43 >  rcx:${   $1   };   gcx:${   $9   };   bcx:${  $17   };
44 >  rcy:${   $2   };   gcy:${  $10   };   bcy:${  $18   };
45 >  rsx:${   $3   };   gsx:${  $11   };   bsx:${  $19   };
46 >  rsy:${   $4   };   gsy:${  $12   };   bsy:${  $20   };
47 > rcxcy:${   $5   }; gcxcy:${  $13   }; bcxcy:${  $21   };
48 > rcxsy:${   $6   }; gcxsy:${  $14   }; bcxsy:${  $22   };
49 > rsxcy:${   $7   }; gsxcy:${  $15   }; bsxcy:${  $23   };
50 > rsxsy:${   $8   }; gsxsy:${  $16   }; bsxsy:${  $24   };
51   '_EOF_'
52   cat > $td/coef.cal << '_EOF_'
53   $1=$3*2*cx; $2=$3*2*cy; $3=$3*2*sx; $4=$3*2*sy;
# Line 58 | Line 59 | $21=$5*4*cx*cy; $22=$5*4*cx*sy; $23=$5*4*sx*cy; $24=$5
59   $25=$3; $26=$4; $27=$5;
60   cx=cos(wx); cy=cos(wy);
61   sx=sin(wx); sy=sin(wy);
62 < wx=2*PI*($1+.5)/xres; wy=2*PI*($2+.5)/yres;
62 > wx=2*PI/xres*($1+.5); wy=2*PI/yres*($2+.5);
63   '_EOF_'
64   cat > $td/fsub.cal << '_EOF_'
65 + PI:3.14159265358979323846;
66   ro=ri(1)*rm/(rm+rcx*cx+rcy*cy+rsx*sx+rsy*sy
67                  +rcxcy*cx*cy+rcxsy*cx*sy+rsxcy*sx*cy+rsxsy*sx*sy);
68   go=gi(1)*gm/(gm+gcx*cx+gcy*cy+gsx*sx+gsy*sy
# Line 69 | Line 71 | bo=bi(1)*bm/(bm+bcx*cx+bcy*cy+bsx*sx+bsy*sy
71                  +bcxcy*cx*cy+bcxsy*cx*sy+bsxcy*sx*cy+bsxsy*sx*sy);
72   cx=cos(wx); cy=cos(wy);
73   sx=sin(wx); sy=sin(wy);
74 < wx=2*PI*(x+.5)/xres; wy=2*PI*(y+.5)/yres;
73 < PI=3.14159265358979323846;
74 > wx=2*PI/xres*(x+.5); wy=2*PI/yres*(y+.5);
75   '_EOF_'
76 + skipthis:
77   foreach f ($*)
78          if ( $?verb ) then
79                  echo $f\:
# Line 86 | Line 88 | $ha
88   w
89   q
90   _EOF_
91 <        set resolu=`getinfo -d < $td/pf | sed 's/-Y \([0-9]*\) +X \([0-9]*\)/\2 \1/'`
91 >        set resolu=`getinfo -d < $td/pf | sed 's/-Y \([1-9][0-9]*\) +X \([1-9][0-9]*\)/\2 \1/'`
92          if ( ! $?dofsub ) then
93                  mv $td/pf $td/hf
94                  goto donefsub
95          endif
96 +        # if ( $?verb ) then
97 +        #       echo computing Fourier coefficients...
98 +        # endif
99 +        # pfilt -1 -x 32 -y 32 $td/pf | pvalue -h \
100 +        #       | rcalc -e 'xres:32;yres:32' -f $td/coef.cal \
101 +        #       | total -m | rcalc -o $td/coef.fmt \
102 +        #       > $td/coef
103          if ( $?verb ) then
104 <                echo computing Fourier coefficients...
96 <        endif
97 <        pfilt -1 -x 32 -y 32 $td/pf | pvalue -h \
98 <                | rcalc -f $td/coef.cal -e 'xres=32;yres=32' \
99 <                | total -m | rcalc -o $td/coef.fmt \
100 <                > $td/coef
101 <        if ( $?verb ) then
102 <                cat $td/coef
104 >                # cat $td/coef
105                  echo removing low frequencies...
106          endif
107 <        pcomb -f $td/fsub.cal -f $td/coef \
108 <                -e "xres=$resolu[1];yres=$resolu[2]" \
109 <                $td/pf > $td/hf
107 >        pgblur -r `ev "sqrt($resolu[1]*$resolu[2])/8"` $td/pf > $td/lf
108 >        pcomb -e 's=1/li(2);ro=s*ri(1);go=s*gi(1);bo=s*bi(1)' \
109 >                        $td/pf $td/lf > $td/hf
110 >        # pcomb -f $td/coef -f $td/fsub.cal $td/pf > $td/hf
111          donefsub:
112          if ( $?blend ) then
113                  if ( $?verb ) then
114                          echo blending edges...
115                  endif
116                  @ mar= $resolu[1] - 3
117 <                pcompos -x 3 $td/hf 0 0 > $td/left
118 <                pcompos $td/hf -$mar 0 > $td/right
117 >                @ les= $resolu[1] - 1
118 >                pcompos -x 1 $td/hf 0 0 | pfilt -1 -x 3 > $td/left
119 >                pcompos $td/hf -$les 0 | pfilt -1 -x 3 > $td/right
120                  pcomb -e 'ro=f(ri);go=f(gi);bo=f(bi)' \
121                          -e 'f(p)=(3-x)/7*p(1)+(4+x)/7*p(2)' \
122                          $td/right $td/left > $td/left.patch
# Line 122 | Line 126 | _EOF_
126                  pcompos $td/hf 0 0 $td/left.patch 0 0 $td/right.patch $mar 0 \
127                          > $td/hflr
128                  @ mar= $resolu[2] - 3
129 <                pcompos -y 3 $td/hflr 0 0 > $td/bottom
130 <                pcompos $td/hflr 0 -$mar > $td/top
129 >                @ les= $resolu[2] - 1
130 >                pcompos -y 1 $td/hflr 0 0 | pfilt -1 -y 3 > $td/bottom
131 >                pcompos $td/hflr 0 -$les | pfilt -1 -y 3 > $td/top
132                  pcomb -e 'ro=f(ri);go=f(gi);bo=f(bi)' \
133                          -e 'f(p)=(3-y)/7*p(1)+(4+y)/7*p(2)' \
134                          $td/top $td/bottom > $td/bottom.patch

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines