Merge pull request #1339 from rohankuruvilla/merge2

JS Bindings improvements

cocos2dx/particle_nodes/CCParticleSystemQuad.cpp

@@ -120,6 +120,18 @@ CCParticleSystemQuad * CCParticleSystemQuad::create(const char *plistFile)
     return pRet;
 }
 
+CCParticleSystemQuad * CCParticleSystemQuad::createWithTotalParticles(unsigned int numberOfParticles) {
+    CCParticleSystemQuad *pRet = new CCParticleSystemQuad();
+    if (pRet && pRet->initWithTotalParticles(numberOfParticles))
+    {
+        pRet->autorelease();
+        return pRet;
+    }
+    CC_SAFE_DELETE(pRet);
+    return pRet;
+}
+
+
 // pointRect should be in Texture coordinates, not pixel coordinates
 void CCParticleSystemQuad::initTexCoordsWithRect(const CCRect& pointRect)
 {

cocos2dx/particle_nodes/CCParticleSystemQuad.h

@@ -110,6 +110,7 @@ public:
     CC_DEPRECATED_ATTRIBUTE static CCParticleSystemQuad * node();
 
     static CCParticleSystemQuad * create();
+    static CCParticleSystemQuad * createWithTotalParticles(unsigned int numberOfParticles);
 private:
 #if CC_TEXTURE_ATLAS_USE_VAO
     void setupVBOandVAO();

extensions/CCBReader/CCBReader.h

@@ -235,6 +235,7 @@ public:
     static float getResolutionScale();
     
     CCNode* readFileWithCleanUp(bool bCleanUp);
+    bool hasScriptingOwner = false;    
 
 private:
     void cleanUpNodeGraph(CCNode *pNode);
@@ -250,6 +251,7 @@ private:
     bool getBit();
     void alignBits();
     CCString* readUTF8();
+
 };
 
 // end of effects group

extensions/CCBReader/CCBSelectorResolver.h

@@ -3,6 +3,7 @@
 
 #include "cocos2d.h"
 #include "ExtensionMacros.h"
+#include "../GUI/CCControlExtension/CCInvocation.h"
 
 USING_NS_CC;
 NS_CC_EXT_BEGIN
@@ -18,11 +19,18 @@ NS_CC_EXT_BEGIN
 class CCBSelectorResolver {
     public:
         virtual ~CCBSelectorResolver() {};
-
     virtual cocos2d::SEL_MenuHandler onResolveCCBCCMenuItemSelector(CCObject * pTarget, CCString * pSelectorName) = 0;
+    
     virtual cocos2d::extension::SEL_CCControlHandler onResolveCCBCCControlSelector(CCObject * pTarget, CCString * pSelectorName) = 0;
 };
 
+
+class CCBScriptOwnerProtocol {
+public:
+    virtual ~CCBScriptOwnerProtocol() {};
+    virtual CCBSelectorResolver * createNew() = 0;
+};
+
 NS_CC_EXT_END
 
 #endif

extensions/CCBReader/CCData.h

@@ -3,7 +3,7 @@
 #define __CCB_CCDATA_H__
 
 #include "cocos2d.h"
-#include "cocos-ext.h"
+#include "ExtensionMacros.h""
 
 NS_CC_EXT_BEGIN
 

extensions/CCBReader/CCNodeLoader.cpp

