Skip to content

Commit

Permalink
01/24/2012 *0.2 Build 48*
Browse files Browse the repository at this point in the history 
--------------------------

* Fixed Path.applyAsPath which failed to execute.
* Fixed Path.applyAsPath which wasn't applying the mask properly.
  • Loading branch information
hyperandroid committed Jan 24, 2012
1 parent 757f0af commit 221f1df
Show file tree
Hide file tree
Showing 60 changed files with 132 additions and 127 deletions.
6 changes: 3 additions & 3 deletions build/caat-box2d-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions build/caat-box2d.js
View file
Expand Up @@ -21,11 +21,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Version: 0.2 build: 40
Version: 0.2 build: 49
Created on:
DATE: 2012-01-23
TIME: 23:11:22
DATE: 2012-01-24
TIME: 23:32:49
*/


Expand Down
16 changes: 8 additions & 8 deletions build/caat-css-min.js
View file

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions build/caat-css.js
View file
Expand Up @@ -21,11 +21,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Version: 0.2 build: 40
Version: 0.2 build: 49
Created on:
DATE: 2012-01-23
TIME: 23:11:22
DATE: 2012-01-24
TIME: 23:32:49
*/


Expand Down Expand Up @@ -1810,7 +1810,7 @@ var cp1= proxy(
this.coordlist[index]= point;
}
},
applyAsPath : function( ctx ) {
applyAsPath : function( director ) {
}
};
})();
Expand All @@ -1833,12 +1833,12 @@ var cp1= proxy(

cubic: false,

applyAsPath : function( ctx ) {
applyAsPath : function( director ) {

var cc= this.coordlist;

if ( this.cubic ) {
ctx.bezierCurveTo(
director.ctx.bezierCurveTo(
cc[1].x,
cc[1].y,
cc[2].x,
Expand All @@ -1847,7 +1847,7 @@ var cp1= proxy(
cc[3].y
);
} else {
ctx.quadraticCurveTo(
director.ctx.quadraticCurveTo(
cc[1].x,
cc[1].y,
cc[2].x,
Expand Down Expand Up @@ -8096,6 +8096,7 @@ var cp1= proxy(
if ( this.dirtyRectsEnabled ) {

ctx.beginPath();
ctx.rect(0,0,120,40);
var dr= this.cDirtyRects;
for( i=0; i<dr.length; i++ ) {
var drr= dr[i];
Expand All @@ -8113,7 +8114,7 @@ var cp1= proxy(

if (c.isInAnimationFrame(this.time)) {
tt = c.time - c.start_time;
ctx.save();
// ctx.save();

if ( c.onRenderStart ) {
c.onRenderStart(tt);
Expand All @@ -8122,7 +8123,7 @@ var cp1= proxy(
if ( c.onRenderEnd ) {
c.onRenderEnd(tt);
}
ctx.restore();
// ctx.restore();

if (CAAT.DEBUGAABB) {
ctx.globalAlpha= 1;
Expand Down Expand Up @@ -12961,8 +12962,8 @@ CAAT.modules.CircleManager = CAAT.modules.CircleManager || {};/**
curve: null, // a CAAT.Bezier instance.
newPosition: null, // spare holder for getPosition coordinate return.

applyAsPath : function(director, ctx) {
this.curve.applyAsPath(director, ctx);
applyAsPath : function(director) {
this.curve.applyAsPath(director);
return this;
},
setPoint : function( point, index ) {
Expand Down
26 changes: 13 additions & 13 deletions build/caat-min.js
View file

Large diffs are not rendered by default.

30 changes: 16 additions & 14 deletions build/caat.js
View file
Expand Up @@ -21,11 +21,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

Version: 0.2 build: 40
Version: 0.2 build: 49

Created on:
DATE: 2012-01-23
TIME: 23:11:22
DATE: 2012-01-24
TIME: 23:32:48
*/


Expand Down Expand Up @@ -1809,7 +1809,7 @@ var cp1= proxy(
this.coordlist[index]= point;
}
},
applyAsPath : function( ctx ) {
applyAsPath : function( director ) {
}
};
})();
Expand All @@ -1832,12 +1832,12 @@ var cp1= proxy(

cubic: false,

applyAsPath : function( ctx ) {
applyAsPath : function( director ) {

var cc= this.coordlist;

if ( this.cubic ) {
ctx.bezierCurveTo(
director.ctx.bezierCurveTo(
cc[1].x,
cc[1].y,
cc[2].x,
Expand All @@ -1846,7 +1846,7 @@ var cp1= proxy(
cc[3].y
);
} else {
ctx.quadraticCurveTo(
director.ctx.quadraticCurveTo(
cc[1].x,
cc[1].y,
cc[2].x,
Expand Down Expand Up @@ -6328,7 +6328,6 @@ var cp1= proxy(
ctx.globalAlpha= this.frameAlpha;

director.modelViewMatrix.transformRenderingContextSet( ctx );
ctx.save();

this.worldModelViewMatrix.transformRenderingContext(ctx);

Expand All @@ -6344,8 +6343,6 @@ var cp1= proxy(

this.paint(director, time);

ctx.restore();

return true;
},
/**
Expand Down Expand Up @@ -6759,6 +6756,8 @@ var cp1= proxy(
}

var ctx= director.ctx;

ctx.save();

CAAT.ActorContainer.superclass.paintActor.call(this,director,time);
if ( !this.isGlobalAlpha ) {
Expand All @@ -6771,6 +6770,8 @@ var cp1= proxy(
}
}

ctx.restore();

return true;
},
__paintActor : function(director, time ) {
Expand Down Expand Up @@ -9153,6 +9154,7 @@ var cp1= proxy(
if ( this.dirtyRectsEnabled ) {

ctx.beginPath();
ctx.rect(0,0,120,40);
var dr= this.cDirtyRects;
for( i=0; i<dr.length; i++ ) {
var drr= dr[i];
Expand All @@ -9170,7 +9172,7 @@ var cp1= proxy(

if (c.isInAnimationFrame(this.time)) {
tt = c.time - c.start_time;
ctx.save();
// ctx.save();

if ( c.onRenderStart ) {
c.onRenderStart(tt);
Expand All @@ -9179,7 +9181,7 @@ var cp1= proxy(
if ( c.onRenderEnd ) {
c.onRenderEnd(tt);
}
ctx.restore();
// ctx.restore();

if (CAAT.DEBUGAABB) {
ctx.globalAlpha= 1;
Expand Down Expand Up @@ -14019,8 +14021,8 @@ CAAT.modules.CircleManager = CAAT.modules.CircleManager || {};/**
curve: null, // a CAAT.Bezier instance.
newPosition: null, // spare holder for getPosition coordinate return.

applyAsPath : function(director, ctx) {
this.curve.applyAsPath(director, ctx);
applyAsPath : function(director) {
this.curve.applyAsPath(director);
return this;
},
setPoint : function( point, index ) {
Expand Down
6 changes: 6 additions & 0 deletions changelog
View file
@@ -1,3 +1,9 @@
01/24/2012 *0.2 Build 48*
--------------------------

* Fixed Path.applyAsPath which failed to execute.
* Fixed Path.applyAsPath which wasn't applying the mask properly.

01/23/2012 *0.2 Build 40*
--------------------------

Expand Down
2 changes: 1 addition & 1 deletion documentation/jsdoc/files.html
View file
Expand Up @@ -696,7 +696,7 @@ <h2><a href="symbols/src/_Users_ibon_js_CAAT_src_webgl_ShaderUtil.js.html">/User
</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:05:00 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:19 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/index.html
View file
Expand Up @@ -564,7 +564,7 @@ <h2><a href="symbols/Function.html">Function</a></h2>
</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:05:00 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:19 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.Actor.html
View file
Expand Up @@ -4570,7 +4570,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:56 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:15 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.ActorContainer.html
View file
Expand Up @@ -1418,7 +1418,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:15 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.AudioManager.html
View file
Expand Up @@ -1127,7 +1127,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:15 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.B2DBodyActor.html
View file
Expand Up @@ -1227,7 +1227,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:15 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.B2DCircularBody.html
View file
Expand Up @@ -632,7 +632,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:16 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.B2DPolygonBody.html
View file
Expand Up @@ -714,7 +714,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:16 GMT+0100 (CET)
</div>
</body>
</html>
8 changes: 4 additions & 4 deletions documentation/jsdoc/symbols/CAAT.Bezier.html
View file
Expand Up @@ -351,7 +351,7 @@ <h1 class="classTitle">
<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/CAAT.Bezier.html#applyAsPath">applyAsPath</a></b>(ctx)
<div class="fixedFont"><b><a href="../symbols/CAAT.Bezier.html#applyAsPath">applyAsPath</a></b>(director)
</div>
<div class="description"></div>
</td>
Expand Down Expand Up @@ -512,7 +512,7 @@ <h1 class="classTitle">
<div class="fixedFont">


<b>applyAsPath</b>(ctx)
<b>applyAsPath</b>(director)

</div>
<div class="description">
Expand All @@ -528,7 +528,7 @@ <h1 class="classTitle">
<dt class="heading">Parameters:</dt>

<dt>
<b>ctx</b>
<b>director</b>

</dt>
<dd></dd>
Expand Down Expand Up @@ -1022,7 +1022,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:16 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.CatmullRom.html
View file
Expand Up @@ -597,7 +597,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:16 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.Color.RGB.html
View file
Expand Up @@ -470,7 +470,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:16 GMT+0100 (CET)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion documentation/jsdoc/symbols/CAAT.Color.html
View file
Expand Up @@ -694,7 +694,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Mon Jan 23 2012 23:04:57 GMT+0100 (CET)
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Tue Jan 24 2012 23:33:16 GMT+0100 (CET)
</div>
</body>
</html>

0 comments on commit 221f1df

Please sign in to comment.