Mercurial > drafts / changeset

     1.1 --- a/filters/master/Filters.html	Tue Jul 19 17:49:20 2011 +0200
     1.2 +++ b/filters/master/Filters.html	Mon Jul 25 12:05:08 2011 -0700
     1.3 @@ -3159,7 +3159,9 @@
     1.4  <p>It is possible to create bandwidth-limited noise by synthesizing only one
     1.5  octave.</p>
     1.6  
     1.7 -<p>The C code below shows the exact algorithm used for this filter effect.</p>
     1.8 +<p>The C code below shows the exact algorithm used for this filter effect. 
     1.9 +The <a>filter primitive subregion</a> is to be passed as the arguments fTileX, 
    1.10 +fTileY, fTileWidth and fTileHeight.</p>
    1.11  
    1.12  <p>For fractalSum, you get a turbFunctionResult that is aimed at a range of
    1.13  -1 to 1 (the actual result might exceed this range in some cases). To convert
    1.14 @@ -3298,9 +3300,9 @@
    1.15    b = lerp(sx, u, v);
    1.16    return lerp(sy, a, b);
    1.17  }
    1.18 -double turbulence(int nColorChannel, double *point, double fBaseFreqX, double fBaseFreqY,
    1.19 -          int nNumOctaves, bool bFractalSum, bool bDoStitching,
    1.20 -          double fTileX, double fTileY, double fTileWidth, double fTileHeight)
    1.21 +double turbulence(int nColorChannel, double *point, double <a href="#feTurbulenceBaseFrequencyAttribute">fBaseFreqX</a>, double <a href="#feTurbulenceBaseFrequencyAttribute">fBaseFreqY</a>,
    1.22 +          int <a href="#feTurbulenceNumOctavesAttribute">nNumOctaves</a>, bool bFractalSum, bool bDoStitching,
    1.23 +          double <a href="#FilterPrimitiveSubRegion">fTileX</a>, double <a href="#FilterPrimitiveSubRegion">fTileY</a>, double <a href="#FilterPrimitiveSubRegion">fTileWidth</a>, double <a href="#FilterPrimitiveSubRegion">fTileHeight</a>)
    1.24  {
    1.25    StitchInfo stitch;
    1.26    StitchInfo *pStitchInfo = NULL; // Not stitching when NULL.

     2.1 --- a/filters/publish/Filters.html	Tue Jul 19 17:49:20 2011 +0200
     2.2 +++ b/filters/publish/Filters.html	Mon Jul 25 12:05:08 2011 -0700
     2.3 @@ -14,7 +14,7 @@
     2.4  <div class="head">
     2.5    <p><a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"/></a></p>
     2.6    <h1 id="pagetitle">Filter Effects 1.0: Language</h1>
     2.7 -  <h2 id="pagesubtitle">W3C Editor’s Draft <em>19 July 2011</em></h2>
     2.8 +  <h2 id="pagesubtitle">W3C Editor’s Draft <em>25 July 2011</em></h2>
     2.9    <dl><dt>This version:</dt><dd><a href="https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/publish/Filters.html" class="url">https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/publish/Filters.html</a></dd><dt>Latest version:</dt><dd><a href="http://www.w3.org/TR/FilterEffects10/" class="url">http://www.w3.org/TR/FilterEffects10/</a></dd><dt>Previous version:</dt><dd><a href="http://www.w3.org/TR/2007/WD-SVGFilter12-20070501/" class="url">http://www.w3.org/TR/2007/WD-SVGFilter12-20070501/</a></dd><dt>Editors:</dt><dd><a href="mailto:ed@opera.com">Erik Dahlström</a>, (<a href="http://www.opera.com/">Opera Software ASA</a>)</dd><dd><a href="mailto:dino@apple.com">Dean Jackson</a> (<a href="http://www.apple.com/">Apple Inc</a>)</dd><dt>Authors:</dt><dd>The authors of this specification are the participants of the W3C SVG and CSS Working Groups.</dd></dl>
    2.10    <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2011 <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p>
    2.11  </div>
    2.12 @@ -3061,7 +3061,9 @@
    2.13  <p>It is possible to create bandwidth-limited noise by synthesizing only one
    2.14  octave.</p>
    2.15  
    2.16 -<p>The C code below shows the exact algorithm used for this filter effect.</p>
    2.17 +<p>The C code below shows the exact algorithm used for this filter effect. 
    2.18 +The <a href="#FilterPrimitiveSubRegion"><span class="svg-term">filter primitive subregion</span></a> is to be passed as the arguments fTileX, 
    2.19 +fTileY, fTileWidth and fTileHeight.</p>
    2.20  
    2.21  <p>For fractalSum, you get a turbFunctionResult that is aimed at a range of
    2.22  -1 to 1 (the actual result might exceed this range in some cases). To convert
    2.23 @@ -3200,9 +3202,9 @@
    2.24    b = lerp(sx, u, v);
    2.25    return lerp(sy, a, b);
    2.26  }
    2.27 -double turbulence(int nColorChannel, double *point, double fBaseFreqX, double fBaseFreqY,
    2.28 -          int nNumOctaves, bool bFractalSum, bool bDoStitching,
    2.29 -          double fTileX, double fTileY, double fTileWidth, double fTileHeight)
    2.30 +double turbulence(int nColorChannel, double *point, double <a href="#feTurbulenceBaseFrequencyAttribute">fBaseFreqX</a>, double <a href="#feTurbulenceBaseFrequencyAttribute">fBaseFreqY</a>,
    2.31 +          int <a href="#feTurbulenceNumOctavesAttribute">nNumOctaves</a>, bool bFractalSum, bool bDoStitching,
    2.32 +          double <a href="#FilterPrimitiveSubRegion">fTileX</a>, double <a href="#FilterPrimitiveSubRegion">fTileY</a>, double <a href="#FilterPrimitiveSubRegion">fTileWidth</a>, double <a href="#FilterPrimitiveSubRegion">fTileHeight</a>)
    2.33  {
    2.34    StitchInfo stitch;
    2.35    StitchInfo *pStitchInfo = NULL; // Not stitching when NULL.