Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing CallFuncN bindings to properly pass optional third parameter

This commit is contained in:
Rohan Kuruvilla 2012-10-24 14:05:29 -07:00 committed by James Chen
parent 094d52664d
commit 5760ea305c
3 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/MoonWarriors/Resources/js/Bullet.js
View File

@ -48,7 +48,11 @@ var Bullet = cc.Sprite.extend({
cc.ArrayRemoveObject(MW.CONTAINER.ENEMY_BULLETS,this); cc.ArrayRemoveObject(MW.CONTAINER.ENEMY_BULLETS,this);
cc.ArrayRemoveObject(MW.CONTAINER.PLAYER_BULLETS,this); cc.ArrayRemoveObject(MW.CONTAINER.PLAYER_BULLETS,this);
this.removeFromParentAndCleanup(true); this.removeFromParentAndCleanup(true);
var removeExplode = cc.CallFunc.create(explode,explode.removeFromParentAndCleanup);
var removeExplode = cc.CallFunc.create(explode, function(sender) {
explode.removeFromParentAndCleanup(true);
});
explode.runAction(cc.ScaleBy.create(0.3, 2,2)); explode.runAction(cc.ScaleBy.create(0.3, 2,2));
explode.runAction(cc.Sequence.create(cc.FadeOut.create(0.3), removeExplode)); explode.runAction(cc.Sequence.create(cc.FadeOut.create(0.3), removeExplode));
}, },

3
scripting/javascript/bindings/cocos2d_specifics.cpp
View File

@ -554,8 +554,7 @@ void JSCallFunc::setJSCallbackThis(jsval thisObj) {
} }
void JSCallFunc::setExtraDataField(jsval data) { void JSCallFunc::setExtraDataField(jsval data) {
extraData = new jsval(); extraData = data;
*extraData = data;
} }
void JSCallFunc::setTargetForNativeNode(CCNode *pNode, JSCallFunc *target) { void JSCallFunc::setTargetForNativeNode(CCNode *pNode, JSCallFunc *target) {

11
scripting/javascript/bindings/cocos2d_specifics.hpp
View File

@ -82,7 +82,7 @@ void register_cocos2dx_js_extensions(JSContext* cx, JSObject* obj);
class JSCallFunc: public CCObject { class JSCallFunc: public CCObject {
public: public:
JSCallFunc(jsval func): jsCallback(func) {} JSCallFunc(jsval func): jsCallback(func) {}
JSCallFunc() { extraData = NULL; } JSCallFunc() {}
virtual ~JSCallFunc() { virtual ~JSCallFunc() {
return; return;
} }
@ -102,16 +102,15 @@ public:
js_proxy_t *proxy = js_get_or_create_proxy<cocos2d::CCNode>(cx, node); js_proxy_t *proxy = js_get_or_create_proxy<cocos2d::CCNode>(cx, node);
valArr[0] = OBJECT_TO_JSVAL(proxy->obj); valArr[0] = OBJECT_TO_JSVAL(proxy->obj);
if(!JSVAL_IS_NULL(extraData)) {
if(extraData != NULL) { valArr[1] = extraData;
valArr[1] = *extraData;
} else { } else {
valArr[1] = JSVAL_NULL; valArr[1] = JSVAL_NULL;
} }
jsval retval; jsval retval;
if(jsCallback != JSVAL_VOID || jsThisObj != JSVAL_VOID) { if(jsCallback != JSVAL_VOID || jsThisObj != JSVAL_VOID) {
JS_CallFunctionValue(cx, JSVAL_TO_OBJECT(jsThisObj), jsCallback, 1, valArr, &retval); JS_CallFunctionValue(cx, JSVAL_TO_OBJECT(jsThisObj), jsCallback, 2, valArr, &retval);
} }
JSCallFunc::setTargetForNativeNode(node, (JSCallFunc *)this); JSCallFunc::setTargetForNativeNode(node, (JSCallFunc *)this);
@ -119,7 +118,7 @@ public:
private: private:
jsval jsCallback; jsval jsCallback;
jsval jsThisObj; jsval jsThisObj;
jsval *extraData; jsval extraData;
}; };