Skip to content

Commit 7140fc7

Browse files
author
SeanLin
committed
Merge pull request cocos2d#496 from ricardoquesada/js_compact_fixes
Changes needed to make it compatible with cocos2d + JS bindings
2 parents 6748f2c + fe06c6d commit 7140fc7

File tree

5 files changed

+65
-41
lines changed

5 files changed

+65
-41
lines changed

‎cocos2d/cocoa/CCGeometry.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,15 @@ cc.Rect.CCRectIntersectsRect = function (rectA, rectB) {
230230
cc.Rect.CCRectGetMaxY(rectB) < cc.Rect.CCRectGetMinY(rectA));
231231
};
232232

233+
/**
234+
* @function
235+
* @param {cc.Rect} rectA
236+
* @param {cc.Rect} rectB
237+
* @return {Boolean}
238+
* Constructor
239+
*/
240+
cc.rectIntersectsRect = cc.Rect.CCRectIntersectsRect;
241+
233242
/**
234243
* @function
235244
* @param {cc.Rect} rectA

‎cocos2d/menu_nodes/CCMenuItem.js‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ cc.MenuItem = cc.Node.extend(/** @lends cc.MenuItem# */{
107107
* @param {function|String} selector
108108
* @return {Boolean}
109109
*/
110-
initWithTarget:function (rec, selector) {
110+
initWithCallback:function (rec, selector) {
111111
this.setAnchorPoint(cc.p(0.5, 0.5));
112112
this._listener = rec;
113113
this._selector = selector;
@@ -143,7 +143,7 @@ cc.MenuItem = cc.Node.extend(/** @lends cc.MenuItem# */{
143143
* @param {cc.Node} rec
144144
* @param {function|String} selector
145145
*/
146-
setTarget:function (rec, selector) {
146+
setCallback:function (rec, selector) {
147147
this._listener = rec;
148148
this._selector = selector;
149149
},
@@ -171,7 +171,7 @@ cc.MenuItem = cc.Node.extend(/** @lends cc.MenuItem# */{
171171
*/
172172
cc.MenuItem.create = function (rec, selector) {
173173
var ret = new cc.MenuItem();
174-
ret.initWithTarget(rec, selector);
174+
ret.initWithCallback(rec, selector);
175175
return ret;
176176
};
177177

@@ -290,7 +290,7 @@ cc.MenuItemLabel = cc.MenuItem.extend(/** @lends cc.MenuItemLabel# */{
290290
* @return {Boolean}
291291
*/
292292
initWithLabel:function (label, target, selector) {
293-
this.initWithTarget(target, selector);
293+
this.initWithCallback(target, selector);
294294
this._originalScale = 1.0;
295295
this._colorBackup = cc.WHITE;
296296
this._disabledColor = cc.c3b(126, 126, 126);
@@ -642,7 +642,7 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{
642642
* @return {Boolean}
643643
*/
644644
initWithNormalSprite:function (normalSprite, selectedSprite, disabledSprite, target, selector) {
645-
this.initWithTarget(target, selector);
645+
this.initWithCallback(target, selector);
646646
this.setNormalImage(normalSprite);
647647
this.setSelectedImage(selectedSprite);
648648
this.setDisabledImage(disabledSprite);
@@ -1035,14 +1035,31 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{
10351035
* @return {Boolean}
10361036
*/
10371037
initWithItem:function (item) {
1038-
this.initWithTarget(null, null);
1038+
this.initWithCallback(null, null);
10391039
this._subItems = [];
10401040
this._subItems.push(item);
10411041
this._selectedIndex = cc.UINT_MAX;
10421042
this.setSelectedIndex(0);
10431043
return true;
10441044
},
10451045

1046+
/**
1047+
* @param {cc.MenuItem} args[1+] items
1048+
* @return {Boolean}
1049+
*/
1050+
initWithItems:function (args) {
1051+
this.initWithCallback(null, null);
1052+
this._subItems = [];
1053+
for (var i = 0; i < args.length; i++) {
1054+
if (args[i]) {
1055+
this._subItems.push(args[i]);
1056+
}
1057+
}
1058+
this._selectedIndex = cc.UINT_MAX;
1059+
this.setSelectedIndex(0);
1060+
return true;
1061+
},
1062+
10461063
/**
10471064
* @param {cc.MenuItem} item
10481065
*/
@@ -1131,10 +1148,11 @@ cc.MenuItemToggle = cc.MenuItem.extend(/** @lends cc.MenuItemToggle# */{
11311148
*/
11321149
cc.MenuItemToggle.create = function (/*Multiple arguments follow*/) {
11331150
var ret = new cc.MenuItemToggle();
1134-
if (arguments.length == 1) {
1135-
ret.initWithItem(arguments);
1136-
} else {
1137-
ret.initWithTarget(arguments);
1138-
}
1151+
ret.initWithItems(arguments);
1152+
// if (arguments.length == 1) {
1153+
// ret.initWithItem(arguments);
1154+
// } else {
1155+
// ret.initWithTarget(arguments);
1156+
// }
11391157
return ret;
11401158
};

‎cocos2d/platform/CCCommon.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ cc.clone = function (obj) {
4646
return newObj;
4747
};
4848

49+
/**
50+
* Function added for JS bindings compatibility. Not needed in cocos2d-html5.
51+
* @function
52+
* @param {object} jsobj subclass
53+
* @param {object} klass superclass
54+
*/
55+
cc.associateWithNative = function( jsobj, superclass ) {
56+
};
57+
4958
/**
5059
* Is show bebug info on web page
5160
* @constant

‎cocos2d/sprite_nodes/CCAnimation.js‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -385,15 +385,3 @@ cc.Animation.createWithAnimationFrames = function (arrayOfAnimationFrameNames, d
385385
return animation;
386386
};
387387

388-
/**
389-
* Creates an animation with an array of cc.SpriteFrame and a delay between frames in seconds. The frames will be added with one "delay unit".
390-
* @param {Array} arrayOfSpriteFrameNames
391-
* @param {Number} delay
392-
* @return {cc.Animation}
393-
*/
394-
cc.Animation.createWithSpriteFrames = function (arrayOfSpriteFrameNames, delay) {
395-
var animation = new cc.Animation();
396-
animation.initWithSpriteFrames(arrayOfSpriteFrameNames, delay);
397-
return animation;
398-
};
399-

‎tests/src/tests/SpriteTest/SpriteTest.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,7 +1544,7 @@ var SpriteFrameTest = SpriteTestDemo.extend({
15441544
animFrames.push(frame);
15451545
}
15461546

1547-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
1547+
var animation = cc.Animation.create(animFrames, 0.3);
15481548
this._sprite1.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
15491549

15501550
// to test issue #732, uncomment the following line
@@ -1573,7 +1573,7 @@ var SpriteFrameTest = SpriteTestDemo.extend({
15731573

15741574
// append frames from another batch
15751575
moreFrames = moreFrames.concat(animFrames);
1576-
var animMixed = cc.Animation.createWithSpriteFrames(moreFrames, 0.3);
1576+
var animMixed = cc.Animation.create(moreFrames, 0.3);
15771577

15781578
this._sprite2.runAction(cc.RepeatForever.create(cc.Animate.create(animMixed)));
15791579

@@ -1687,7 +1687,7 @@ var SpriteFrameAliasNameTest = SpriteTestDemo.extend({
16871687
animFrames.push(frame);
16881688
}
16891689

1690-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
1690+
var animation = cc.Animation.create(animFrames, 0.3);
16911691
// 14 frames * 1sec = 14 seconds
16921692
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
16931693
},
@@ -1743,7 +1743,7 @@ var SpriteOffsetAnchorRotation = SpriteTestDemo.extend({
17431743
animFrames.push(frame);
17441744
}
17451745

1746-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
1746+
var animation = cc.Animation.create(animFrames, 0.3);
17471747
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
17481748
sprite.runAction(cc.RepeatForever.create(cc.RotateBy.create(10, 360)));
17491749

@@ -1810,7 +1810,7 @@ var SpriteBatchNodeOffsetAnchorRotation = SpriteTestDemo.extend({
18101810
animFrames.push(frame);
18111811
}
18121812

1813-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
1813+
var animation = cc.Animation.create(animFrames, 0.3);
18141814
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
18151815
sprite.runAction(cc.RepeatForever.create(cc.RotateBy.create(10, 360)));
18161816

@@ -1875,7 +1875,7 @@ var SpriteOffsetAnchorScale = SpriteTestDemo.extend({
18751875
animFrames.push(frame);
18761876
}
18771877

1878-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
1878+
var animation = cc.Animation.create(animFrames, 0.3);
18791879
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
18801880

18811881
var scale = cc.ScaleBy.create(2, 2);
@@ -1948,7 +1948,7 @@ var SpriteBatchNodeOffsetAnchorScale = SpriteTestDemo.extend({
19481948
animFrames.push(frame);
19491949
}
19501950

1951-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
1951+
var animation = cc.Animation.create(animFrames, 0.3);
19521952
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
19531953

19541954
var scale = cc.ScaleBy.create(2, 2);
@@ -2015,7 +2015,7 @@ var SpriteOffsetAnchorSkew = SpriteTestDemo.extend({
20152015
animFrames.push(frame);
20162016
}
20172017

2018-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
2018+
var animation = cc.Animation.create(animFrames, 0.3);
20192019
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
20202020

20212021
var skewX = cc.SkewBy.create(2, 45, 0);
@@ -2082,7 +2082,7 @@ var SpriteBatchNodeOffsetAnchorSkew = SpriteTestDemo.extend({
20822082
animFrames.push(frame);
20832083
}
20842084

2085-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
2085+
var animation = cc.Animation.create(animFrames, 0.3);
20862086
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
20872087

20882088
animFrames = null;
@@ -2148,7 +2148,7 @@ var SpriteOffsetAnchorSkewScale = SpriteTestDemo.extend({
21482148
animFrames.push(frame);
21492149
}
21502150

2151-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
2151+
var animation = cc.Animation.create(animFrames, 0.3);
21522152
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
21532153

21542154
animFrames = null;
@@ -2224,7 +2224,7 @@ var SpriteBatchNodeOffsetAnchorSkewScale = SpriteTestDemo.extend({
22242224
animFrames.push(frame);
22252225
}
22262226

2227-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
2227+
var animation = cc.Animation.create(animFrames, 0.3);
22282228
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
22292229

22302230
animFrames = null;
@@ -2297,7 +2297,7 @@ var SpriteOffsetAnchorFlip = SpriteTestDemo.extend({
22972297
animFrames.push(frame);
22982298
}
22992299

2300-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
2300+
var animation = cc.Animation.create(animFrames, 0.3);
23012301
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
23022302

23032303
animFrames = null;
@@ -2368,7 +2368,7 @@ var SpriteBatchNodeOffsetAnchorFlip = SpriteTestDemo.extend({
23682368
animFrames.push(frame);
23692369
}
23702370

2371-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.3);
2371+
var animation = cc.Animation.create(animFrames, 0.3);
23722372
sprite.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
23732373

23742374
animFrames = null;
@@ -2423,7 +2423,7 @@ var SpriteAnimationSplit = SpriteTestDemo.extend({
24232423
animFrames.push(frame4);
24242424
animFrames.push(frame5);
24252425

2426-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.2);
2426+
var animation = cc.Animation.create(animFrames, 0.2);
24272427
var animate = cc.Animate.create(animation);
24282428
var seq = cc.Sequence.create(animate,
24292429
cc.FlipX.create(true),
@@ -2568,7 +2568,7 @@ var SpriteBatchNodeChildren = SpriteTestDemo.extend({
25682568
animFrames.push(frame);
25692569
}
25702570

2571-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.2);
2571+
var animation = cc.Animation.create(animFrames, 0.2);
25722572
sprite1.runAction(cc.RepeatForever.create(cc.Animate.create(animation)));
25732573
// END NEW CODE
25742574

@@ -3370,7 +3370,7 @@ var AnimationCache = SpriteTestDemo.extend({
33703370
animFrames.push(frame);
33713371
}
33723372

3373-
var animation = cc.Animation.createWithSpriteFrames(animFrames, 0.2);
3373+
var animation = cc.Animation.create(animFrames, 0.2);
33743374

33753375
// Add an animation to the Cache
33763376
cc.AnimationCache.getInstance().addAnimation(animation, "dance");
@@ -3385,7 +3385,7 @@ var AnimationCache = SpriteTestDemo.extend({
33853385
animFrames.push(frame);
33863386
}
33873387

3388-
animation = cc.Animation.createWithSpriteFrames(animFrames, 0.2);
3388+
animation = cc.Animation.create(animFrames, 0.2);
33893389

33903390
// Add an animation to the Cache
33913391
cc.AnimationCache.getInstance().addAnimation(animation, "dance_gray");
@@ -3400,7 +3400,7 @@ var AnimationCache = SpriteTestDemo.extend({
34003400
animFrames.push(frame);
34013401
}
34023402

3403-
animation = cc.Animation.createWithSpriteFrames(animFrames, 0.2);
3403+
animation = cc.Animation.create(animFrames, 0.2);
34043404

34053405
// Add an animation to the Cache
34063406
cc.AnimationCache.getInstance().addAnimation(animation, "dance_blue");

0 commit comments

Comments
 (0)