Merge pull request #244 from pandamicro/master

Fixed #4742: SAXParser renamed to PlistParser in JSB

Author: dingpinglv

frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_auto_api.js

@@ -15874,7 +15874,7 @@ getInstance : function (
 /**
  * @class SAXParser
  */
-cc.SAXParser = {
+cc.PlistParser = {
 
 /**
  * @method init

frameworks/js-bindings/bindings/auto/jsb_cocos2dx_auto.cpp

@@ -48444,7 +48444,7 @@ void js_cocos2d_SAXParser_finalize(JSFreeOp *fop, JSObject *obj) {
 
 void js_register_cocos2dx_SAXParser(JSContext *cx, JSObject *global) {
 	jsb_cocos2d_SAXParser_class = (JSClass *)calloc(1, sizeof(JSClass));
-	jsb_cocos2d_SAXParser_class->name = "SAXParser";
+	jsb_cocos2d_SAXParser_class->name = "PlistParser";
 	jsb_cocos2d_SAXParser_class->addProperty = JS_PropertyStub;
 	jsb_cocos2d_SAXParser_class->delProperty = JS_DeletePropertyStub;
 	jsb_cocos2d_SAXParser_class->getProperty = JS_PropertyStub;
@@ -48479,7 +48479,7 @@ void js_register_cocos2dx_SAXParser(JSContext *cx, JSObject *global) {
 	// make the class enumerable in the registered namespace
 //	bool found;
 //FIXME: Removed in Firefox v27	
-//	JS_SetPropertyAttributes(cx, global, "SAXParser", JSPROP_ENUMERATE | JSPROP_READONLY, &found);
+//	JS_SetPropertyAttributes(cx, global, "PlistParser", JSPROP_ENUMERATE | JSPROP_READONLY, &found);
 
 	// add the proto and JSClass to the type->js info hash table
 	TypeTest<cocos2d::SAXParser> t;

frameworks/js-bindings/bindings/manual/cocos2d_specifics.cpp

@@ -4074,9 +4074,9 @@ bool js_cocos2dx_NodeGrid_setGrid(JSContext *cx, uint32_t argc, jsval *vp)
     return false;
 }
 
-// cc.SAXParser.getInstance()
-bool js_SAXParser_getInstance(JSContext *cx, unsigned argc, JS::Value *vp) {
-    __JSSAXDelegator* delegator = __JSSAXDelegator::getInstance();
+// cc.PlistParser.getInstance()
+bool js_PlistParser_getInstance(JSContext *cx, unsigned argc, JS::Value *vp) {
+    __JSPlistDelegator* delegator = __JSPlistDelegator::getInstance();
     SAXParser* parser = delegator->getParser();
 
     jsval jsret;
@@ -4096,9 +4096,9 @@ bool js_SAXParser_getInstance(JSContext *cx, unsigned argc, JS::Value *vp) {
 
     return true;
 }
-// cc.SAXParser.getInstance().parse(filepath)
-bool js_SAXParser_parse(JSContext *cx, unsigned argc, JS::Value *vp) {
-    __JSSAXDelegator* delegator = __JSSAXDelegator::getInstance();
+// cc.PlistParser.getInstance().parse(filepath)
+bool js_PlistParser_parse(JSContext *cx, unsigned argc, JS::Value *vp) {
+    __JSPlistDelegator* delegator = __JSPlistDelegator::getInstance();
 
     bool ok = true;
     jsval *argv = JS_ARGV(cx, vp);
@@ -4124,55 +4124,12 @@ bool js_SAXParser_parse(JSContext *cx, unsigned argc, JS::Value *vp) {
     JS_ReportError(cx, "js_SAXParser_parse : wrong number of arguments: %d, was expecting %d", argc, 1);
     return false;
 }
-// cc.SAXParser.getInstance().preloadPlist(filepath)
-bool js_SAXParser_preloadPlist(JSContext *cx, unsigned argc, JS::Value *vp) {
-    __JSSAXDelegator* delegator = __JSSAXDelegator::getInstance();
-    
-    bool ok = true;
-    jsval *argv = JS_ARGV(cx, vp);
-    if (argc == 1) {
-        std::string arg0;
-        ok &= jsval_to_std_string(cx, argv[0], &arg0);
-        JSB_PRECONDITION2(ok, cx, false, "Error processing arguments");
-        
-        ok &= delegator->preloadPlist(arg0);
-        if(!ok)
-            JS_ReportError(cx, "js_SAXParser_preloadPlist : file not found %d", &arg0, 1);
-        return true;
-    }
-    JS_ReportError(cx, "js_SAXParser_parse : wrong number of arguments: %d, was expecting %d", argc, 1);
-    return false;
-}
-// cc.SAXParser.getInstance().unloadPlist(filepath)
-bool js_SAXParser_unloadPlist(JSContext *cx, unsigned argc, JS::Value *vp) {
-    return true;
-}
-// cc.SAXParser.getInstance().getList(key)
-bool js_SAXParser_getList(JSContext *cx, unsigned argc, JS::Value *vp) {
-    __JSSAXDelegator* delegator = __JSSAXDelegator::getInstance();
-    
-    bool ok = true;
-    jsval *argv = JS_ARGV(cx, vp);
-    if (argc == 1) {
-        std::string arg0;
-        ok &= jsval_to_std_string(cx, argv[0], &arg0);
-        JSB_PRECONDITION2(ok, cx, false, "Error processing arguments");
-        
-        std::string value = delegator->getList(arg0);
-        jsval ret = std_string_to_jsval(cx, value);
-        JS_SET_RVAL(cx, vp, ret);
-        
-        return true;
-    }
-    JS_ReportError(cx, "js_SAXParser_parse : wrong number of arguments: %d, was expecting %d", argc, 1);
-    return false;
-}
 
-cocos2d::SAXParser* __JSSAXDelegator::getParser() {
+cocos2d::SAXParser* __JSPlistDelegator::getParser() {
     return &_parser;
 }
 
-std::string __JSSAXDelegator::parse(const std::string& path) {
+std::string __JSPlistDelegator::parse(const std::string& path) {
     _result.clear();
 
     SAXParser parser;
@@ -4185,11 +4142,11 @@ std::string __JSSAXDelegator::parse(const std::string& path) {
     return _result;
 }
 
-__JSSAXDelegator::~__JSSAXDelegator(){
+__JSPlistDelegator::~__JSPlistDelegator(){
     CCLOGINFO("deallocing __JSSAXDelegator: %p", this);
 }
 
-void __JSSAXDelegator::startElement(void *ctx, const char *name, const char **atts) {
+void __JSPlistDelegator::startElement(void *ctx, const char *name, const char **atts) {
     _isStoringCharacters = true;
     _currentValue.clear();
 
@@ -4208,7 +4165,7 @@ void __JSSAXDelegator::startElement(void *ctx, const char *name, const char **at
     }
 }
 
-void __JSSAXDelegator::endElement(void *ctx, const char *name) {
+void __JSPlistDelegator::endElement(void *ctx, const char *name) {
     _isStoringCharacters = false;
     std::string elementName = (char*)name;
 
@@ -4232,7 +4189,7 @@ void __JSSAXDelegator::endElement(void *ctx, const char *name) {
     }
 }
 
-void __JSSAXDelegator::textHandler(void *ctx, const char *ch, int len) {
+void __JSPlistDelegator::textHandler(void *ctx, const char *ch, int len) {
     CC_UNUSED_PARAM(ctx);
     std::string text((char*)ch, 0, len);
 
@@ -4540,13 +4497,10 @@ void register_cocos2dx_js_extensions(JSContext* cx, JSObject* global)
 	JS_DefineFunction(cx, tmpObj, "create", js_callFunc, 1, JSPROP_READONLY | JSPROP_PERMANENT);
     JS_DefineFunction(cx, jsb_cocos2d_CallFunc_prototype, "initWithFunction", js_cocos2dx_CallFunc_initWithFunction, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT);
 
-    tmpObj = JSVAL_TO_OBJECT(anonEvaluate(cx, global, "(function () { return cc.SAXParser; })()"));
-	JS_DefineFunction(cx, tmpObj, "getInstance", js_SAXParser_getInstance, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-    tmpObj = JSVAL_TO_OBJECT(anonEvaluate(cx, global, "(function () { return cc.SAXParser.getInstance(); })()"));
-	JS_DefineFunction(cx, tmpObj, "parse", js_SAXParser_parse, 1, JSPROP_READONLY | JSPROP_PERMANENT);
-    JS_DefineFunction(cx, tmpObj, "preloadPlist", js_SAXParser_preloadPlist, 1, JSPROP_READONLY | JSPROP_PERMANENT);
-    JS_DefineFunction(cx, tmpObj, "unloadPlist", js_SAXParser_unloadPlist, 1, JSPROP_READONLY | JSPROP_PERMANENT);
-    JS_DefineFunction(cx, tmpObj, "getList", js_SAXParser_getList, 1, JSPROP_READONLY | JSPROP_PERMANENT);
+    tmpObj = JSVAL_TO_OBJECT(anonEvaluate(cx, global, "(function () { return cc.PlistParser; })()"));
+	JS_DefineFunction(cx, tmpObj, "getInstance", js_PlistParser_getInstance, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+    tmpObj = JSVAL_TO_OBJECT(anonEvaluate(cx, global, "(function () { return cc.PlistParser.getInstance(); })()"));
+	JS_DefineFunction(cx, tmpObj, "parse", js_PlistParser_parse, 1, JSPROP_READONLY | JSPROP_PERMANENT);
 
 
 	tmpObj = JSVAL_TO_OBJECT(anonEvaluate(cx, global, "(function () { return cc.GLProgram; })()"));

frameworks/js-bindings/bindings/manual/cocos2d_specifics.hpp

@@ -202,31 +202,23 @@ class JSTouchDelegate: public cocos2d::Ref
 };
 
 
-class CC_DLL __JSSAXDelegator: public cocos2d::SAXDelegator
+class CC_DLL __JSPlistDelegator: public cocos2d::SAXDelegator
 {
 public:
-    static __JSSAXDelegator* getInstance() {
-		static __JSSAXDelegator* pInstance = NULL;
+    static __JSPlistDelegator* getInstance() {
+		static __JSPlistDelegator* pInstance = NULL;
         if (pInstance == NULL) {
-            pInstance = new __JSSAXDelegator();
+            pInstance = new __JSPlistDelegator();
         }
 		return pInstance;
 	};
 
-    ~__JSSAXDelegator();
+    ~__JSPlistDelegator();
 
     cocos2d::SAXParser* getParser();
 
     std::string parse(const std::string& path);
 
-    bool preloadPlist(const std::string& path) {
-        return true;
-    }
-    
-    std::string getList(const std::string& path) {
-        return path;
-    }
-    
     // implement pure virtual methods of SAXDelegator
     void startElement(void *ctx, const char *name, const char **atts);
     void endElement(void *ctx, const char *name);

frameworks/js-bindings/bindings/script/jsb_boot.js

@@ -597,7 +597,7 @@ cc.shaderCache = cc.ShaderCache.getInstance();
 cc.animationCache = cc.AnimationCache.getInstance();
 cc.spriteFrameCache = cc.SpriteFrameCache.getInstance();
 //cc.saxParser
-cc.plistParser = cc.SAXParser.getInstance();
+cc.plistParser = cc.PlistParser.getInstance();
 //cc.tiffReader;
 //cc.imeDispatcher;
 

frameworks/js-bindings/bindings/script/jsb_cocos2d.js

@@ -126,8 +126,16 @@ _Class.defaultPixelFormat = _Class.PIXEL_FORMAT_DEFAULT;
 cc.ONE = 1;
 cc.ZERO = 0;
 cc.SRC_ALPHA = 0x0302;
+cc.SRC_ALPHA_SATURATE = 0x308;
+cc.SRC_COLOR = 0x300;
+cc.DST_ALPHA = 0x304;
+cc.DST_COLOR = 0x306;
 cc.ONE_MINUS_SRC_ALPHA = 0x0303;
+cc.ONE_MINUS_SRC_COLOR = 0x301;
+cc.ONE_MINUS_DST_ALPHA = 0x305;
 cc.ONE_MINUS_DST_COLOR = 0x0307;
+cc.ONE_MINUS_CONSTANT_ALPHA	= 0x8004;
+cc.ONE_MINUS_CONSTANT_COLOR	= 0x8002;
 
 
 //
@@ -209,6 +217,15 @@ cc.lerp = function (a, b, r) {
 	return a + (b - a) * r;
 };
 
+/**
+ * get a random number from 0 to 0xffffff
+ * @function
+ * @returns {number}
+ */
+cc.rand = function () {
+	return Math.random() * 0xffffff;
+};
+
 /**
  * returns a random float between -1 and 1
  * @return {Number}
@@ -1829,6 +1846,4 @@ cc.DrawNode = cc._DrawNode.extend({
 });
 cc.DrawNode.create = function () {
 	return new cc.DrawNode();
-};
-
-//cc.DrawNode = cc._DrawNode;
+};

frameworks/js-bindings/bindings/script/jsb_create_apis.js

@@ -161,23 +161,23 @@ _p._ctor = function(value, callback, target) {
 
 _p = cc.MenuItemSprite.prototype;
 _p._ctor = function(normalSprite, selectedSprite, three, four, five) {
-	var argc = arguments.length;
-	if (argc > 1) {
-		normalSprite = arguments[0];
-		selectedSprite = arguments[1];
+	if (selectedSprite) {
+		normalSprite = normalSprite;
+		selectedSprite = selectedSprite;
 		var disabledImage, target, callback;
-		if (argc == 5) {
-			disabledImage = arguments[2];
-			callback = arguments[3];
-			target = arguments[4];
-		} else if (argc == 4 && typeof arguments[3] === "function") {
-			disabledImage = arguments[2];
-			callback = arguments[3];
-		} else if (argc == 4 && typeof arguments[2] === "function") {
-			target = arguments[3];
-			callback = arguments[2];
-		} else if (argc <= 2) {
-			disabledImage = arguments[2];
+		if (five) {
+			disabledImage = three;
+			callback = four;
+			target = five;
+		} else if (four && typeof four === "function") {
+			disabledImage = three;
+			callback = four;
+		} else if (four && typeof three === "function") {
+			target = four;
+			callback = three;
+            disabledImage = normalSprite;
+		} else if (three === undefined) {
+			disabledImage = normalSprite;
 		}
 		callback = callback ? callback.bind(target) : null;
 		this.initWithNormalSprite(normalSprite, selectedSprite, disabledImage, callback);

tools/tojs/cocos2dx.ini

@@ -142,7 +142,8 @@ rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames ge
 rename_classes = ParticleSystemQuad::ParticleSystem,
            SimpleAudioEngine::AudioEngine,
            __NodeRGBA::NodeRGBA,
-           __LayerRGBA::LayerRGBA
+           __LayerRGBA::LayerRGBA,
+           SAXParser::PlistParser
 
 # for all class names, should we remove something when registering in the target VM?
 remove_prefix =