@@ -686,6 +686,17 @@ BlockData * CCNodeLoader::parsePropTypeBlock(CCNode * pNode, CCNode * pParent, C
             target = pCCBReader->getAnimationManager()->getRootNode();
         } else if(selectorTarget == kCCBTargetTypeOwner) {
             target = pCCBReader->getOwner();
+            
+            /* Scripting specific code because selector function is common for all callbacks.
+             * So if we had 1 target and 1 selector function, the context (callback function name)
+             * would get lost. Hence the need for a new target for each callback.
+             */
+            if(pCCBReader->hasScriptingOwner) {
+                CCBScriptOwnerProtocol *proxy = dynamic_cast<CCBScriptOwnerProtocol *>(pCCBReader->getOwner());
+                if(proxy) {
+                    target = dynamic_cast<CCObject *>(proxy->createNew());
+                }
+            }
         }
 
         if(target != NULL) {

scripting/javascript/bindings/ScriptingCore.cpp

@@ -14,6 +14,7 @@
 #include <vector>
 #include "ScriptingCore.h"
 #include "cocos2d.h"
+#include "cocos2d_specifics.hpp"
 
 #ifdef ANDROID
 #include <android/log.h>
@@ -275,8 +276,19 @@ void ScriptingCore::addRegisterCallback(sc_register_sth callback) {
     registrationList.push_back(callback);
 }
 
+void ScriptingCore::removeAllRoots(JSContext *cx) {
+    js_proxy_t *current, *tmp;
+    HASH_ITER(hh, _js_native_global_ht, current, tmp) {
+        JS_RemoveObjectRoot(cx, &current->obj);
+    }
+    HASH_CLEAR(hh, _js_native_global_ht);
+    HASH_CLEAR(hh, _native_js_global_ht);
+    HASH_CLEAR(hh, _js_global_type_ht);
+}
+
 void ScriptingCore::createGlobalContext() {
     if (this->cx && this->rt) {        
+        ScriptingCore::removeAllRoots(this->cx);
         JS_DestroyContext(this->cx);
         JS_DestroyRuntime(this->rt);
         this->cx = NULL;
@@ -368,8 +380,8 @@ void ScriptingCore::removeScriptObjectByCCObject(CCObject* pObj)
     JS_GET_PROXY(nproxy, ptr);
     if (nproxy) {
         JSContext *cx = ScriptingCore::getInstance()->getGlobalContext();
-        JS_RemoveObjectRoot(cx, &nproxy->obj);
         JS_GET_NATIVE_PROXY(jsproxy, nproxy->obj);
+        JS_RemoveObjectRoot(cx, &jsproxy->obj);
         JS_REMOVE_PROXY(nproxy, jsproxy);
     }
 }
@@ -565,6 +577,14 @@ int ScriptingCore::executeFunctionWithObjectData(CCNode *self, const char *name,
     return 1;
 }
 
+int ScriptingCore::executeFunctionWithOwner(jsval owner, const char *name, jsval data) {
+    jsval retval;
+
+    executeJSFunctionWithName(this->cx, JSVAL_TO_OBJECT(owner), name, data, retval);
+
+    return 1;
+}
+
 int ScriptingCore::executeCustomTouchesEvent(int eventType, 
                                        CCSet *pTouches, JSObject *obj)
 {
@@ -776,7 +796,23 @@ CCArray* jsval_to_ccarray(JSContext* cx, jsval v) {
     return NULL;
 }
 
-// from native
+
+jsval ccarray_to_jsval(JSContext* cx, CCArray *arr) {
+    
+  JSObject *jsretArr = JS_NewArrayObject(cx, 0, NULL);
+
+  for(int i = 0; i < arr->count(); ++i) {
+
+    CCObject *obj = arr->objectAtIndex(i);
+    js_proxy_t *proxy = js_get_or_create_proxy<cocos2d::CCObject>(cx, obj);
+    jsval arrElement = OBJECT_TO_JSVAL(proxy->obj);
+
+    if(!JS_SetElement(cx, jsretArr, i, &arrElement)) {
+      break;
+    }
+  }
+  return OBJECT_TO_JSVAL(jsretArr);
+}
 
 jsval long_long_to_jsval(JSContext* cx, long long v) {
     JSObject *tmp = JS_NewUint32Array(cx, 2);

scripting/javascript/bindings/ScriptingCore.h

@@ -81,6 +81,7 @@ public:
     virtual int executeLayerTouchEvent(CCLayer* pLayer, int eventType, CCTouch *pTouch);
 
     int executeFunctionWithObjectData(CCNode *self, const char *name, JSObject *obj);
+    int executeFunctionWithOwner(jsval owner, const char *name, jsval data);
     
     void executeJSFunctionWithThisObj(jsval thisObj, jsval callback, jsval data);
 
@@ -115,6 +116,8 @@ public:
 	 */
 	void createGlobalContext();
     
+    static void removeAllRoots(JSContext *cx);
+	
     
     int executeCustomTouchEvent(int eventType, 
                                 CCTouch *pTouch, JSObject *obj, jsval &retval);
@@ -180,6 +183,7 @@ ccColor4B jsval_to_cccolor4b(JSContext *cx, jsval v);
 ccColor4F jsval_to_cccolor4f(JSContext *cx, jsval v);
 ccColor3B jsval_to_cccolor3b(JSContext *cx, jsval v);
 CCArray* jsval_to_ccarray(JSContext* cx, jsval v);
+jsval ccarray_to_jsval(JSContext* cx, CCArray *arr);
 // from native
 jsval long_long_to_jsval(JSContext* cx, long long v);
 jsval std_string_to_jsval(JSContext* cx, std::string& v);

scripting/javascript/bindings/cocos2d_specifics.cpp

@@ -326,27 +326,45 @@ JSBool js_cocos2dx_CCMenuItemFont_create(JSContext *cx, uint32_t argc, jsval *vp
 	return JS_FALSE;
 }
 
+
 JSBool js_cocos2dx_CCMenuItemToggle_create(JSContext *cx, uint32_t argc, jsval *vp)
 {
   if (argc >= 1) {
     jsval *argv = JS_ARGV(cx, vp);
     cocos2d::CCMenuItemToggle* ret = cocos2d::CCMenuItemToggle::create();
-		JSObject *obj = bind_menu_item(cx, ret, (argc == 2 ? argv[1] : JSVAL_VOID), argv[0]);
+        
-		for (int i=1; i < argc; i++) {
+        
+    for (int i=0; i < argc; i++) {
       js_proxy_t *proxy;
       JSObject *tmpObj = JSVAL_TO_OBJECT(argv[i]);
       JS_GET_NATIVE_PROXY(proxy, tmpObj);
       cocos2d::CCMenuItem* item = (cocos2d::CCMenuItem*)(proxy ? proxy->ptr : NULL);
       TEST_NATIVE_OBJECT(cx, item)
-			ret->addSubItem(item);
+	if(i == 0) ret->initWithItem(item);
+	else ret->addSubItem(item);
     }
-		JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(obj));
+        
+    jsval jsret;
+    if (ret) {
+      js_proxy_t *proxy;
+      JS_GET_PROXY(proxy, ret);
+      if (proxy) {
+	jsret = OBJECT_TO_JSVAL(proxy->obj);
+      } else {
+	// create a new js obj of that class
+	proxy = js_get_or_create_proxy<cocos2d::CCMenuItemToggle>(cx, ret);
+	jsret = OBJECT_TO_JSVAL(proxy->obj);
+      }
+    } else {
+      jsret = JSVAL_NULL;
+    }
+        
+    JS_SET_RVAL(cx, vp, jsret);
     return JS_TRUE;
   }
   return JS_FALSE;
 }
 
-
 JSBool js_cocos2dx_setCallback(JSContext *cx, uint32_t argc, jsval *vp) {
 
     if(argc == 2) {
@@ -451,6 +469,8 @@ JSBool js_cocos2dx_swap_native_object(JSContext *cx, uint32_t argc, jsval *vp)
 			js_proxy_t *jsproxy;
 			JS_GET_PROXY(jsproxy, ptrTwo);
 			if (jsproxy) {
+                JS_RemoveObjectRoot(cx, &nproxy->obj);
+
 				JS_REMOVE_PROXY(jsproxy, nproxy);
 				JS_NEW_PROXY(nproxy, ptrTwo, one);
 			}

scripting/javascript/bindings/js_bindings_ccbreader.cpp

@@ -0,0 +1,156 @@
+//
+//  js_bindings_ccbreader.cpp
+//  watermelon
+//
+//  Created by Rohan Kuruvilla on 14/08/2012.
+//
+//
+
+#include "js_bindings_ccbreader.h"
+#include "ScriptingCore.h"
+#include "CCNodeLoaderLibrary.h"
+
+USING_NS_CC;
+USING_NS_CC_EXT;
+
+static void removeSelector(std::string &str) {
+    size_t found;
+    found = str.find(":");
+    while (found!=std::string::npos){
+        str.replace(found, found+1, "");
+        found = str.find(":");
+    }
+}
+
+SEL_MenuHandler CCBScriptCallbackProxy::onResolveCCBCCMenuItemSelector(cocos2d::CCObject * pTarget,
+                                                                       cocos2d::CCString * pSelectorName) {
+    this->callBackProp = pSelectorName->getCString();
+    removeSelector(this->callBackProp);
+    return menu_selector(CCBScriptCallbackProxy::menuItemCallback);
+}
+
+SEL_CCControlHandler CCBScriptCallbackProxy::onResolveCCBCCControlSelector(CCObject * pTarget,
+                                                                           CCString * pSelectorName) {
+    
+    this->callBackProp = pSelectorName->getCString();
+    removeSelector(this->callBackProp);
+    return cccontrol_selector(CCBScriptCallbackProxy::controlCallback);
+}
+
+bool CCBScriptCallbackProxy::onAssignCCBMemberVariable(CCObject * pTarget,
+                                                       CCString * pMemberVariableName,
+                                                       CCNode * pNode) {
+    return true;
+}
+
+void CCBScriptCallbackProxy::onNodeLoaded(CCNode * pNode,
+                                          CCNodeLoader * pNodeLoader) {}
+
+CCBSelectorResolver * CCBScriptCallbackProxy::createNew() {
+    CCBScriptCallbackProxy * ret = new CCBScriptCallbackProxy();
+    ret->setJSOwner(this->owner);
+    return dynamic_cast<CCBSelectorResolver *>(ret);
+}
+
+void CCBScriptCallbackProxy::menuItemCallback(CCObject *pSender) {
+    ScriptingCore::getInstance()->executeFunctionWithOwner(owner, callBackProp.c_str() , JSVAL_NULL);
+}
+
+void CCBScriptCallbackProxy::controlCallback(CCObject *pSender, CCControlEvent event) {
+    ScriptingCore::getInstance()->executeFunctionWithOwner(owner, callBackProp.c_str() , JSVAL_NULL);
+}
+
+void CCBScriptCallbackProxy::setCallbackProperty(const char *prop) {
+    callBackProp = prop;
+}
+
+void CCBScriptCallbackProxy::setJSOwner(jsval ownr) {
+    owner = ownr;
+}
+
+jsval CCBScriptCallbackProxy::getJSOwner() {
+    return owner;
+}
+
+
+static CCNode* loadReader(const char *file, jsval owner) {
+    /* Create an autorelease CCNodeLoaderLibrary. */
+    
+    /* Create an autorelease CCBReader. */
+    CCNodeLoaderLibrary * ccNodeLoaderLibrary = CCNodeLoaderLibrary::newDefaultCCNodeLoaderLibrary();
+    
+    ccNodeLoaderLibrary->registerCCNodeLoader("", JSLayerLoader::loader());
+    
+    cocos2d::extension::CCBReader * ccbReader = new cocos2d::extension::CCBReader(ccNodeLoaderLibrary);
+    ccbReader->autorelease();
+    
+    /* Read a ccbi file. */
+    ccbReader->hasScriptingOwner = true;
+    
+    CCBScriptCallbackProxy *ccBCallbackProxy = new CCBScriptCallbackProxy();
+    ccBCallbackProxy->setJSOwner(owner);
+    //ccbReader->setOwner(dynamic_cast<CCObject *>(ccBCallbackProxy));
+    
+    CCBSelectorResolver * targetAsCCBSelectorResolver = dynamic_cast<CCBSelectorResolver *>(ccBCallbackProxy);
+    
+    CCNode * node = ccbReader->readNodeGraphFromFile(file, dynamic_cast<CCObject *>(ccBCallbackProxy));
+    
+    return node;
+}
+
+
+JSBool js_CocosBuilder_Run(JSContext *cx, uint32_t argc, jsval *vp)
+{
+    if (argc >= 1) {
+		jsval *argv = JS_ARGV(cx, vp);
+		const char *arg0;
+        do {
+            JSString *tmp = JS_ValueToString(cx, argv[0]);
+            arg0 = JS_EncodeString(cx, tmp);
+        }
+        while (0);
+      
+        jsval obj =  argc >= 2 ? argv[1] : JSVAL_NULL;
+        js_log("%s: + ", JSVAL_TO_OBJECT(obj));
+        CCNode * ret = loadReader(arg0, obj);
+        jsval jsret;
+		if (ret) {
+			js_proxy_t *proxy;
+			JS_GET_PROXY(proxy, ret);
+			if (proxy) {
+				jsret = OBJECT_TO_JSVAL(proxy->obj);
+			} else {
+				// create a new js obj of that class
+				proxy = js_get_or_create_proxy<cocos2d::CCNode>(cx, ret);
+				jsret = OBJECT_TO_JSVAL(proxy->obj);
+			}
+		} else {
+			jsret = JSVAL_NULL;
+		}
+		JS_SET_RVAL(cx, vp, jsret);
+		return JS_TRUE;
+
+    }
+    return JS_FALSE;
+}
+
+
+void register_CCBuilderReader(JSContext *cx, JSObject *obj) {
+    
+    
+    jsval nsval;
+	JSObject *ns;
+	JS_GetProperty(cx, obj, "cc", &nsval);
+	if (nsval == JSVAL_VOID) {
+		ns = JS_NewObject(cx, NULL, NULL, NULL);
+		nsval = OBJECT_TO_JSVAL(ns);
+		JS_SetProperty(cx, obj, "cc", &nsval);
+	} else {
+		JS_ValueToObject(cx, nsval, &ns);
+	}
+	obj = ns;
+
+    JSObject *tmpObj = JSVAL_TO_OBJECT(anonEvaluate(cx, obj, "(function () { cc = cc || {}; cc.Reader = cc.Reader || {}; return cc.Reader; })()"));
+    JS_DefineFunction(cx, tmpObj, "load", js_CocosBuilder_Run, 2, JSPROP_READONLY | JSPROP_PERMANENT)    ;
+    
+}

scripting/javascript/bindings/js_bindings_ccbreader.h

@@ -0,0 +1,62 @@
+//
+//  js_bindings_ccbreader.h
+//  watermelon
+//
+//  Created by Rohan Kuruvilla on 14/08/2012.
+//
+//
+#include "jsapi.h"
+#include "CCBReader.h"
+#include "CCBSelectorResolver.h"
+#include "CCBMemberVariableAssigner.h"
+#include "CCInvocation.h"
+#include "ExtensionMacros.h"
+#include "CCLayerLoader.h"
+
+#include "cocos2d_specifics.hpp"
+
+
+class CCBScriptCallbackProxy:  public cocos2d::CCLayer
+, public cocos2d::extension::CCBScriptOwnerProtocol
+, public cocos2d::extension::CCBSelectorResolver
+, public cocos2d::extension::CCBMemberVariableAssigner {
+    
+    std::string callBackProp;
+    jsval owner;
+
+public:
+
+
+    CCBScriptCallbackProxy () {}
+    virtual ~CCBScriptCallbackProxy() {}
+
+    CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(CCBScriptCallbackProxy, create);
+    virtual cocos2d::SEL_MenuHandler onResolveCCBCCMenuItemSelector(cocos2d::CCObject * pTarget,
+                                                                    cocos2d::CCString * pSelectorName);
+    
+    virtual cocos2d::extension::SEL_CCControlHandler onResolveCCBCCControlSelector(cocos2d::CCObject * pTarget,
+                                                                                   cocos2d::CCString * pSelectorName);
+    virtual bool onAssignCCBMemberVariable(cocos2d::CCObject * pTarget, cocos2d::CCString * pMemberVariableName,
+                                           cocos2d::CCNode * pNode);
+    virtual void onNodeLoaded(cocos2d::CCNode * pNode,
+                              cocos2d::extension::CCNodeLoader * pNodeLoader);
+        
+    virtual CCBSelectorResolver * createNew();
+    void menuItemCallback(CCObject *pSender);
+    void controlCallback(CCObject *pSender, cocos2d::extension::CCControlEvent event);
+    void setCallbackProperty(const char *prop);
+    void setJSOwner(jsval ownr);
+    jsval getJSOwner();
+};
+
+
+class JSLayerLoader : public cocos2d::extension::CCLayerLoader {
+public:
+    CCB_STATIC_NEW_AUTORELEASE_OBJECT_METHOD(JSLayerLoader, loader);
+    
+protected:
+    CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(CCBScriptCallbackProxy);
+};
+
+void register_CCBuilderReader(JSContext *cx, JSObject *global);
+JSBool js_CocosBuilder_Run(JSContext *cx, uint32_t argc, jsval *vp);

scripting/javascript/bindings/spidermonkey_specifics.h

@@ -77,8 +77,8 @@ do { \
 
 #define JS_REMOVE_PROXY(nproxy, jsproxy) \
 do { \
-	if (nproxy)  HASH_DEL(_native_js_global_ht, nproxy); \
+	if (nproxy) { HASH_DEL(_native_js_global_ht, nproxy); free(nproxy); } \
-	if (jsproxy) HASH_DEL(_js_native_global_ht, jsproxy); \
+	if (jsproxy) { HASH_DEL(_js_native_global_ht, jsproxy); free(jsproxy); } \
 } while (0)
 
 #define TEST_NATIVE_OBJECT(cx, native_obj) \

template/xcode4/cocos2dx_js.xctemplate/Classes/AppDelegate.cpp

@@ -8,6 +8,7 @@
 #include "cocos2d_specifics.hpp"
 #include "js_bindings_chipmunk_manual.hpp"
 #include "js_bindings_chipmunk_functions.hpp"
+#include "js_bindings_ccbreader.h"
 
 USING_NS_CC;
 using namespace CocosDenshion;
@@ -43,6 +44,7 @@ bool AppDelegate::applicationDidFinishLaunching()
     sc->addRegisterCallback(register_cocos2dx_js_extensions);
     sc->addRegisterCallback(register_chipmunk_manual);
     sc->addRegisterCallback(register_CCPhysicsSprite);
+    sc->addRegisterCallback(register_CCBuilderReader);
     
 
     

template/xcode4/cocos2dx_js.xctemplate/Resources/CCB/Abadi40-hd.png.REMOVED.git-id

@@ -0,0 +1 @@
+f06c047dd32b61f12ad51e981afe518364512be6

template/xcode4/cocos2dx_js.xctemplate/Resources/CCB/Abadi40-ipad.png.REMOVED.git-id

@@ -0,0 +1 @@
+4b7c1e97acefff48ae3652f023e708245992f553

template/xcode4/cocos2dx_js.xctemplate/Resources/CCB/Abadi40.png.REMOVED.git-id

@@ -0,0 +1 @@
+ae62d7b07ac3e7579ed7d6a2e1f903719e45c6d9

template/xcode4/cocos2dx_js.xctemplate/Resources/CCB/Gas40-hd.png.REMOVED.git-id

@@ -0,0 +1 @@
+12db20c3124e1bd864312257eb8cefe95d2ee349

template/xcode4/cocos2dx_js.xctemplate/Resources/CCB/Gas40-ipad.png.REMOVED.git-id

@@ -0,0 +1 @@
+e71140c1535f16b49980f3ea0cf7d3a29a8a9788

template/xcode4/cocos2dx_js.xctemplate/Resources/CCB/konqa32-hd.png.REMOVED.git-id

@@ -0,0 +1 @@
+dc235c169030151e337ecbfa1fc6302fc909e500

template/xcode4/cocos2dx_js.xctemplate/Resources/CCB/konqa32-ipad.png.REMOVED.git-id

@@ -0,0 +1 @@
+9e95a02e6eb2944fea12a49eb3f2c6fe7505a3ce

template/xcode4/cocos2dx_js.xctemplate/Resources/CCB/konqa32.png.REMOVED.git-id

@@ -0,0 +1 @@
+1423c81273926b3da9fb1cb36c9b710d3f14ee0e

template/xcode4/cocos2dx_js.xctemplate/Resources/hello.js

@@ -1,3 +1,4 @@
+
 try {
 
     cc.p = cc.p || function( x, y ) {
@@ -8,8 +9,23 @@ try {
         return {r: r, g: g, b: b, a: o};
     };
   
+    
+    cc.c3 = cc.c3 || function (r, g, b) {
+        return {r: r, g: g, b: b};
+    };
+    cc.BLACK = cc.c3(0,0,0);
+
+    
     director = cc.Director.getInstance();
     winSize = director.getWinSize();
+    centerPos = cc.p( winSize.width/2, winSize.height/2 );
+
+    var GameCreator = function() {
+        
+        var self = {};
+        self.callbacks = {};
+
+        self.getPlayScene = function() {
             
             var scene = new cc.Scene();
             var layer = new cc.LayerGradient();
@@ -21,9 +37,111 @@ try {
             layer.addChild(label, 1);
             label.setPosition( cc.p(winSize.width / 2, winSize.height / 2));
             
+            var back = cc.MenuItemFont.create("Back", this.callbacks, this.callbacks.onBack );
+            back.setColor( cc.BLACK );
+            
+            var menu = cc.Menu.create( back );
+            layer.addChild( menu );
+            menu.alignItemsVertically();
+            menu.setPosition( cc.p( winSize.width - 50, 50) );
             
             scene.addChild(layer);
             
-    director.runWithScene(scene);
+            return scene;
+        };
+        
+        self.getMainMenuScene = function() {
+            var l = cc.Layer.create();
+            var scene = cc.Scene.create();
+            
+            var node = cc.Reader.load("MainMenu.ccbi", this, winSize);
+            l.addChild(node);
+            
+            scene.addChild(l);
+            
+            return scene;
+        };
+        
+        self.getOptionsScene = function() {
+
+            var l = cc.LayerGradient.create();
+            l.init(cc.c4b(0, 0, 0, 255), cc.c4b(255, 255, 255, 255));
+
+            var scene = cc.Scene.create();
+            
+            var label1 = cc.LabelBMFont.create("MUSIC ON", "konqa32.fnt" );
+            var item1 = cc.MenuItemLabel.create(label1);
+            var label2 = cc.LabelBMFont.create("MUSIC OFF", "konqa32.fnt" );
+            var item2 = cc.MenuItemLabel.create(label2);
+            var toggle = cc.MenuItemToggle.create( item1, item2 );
+            
+            this.onMusicToggle = function( sender ) {
+            };
+            
+            toggle.setCallback( this, this.onMusicToggle);
+            
+            var back = cc.MenuItemFont.create("Back", this.callbacks, this.callbacks.onBack );
+            var menu = cc.Menu.create( toggle, back );
+            l.addChild( menu );
+            menu.alignItemsVertically();
+            menu.setPosition( centerPos );
+
+            scene.addChild(l);
+            
+            return scene;
+        };
+        
+     
+        self.getAboutScene = function() {
+            
+            var scene = cc.Scene.create();
+            var l = cc.Layer.create();
+            var about = cc.Reader.load("About.ccbi", this);
+            l.addChild( about )
+            
+            var back = cc.MenuItemFont.create("Back", this.callbacks, this.callbacks.onBack );
+            back.setColor( cc.BLACK );
+            var menu = cc.Menu.create( back );
+            l.addChild( menu );
+            menu.alignItemsVertically();
+            menu.setPosition( cc.p( winSize.width - 50, 50) );
+            
+            scene.addChild( l );
+            
+            return scene;
+        };
+        
+        
+        // CCBuilder Selectors
+        
+        self.onPlay = function() {
+            director.replaceScene( cc.TransitionFade.create(1, this.getPlayScene()) );
+        }
+        
+        self.onAbout = function() {
+            director.replaceScene( cc.TransitionZoomFlipY.create(1, this.getAboutScene()) );
+        };
+    
+        self.onOptions = function() {
+            director.replaceScene( cc.TransitionZoomFlipY.create(1, this.getOptionsScene()) );
+        };
+        
+        
+        // Manual Callbacks
+        
+        self.callbacks.onBack  = function( sender) {
+            director.replaceScene( cc.TransitionFlipX.create(1,  self.getMainMenuScene()) );
+        };
+        
+        return self;
+
+    };
+    
+    var game = GameCreator();
+    
+    __jsc__.garbageCollect();
+    
+    director.runWithScene(game.getMainMenuScene());
     
 } catch(e) {log(e);}
+

tools/tojs/cocos2dx.ini

@@ -27,7 +27,8 @@ headers = %(cocosdir)s/cocos2dx/include/cocos2d.h
 
 # what classes to produce code for. You can use regular expressions here. When testing the regular
 # expression, it will be enclosed in "^$", like this: "^CCMenu*$".
-classes = CCSprite.* CCScene CCNode CCDirector CCLayer.* CCMenu.* CCTouch CC.*Action.* CCMove.* CCRotate.* CCBlink.* CCTint.* CCSequence CCRepeat.* CCFade.* CCEase.* CCScale.* CCTransition.* CCSpawn CCSequence CCAnimat.* CCFlip.* CCDelay.* CCSkew.* CCJump.* CCPlace.* CCShow.* CCProgress.* CCToggleVisibility.* CCHide CCParticle.* CCLabel.* CCAtlas.* CCTextureCache.* CCTexture2D CCParallaxNode CCTileMap.* CCTMX.* CCCallFunc CCRenderTexture CCGridAction CCGrid3DAction CCShaky3D CCWaves3D CCFlipX3D CCFlipY3D CCSpeed CCSet
+
+classes = CCSprite.* CCScene CCNode CCDirector CCLayer.* CCMenu.* CCTouch CC.*Action.* CCMove.* CCRotate.* CCBlink.* CCTint.* CCSequence CCRepeat.* CCFade.* CCEase.* CCScale.* CCTransition.* CCSpawn CCSequence CCAnimat.* CCFlip.* CCDelay.* CCSkew.* CCJump.* CCPlace.* CCShow.* CCProgress.* CCToggleVisibility.* CCHide CCParticle.* CCLabel.* CCAtlas.* CCTextureCache.* CCTexture2D CCParallaxNode CCTileMap.* CCTMX.* CCCallFunc CCRenderTexture CCGridAction CCGrid3DAction CCShaky3D CCWaves3D CCFlipX3D CCFlipY3D CCSpeed CCSet CCObject
 
 # what should we skip? in the format ClassName::[function function]
 # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also
@@ -42,7 +43,6 @@ skip = CCNode::[.*Transform convertToWindowSpace getChildren getGrid setGLServer
 		CCMenu.*::[.*Target getSubItems create alignItemsInColumns initWithItems alignItemsInRows],
 		CCMenuItem.*::[create],
 		CCRGBAProtocol::[*],
-		CCObject::[*],
 		CCCopying::[*],
 		CC.*Protocol::[*],
 		CC.*Delegate::[*],
@@ -79,19 +79,21 @@ skip = CCNode::[.*Transform convertToWindowSpace getChildren getGrid setGLServer
 		CCGrid3DAction::[create actionWith.*],
 		CCTiledGrid3DAction::[create actionWith.*],
 		CCTMXMapInfo::[startElement endElement textHandler],
-		CCTMXObjectGroup::[getObjects],
+		CCParticleSystemQuad::[postStep setBatchNode draw setTexture$ setTotalParticles updateQuadWithParticle setupIndices listenBackToForeground initWithTotalParticles particleWithFile node],
 		CCTexture2D::[initWithPVRTCData addPVRTCImage],
 		CCLayerMultiplex::[*],
         CCTextureCache::[addPVRTCImage],
 		*::[copyWith.* onEnter.* onExit.* description getObjectType .*RGB.* .*HSV.*]
 
-rename = CCDirector::[sharedDirector=getInstance],
+rename_functions = CCDirector::[sharedDirector=getInstance],
 	CCSpriteFrameCache::[sharedSpriteFrameCache=getInstance addSpriteFramesWithFile=addSpriteFrames],
 	CCMenuItemFont::[setFontNameObj=setFontName setFontSizeObj=setFontSize fontSizeObj=fontSize fontNameObj=fontName],
 	CCProgressTimer::[setReverseProgress=setReverseDirection],
 	CCTextureCache::[sharedTextureCache=getInstance],
 	CCMenuItem::[setEnabled=setIsEnabled]
 
+rename_classes = CCParticleSystemQuad::CCParticleSystem
+
 # for all class names, should we remove something when registering in the target VM?
 remove_prefix = CC