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

Merge pull request #1707 from dumganhar/gles20 

Synchronizing to the latest cocos2d-js-test
This commit is contained in:
James Chen 2012-12-03 19:38:19 -08:00
parent ed86e2967f b5ae1f6d2a
commit 16eea28f06
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/MoonWarriors/Classes/AppDelegate.cpp
View File

@ -43,7 +43,7 @@ bool AppDelegate::applicationDidFinishLaunching()
CCScriptEngineProtocol *pEngine = ScriptingCore::getInstance();
CCScriptEngineManager::sharedManager()->setScriptEngine(pEngine);
ScriptingCore::getInstance()->runScript("MoonWarriors-native.js");
ScriptingCore::getInstance()->runScript("MoonWarriors-jsb.js");
return true;
}

2
samples/TestJavascript/cocos2d-js-tests

@ -1 +1 @@
Subproject commit 454baa5e2aa4d2ce4957da6f76482e7a05d242cd
Subproject commit d8a9715050f52e04aadc5e8410eeeacede4a3451

26
scripting/javascript/bindings/js_bindings_ccbreader.cpp
View File

@ -98,31 +98,6 @@ JSBool js_cocos2dx_CCBAnimationManager_animationCompleteCallback(JSContext *cx,
return JS_FALSE;
}
JSBool js_cocos2dx_CCBReader_setCCBRootPath(JSContext *cx, uint32_t argc, jsval *vp)
{
JSBool bRet = JS_FALSE;
if (argc == 1) {
jsval *argv = JS_ARGV(cx, vp);
cocos2d::extension::CCBReader* cobj;
JSObject* obj = JS_THIS_OBJECT(cx, vp);
js_proxy_t *proxy; JS_GET_NATIVE_PROXY(proxy, obj);
cobj = (cocos2d::extension::CCBReader *)(proxy ? proxy->ptr : NULL);
TEST_NATIVE_OBJECT(cx, cobj)
if (argv[0].isString())
{
JSStringWrapper str(argv[0], cx);
cobj->setCCBRootPath(str);
JS_SET_RVAL(cx, vp, JSVAL_VOID);
bRet = JS_TRUE;
}
return bRet;
}
JS_ReportError(cx, "wrong number of arguments: %d, was expecting %d", argc, 1);
return JS_FALSE;
}
JSBool js_cocos2dx_CCBReader_readNodeGraphFromFile(JSContext *cx, uint32_t argc, jsval *vp)
{
jsval *argv = JS_ARGV(cx, vp);
@ -327,6 +302,5 @@ void register_CCBuilderReader(JSContext *cx, JSObject *obj) {
JS_DefineFunction(cx, tmpObj, "loadScene", js_cocos2dx_CCBReader_createSceneWithNodeGraphFromFile, 2, JSPROP_READONLY | JSPROP_PERMANENT);
JS_DefineFunction(cx, js_cocos2dx_CCBReader_prototype, "load", js_cocos2dx_CCBReader_readNodeGraphFromFile, 2, JSPROP_READONLY | JSPROP_PERMANENT);
JS_DefineFunction(cx, js_cocos2dx_CCBReader_prototype, "setCCBRootPath", js_cocos2dx_CCBReader_setCCBRootPath, 1, JSPROP_READONLY | JSPROP_PERMANENT);
JS_DefineFunction(cx, js_cocos2dx_CCBAnimationManager_prototype, "setCompletedAnimationCallback", js_cocos2dx_CCBAnimationManager_animationCompleteCallback, 2, JSPROP_READONLY | JSPROP_PERMANENT);
}