Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@meltingice
meltingice committed Nov 13, 2013
2 parents 3f00a76 + ccfb7a0 commit 5b59c23
Show file tree
Hide file tree
Showing 51 changed files with 643 additions and 182 deletions.
2 changes: 1 addition & 1 deletion api/LICENSE.html
View file
Expand Up @@ -129,7 +129,7 @@
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/README.md.html
View file
Expand Up @@ -139,7 +139,7 @@ <h2>Testing</h2><p>Tests for CamanJS run both in NodeJS and the browser.</p><h3>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/assets/search_data.js
View file

Large diffs are not rendered by default.

14 changes: 1 addition & 13 deletions api/class_index.html
View file
Expand Up @@ -141,12 +141,6 @@ <h2>Class Listing A-Z</h2>
<li>
<a href='classes/CamanParser.html'>CamanParser</a>
</li>
<li>
<a href='classes/Caman/Calculate.html'>Calculate</a>
<small>
(Caman)
</small>
</li>
<li>
<a href='classes/Caman.html'>Caman</a>
</li>
Expand Down Expand Up @@ -297,12 +291,6 @@ <h2>File Listing A-Z</h2>
<ul>
<li class='letter'>c</li>
<ul>
<li>
<a href='files/core/calculate.coffee.html'>calculate.coffee</a>
<small>
(core)
</small>
</li>
<li>
<a href='files/core/caman.coffee.html'>caman.coffee</a>
<small>
Expand Down Expand Up @@ -416,7 +404,7 @@ <h2>File Listing A-Z</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
6 changes: 0 additions & 6 deletions api/class_list.html
View file
Expand Up @@ -39,12 +39,6 @@ <h1 class='full_list_header'>Class List</h1>
Caman
</small>
</li>
<li>
<a href='classes/Caman/Calculate.html' target='main'>Calculate</a>
<small class='namespace'>
Caman
</small>
</li>
<li>
<a href='classes/Caman/Convert.html' target='main'>Convert</a>
<small class='namespace'>
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman.html
View file
Expand Up @@ -1493,7 +1493,7 @@ <h3>Parameters:</h3>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Analyze.html
View file
Expand Up @@ -181,7 +181,7 @@ <h3>Returns:</h3>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Blender.html
View file
Expand Up @@ -220,7 +220,7 @@ <h3>Returns:</h3>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
122 changes: 119 additions & 3 deletions api/classes/Caman/Calculate.html
View file
Expand Up @@ -161,7 +161,27 @@ <h2>Class Method Summary</h2>
</a>
</span>
<span class='desc'>
Generates a bezier curve given a start and end point, with two control points in between.
Generates a bezier curve given a start and end point, with control points in between.
</span>
</li>
<li>
<span class='signature'>
<a href='#hermite-class'>
+ (Array) <strong>hermite</strong>(controlPoints, lowBound, highBound)
</a>
</span>
<span class='desc'>
Generates a hermite curve given a start and end point, with control points in between.
</span>
</li>
<li>
<span class='signature'>
<a href='#missingValues-class'>
+ (Array) <strong>missingValues</strong>(values, endX)
</a>
</span>
<span class='desc'>
Calculates possible missing values from a given value array.
</span>
</li>
</ul>
Expand Down Expand Up @@ -296,7 +316,7 @@ <h3>Returns:</h3>
+ (Array) <strong>bezier</strong>(start, ctrl1, ctrl2, end, lowBound, highBound)
</p>
<div class='docstring'>
<p>Generates a bezier curve given a start and end point, with two control points in between.
<p>Generates a bezier curve given a start and end point, with control points in between.
Can also optionally bound the y values between a low and high bound.</p><p>This is different than most bezier curve functions because it attempts to construct it in such
a way that we can use it more like a simple input -&gt; output system, or a one-to-one function.
In other words we can provide an input color value, and immediately receive an output modified
Expand All @@ -313,7 +333,7 @@ <h3>Parameters:</h3>
(<tt>Array</tt>)
</span>
&mdash;
<span class='desc'>arrays describing the x, y coordinates of the control points. Minimum three.</span>
<span class='desc'>arrays describing the x, y coordinates of the control points. Minimum two.</span>
</li>
<li>
<span class='name'>lowBound</span>
Expand Down Expand Up @@ -341,13 +361,109 @@ <h3>Returns:</h3>
<span class='desc'>Array whose index represents every x-value between start and end, and value represents the corresponding y-value.</span>
</li>
</ul>
</div>
</div>
<div class='method_details'>
<p class='signature' id='hermite-class'>
+ (Array) <strong>hermite</strong>(controlPoints, lowBound, highBound)
</p>
<div class='docstring'>
<p>Generates a hermite curve given a start and end point, with control points in between.
Can also optionally bound the y values between a low and high bound.</p><p>This is different than most hermite curve functions because it attempts to construct it in such
a way that we can use it more like a simple input -&gt; output system, or a one-to-one function.
In other words we can provide an input color value, and immediately receive an output modified
color value.</p><p>Note that, by design, this does not force X values to be in the range [0..255]. This is to
generalize the function a bit more. If you give it a starting X value that isn&#39;t 0, and/or a
ending X value that isn&#39;t 255, you may run into problems with your filter!</p>
</div>
<div class='tags'>
<h3>Parameters:</h3>
<ul class='param'>
<li>
<span class='name'>2-item</span>
<span class='type'>
(<tt>Array</tt>)
</span>
&mdash;
<span class='desc'>arrays describing the x, y coordinates of the control points. Minimum two.</span>
</li>
<li>
<span class='name'>lowBound</span>
<span class='type'>
(<tt>Number</tt>)
</span>
&mdash;
<span class='desc'>(optional) Minimum possible value for any y-value in the curve.</span>
</li>
<li>
<span class='name'>highBound</span>
<span class='type'>
(<tt>Number</tt>)
</span>
&mdash;
<span class='desc'>(optional) Maximum possible value for any y-value in the curve.</span>
</li>
</ul>
<h3>Returns:</h3>
<ul class='return'>
<li>
<span class='type'></span>
(<tt>Array</tt>)
&mdash;
<span class='desc'>Array whose index represents every x-value between start and end, and value represents the corresponding y-value.</span>
</li>
</ul>
</div>
</div>
<div class='method_details'>
<p class='signature' id='missingValues-class'>
+ (Array) <strong>missingValues</strong>(values, endX)
</p>
<div class='docstring'>
<p>Calculates possible missing values from a given value array. Note that this returns a copy
and does not mutate the original. In case no values are missing the original array is
returned as that is convenient.</p>
</div>
<div class='tags'>
<h3>Parameters:</h3>
<ul class='param'>
<li>
<span class='name'>2-item</span>
<span class='type'>
(<tt>Array</tt>)
</span>
&mdash;
<span class='desc'>arrays describing the x, y coordinates of the control points.</span>
</li>
<li>
<span class='name'>end</span>
<span class='type'>
(<tt>Number</tt>)
</span>
&mdash;
<span class='desc'>x value of the array (maximum)</span>
</li>
</ul>
<h3>Returns:</h3>
<ul class='return'>
<li>
<span class='type'></span>
(<tt>Array</tt>)
&mdash;
<span class='desc'>Array whose index represents every x-value between start and end, and value represents the corresponding y-value.</span>
</li>
</ul>
</div>
</div>
</div>
</div>
<div id='footer'>
Generated on
<<<<<<< HEAD
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
=======
Thu Oct 24 2013 21:32:51 GMT+0300 (EEST)
>>>>>>> ccfb7a0222938868fbd5f6b67c40353271386db2
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Convert.html
View file
Expand Up @@ -986,7 +986,7 @@ <h3>See also:</h3>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Event.html
View file
Expand Up @@ -272,7 +272,7 @@ <h3>Parameters:</h3>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Filter.html
View file
Expand Up @@ -170,7 +170,7 @@ <h3>Parameters:</h3>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/IO.html
View file
Expand Up @@ -362,7 +362,7 @@ <h3>Returns:</h3>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Layer.html
View file
Expand Up @@ -302,7 +302,7 @@ <h2>Instance Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Logger.html
View file
Expand Up @@ -149,7 +149,7 @@ <h2>Constructor Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Pixel.html
View file
Expand Up @@ -363,7 +363,7 @@ <h2>Instance Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Plugin.html
View file
Expand Up @@ -165,7 +165,7 @@ <h2>Class Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Renderer.html
View file
Expand Up @@ -369,7 +369,7 @@ <h2>Instance Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Caman/Store.html
View file
Expand Up @@ -217,7 +217,7 @@ <h2>Class Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/CamanParser.html
View file
Expand Up @@ -227,7 +227,7 @@ <h2>Instance Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Module.html
View file
Expand Up @@ -249,7 +249,7 @@ <h2>Class Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/classes/Util.html
View file
Expand Up @@ -201,7 +201,7 @@ <h2>Class Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
6 changes: 0 additions & 6 deletions api/file_list.html
View file
Expand Up @@ -45,12 +45,6 @@ <h1 class='full_list_header'>File List</h1>
core
</small>
</li>
<li>
<a href='files/core/calculate.coffee.html' target='main'>calculate.coffee</a>
<small class='namespace'>
core
</small>
</li>
<li>
<a href='files/core/caman.coffee.html' target='main'>caman.coffee</a>
<small class='namespace'>
Expand Down
2 changes: 1 addition & 1 deletion api/files/core/analyze.coffee.html
View file
Expand Up @@ -119,7 +119,7 @@ <h1>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion api/files/core/autoload.coffee.html
View file
Expand Up @@ -146,7 +146,7 @@ <h2>Method Details</h2>
</div>
<div id='footer'>
Generated on
Tue Nov 12 2013 23:11:51 GMT-0500 (EST)
Tue Nov 12 2013 23:13:35 GMT-0500 (EST)
by
<a href='https://github.com/netzpirat/codo' title='CoffeeScript API documentation generator'>Codo</a>
v1.7.0
Expand Down

0 comments on commit 5b59c23

Please sign in to comment.