Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

Commit

Permalink
* 04/07/2013 0.6 Build 52 *
Browse files Browse the repository at this point in the history
---------------------------

* Changed. Some functions from Matrix objects to Matrix class.
* Added. Modification to CAAT.Math.Rectangle . if no parameters in constructor is set to empty.
* Fixed. CAAT.Foundation.UI.Label dependencies.
* Fixed. CAAT.Foundation.Actor dependencies.
* Added. Capture skeletal animation on-the-fly to an spriteSheet.
  • Loading branch information
ibon tolosana committed Apr 7, 2013
1 parent ea6d7e2 commit cbddb15
Show file tree
Hide file tree
Showing 134 changed files with 807 additions and 416 deletions.
6 changes: 3 additions & 3 deletions build/caat-box2d-min.js

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
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.6 build: 49
Version: 0.6 build: 51
Created on:
DATE: 2013-04-03
TIME: 21:50:58
DATE: 2013-04-07
TIME: 11:05:51
*/


Expand Down
58 changes: 29 additions & 29 deletions build/caat-css-min.js

Large diffs are not rendered by default.

108 changes: 58 additions & 50 deletions build/caat-css.js
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.6 build: 49
Version: 0.6 build: 51

Created on:
DATE: 2013-04-03
TIME: 21:50:58
DATE: 2013-04-07
TIME: 11:05:50
*/


Expand Down Expand Up @@ -1927,6 +1927,52 @@ CAAT.Module({
CAAT.Math.Matrix.prototype.transformRenderingContext= CAAT.Matrix.prototype.transformRenderingContext_NoClamp;
CAAT.Math.Matrix.prototype.transformRenderingContextSet= CAAT.Matrix.prototype.transformRenderingContextSet_NoClamp;
}
},
/**
* Create a scale matrix.
* @param scalex {number} x scale magnitude.
* @param scaley {number} y scale magnitude.
*
* @return {CAAT.Matrix} a matrix object.
*
* @static
*/
scale:function (scalex, scaley) {
var m = new CAAT.Math.Matrix();

m.matrix[0] = scalex;
m.matrix[4] = scaley;

return m;
},
/**
* Create a new rotation matrix and set it up for the specified angle in radians.
* @param angle {number}
* @return {CAAT.Matrix} a matrix object.
*
* @static
*/
rotate:function (angle) {
var m = new CAAT.Math.Matrix();
m.setRotation(angle);
return m;
},
/**
* Create a translation matrix.
* @param x {number} x translation magnitude.
* @param y {number} y translation magnitude.
*
* @return {CAAT.Matrix} a matrix object.
* @static
*
*/
translate:function (x, y) {
var m = new CAAT.Math.Matrix();

m.matrix[2] = x;
m.matrix[5] = y;

return m;
}
},
extendsWith:function () {
Expand Down Expand Up @@ -1969,18 +2015,7 @@ CAAT.Module({

return point;
},
/**
* Create a new rotation matrix and set it up for the specified angle in radians.
* @param angle {number}
* @return {CAAT.Matrix} a matrix object.
*
* @static
*/
rotate:function (angle) {
var m = new CAAT.Math.Matrix();
m.setRotation(angle);
return m;
},

setRotation:function (angle) {

this.identity();
Expand All @@ -1995,23 +2030,7 @@ CAAT.Module({

return this;
},
/**
* Create a scale matrix.
* @param scalex {number} x scale magnitude.
* @param scaley {number} y scale magnitude.
*
* @return {CAAT.Matrix} a matrix object.
*
* @static
*/
scale:function (scalex, scaley) {
var m = new CAAT.Math.Matrix();

m.matrix[0] = scalex;
m.matrix[4] = scaley;

return m;
},
setScale:function (scalex, scaley) {
this.identity();

Expand All @@ -2020,23 +2039,7 @@ CAAT.Module({

return this;
},
/**
* Create a translation matrix.
* @param x {number} x translation magnitude.
* @param y {number} y translation magnitude.
*
* @return {CAAT.Matrix} a matrix object.
* @static
*
*/
translate:function (x, y) {
var m = new CAAT.Math.Matrix();

m.matrix[2] = x;
m.matrix[5] = y;

return m;
},
/**
* Sets this matrix as a translation matrix.
* @param x
Expand Down Expand Up @@ -3112,8 +3115,12 @@ CAAT.Module( {
*/

__init : function( x,y,w,h ) {
this.setLocation(x,y);
this.setDimension(w,h);
if ( arguments.length!==4 ) {
this.setEmpty();
} else {
this.setLocation(x,y);
this.setDimension(w,h);
}
},

/**
Expand Down Expand Up @@ -23793,7 +23800,8 @@ CAAT.Module( {
depends : [
"CAAT.Foundation.Actor",
"CAAT.Foundation.SpriteImage",
"CAAT.Module.Font.Font"
"CAAT.Module.Font.Font",
"CAAT.Foundation.UI.Layout.LayoutManager"
],
aliases : ["CAAT.UI.Label"],
extendsClass : "CAAT.Foundation.Actor",
Expand Down

0 comments on commit cbddb15

Please sign in to comment.