From dd81e009f8884181e196c703fa0c6571f362f8a9 Mon Sep 17 00:00:00 2001 From: tangnan Date: Wed, 2 Jul 2014 10:29:09 +0800 Subject: [PATCH 01/32] could add seach path and resolution order path in front. --- cocos/platform/CCFileUtils.cpp | 17 ++++++++++++----- cocos/platform/CCFileUtils.h | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/cocos/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp index c655dbba03..6944a4d0e3 100644 --- a/cocos/platform/CCFileUtils.cpp +++ b/cocos/platform/CCFileUtils.cpp @@ -765,13 +765,16 @@ void FileUtils::setSearchResolutionsOrder(const std::vector& search } } -void FileUtils::addSearchResolutionsOrder(const std::string &order) +void FileUtils::addSearchResolutionsOrder(const std::string &order,const bool front) { std::string resOrder = order; if (!resOrder.empty() && resOrder[resOrder.length()-1] != '/') resOrder.append("/"); - - _searchResolutionsOrderArray.push_back(resOrder); + if (front) { + _searchResolutionsOrderArray.insert(_searchResolutionsOrderArray.begin(), resOrder); + } else { + _searchResolutionsOrderArray.push_back(resOrder); + } } const std::vector& FileUtils::getSearchResolutionsOrder() @@ -818,7 +821,7 @@ void FileUtils::setSearchPaths(const std::vector& searchPaths) } } -void FileUtils::addSearchPath(const std::string &searchpath) +void FileUtils::addSearchPath(const std::string &searchpath,const bool front) { std::string prefix; if (!isAbsolutePath(searchpath)) @@ -829,7 +832,11 @@ void FileUtils::addSearchPath(const std::string &searchpath) { path += "/"; } - _searchPathArray.push_back(path); + if (front) { + _searchPathArray.insert(_searchPathArray.begin(), path); + } else { + _searchPathArray.push_back(path); + } } void FileUtils::setFilenameLookupDictionary(const ValueMap& filenameLookupDict) diff --git a/cocos/platform/CCFileUtils.h b/cocos/platform/CCFileUtils.h index 60e899ed35..570b02fc50 100644 --- a/cocos/platform/CCFileUtils.h +++ b/cocos/platform/CCFileUtils.h @@ -229,7 +229,7 @@ public: * @see setSearchResolutionsOrder(), fullPathForFilename(). * @since v2.1 */ - virtual void addSearchResolutionsOrder(const std::string &order); + virtual void addSearchResolutionsOrder(const std::string &order,const bool front=false); /** * Gets the array that contains the search order of the resources. @@ -266,7 +266,7 @@ public: * * @since v2.1 */ - void addSearchPath(const std::string & path); + void addSearchPath(const std::string & path, const bool front=false); /** * Gets the array of search paths. From 5db9fa6e4b8d0a42192e853a83a2bcdb4aacd5b5 Mon Sep 17 00:00:00 2001 From: "Frank.Xu" Date: Tue, 8 Jul 2014 15:58:34 +0800 Subject: [PATCH 02/32] Add getChildByName method for get a node that can be cast to Type T --- cocos/2d/CCNode.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index 80007d7758..ead329c6a0 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -712,6 +712,15 @@ public: * @since v3.2 */ virtual Node* getChildByName(const std::string& name) const; + /** + * Gets a child from the container with its name that can be cast to Type T + * + * @param name An identifier to find the child node. + * + * @return a Node with the given name that can be cast to Type T + */ + template + inline T getChildByName(const std::string& name) const { return static_cast(getChildByName(name)); } /** Search the children of the receiving node to perform processing for nodes which share a name. * * @param name The name to search for, supports c++11 regular expression From 7fd0ca217c0e905897a3c3f67ac20f6b51287c48 Mon Sep 17 00:00:00 2001 From: boyu0 Date: Mon, 14 Jul 2014 20:42:08 +0800 Subject: [PATCH 03/32] Implement utils::atof() --- cocos/base/ccUtils.cpp | 24 ++++++++++++++++++++++++ cocos/base/ccUtils.h | 5 +++++ 2 files changed, 29 insertions(+) diff --git a/cocos/base/ccUtils.cpp b/cocos/base/ccUtils.cpp index 5a025b25ec..36cafb1c20 100644 --- a/cocos/base/ccUtils.cpp +++ b/cocos/base/ccUtils.cpp @@ -24,6 +24,9 @@ THE SOFTWARE. ****************************************************************************/ #include "base/ccUtils.h" + +#include + #include "base/CCDirector.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCRenderer.h" @@ -160,6 +163,27 @@ std::vector findChildren(const Node &node, const std::string &name) return vec; } + +#define MAX_ITOA_BUFFER_SIZE 256 +double atof(const char* str) +{ + if (str == nullptr) + { + return 0.0; + } + + char buf[MAX_ITOA_BUFFER_SIZE]; + strncpy(buf, str, MAX_ITOA_BUFFER_SIZE); + + // strip string, only remain 7 numbers after '.' + char* dot = strchr(buf, '.'); + if (dot != nullptr && dot - buf + 8 < MAX_ITOA_BUFFER_SIZE) + { + dot[8] = '\0'; + } + + return ::atof(buf); +} } diff --git a/cocos/base/ccUtils.h b/cocos/base/ccUtils.h index 939d71b854..1fba5b1b40 100644 --- a/cocos/base/ccUtils.h +++ b/cocos/base/ccUtils.h @@ -73,6 +73,11 @@ namespace utils * @since v3.2 */ std::vector findChildren(const Node &node, const std::string &name); + + /** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof。 + * Why we need this? Because in android c++_static, atof ( and std::atof ) is unsupported for numbers have long decimal part and contain several numbers can approximate to 1 （ like 90.099998474121094 ), it will return inf. this function is used to fix this bug. + */ + double atof(const char* str); } NS_CC_END From c7fec217ba294015582b74a81cee4c1ad6a800fe Mon Sep 17 00:00:00 2001 From: boyu0 Date: Mon, 14 Jul 2014 20:45:24 +0800 Subject: [PATCH 04/32] Change atof() to utils::atof() --- cocos/3d/CCObjLoader.cpp | 3 +- cocos/base/CCConsole.cpp | 13 ++--- cocos/base/CCNS.cpp | 18 +++---- cocos/base/CCUserDefault.cpp | 2 +- cocos/base/CCUserDefaultAndroid.cpp | 5 +- cocos/base/CCValue.cpp | 5 +- cocos/deprecated/CCString.cpp | 5 +- .../cocostudio/CCActionNode.cpp | 3 +- .../cocostudio/CCActionObject.cpp | 3 +- .../cocostudio/CCDataReaderHelper.cpp | 47 ++++++++++--------- .../cocostudio/CCSGUIReader.cpp | 4 +- .../cocostudio/CCSSceneReader.cpp | 8 ++-- .../editor-support/cocostudio/TriggerMng.cpp | 4 +- .../cocostudio/WidgetReader/WidgetReader.cpp | 2 +- cocos/platform/CCFileUtils.cpp | 5 +- cocos/platform/desktop/CCGLView.cpp | 3 +- .../CocoStudioSceneTest/TriggerCode/acts.cpp | 42 ++++++++--------- .../CocoStudioSceneTest/TriggerCode/cons.cpp | 2 +- 18 files changed, 93 insertions(+), 81 deletions(-) diff --git a/cocos/3d/CCObjLoader.cpp b/cocos/3d/CCObjLoader.cpp index 4c5da0d89e..1ad3e446eb 100644 --- a/cocos/3d/CCObjLoader.cpp +++ b/cocos/3d/CCObjLoader.cpp @@ -28,6 +28,7 @@ #include "CCObjLoader.h" #include "platform/CCFileUtils.h" +#include "base/ccUtils.h" NS_CC_BEGIN @@ -102,7 +103,7 @@ static inline int parseInt(const char*& token) static inline float parseFloat(const char*& token) { token += strspn(token, " \t"); - float f = (float)atof(token); + float f = (float)utils::atof(token); token += strcspn(token, " \t\r"); return f; } diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index e06185654c..8e149e76c1 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -63,6 +63,7 @@ #include "renderer/CCTextureCache.h" #include "CCGLView.h" #include "base/base64.h" +#include "base/ccUtils.h" NS_CC_BEGIN extern const char* cocos2dVersion(void); @@ -660,8 +661,8 @@ void Console::commandTouch(int fd, const std::string& args) if((argv.size() == 3) && (isFloat(argv[1]) && isFloat(argv[2]))) { - float x = std::atof(argv[1].c_str()); - float y = std::atof(argv[2].c_str()); + float x = utils::atof(argv[1].c_str()); + float y = utils::atof(argv[2].c_str()); srand ((unsigned)time(nullptr)); _touchId = rand(); @@ -686,10 +687,10 @@ void Console::commandTouch(int fd, const std::string& args) && (isFloat(argv[3])) && (isFloat(argv[4]))) { - float x1 = std::atof(argv[1].c_str()); - float y1 = std::atof(argv[2].c_str()); - float x2 = std::atof(argv[3].c_str()); - float y2 = std::atof(argv[4].c_str()); + float x1 = utils::atof(argv[1].c_str()); + float y1 = utils::atof(argv[2].c_str()); + float x2 = utils::atof(argv[3].c_str()); + float y2 = utils::atof(argv[4].c_str()); srand ((unsigned)time(nullptr)); _touchId = rand(); diff --git a/cocos/base/CCNS.cpp b/cocos/base/CCNS.cpp index 452e3a7458..0073a740f4 100644 --- a/cocos/base/CCNS.cpp +++ b/cocos/base/CCNS.cpp @@ -28,6 +28,8 @@ THE SOFTWARE. #include #include +#include "base/ccUtils.h" + using namespace std; NS_CC_BEGIN @@ -133,10 +135,10 @@ Rect RectFromString(const std::string& str) strArray sizeInfo; CC_BREAK_IF(!splitWithForm(sizeStr.c_str(), sizeInfo)); - float x = (float) atof(pointInfo[0].c_str()); - float y = (float) atof(pointInfo[1].c_str()); - float width = (float) atof(sizeInfo[0].c_str()); - float height = (float) atof(sizeInfo[1].c_str()); + float x = (float) utils::atof(pointInfo[0].c_str()); + float y = (float) utils::atof(pointInfo[1].c_str()); + float width = (float) utils::atof(sizeInfo[0].c_str()); + float height = (float) utils::atof(sizeInfo[1].c_str()); result = Rect(x, y, width, height); } while (0); @@ -153,8 +155,8 @@ Vec2 PointFromString(const std::string& str) strArray strs; CC_BREAK_IF(!splitWithForm(str, strs)); - float x = (float) atof(strs[0].c_str()); - float y = (float) atof(strs[1].c_str()); + float x = (float) utils::atof(strs[0].c_str()); + float y = (float) utils::atof(strs[1].c_str()); ret = Vec2(x, y); } while (0); @@ -171,8 +173,8 @@ Size SizeFromString(const std::string& pszContent) strArray strs; CC_BREAK_IF(!splitWithForm(pszContent, strs)); - float width = (float) atof(strs[0].c_str()); - float height = (float) atof(strs[1].c_str()); + float width = (float) utils::atof(strs[0].c_str()); + float height = (float) utils::atof(strs[1].c_str()); ret = Size(width, height); } while (0); diff --git a/cocos/base/CCUserDefault.cpp b/cocos/base/CCUserDefault.cpp index 2c19feb45c..d49d9c1551 100644 --- a/cocos/base/CCUserDefault.cpp +++ b/cocos/base/CCUserDefault.cpp @@ -250,7 +250,7 @@ double UserDefault::getDoubleForKey(const char* pKey, double defaultValue) if (value) { - ret = atof(value); + ret = utils::atof(value); } if (doc) delete doc; diff --git a/cocos/base/CCUserDefaultAndroid.cpp b/cocos/base/CCUserDefaultAndroid.cpp index 63ee9182db..c6c3a166d1 100644 --- a/cocos/base/CCUserDefaultAndroid.cpp +++ b/cocos/base/CCUserDefaultAndroid.cpp @@ -24,6 +24,7 @@ THE SOFTWARE. ****************************************************************************/ #include "base/CCUserDefault.h" #include "base/CCPlatformConfig.h" +#include "base/ccUtils.h" #include "platform/CCCommon.h" #include "base/base64.h" @@ -243,7 +244,7 @@ float UserDefault::getFloatForKey(const char* pKey, float defaultValue) { if (node->FirstChild()) { - float ret = atof((const char*)node->FirstChild()->Value()); + float ret = utils::atof((const char*)node->FirstChild()->Value()); // set value in NSUserDefaults setFloatForKey(pKey, ret); @@ -279,7 +280,7 @@ double UserDefault::getDoubleForKey(const char* pKey, double defaultValue) { if (node->FirstChild()) { - double ret = atof((const char*)node->FirstChild()->Value()); + double ret = utils::atof((const char*)node->FirstChild()->Value()); // set value in NSUserDefaults setDoubleForKey(pKey, ret); diff --git a/cocos/base/CCValue.cpp b/cocos/base/CCValue.cpp index 00b4904810..d5e0e06a4e 100644 --- a/cocos/base/CCValue.cpp +++ b/cocos/base/CCValue.cpp @@ -25,6 +25,7 @@ #include "base/CCValue.h" #include #include +#include "base/ccUtils.h" NS_CC_BEGIN @@ -504,7 +505,7 @@ float Value::asFloat() const if (_type == Type::STRING) { - return atof(_field.strVal->c_str()); + return utils::atof(_field.strVal->c_str()); } if (_type == Type::INTEGER) @@ -540,7 +541,7 @@ double Value::asDouble() const if (_type == Type::STRING) { - return static_cast(atof(_field.strVal->c_str())); + return static_cast(utils::atof(_field.strVal->c_str())); } if (_type == Type::INTEGER) diff --git a/cocos/deprecated/CCString.cpp b/cocos/deprecated/CCString.cpp index 06bf28d7de..38d153b95f 100644 --- a/cocos/deprecated/CCString.cpp +++ b/cocos/deprecated/CCString.cpp @@ -29,6 +29,7 @@ Copyright (c) 2013-2014 Chukong Technologies #include #include #include "CCArray.h" +#include "base/ccUtils.h" NS_CC_BEGIN @@ -118,7 +119,7 @@ float __String::floatValue() const { return 0.0f; } - return (float)atof(_string.c_str()); + return (float)utils::atof(_string.c_str()); } double __String::doubleValue() const @@ -127,7 +128,7 @@ double __String::doubleValue() const { return 0.0; } - return atof(_string.c_str()); + return utils::atof(_string.c_str()); } bool __String::boolValue() const diff --git a/cocos/editor-support/cocostudio/CCActionNode.cpp b/cocos/editor-support/cocostudio/CCActionNode.cpp index f0c6ee782e..116eeb1592 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.cpp +++ b/cocos/editor-support/cocostudio/CCActionNode.cpp @@ -28,6 +28,7 @@ THE SOFTWARE. #include "ui/UIWidget.h" #include "ui/UIHelper.h" #include "cocostudio/CocoLoader.h" +#include "base/ccUtils.h" using namespace cocos2d; using namespace ui; @@ -184,7 +185,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic, Ref* root) } float ActionNode::valueToFloat(const std::string& value) { - return atof(value.c_str()); + return utils::atof(value.c_str()); } void ActionNode::initWithBinary(CocoLoader *cocoLoader, diff --git a/cocos/editor-support/cocostudio/CCActionObject.cpp b/cocos/editor-support/cocostudio/CCActionObject.cpp index b064cb2fc2..67d6c25fb7 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.cpp +++ b/cocos/editor-support/cocostudio/CCActionObject.cpp @@ -29,6 +29,7 @@ THE SOFTWARE. #include "base/CCDirector.h" #include "base/CCScheduler.h" #include "2d/CCActionInstant.h" +#include "base/ccUtils.h" using namespace cocos2d; @@ -189,7 +190,7 @@ bool ActionObject::valueToBool(const std::string& value) } float ActionObject::valueToFloat(const std::string& value) { - return atof(value.c_str()); + return utils::atof(value.c_str()); } void ActionObject::addActionNode(ActionNode* node) diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp index 88be54e2cb..22b076371c 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp @@ -25,6 +25,7 @@ THE SOFTWARE. #include "platform/CCFileUtils.h" #include "base/CCDirector.h" #include "base/CCScheduler.h" +#include "base/ccUtils.h" #include "tinyxml2.h" @@ -1763,7 +1764,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, if (key.compare(CONTENT_SCALE) == 0) { std::string value = tpChildArray[i].GetValue(&tCocoLoader); - dataInfo->contentScale = atof(value.c_str()); + dataInfo->contentScale = utils::atof(value.c_str()); } else if ( 0 == key.compare(ARMATURE_DATA)) { @@ -1879,7 +1880,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, armatureData->name = name; } - float version = atof(pAramtureDataArray[1].GetValue(cocoLoader)); + float version = utils::atof(pAramtureDataArray[1].GetValue(cocoLoader)); dataInfo->cocoStudioVersion = armatureData->dataVersion = version; //DICTOOL->getFloatValue_json(json, VERSION, 0.1f); int length = pAramtureDataArray[3].GetChildNum(); //DICTOOL->getArrayCount_json(json, BONE_DATA, 0); @@ -1989,27 +1990,27 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, str = SkinDataValue[i].GetValue(cocoLoader); if (key.compare(A_X) == 0) { - sdd->skinData.x = atof(str) * s_PositionReadScale; + sdd->skinData.x = utils::atof(str) * s_PositionReadScale; } else if (key.compare(A_Y) == 0) { - sdd->skinData.y = atof(str) * s_PositionReadScale; + sdd->skinData.y = utils::atof(str) * s_PositionReadScale; } else if (key.compare(A_SCALE_X) == 0) { - sdd->skinData.scaleX = atof(str); + sdd->skinData.scaleX = utils::atof(str); } else if (key.compare(A_SCALE_Y) == 0) { - sdd->skinData.scaleY = atof(str); + sdd->skinData.scaleY = utils::atof(str); } else if (key.compare(A_SKEW_X) == 0) { - sdd->skinData.skewX = atof(str); + sdd->skinData.skewX = utils::atof(str); } else if (key.compare(A_SKEW_Y) == 0) { - sdd->skinData.skewY = atof(str); + sdd->skinData.skewY = utils::atof(str); } } @@ -2168,7 +2169,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, movementData->scale = 1.0; if(str != nullptr) { - movementData->scale = atof(str); + movementData->scale = utils::atof(str); } } else if (key.compare(A_TWEEN_EASING) == 0) @@ -2220,7 +2221,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, { if(str != nullptr) { - movementBoneData->delay = atof(str); + movementBoneData->delay = utils::atof(str); } } else if (key.compare(FRAME_DATA) == 0) @@ -2382,7 +2383,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, str = pFrameData[ii].GetValue(cocoLoader); if (str != nullptr) { - frameData->easingParams[ii] = atof(str); + frameData->easingParams[ii] = utils::atof(str); } } } @@ -2421,28 +2422,28 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, { if(str != nullptr) { - textureData->width = atof(str); + textureData->width = utils::atof(str); } } else if (key.compare(A_HEIGHT) == 0) { if(str != nullptr) { - textureData->height = atof(str); + textureData->height = utils::atof(str); } } else if (key.compare(A_PIVOT_X) == 0) { if(str != nullptr) { - textureData->pivotX = atof(str); + textureData->pivotX = utils::atof(str); } } else if (key.compare(A_PIVOT_Y) == 0) { if(str != nullptr) { - textureData->pivotY = atof(str); + textureData->pivotY = utils::atof(str); } } else if (key.compare(CONTOUR_DATA) == 0) @@ -2481,8 +2482,8 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, { pVerTexPoint = pVerTexPointArray[ii].GetChildArray(cocoLoader); Vec2 vertex; - vertex.x = atof(pVerTexPoint[0].GetValue(cocoLoader)); - vertex.y = atof(pVerTexPoint[1].GetValue(cocoLoader)); + vertex.x = utils::atof(pVerTexPoint[0].GetValue(cocoLoader)); + vertex.y = utils::atof(pVerTexPoint[1].GetValue(cocoLoader)); contourData->vertexList.push_back(vertex); } break; } @@ -2505,11 +2506,11 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, str = child->GetValue(cocoLoader); if (key.compare(A_X) == 0) { - node->x = atof(str) * dataInfo->contentScale; + node->x = utils::atof(str) * dataInfo->contentScale; } else if (key.compare(A_Y) == 0) { - node->y = atof(str) * dataInfo->contentScale; + node->y = utils::atof(str) * dataInfo->contentScale; } else if (key.compare(A_Z) == 0) { @@ -2517,19 +2518,19 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json, } else if (key.compare(A_SKEW_X) == 0) { - node->skewX = atof(str); + node->skewX = utils::atof(str); } else if (key.compare(A_SKEW_Y) == 0) { - node->skewY = atof(str); + node->skewY = utils::atof(str); } else if (key.compare(A_SCALE_X) == 0) { - node->scaleX = atof(str); + node->scaleX = utils::atof(str); } else if (key.compare(A_SCALE_Y) == 0) { - node->scaleY = atof(str); + node->scaleY = utils::atof(str); } else if (key.compare(COLOR_INFO) == 0) { diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.cpp b/cocos/editor-support/cocostudio/CCSGUIReader.cpp index 7e706e4455..d86f04c166 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.cpp +++ b/cocos/editor-support/cocostudio/CCSGUIReader.cpp @@ -1241,9 +1241,9 @@ Widget* WidgetPropertiesReader0300::createWidget(const rapidjson::Value& data, c SpriteFrameCache::getInstance()->addSpriteFramesWithFile(file); } }else if (key == "designWidth"){ - fileDesignWidth = atof(tpChildArray[i].GetValue(cocoLoader)); + fileDesignWidth = utils::atof(tpChildArray[i].GetValue(cocoLoader)); }else if (key == "designHeight"){ - fileDesignHeight = atof(tpChildArray[i].GetValue(cocoLoader)); + fileDesignHeight = utils::atof(tpChildArray[i].GetValue(cocoLoader)); }else if (key == "widgetTree"){ if (fileDesignWidth <= 0 || fileDesignHeight <= 0) { diff --git a/cocos/editor-support/cocostudio/CCSSceneReader.cpp b/cocos/editor-support/cocostudio/CCSSceneReader.cpp index 92177e9284..ab855a30cc 100644 --- a/cocos/editor-support/cocostudio/CCSSceneReader.cpp +++ b/cocos/editor-support/cocostudio/CCSSceneReader.cpp @@ -510,12 +510,12 @@ void SceneReader::setPropertyFromJsonDict(CocoLoader *cocoLoader, stExpCocoNode if (key == "x") { - x = atof(value.c_str()); + x = utils::atof(value.c_str()); node->setPositionX(x); } else if (key == "y") { - y = atof(value.c_str()); + y = utils::atof(value.c_str()); node->setPositionY(y); } else if (key == "visible") @@ -535,7 +535,7 @@ void SceneReader::setPropertyFromJsonDict(CocoLoader *cocoLoader, stExpCocoNode } else if(key == "scalex") { - fScaleX = atof(value.c_str()); + fScaleX = utils::atof(value.c_str()); node->setScaleX(fScaleX); } else if(key == "scaley") @@ -545,7 +545,7 @@ void SceneReader::setPropertyFromJsonDict(CocoLoader *cocoLoader, stExpCocoNode } else if(key == "rotation") { - fRotationZ = atof(value.c_str()); + fRotationZ = utils::atof(value.c_str()); node->setRotation(fRotationZ); } } diff --git a/cocos/editor-support/cocostudio/TriggerMng.cpp b/cocos/editor-support/cocostudio/TriggerMng.cpp index 779b5dca86..23a482baa5 100755 --- a/cocos/editor-support/cocostudio/TriggerMng.cpp +++ b/cocos/editor-support/cocostudio/TriggerMng.cpp @@ -270,7 +270,7 @@ bool TriggerMng::isEmpty(void) const else if(type == rapidjson::kNumberType) { int nV = atoi(str3); - float fV = atof(str3); + float fV = utils::atof(str3); if (fabs(nV - fV) < 0.0000001) { dataitem.AddMember("value", nV, allocator); @@ -346,7 +346,7 @@ bool TriggerMng::isEmpty(void) const else if(type == rapidjson::kNumberType) { int nV = atoi(str5); - float fV = atof(str5); + float fV = utils::atof(str5); if (fabs(nV - fV) < 0.0000001) { dataitem.AddMember("value", nV, allocator); diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp index f68f2af107..69eda57774 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp @@ -87,7 +87,7 @@ namespace cocostudio }; valueToFloat = [=](const std::string& str) -> float{ - return atof(str.c_str()); + return utils::atof(str.c_str()); }; } diff --git a/cocos/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp index c655dbba03..4d0c71df93 100644 --- a/cocos/platform/CCFileUtils.cpp +++ b/cocos/platform/CCFileUtils.cpp @@ -31,6 +31,7 @@ THE SOFTWARE. #include "base/ccMacros.h" #include "base/CCDirector.h" #include "platform/CCSAXParser.h" +#include "base/ccUtils.h" #include "tinyxml2.h" #include "unzip.h" @@ -257,7 +258,7 @@ public: else if (sName == "integer") _curArray->push_back(Value(atoi(_curValue.c_str()))); else - _curArray->push_back(Value(atof(_curValue.c_str()))); + _curArray->push_back(Value(utils::atof(_curValue.c_str()))); } else if (SAX_DICT == curState) { @@ -266,7 +267,7 @@ public: else if (sName == "integer") (*_curDict)[_curKey] = Value(atoi(_curValue.c_str())); else - (*_curDict)[_curKey] = Value(atof(_curValue.c_str())); + (*_curDict)[_curKey] = Value(utils::atof(_curValue.c_str())); } _curValue.clear(); diff --git a/cocos/platform/desktop/CCGLView.cpp b/cocos/platform/desktop/CCGLView.cpp index a934875204..4c4fbd7072 100644 --- a/cocos/platform/desktop/CCGLView.cpp +++ b/cocos/platform/desktop/CCGLView.cpp @@ -30,6 +30,7 @@ THE SOFTWARE. #include "base/CCEventKeyboard.h" #include "base/CCEventMouse.h" #include "base/CCIMEDispatcher.h" +#include "base/ccUtils.h" #include @@ -356,7 +357,7 @@ bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoo // check OpenGL version at first const GLubyte* glVersion = glGetString(GL_VERSION); - if ( atof((const char*)glVersion) < 1.5 ) + if ( utils::atof((const char*)glVersion) < 1.5 ) { char strComplain[256] = {0}; sprintf(strComplain, diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp index d48f64e1e7..28eb7a08a3 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp @@ -189,7 +189,7 @@ void TMoveTo::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCo { if (str != nullptr) { - _duration = atof(str); + _duration = utils::atof(str); } } @@ -197,7 +197,7 @@ void TMoveTo::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCo { if (str != nullptr) { - _pos.x = atof(str); + _pos.x = utils::atof(str); } } else if (key == "y") @@ -311,7 +311,7 @@ void TMoveBy::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCo { if (str != nullptr) { - _duration = atof(str); + _duration = utils::atof(str); } } @@ -319,14 +319,14 @@ void TMoveBy::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCo { if (str != nullptr) { - _pos.x = atof(str); + _pos.x = utils::atof(str); } } else if (key == "y") { if (str != nullptr) { - _pos.y = atof(str); + _pos.y = utils::atof(str); } } else if (key == "IsReverse") @@ -424,7 +424,7 @@ void TRotateTo::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExp { if (str != nullptr) { - _duration = atof(str); + _duration = utils::atof(str); } } @@ -432,7 +432,7 @@ void TRotateTo::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExp { if (str != nullptr) { - _deltaAngle = atof(str); + _deltaAngle = utils::atof(str); } } } @@ -537,7 +537,7 @@ void TRotateBy::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExp { if (str != nullptr) { - _duration = atof(str); + _duration = utils::atof(str); } } @@ -545,7 +545,7 @@ void TRotateBy::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExp { if (str != nullptr) { - _deltaAngle = atof(str); + _deltaAngle = utils::atof(str); } } else if (key == "IsReverse") @@ -647,7 +647,7 @@ void TScaleTo::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpC { if (str != nullptr) { - _duration = atof(str); + _duration = utils::atof(str); } } @@ -655,14 +655,14 @@ void TScaleTo::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpC { if (str != nullptr) { - _scale.x = atof(str); + _scale.x = utils::atof(str); } } else if (key == "ScaleY") { if (str != nullptr) { - _scale.y = atof(str); + _scale.y = utils::atof(str); } } } @@ -771,7 +771,7 @@ void TScaleBy::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpC { if (str != nullptr) { - _duration = atof(str); + _duration = utils::atof(str); } } @@ -779,14 +779,14 @@ void TScaleBy::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpC { if (str != nullptr) { - _scale.x = atof(str); + _scale.x = utils::atof(str); } } else if (key == "ScaleY") { if (str != nullptr) { - _scale.y = atof(str); + _scale.y = utils::atof(str); } } else if (key == "IsReverse") @@ -889,7 +889,7 @@ void TSkewTo::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCo { if (str != nullptr) { - _duration = atof(str); + _duration = utils::atof(str); } } @@ -897,14 +897,14 @@ void TSkewTo::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCo { if (str != nullptr) { - _skew.x = atof(str); + _skew.x = utils::atof(str); } } else if (key == "SkewY") { if (str != nullptr) { - _skew.y = atof(str); + _skew.y = utils::atof(str); } } } @@ -1012,7 +1012,7 @@ void TSkewBy::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCo { if (str != nullptr) { - _duration = atof(str); + _duration = utils::atof(str); } } @@ -1020,14 +1020,14 @@ void TSkewBy::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCo { if (str != nullptr) { - _skew.x = atof(str); + _skew.x = utils::atof(str); } } else if (key == "SkewY") { if (str != nullptr) { - _skew.y = atof(str); + _skew.y = utils::atof(str); } } else if (key == "IsReverse") diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp index 9ed21d1579..1810fc2112 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp @@ -64,7 +64,7 @@ void TimeElapsed::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stE { if (str != nullptr) { - _totalTime = atof(str); //DICTOOL->getFloatValue_json(subDict, "value"); + _totalTime = utils::atof(str); //DICTOOL->getFloatValue_json(subDict, "value"); } } } From 2354c79c3f359a7627259c9f1b82b8593a836ef4 Mon Sep 17 00:00:00 2001 From: boyu0 Date: Mon, 14 Jul 2014 23:05:16 +0800 Subject: [PATCH 05/32] Fix compile error --- cocos/base/CCUserDefault.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos/base/CCUserDefault.cpp b/cocos/base/CCUserDefault.cpp index d49d9c1551..ef52f03c0d 100644 --- a/cocos/base/CCUserDefault.cpp +++ b/cocos/base/CCUserDefault.cpp @@ -27,6 +27,7 @@ THE SOFTWARE. #include "platform/CCFileUtils.h" #include "tinyxml2.h" #include "base/base64.h" +#include "base/ccUtils.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS && CC_TARGET_PLATFORM != CC_PLATFORM_MAC && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID) From 70ae3bf9808e84861942542f7f37806bd11a3ca5 Mon Sep 17 00:00:00 2001 From: andyque Date: Wed, 16 Jul 2014 10:08:23 +0800 Subject: [PATCH 06/32] modify widget class comments --- cocos/ui/UIWidget.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/cocos/ui/UIWidget.h b/cocos/ui/UIWidget.h index 8c809e45b7..8ea40cc9d5 100644 --- a/cocos/ui/UIWidget.h +++ b/cocos/ui/UIWidget.h @@ -169,7 +169,7 @@ public: * * @see BrightStyle * - * @param style BRIGHT_NORMAL the widget is normal state, BRIGHT_HIGHLIGHT the widget is height light state. + * @param style BrightStyle::NORMAL means the widget is in normal state, BrightStyle::HIGHLIGHT means the widget is in highlight state. */ void setBrightStyle(BrightStyle style); @@ -197,7 +197,7 @@ public: void setHighlighted(bool hilight); /** - * Gets the left boundary position of this widget. + * Gets the left boundary position of this widget in parent's coordination system. * * @return The left boundary position of this widget. */ @@ -205,7 +205,7 @@ public: float getLeftBoundary() const; /** - * Gets the bottom boundary position of this widget. + * Gets the bottom boundary position of this widget in parent's coordination system. * * @return The bottom boundary position of this widget. */ @@ -213,7 +213,7 @@ public: float getBottomBoundary() const; /** - * Gets the right boundary position of this widget. + * Gets the right boundary position of this widget in parent's coordination system. * * @return The right boundary position of this widget. */ @@ -221,7 +221,7 @@ public: float getRightBoundary() const; /** - * Gets the top boundary position of this widget. + * Gets the top boundary position of this widget in parent's coordination system. * * @return The top boundary position of this widget. */ @@ -636,19 +636,19 @@ protected: void cleanupWidget(); protected: - bool _enabled; ///< Highest control of widget - bool _bright; ///< is this widget bright - bool _touchEnabled; ///< is this widget touch endabled - bool _highlight; ///< is the widget on focus + bool _enabled; + bool _bright; + bool _touchEnabled; + bool _highlight; bool _reorderWidgetChildDirty; bool _affectByClipping; bool _ignoreSize; - BrightStyle _brightStyle; ///< bright style + BrightStyle _brightStyle; SizeType _sizeType; PositionType _positionType; - //use + //used for search widget by action tag in UIHelper class int _actionTag; Size _customSize; @@ -658,9 +658,9 @@ protected: bool _hitted; EventListenerTouchOneByOne* _touchListener; - Vec2 _touchBeganPosition; ///< touch began point - Vec2 _touchMovePosition; ///< touch moved point - Vec2 _touchEndPosition; ///< touch ended point + Vec2 _touchBeganPosition; + Vec2 _touchMovePosition; + Vec2 _touchEndPosition; bool _flippedX; bool _flippedY; @@ -676,7 +676,6 @@ protected: */ static Widget *_focusedWidget; //both layout & widget will be stored in this variable - //if use the old API, we must retain the _touchEventListener Ref* _touchEventListener; #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" From 7e76b7b9a1291ff0314e357f9c98e5ae861a6b92 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Wed, 16 Jul 2014 14:48:22 +0800 Subject: [PATCH 07/32] Remove prompt box of connect controller[Nibiru]. --- .../src/org/cocos2dx/lib/GameControllerNibiru.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerNibiru.java b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerNibiru.java index 142a19f671..ec3aeb9723 100644 --- a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerNibiru.java +++ b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerNibiru.java @@ -113,7 +113,7 @@ OnSimpleStickListener, OnAccListener, OnGyroListener, OnStateListener, GameContr { if( !mControllerService.hasDeviceConnected() ){ Bundle bun = new Bundle(); - bun.putBoolean(ControllerService.FLAG_IS_SHOW_GAMEPAD_TIP, true); + bun.putBoolean(ControllerService.FLAG_IS_SHOW_GAMEPAD_TIP, false); try { mControllerService.showDeviceManagerUI(mContext, bun); } catch (ControllerServiceException e) { From 80de57be39a18f4214099f550defa10904cab067 Mon Sep 17 00:00:00 2001 From: zhangcheng Date: Wed, 16 Jul 2014 14:50:35 +0800 Subject: [PATCH 08/32] =?UTF-8?q?1=E3=80=81=20fixes=20lua=20TriggerTest=20?= =?UTF-8?q?bug.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editor-support/cocostudio/TriggerMng.cpp | 6 +- .../editor-support/cocostudio/TriggerObj.cpp | 148 +++++++++--------- .../CocoStudioSceneTest.lua | 5 +- 3 files changed, 79 insertions(+), 80 deletions(-) diff --git a/cocos/editor-support/cocostudio/TriggerMng.cpp b/cocos/editor-support/cocostudio/TriggerMng.cpp index 779b5dca86..d1e8d33fe3 100755 --- a/cocos/editor-support/cocostudio/TriggerMng.cpp +++ b/cocos/editor-support/cocostudio/TriggerMng.cpp @@ -191,7 +191,7 @@ bool TriggerMng::isEmpty(void) const } - void TriggerMng::buildJson(rapidjson::Document &document, cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode) +void TriggerMng::buildJson(rapidjson::Document &document, cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode) { int count = pCocoNode[13].GetChildNum(); int length = 0; @@ -262,12 +262,12 @@ bool TriggerMng::isEmpty(void) const } else { - rapidjson::Type type = pDataItemArray[i4].GetType(pCocoLoader); + rapidjson::Type type = pDataItemArray[i5].GetType(pCocoLoader); if (type == rapidjson::kStringType) { dataitem.AddMember("value", str3, allocator); } - else if(type == rapidjson::kNumberType) + else { int nV = atoi(str3); float fV = atof(str3); diff --git a/cocos/editor-support/cocostudio/TriggerObj.cpp b/cocos/editor-support/cocostudio/TriggerObj.cpp index 7fec68a848..06cd96986e 100755 --- a/cocos/editor-support/cocostudio/TriggerObj.cpp +++ b/cocos/editor-support/cocostudio/TriggerObj.cpp @@ -241,98 +241,98 @@ void TriggerObj::serialize(const rapidjson::Value &val) } - void TriggerObj::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode) +void TriggerObj::serialize(cocostudio::CocoLoader *pCocoLoader, cocostudio::stExpCocoNode *pCocoNode) +{ + int length = pCocoNode->GetChildNum(); + int count = 0; + int num = 0; + stExpCocoNode *pTriggerObjArray = pCocoNode->GetChildArray(pCocoLoader); + for (int i0 = 0; i0 < length; ++i0) { - int length = pCocoNode->GetChildNum(); - int count = 0; - int num = 0; - stExpCocoNode *pTriggerObjArray = pCocoNode->GetChildArray(pCocoLoader); - for (int i0 = 0; i0 < length; ++i0) + std::string key = pTriggerObjArray[i0].GetName(pCocoLoader); + const char* str0 = pTriggerObjArray[i0].GetValue(pCocoLoader); + if (key.compare("id") == 0) { - std::string key = pTriggerObjArray[i0].GetName(pCocoLoader); - const char* str0 = pTriggerObjArray[i0].GetValue(pCocoLoader); - if (key.compare("id") == 0) + if (str0 != nullptr) { - if (str0 != nullptr) - { - _id = atoi(str0); //(unsigned int)(DICTOOL->getIntValue_json(val, "id")); - } + _id = atoi(str0); } - else if (key.compare("conditions") == 0) + } + else if (key.compare("conditions") == 0) + { + count = pTriggerObjArray[i0].GetChildNum(); + stExpCocoNode *pConditionsArray = pTriggerObjArray[i0].GetChildArray(pCocoLoader); + for (int i1 = 0; i1 < count; ++i1) { - count = pTriggerObjArray[i0].GetChildNum(); - stExpCocoNode *pConditionsArray = pTriggerObjArray[i0].GetChildArray(pCocoLoader); - for (int i1 = 0; i1 < count; ++i1) + num = pConditionsArray[i1].GetChildNum(); + stExpCocoNode *pConditionArray = pConditionsArray[i1].GetChildArray(pCocoLoader); + const char *classname = pConditionArray[0].GetValue(pCocoLoader); + if (classname == nullptr) { - num = pConditionsArray[i1].GetChildNum(); - stExpCocoNode *pConditionArray = pConditionsArray[i1].GetChildArray(pCocoLoader); - const char *classname = pConditionArray[0].GetValue(pCocoLoader); - if (classname == nullptr) - { - continue; - } - BaseTriggerCondition *con = dynamic_cast(ObjectFactory::getInstance()->createObject(classname)); - CCAssert(con != nullptr, "class named classname can not implement!"); - con->serialize(pCocoLoader, &pConditionArray[1]); - con->init(); - _cons.pushBack(con); + continue; } + BaseTriggerCondition *con = dynamic_cast(ObjectFactory::getInstance()->createObject(classname)); + CCAssert(con != nullptr, "class named classname can not implement!"); + con->serialize(pCocoLoader, &pConditionArray[1]); + con->init(); + _cons.pushBack(con); } - else if (key.compare("actions") == 0) + } + else if (key.compare("actions") == 0) + { + count = pTriggerObjArray[i0].GetChildNum(); + stExpCocoNode *pActionsArray = pTriggerObjArray[i0].GetChildArray(pCocoLoader); + for (int i2 = 0; i2 < count; ++i2) { - count = pTriggerObjArray[i0].GetChildNum(); - stExpCocoNode *pActionsArray = pTriggerObjArray[i0].GetChildArray(pCocoLoader); - for (int i2 = 0; i2 < count; ++i2) + num = pActionsArray[i2].GetChildNum(); + stExpCocoNode *pActionArray = pActionsArray[i2].GetChildArray(pCocoLoader); + const char *classname = pActionArray[0].GetValue(pCocoLoader); + if (classname == nullptr) { - num = pActionsArray[i2].GetChildNum(); - stExpCocoNode *pActionArray = pActionsArray[i2].GetChildArray(pCocoLoader); - const char *classname = pActionArray[0].GetValue(pCocoLoader); - if (classname == nullptr) - { - continue; - } - BaseTriggerAction *act = dynamic_cast(ObjectFactory::getInstance()->createObject(classname)); - CCAssert(act != nullptr, "class named classname can not implement!"); - act->serialize(pCocoLoader, &pActionArray[1]); - act->init(); - _acts.pushBack(act); + continue; } + BaseTriggerAction *act = dynamic_cast(ObjectFactory::getInstance()->createObject(classname)); + CCAssert(act != nullptr, "class named classname can not implement!"); + act->serialize(pCocoLoader, &pActionArray[1]); + act->init(); + _acts.pushBack(act); } - else if (key.compare("events") == 0) + } + else if (key.compare("events") == 0) + { + count = pTriggerObjArray[i0].GetChildNum(); + stExpCocoNode *pEventsArray = pTriggerObjArray[i0].GetChildArray(pCocoLoader); + for (int i3 = 0; i3 < count; ++i3) { - count = pTriggerObjArray[i0].GetChildNum(); - stExpCocoNode *pEventsArray = pTriggerObjArray[i0].GetChildArray(pCocoLoader); - for (int i3 = 0; i3 < count; ++i3) + num = pEventsArray[i3].GetChildNum(); + stExpCocoNode *pEventArray = pEventsArray[i3].GetChildArray(pCocoLoader); + const char *str1 = pEventArray[0].GetValue(pCocoLoader); + if (str1 == nullptr) { - num = pEventsArray[i3].GetChildNum(); - stExpCocoNode *pEventArray = pEventsArray[i3].GetChildArray(pCocoLoader); - const char *str1 = pEventArray[0].GetValue(pCocoLoader); - if (str1 == nullptr) - { - continue; - } - int event = atoi(str1); - if (event < 0) - { - continue; - } - char* buf = new char[10]; - sprintf(buf, "%d", event); - std::string custom_event_name(buf); - CC_SAFE_DELETE_ARRAY(buf); - - EventListenerCustom* listener = EventListenerCustom::create(custom_event_name, [=](EventCustom* evt){ - if (detect()) - { - done(); - } - }); - _listeners.pushBack(listener); - TriggerMng::getInstance()->addEventListenerWithFixedPriority(listener, 1); + continue; } + int event = atoi(str1); + if (event < 0) + { + continue; + } + char* buf = new char[10]; + sprintf(buf, "%d", event); + std::string custom_event_name(buf); + CC_SAFE_DELETE_ARRAY(buf); + + EventListenerCustom* listener = EventListenerCustom::create(custom_event_name, [=](EventCustom* evt){ + if (detect()) + { + done(); + } + }); + _listeners.pushBack(listener); + TriggerMng::getInstance()->addEventListenerWithFixedPriority(listener, 1); } } } +} diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua index 8e4e375b97..50d23a12c9 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua @@ -174,6 +174,7 @@ function SceneEditorTestLayer:createMenu() if sceneEditorTestIdx == #SceneEditorTestLayer.title then self:unscheduleUpdate() + ccs.TriggerMng.getInstance():removeAll() end SceneEditorTestLayer.fileName = self:loadFileChangeHelper(SceneEditorTestLayer.fileName) @@ -846,13 +847,11 @@ function TriggerTest:onEnter() ccs.sendTriggerEvent(triggerEventDef.TRIGGEREVENT_UPDATESCENE) end self:scheduleUpdateWithPriorityLua(update,0) - - ccs.sendTriggerEvent(triggerEventDef.TRIGGEREVENT_ENTERSCENE) end end function TriggerTest:defaultPlay() - + ccs.sendTriggerEvent(triggerEventDef.TRIGGEREVENT_ENTERSCENE) end function TriggerTest:onExit() From 0bf4af1175c0c559204c49dd0bdbc735926e7a12 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Wed, 16 Jul 2014 15:36:50 +0800 Subject: [PATCH 09/32] fixed crash in setup.py script. --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 49f67ba7ff..08ca197bdb 100755 --- a/setup.py +++ b/setup.py @@ -98,7 +98,11 @@ class SetEnvVar(object): return sys.platform == 'darwin' def _is_zsh(self): - return os.environ.get('SHELL')[-3:] == "zsh" + shellItem = os.environ.get('SHELL') + if shellItem is not None: + if len(shellItem) >= 3: + return shellItem[-3:] == "zsh" + return False def _get_unix_file_list(self): file_list = None From 1530ba4a903f9976814209e933df75b1e7734619 Mon Sep 17 00:00:00 2001 From: zhangcheng Date: Wed, 16 Jul 2014 16:12:55 +0800 Subject: [PATCH 10/32] =?UTF-8?q?1=E3=80=81fixes=20Trigger=20condition=20v?= =?UTF-8?q?alue=20can't=20be=20export.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cocos/editor-support/cocostudio/TriggerMng.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/editor-support/cocostudio/TriggerMng.cpp b/cocos/editor-support/cocostudio/TriggerMng.cpp index d1e8d33fe3..8b7710aede 100755 --- a/cocos/editor-support/cocostudio/TriggerMng.cpp +++ b/cocos/editor-support/cocostudio/TriggerMng.cpp @@ -343,7 +343,7 @@ void TriggerMng::buildJson(rapidjson::Document &document, cocostudio::CocoLoader { dataitem.AddMember("value", str5, allocator); } - else if(type == rapidjson::kNumberType) + else { int nV = atoi(str5); float fV = atof(str5); From 46aafeecc65917626df64e55cd47748cba21576d Mon Sep 17 00:00:00 2001 From: andyque Date: Wed, 16 Jul 2014 16:28:01 +0800 Subject: [PATCH 11/32] remove unused functions --- cocos/ui/UIPageView.cpp | 10 +--------- cocos/ui/UIPageView.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cocos/ui/UIPageView.cpp b/cocos/ui/UIPageView.cpp index 0dce9f9afa..fcca3e38b7 100644 --- a/cocos/ui/UIPageView.cpp +++ b/cocos/ui/UIPageView.cpp @@ -336,10 +336,6 @@ void PageView::autoScroll(float dt) bool PageView::onTouchBegan(Touch *touch, Event *unusedEvent) { bool pass = Layout::onTouchBegan(touch, unusedEvent); - if (_hitted) - { - handlePressLogic(touch); - } return pass; } @@ -433,10 +429,6 @@ bool PageView::scrollPages(float touchOffset) return true; } -void PageView::handlePressLogic(Touch *touch) -{ - //no-op -} void PageView::handleMoveLogic(Touch *touch) { @@ -507,7 +499,7 @@ void PageView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch * switch (event) { case TouchEventType::BEGAN: - handlePressLogic(touch); + //no-op break; case TouchEventType::MOVED: { diff --git a/cocos/ui/UIPageView.h b/cocos/ui/UIPageView.h index fc439f9b79..52df2509ef 100644 --- a/cocos/ui/UIPageView.h +++ b/cocos/ui/UIPageView.h @@ -185,7 +185,6 @@ protected: void updateAllPagesPosition(); void autoScroll(float dt); - virtual void handlePressLogic(Touch *touch); virtual void handleMoveLogic(Touch *touch) ; virtual void handleReleaseLogic(Touch *touch) ; virtual void interceptTouchEvent(TouchEventType event, Widget* sender,Touch *touch) ; From 1b2d389011d163017ec136fd2af3f676ba38b1e9 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Wed, 16 Jul 2014 17:18:01 +0800 Subject: [PATCH 12/32] Update ListViewEventType for Lua --- cocos/scripting/lua-bindings/script/DeprecatedEnum.lua | 2 ++ cocos/scripting/lua-bindings/script/GuiConstants.lua | 3 ++- .../src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua b/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua index 738f2a2014..fd21cc4ecb 100644 --- a/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua +++ b/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua @@ -492,3 +492,5 @@ ccui.LayoutType.linearVertical = ccui.LayoutType.VERTICAL ccui.LayoutType.linearHorizontal = ccui.LayoutType.HORIZONTAL ccui.LayoutType.relative = ccui.LayoutType.RELATIVE +ccui.ListViewEventType.onsSelectedItem = ccui.ListViewEventType.ONSELECTEDITEM_START + diff --git a/cocos/scripting/lua-bindings/script/GuiConstants.lua b/cocos/scripting/lua-bindings/script/GuiConstants.lua index e322d3bfaf..1b3ce7e439 100644 --- a/cocos/scripting/lua-bindings/script/GuiConstants.lua +++ b/cocos/scripting/lua-bindings/script/GuiConstants.lua @@ -151,7 +151,8 @@ ccui.ListViewMoveDirection = { } ccui.ListViewEventType = { - onsSelectedItem = 0, + ONSELECTEDITEM_START = 0, + ONSELECTEDITEM_END = 1, } ccui.PageViewEventType = { diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua index bac936d12f..ecf355110c 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua @@ -2425,7 +2425,7 @@ function UIListViewVerticalTest:initExtend() end local function listViewEvent(sender, eventType) - if eventType == ccui.ListViewEventType.onsSelectedItem then + if eventType == ccui.ListViewEventType.ONSELECTEDITEM_START then print("select child index = ",sender:getCurSelectedIndex()) end end From cd025158f62f0540ed1edc0f63d70825045e9e0d Mon Sep 17 00:00:00 2001 From: Naoyuki Totani Date: Wed, 16 Jul 2014 19:10:05 +0900 Subject: [PATCH 13/32] fix enabled to interval --- cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp index 1b2e2ff86a..b66fab6fb5 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp @@ -1234,7 +1234,7 @@ static int lua_cocos2dx_Layer_setAccelerometerInterval(lua_State* L) goto tolua_lerror; #endif double interval = tolua_tonumber(L, 2, 0); - Device::setAccelerometerEnabled(interval); + Device::setAccelerometerInterval(interval); return 0; } From af231d78dbc461e997a9a45209556eb08792e409 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Wed, 16 Jul 2014 13:02:27 +0000 Subject: [PATCH 14/32] [AUTO]: updating luabinding automatically --- .../lua-bindings/auto/api/ActionManagerEx.lua | 8 - .../lua-bindings/auto/api/ActionObject.lua | 7 - .../scripting/lua-bindings/auto/api/Node.lua | 20 -- .../auto/api/SkeletonAnimation.lua | 8 - .../lua-bindings/auto/lua_cocos2dx_auto.cpp | 180 ------------------ .../lua-bindings/auto/lua_cocos2dx_auto.hpp | 4 - .../auto/lua_cocos2dx_spine_auto.cpp | 56 ------ .../auto/lua_cocos2dx_spine_auto.hpp | 1 - .../auto/lua_cocos2dx_studio_auto.cpp | 109 ----------- .../auto/lua_cocos2dx_studio_auto.hpp | 2 - 10 files changed, 395 deletions(-) diff --git a/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua b/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua index 5b32f95601..0e482bb65e 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua @@ -23,14 +23,6 @@ -- @param #char char -- @return ActionObject#ActionObject ret (return value: ccs.ActionObject) --------------------------------- --- @function [parent=#ActionManagerEx] initWithBinary --- @param self --- @param #char char --- @param #cc.Ref ref --- @param #ccs.CocoLoader cocoloader --- @param #ccs.stExpCocoNode stexpcoconode - -------------------------------- -- @function [parent=#ActionManagerEx] releaseActions -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ActionObject.lua b/cocos/scripting/lua-bindings/auto/api/ActionObject.lua index bc1d74c131..e9a644595f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionObject.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionObject.lua @@ -61,13 +61,6 @@ -- @param self -- @return bool#bool ret (return value: bool) --------------------------------- --- @function [parent=#ActionObject] initWithBinary --- @param self --- @param #ccs.CocoLoader cocoloader --- @param #ccs.stExpCocoNode stexpcoconode --- @param #cc.Ref ref - -------------------------------- -- @function [parent=#ActionObject] addActionNode -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Node.lua b/cocos/scripting/lua-bindings/auto/api/Node.lua index 846ddc9af9..6dbd131ab7 100644 --- a/cocos/scripting/lua-bindings/auto/api/Node.lua +++ b/cocos/scripting/lua-bindings/auto/api/Node.lua @@ -134,11 +134,6 @@ -- @param self -- @return int#int ret (return value: int) --------------------------------- --- @function [parent=#Node] getonEnterTransitionDidFinishCallback --- @param self --- @return function#function ret (return value: function) - -------------------------------- -- @function [parent=#Node] getGLProgram -- @param self @@ -257,11 +252,6 @@ -- @param #cc.Touch touch -- @return vec2_table#vec2_table ret (return value: vec2_table) --------------------------------- --- @function [parent=#Node] getOnEnterCallback --- @param self --- @return function#function ret (return value: function) - -------------------------------- -- @function [parent=#Node] convertToNodeSpace -- @param self @@ -570,11 +560,6 @@ -- @param #float float -- @param #float float --------------------------------- --- @function [parent=#Node] getOnExitCallback --- @param self --- @return function#function ret (return value: function) - -------------------------------- -- @function [parent=#Node] getChildByTag -- @param self @@ -672,11 +657,6 @@ -- @param self -- @param #cc.Ref ref --------------------------------- --- @function [parent=#Node] getonExitTransitionDidStartCallback --- @param self --- @return function#function ret (return value: function) - -------------------------------- -- overload function: removeFromParentAndCleanup(bool) -- diff --git a/cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua b/cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua index 06f8e2b827..a3cd0aad24 100644 --- a/cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua +++ b/cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua @@ -19,12 +19,4 @@ -- @function [parent=#SkeletonAnimation] clearTrack -- @param self --------------------------------- --- @function [parent=#SkeletonAnimation] onAnimationStateEvent --- @param self --- @param #int int --- @param #spEventType speventtype --- @param #spEvent spevent --- @param #int int - return nil diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index c5c34c2ae2..5bacc30a91 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -4721,50 +4721,6 @@ int lua_cocos2dx_Node_getTag(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Node_getonEnterTransitionDidFinishCallback(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Node* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_getonEnterTransitionDidFinishCallback'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::function& ret = cobj->getonEnterTransitionDidFinishCallback(); - #pragma warning NO CONVERSION FROM NATIVE FOR std::function; - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getonEnterTransitionDidFinishCallback",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_getonEnterTransitionDidFinishCallback'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Node_getGLProgram(lua_State* tolua_S) { int argc = 0; @@ -5782,50 +5738,6 @@ int lua_cocos2dx_Node_convertTouchToNodeSpaceAR(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Node_getOnEnterCallback(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Node* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_getOnEnterCallback'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::function& ret = cobj->getOnEnterCallback(); - #pragma warning NO CONVERSION FROM NATIVE FOR std::function; - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOnEnterCallback",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_getOnEnterCallback'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Node_convertToNodeSpace(lua_State* tolua_S) { int argc = 0; @@ -8379,50 +8291,6 @@ int lua_cocos2dx_Node_setScale(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Node_getOnExitCallback(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Node* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_getOnExitCallback'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::function& ret = cobj->getOnExitCallback(); - #pragma warning NO CONVERSION FROM NATIVE FOR std::function; - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOnExitCallback",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_getOnExitCallback'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Node_getChildByTag(lua_State* tolua_S) { int argc = 0; @@ -9245,50 +9113,6 @@ int lua_cocos2dx_Node_setUserObject(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Node_getonExitTransitionDidStartCallback(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Node* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_getonExitTransitionDidStartCallback'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::function& ret = cobj->getonExitTransitionDidStartCallback(); - #pragma warning NO CONVERSION FROM NATIVE FOR std::function; - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getonExitTransitionDidStartCallback",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_getonExitTransitionDidStartCallback'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Node_removeFromParentAndCleanup(lua_State* tolua_S) { int argc = 0; @@ -9942,7 +9766,6 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S) tolua_function(tolua_S,"removeAllComponents",lua_cocos2dx_Node_removeAllComponents); tolua_function(tolua_S,"_setLocalZOrder",lua_cocos2dx_Node__setLocalZOrder); tolua_function(tolua_S,"getTag",lua_cocos2dx_Node_getTag); - tolua_function(tolua_S,"getonEnterTransitionDidFinishCallback",lua_cocos2dx_Node_getonEnterTransitionDidFinishCallback); tolua_function(tolua_S,"getGLProgram",lua_cocos2dx_Node_getGLProgram); tolua_function(tolua_S,"getNodeToWorldTransform",lua_cocos2dx_Node_getNodeToWorldTransform); tolua_function(tolua_S,"getPosition3D",lua_cocos2dx_Node_getPosition3D); @@ -9965,7 +9788,6 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S) tolua_function(tolua_S,"getRotation3D",lua_cocos2dx_Node_getRotation3D); tolua_function(tolua_S,"getNodeToParentTransform",lua_cocos2dx_Node_getNodeToParentTransform); tolua_function(tolua_S,"convertTouchToNodeSpaceAR",lua_cocos2dx_Node_convertTouchToNodeSpaceAR); - tolua_function(tolua_S,"getOnEnterCallback",lua_cocos2dx_Node_getOnEnterCallback); tolua_function(tolua_S,"convertToNodeSpace",lua_cocos2dx_Node_convertToNodeSpace); tolua_function(tolua_S,"resume",lua_cocos2dx_Node_resume); tolua_function(tolua_S,"getPhysicsBody",lua_cocos2dx_Node_getPhysicsBody); @@ -10021,7 +9843,6 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S) tolua_function(tolua_S,"getParentToNodeTransform",lua_cocos2dx_Node_getParentToNodeTransform); tolua_function(tolua_S,"setGlobalZOrder",lua_cocos2dx_Node_setGlobalZOrder); tolua_function(tolua_S,"setScale",lua_cocos2dx_Node_setScale); - tolua_function(tolua_S,"getOnExitCallback",lua_cocos2dx_Node_getOnExitCallback); tolua_function(tolua_S,"getChildByTag",lua_cocos2dx_Node_getChildByTag); tolua_function(tolua_S,"setOrderOfArrival",lua_cocos2dx_Node_setOrderOfArrival); tolua_function(tolua_S,"getScaleZ",lua_cocos2dx_Node_getScaleZ); @@ -10040,7 +9861,6 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S) tolua_function(tolua_S,"getGlobalZOrder",lua_cocos2dx_Node_getGlobalZOrder); tolua_function(tolua_S,"draw",lua_cocos2dx_Node_draw); tolua_function(tolua_S,"setUserObject",lua_cocos2dx_Node_setUserObject); - tolua_function(tolua_S,"getonExitTransitionDidStartCallback",lua_cocos2dx_Node_getonExitTransitionDidStartCallback); tolua_function(tolua_S,"removeFromParent",lua_cocos2dx_Node_removeFromParentAndCleanup); tolua_function(tolua_S,"setPosition3D",lua_cocos2dx_Node_setPosition3D); tolua_function(tolua_S,"update",lua_cocos2dx_Node_update); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index 42b0e17ab0..557a4a1f5c 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -1605,10 +1605,6 @@ int register_all_cocos2dx(lua_State* tolua_S); - - - - diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp index 55c306c217..fb68e466e2 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp @@ -494,61 +494,6 @@ int lua_cocos2dx_spine_SkeletonAnimation_clearTrack(lua_State* tolua_S) return 0; } -int lua_cocos2dx_spine_SkeletonAnimation_onAnimationStateEvent(lua_State* tolua_S) -{ - int argc = 0; - spine::SkeletonAnimation* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"sp.SkeletonAnimation",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (spine::SkeletonAnimation*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_spine_SkeletonAnimation_onAnimationStateEvent'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 4) - { - int arg0; - spEventType arg1; - spEvent* arg2; - int arg3; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); - - #pragma warning NO CONVERSION TO NATIVE FOR spEvent*; - - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); - if(!ok) - return 0; - cobj->onAnimationStateEvent(arg0, arg1, arg2, arg3); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onAnimationStateEvent",argc, 4); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_spine_SkeletonAnimation_onAnimationStateEvent'.",&tolua_err); -#endif - - return 0; -} static int lua_cocos2dx_spine_SkeletonAnimation_finalize(lua_State* tolua_S) { printf("luabindings: finalizing LUA object (SkeletonAnimation)"); @@ -564,7 +509,6 @@ int lua_register_cocos2dx_spine_SkeletonAnimation(lua_State* tolua_S) tolua_function(tolua_S,"setMix",lua_cocos2dx_spine_SkeletonAnimation_setMix); tolua_function(tolua_S,"clearTracks",lua_cocos2dx_spine_SkeletonAnimation_clearTracks); tolua_function(tolua_S,"clearTrack",lua_cocos2dx_spine_SkeletonAnimation_clearTrack); - tolua_function(tolua_S,"onAnimationStateEvent",lua_cocos2dx_spine_SkeletonAnimation_onAnimationStateEvent); tolua_endmodule(tolua_S); std::string typeName = typeid(spine::SkeletonAnimation).name(); g_luaType[typeName] = "sp.SkeletonAnimation"; diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.hpp index 82266a8afb..aedd24b3f5 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.hpp @@ -24,5 +24,4 @@ int register_all_cocos2dx_spine(lua_State* tolua_S); - #endif // __cocos2dx_spine_h__ diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp index ead974be37..b4352556a9 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -2103,58 +2103,6 @@ int lua_cocos2dx_studio_ActionObject_getLoop(lua_State* tolua_S) return 0; } -int lua_cocos2dx_studio_ActionObject_initWithBinary(lua_State* tolua_S) -{ - int argc = 0; - cocostudio::ActionObject* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccs.ActionObject",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocostudio::ActionObject*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ActionObject_initWithBinary'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 3) - { - cocostudio::CocoLoader* arg0; - cocostudio::stExpCocoNode* arg1; - cocos2d::Ref* arg2; - - ok &= luaval_to_object(tolua_S, 2, "ccs.CocoLoader",&arg0); - - #pragma warning NO CONVERSION TO NATIVE FOR stExpCocoNode*; - - ok &= luaval_to_object(tolua_S, 4, "cc.Ref",&arg2); - if(!ok) - return 0; - cobj->initWithBinary(arg0, arg1, arg2); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithBinary",argc, 3); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ActionObject_initWithBinary'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_studio_ActionObject_addActionNode(lua_State* tolua_S) { int argc = 0; @@ -2485,7 +2433,6 @@ int lua_register_cocos2dx_studio_ActionObject(lua_State* tolua_S) tolua_function(tolua_S,"getCurrentTime",lua_cocos2dx_studio_ActionObject_getCurrentTime); tolua_function(tolua_S,"removeActionNode",lua_cocos2dx_studio_ActionObject_removeActionNode); tolua_function(tolua_S,"getLoop",lua_cocos2dx_studio_ActionObject_getLoop); - tolua_function(tolua_S,"initWithBinary",lua_cocos2dx_studio_ActionObject_initWithBinary); tolua_function(tolua_S,"addActionNode",lua_cocos2dx_studio_ActionObject_addActionNode); tolua_function(tolua_S,"getUnitTime",lua_cocos2dx_studio_ActionObject_getUnitTime); tolua_function(tolua_S,"isPlaying",lua_cocos2dx_studio_ActionObject_isPlaying); @@ -2616,61 +2563,6 @@ int lua_cocos2dx_studio_ActionManagerEx_getActionByName(lua_State* tolua_S) return 0; } -int lua_cocos2dx_studio_ActionManagerEx_initWithBinary(lua_State* tolua_S) -{ - int argc = 0; - cocostudio::ActionManagerEx* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccs.ActionManagerEx",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocostudio::ActionManagerEx*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_studio_ActionManagerEx_initWithBinary'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 4) - { - const char* arg0; - cocos2d::Ref* arg1; - cocostudio::CocoLoader* arg2; - cocostudio::stExpCocoNode* arg3; - - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - - ok &= luaval_to_object(tolua_S, 3, "cc.Ref",&arg1); - - ok &= luaval_to_object(tolua_S, 4, "ccs.CocoLoader",&arg2); - - #pragma warning NO CONVERSION TO NATIVE FOR stExpCocoNode*; - if(!ok) - return 0; - cobj->initWithBinary(arg0, arg1, arg2, arg3); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithBinary",argc, 4); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_studio_ActionManagerEx_initWithBinary'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_studio_ActionManagerEx_releaseActions(lua_State* tolua_S) { int argc = 0; @@ -2789,7 +2681,6 @@ int lua_register_cocos2dx_studio_ActionManagerEx(lua_State* tolua_S) tolua_beginmodule(tolua_S,"ActionManagerEx"); tolua_function(tolua_S,"playActionByName",lua_cocos2dx_studio_ActionManagerEx_playActionByName); tolua_function(tolua_S,"getActionByName",lua_cocos2dx_studio_ActionManagerEx_getActionByName); - tolua_function(tolua_S,"initWithBinary",lua_cocos2dx_studio_ActionManagerEx_initWithBinary); tolua_function(tolua_S,"releaseActions",lua_cocos2dx_studio_ActionManagerEx_releaseActions); tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_studio_ActionManagerEx_destroyInstance); tolua_function(tolua_S,"getInstance", lua_cocos2dx_studio_ActionManagerEx_getInstance); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp index a97498c0c3..db4b08da77 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp @@ -489,8 +489,6 @@ int register_all_cocos2dx_studio(lua_State* tolua_S); - - From d6d182cb5970a9d287fd90feaf70a65418787ccc Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Wed, 16 Jul 2014 23:18:10 +0800 Subject: [PATCH 15/32] =?UTF-8?q?Fix=20the=20action=20can=E2=80=99t=20be?= =?UTF-8?q?=20triggered=20in=20the=20TriggerTest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua index 50d23a12c9..19cdabbbe5 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua @@ -173,7 +173,6 @@ function SceneEditorTestLayer:createMenu() end if sceneEditorTestIdx == #SceneEditorTestLayer.title then - self:unscheduleUpdate() ccs.TriggerMng.getInstance():removeAll() end From 27ba8ecd4266b54fc251b523d1d6b5f69fbc30f9 Mon Sep 17 00:00:00 2001 From: Mazyad Alabduljaleel Date: Thu, 17 Jul 2014 02:10:59 +0400 Subject: [PATCH 16/32] [FIX]: make the scrollView delegate methods optional --- extensions/GUI/CCScrollView/CCScrollView.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h index d26c9240e0..2f4c224418 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.h +++ b/extensions/GUI/CCScrollView/CCScrollView.h @@ -52,12 +52,12 @@ public: * @js NA * @lua NA */ - virtual void scrollViewDidScroll(ScrollView* view) = 0; + virtual void scrollViewDidScroll(ScrollView* view) {}; /** * @js NA * @lua NA */ - virtual void scrollViewDidZoom(ScrollView* view) = 0; + virtual void scrollViewDidZoom(ScrollView* view) {}; }; From 2baf860669dfd848d512f38fb3916b1b9658e22a Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Thu, 17 Jul 2014 09:56:35 +0800 Subject: [PATCH 17/32] Update bindings-generator submodule --- tools/bindings-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bindings-generator b/tools/bindings-generator index 132282d67a..56aaed8134 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 132282d67aff8da7113f4a00596aac75e7b4528d +Subproject commit 56aaed8134d624cdbaa365dc44c5134f325957cc From c47d844d204a424ef8e5c4d792d60280c3c18856 Mon Sep 17 00:00:00 2001 From: vision Date: Thu, 17 Jul 2014 10:08:49 +0800 Subject: [PATCH 18/32] update the buildin shaders on WP8. Disable the effect 3d test. --- .../platform/wp8/shaders/precompiledshaders.h | 2351 +++++++++-------- .../Classes/Sprite3DTest/Sprite3DTest.cpp | 3 + 2 files changed, 1228 insertions(+), 1126 deletions(-) diff --git a/cocos/platform/wp8/shaders/precompiledshaders.h b/cocos/platform/wp8/shaders/precompiledshaders.h index 5a5a3e0450..ee41e8243b 100644 --- a/cocos/platform/wp8/shaders/precompiledshaders.h +++ b/cocos/platform/wp8/shaders/precompiledshaders.h @@ -86,7 +86,7 @@ const unsigned char s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873[] = { 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 248, 3, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 173, 144, 0, 0, 0, 0, + 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 11, 95, 74, 206, 145, 124, 32, 219, 67, 19, @@ -456,7 +456,7 @@ const unsigned char s_13E33F532157A58EC77EDE3B3112560A89D272B2[] = { 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 204, 2, 0, 0, 164, 4, 0, 0, 0, 0, 0, 0, -173, 144, 0, 0, 0, 0, 0, 0, +212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, 235, 249, @@ -800,7 +800,7 @@ const unsigned char s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE[] = { 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 208, 7, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 173, 144, 0, 0, 0, 0, + 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 65, 106, 69, 173, 111, 248, 97, 165, 186, 90, @@ -1301,7 +1301,7 @@ const unsigned char s_53938AB67AD93ABA0DDB87F3C9889304284E011E[] = { 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 24, 4, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 173, 144, 0, 0, 0, 0, + 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 200, 5, 103, 205, 248, 30, 69, 65, 32, 117, @@ -1675,7 +1675,7 @@ const unsigned char s_67837675F2BB48C0E926316F505FC1538228E0FA[] = { 86, 80, 77, 97, 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 16, 4, 0, 0, 48, 5, 0, 0, - 0, 0, 0, 0, 173, 144, 0, 0, + 0, 0, 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 79, 226, 72, 124, 94, 252, 37, 157, @@ -2070,7 +2070,7 @@ const unsigned char s_78250E25D1929D4A842050738140787BE42541C6[] = { 108, 112, 104, 97, 95, 118, 97, 108, 117, 101, 0, 0, 0, 0, 2, 0, 0, 0, 36, 5, 0, 0, 4, 5, - 0, 0, 0, 0, 0, 0, 173, 144, + 0, 0, 0, 0, 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, @@ -2485,7 +2485,7 @@ const unsigned char s_7B67DD242152D35ACC079265FAD9D03DC98182DE[] = { 67, 95, 84, 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 248, 3, 0, 0, 0, 5, - 0, 0, 0, 0, 0, 0, 173, 144, + 0, 0, 0, 0, 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 11, 95, 74, 206, 145, 124, @@ -2869,7 +2869,7 @@ const unsigned char s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 96, 4, 0, 0, 192, 4, 0, 0, 0, 0, 0, - 0, 173, 144, 0, 0, 0, 0, 0, + 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 157, 116, 105, 89, 118, 135, 249, 239, 42, 226, 184, @@ -3250,7 +3250,7 @@ const unsigned char s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C[] = { 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 1, 0, 0, 0, 52, 3, 0, 0, 40, 4, 0, 0, 0, - 0, 0, 0, 173, 144, 0, 0, 0, + 0, 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 153, 8, 62, 201, 202, 170, 111, 182, 149, @@ -3584,7 +3584,7 @@ const unsigned char s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5[] = { 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 240, 4, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, -173, 144, 0, 0, 0, 0, 0, 0, +212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 134, 66, 128, 226, 107, 172, 247, 161, 241, 207, 89, 240, @@ -4001,7 +4001,7 @@ const unsigned char s_92BE325B516F887D2C928EDE20ADF428DB01C038[] = { 95, 118, 97, 108, 117, 101, 0, 0, 0, 0, 2, 0, 0, 0, 36, 5, 0, 0, 0, 5, 0, 0, 0, 0, - 0, 0, 173, 144, 0, 0, 0, 0, + 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, 177, 78, 120, 99, @@ -4330,842 +4330,10 @@ const unsigned char s_92BE325B516F887D2C928EDE20ADF428DB01C038[] = { 111, 110, 0, 171, 171, 171, }; -const unsigned char s_A2377A827972A5466DA8637681045D32DA8A817D[] = { +const unsigned char s_976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE[] = { 166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, - 10, 0, 0, 0, 97, 95, 112, 111, -115, 105, 116, 105, 111, 110, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 255, 255, 255, 255, 80, 139, - 0, 0, 10, 0, 0, 0, 97, 95, -116, 101, 120, 67, 111, 111, 114, 100, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 3, 0, 0, 0, 92, 139, 0, - 0, 242, 141, 0, 0, 12, 0, 0, - 0, 67, 67, 95, 77, 86, 80, 77, - 97, 116, 114, 105, 120, 0, 0, 0, - 0, 255, 255, 255, 255, 0, 0, 0, - 0, 4, 0, 0, 0, 94, 139, 0, - 0, 0, 0, 0, 0, 11, 0, 0, - 0, 67, 67, 95, 84, 101, 120, 116, -117, 114, 101, 48, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 255, 255, 255, - 1, 0, 0, 0, 82, 139, 0, 0, -240, 141, 0, 0, 7, 0, 0, 0, -117, 95, 99, 111, 108, 111, 114, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 1, 0, 0, 0, 3, - 0, 0, 0, 12, 0, 0, 0, 67, - 67, 95, 77, 86, 80, 77, 97, 116, -114, 105, 120, 0, 0, 0, 0, 0, - 0, 0, 0, 11, 0, 0, 0, 67, - 67, 95, 84, 101, 120, 116, 117, 114, -101, 48, 0, 0, 0, 0, 1, 0, - 0, 0, 7, 0, 0, 0, 117, 95, - 99, 111, 108, 111, 114, 0, 0, 0, - 0, 2, 0, 0, 0, 96, 4, 0, - 0, 144, 4, 0, 0, 0, 0, 0, - 0, 173, 144, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 68, 88, 66, 67, 157, 116, 105, - 89, 118, 135, 249, 239, 42, 226, 184, - 78, 220, 105, 236, 28, 1, 0, 0, - 0, 96, 4, 0, 0, 6, 0, 0, - 0, 56, 0, 0, 0, 228, 0, 0, - 0, 252, 1, 0, 0, 120, 2, 0, - 0, 176, 3, 0, 0, 228, 3, 0, - 0, 65, 111, 110, 57, 164, 0, 0, - 0, 164, 0, 0, 0, 0, 2, 255, -255, 112, 0, 0, 0, 52, 0, 0, - 0, 1, 0, 40, 0, 0, 0, 52, - 0, 0, 0, 52, 0, 1, 0, 36, - 0, 0, 0, 52, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 1, 2, 255, -255, 31, 0, 0, 2, 0, 0, 0, -128, 0, 0, 3, 176, 31, 0, 0, - 2, 0, 0, 0, 144, 0, 8, 15, -160, 66, 0, 0, 3, 0, 0, 15, -128, 0, 0, 228, 176, 0, 8, 228, -160, 5, 0, 0, 3, 0, 0, 15, -128, 0, 0, 228, 128, 0, 0, 228, -160, 1, 0, 0, 2, 0, 8, 15, -128, 0, 0, 228, 128, 1, 0, 0, - 2, 1, 8, 15, 128, 0, 0, 228, -128, 1, 0, 0, 2, 2, 8, 15, -128, 0, 0, 228, 128, 1, 0, 0, - 2, 3, 8, 15, 128, 0, 0, 228, -128, 255, 255, 0, 0, 83, 72, 68, - 82, 16, 1, 0, 0, 64, 0, 0, - 0, 68, 0, 0, 0, 89, 0, 0, - 4, 70, 142, 32, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 90, 0, 0, - 3, 0, 96, 16, 0, 0, 0, 0, - 0, 88, 24, 0, 4, 0, 112, 16, - 0, 0, 0, 0, 0, 85, 85, 0, - 0, 98, 16, 0, 3, 50, 16, 16, - 0, 0, 0, 0, 0, 101, 0, 0, - 3, 242, 32, 16, 0, 0, 0, 0, - 0, 101, 0, 0, 3, 242, 32, 16, - 0, 1, 0, 0, 0, 101, 0, 0, - 3, 242, 32, 16, 0, 2, 0, 0, - 0, 101, 0, 0, 3, 242, 32, 16, - 0, 3, 0, 0, 0, 104, 0, 0, - 2, 1, 0, 0, 0, 69, 0, 0, - 9, 242, 0, 16, 0, 0, 0, 0, - 0, 70, 16, 16, 0, 0, 0, 0, - 0, 70, 126, 16, 0, 0, 0, 0, - 0, 0, 96, 16, 0, 0, 0, 0, - 0, 56, 0, 0, 8, 242, 0, 16, - 0, 0, 0, 0, 0, 70, 14, 16, - 0, 0, 0, 0, 0, 70, 142, 32, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 54, 0, 0, 5, 242, 32, 16, - 0, 0, 0, 0, 0, 70, 14, 16, - 0, 0, 0, 0, 0, 54, 0, 0, - 5, 242, 32, 16, 0, 1, 0, 0, - 0, 70, 14, 16, 0, 0, 0, 0, - 0, 54, 0, 0, 5, 242, 32, 16, - 0, 2, 0, 0, 0, 70, 14, 16, - 0, 0, 0, 0, 0, 54, 0, 0, - 5, 242, 32, 16, 0, 3, 0, 0, - 0, 70, 14, 16, 0, 0, 0, 0, - 0, 62, 0, 0, 1, 83, 84, 65, - 84, 116, 0, 0, 0, 7, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 5, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 4, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 82, 68, 69, 70, 48, 1, 0, - 0, 1, 0, 0, 0, 176, 0, 0, - 0, 3, 0, 0, 0, 28, 0, 0, - 0, 0, 4, 255, 255, 0, 65, 0, - 0, 252, 0, 0, 0, 124, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 1, 0, 0, 0, 145, 0, 0, - 0, 2, 0, 0, 0, 5, 0, 0, - 0, 4, 0, 0, 0, 255, 255, 255, -255, 0, 0, 0, 0, 1, 0, 0, - 0, 13, 0, 0, 0, 166, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 115, 97, 109, -112, 108, 101, 114, 95, 95, 67, 67, - 95, 84, 101, 120, 116, 117, 114, 101, - 48, 0, 116, 101, 120, 116, 117, 114, -101, 95, 95, 67, 67, 95, 84, 101, -120, 116, 117, 114, 101, 48, 0, 36, - 71, 108, 111, 98, 97, 108, 115, 0, -171, 166, 0, 0, 0, 1, 0, 0, - 0, 200, 0, 0, 0, 16, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 224, 0, 0, 0, 0, 0, 0, - 0, 16, 0, 0, 0, 2, 0, 0, - 0, 236, 0, 0, 0, 0, 0, 0, - 0, 95, 117, 95, 99, 111, 108, 111, -114, 0, 171, 171, 171, 1, 0, 3, - 0, 1, 0, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 77, 105, 99, -114, 111, 115, 111, 102, 116, 32, 40, - 82, 41, 32, 72, 76, 83, 76, 32, - 83, 104, 97, 100, 101, 114, 32, 67, -111, 109, 112, 105, 108, 101, 114, 32, - 54, 46, 51, 46, 57, 54, 48, 48, - 46, 49, 54, 51, 56, 52, 0, 171, -171, 73, 83, 71, 78, 44, 0, 0, - 0, 1, 0, 0, 0, 8, 0, 0, - 0, 32, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 3, 3, 0, - 0, 84, 69, 88, 67, 79, 79, 82, - 68, 0, 171, 171, 171, 79, 83, 71, - 78, 116, 0, 0, 0, 4, 0, 0, - 0, 8, 0, 0, 0, 104, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 15, 0, 0, 0, 104, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 1, 0, 0, - 0, 15, 0, 0, 0, 104, 0, 0, - 0, 2, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 2, 0, 0, - 0, 15, 0, 0, 0, 104, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 3, 0, 0, - 0, 15, 0, 0, 0, 83, 86, 95, - 84, 97, 114, 103, 101, 116, 0, 171, -171, 68, 88, 66, 67, 110, 14, 140, -120, 239, 110, 56, 78, 103, 37, 245, -162, 140, 151, 93, 223, 1, 0, 0, - 0, 144, 4, 0, 0, 6, 0, 0, - 0, 56, 0, 0, 0, 68, 1, 0, - 0, 156, 2, 0, 0, 24, 3, 0, - 0, 236, 3, 0, 0, 56, 4, 0, - 0, 65, 111, 110, 57, 4, 1, 0, - 0, 4, 1, 0, 0, 0, 2, 254, -255, 208, 0, 0, 0, 52, 0, 0, - 0, 1, 0, 36, 0, 0, 0, 48, - 0, 0, 0, 48, 0, 0, 0, 36, - 0, 1, 0, 48, 0, 0, 0, 0, - 0, 4, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 2, 254, -255, 81, 0, 0, 5, 5, 0, 15, -160, 0, 0, 0, 63, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 31, 0, 0, 2, 5, 0, 0, -128, 0, 0, 15, 144, 31, 0, 0, - 2, 5, 0, 1, 128, 1, 0, 15, -144, 9, 0, 0, 3, 0, 0, 1, -128, 3, 0, 228, 160, 0, 0, 228, -144, 9, 0, 0, 3, 0, 0, 2, -128, 4, 0, 228, 160, 0, 0, 228, -144, 2, 0, 0, 3, 0, 0, 1, -128, 0, 0, 85, 128, 0, 0, 0, -128, 5, 0, 0, 3, 0, 0, 4, -192, 0, 0, 0, 128, 5, 0, 0, -160, 9, 0, 0, 3, 0, 0, 1, -128, 2, 0, 228, 160, 0, 0, 228, -144, 1, 0, 0, 2, 1, 0, 2, -128, 0, 0, 0, 129, 9, 0, 0, - 3, 1, 0, 1, 128, 1, 0, 228, -160, 0, 0, 228, 144, 4, 0, 0, - 4, 0, 0, 3, 192, 0, 0, 85, -128, 0, 0, 228, 160, 1, 0, 228, -128, 1, 0, 0, 2, 0, 0, 8, -192, 0, 0, 85, 128, 1, 0, 0, - 2, 0, 0, 3, 224, 1, 0, 228, -144, 255, 255, 0, 0, 83, 72, 68, - 82, 80, 1, 0, 0, 64, 0, 1, - 0, 84, 0, 0, 0, 89, 0, 0, - 4, 70, 142, 32, 0, 0, 0, 0, - 0, 4, 0, 0, 0, 95, 0, 0, - 3, 242, 16, 16, 0, 0, 0, 0, - 0, 95, 0, 0, 3, 50, 16, 16, - 0, 1, 0, 0, 0, 101, 0, 0, - 3, 50, 32, 16, 0, 0, 0, 0, - 0, 103, 0, 0, 4, 242, 32, 16, - 0, 1, 0, 0, 0, 1, 0, 0, - 0, 104, 0, 0, 2, 1, 0, 0, - 0, 54, 0, 0, 5, 50, 32, 16, - 0, 0, 0, 0, 0, 70, 16, 16, - 0, 1, 0, 0, 0, 17, 0, 0, - 8, 18, 0, 16, 0, 0, 0, 0, - 0, 70, 142, 32, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 70, 30, 16, - 0, 0, 0, 0, 0, 54, 0, 0, - 6, 34, 32, 16, 0, 1, 0, 0, - 0, 10, 0, 16, 128, 65, 0, 0, - 0, 0, 0, 0, 0, 17, 0, 0, - 8, 18, 0, 16, 0, 0, 0, 0, - 0, 70, 142, 32, 0, 0, 0, 0, - 0, 2, 0, 0, 0, 70, 30, 16, - 0, 0, 0, 0, 0, 17, 0, 0, - 8, 34, 0, 16, 0, 0, 0, 0, - 0, 70, 142, 32, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 70, 30, 16, - 0, 0, 0, 0, 0, 0, 0, 0, - 7, 18, 0, 16, 0, 0, 0, 0, - 0, 26, 0, 16, 0, 0, 0, 0, - 0, 10, 0, 16, 0, 0, 0, 0, - 0, 54, 0, 0, 5, 130, 32, 16, - 0, 1, 0, 0, 0, 26, 0, 16, - 0, 0, 0, 0, 0, 56, 0, 0, - 7, 66, 32, 16, 0, 1, 0, 0, - 0, 10, 0, 16, 0, 0, 0, 0, - 0, 1, 64, 0, 0, 0, 0, 0, - 63, 17, 0, 0, 8, 18, 32, 16, - 0, 1, 0, 0, 0, 70, 142, 32, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 70, 30, 16, 0, 0, 0, 0, - 0, 62, 0, 0, 1, 83, 84, 65, - 84, 116, 0, 0, 0, 10, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 4, 0, 0, 0, 7, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 82, 68, 69, 70, 204, 0, 0, - 0, 1, 0, 0, 0, 72, 0, 0, - 0, 1, 0, 0, 0, 28, 0, 0, - 0, 0, 4, 254, 255, 0, 65, 0, - 0, 152, 0, 0, 0, 60, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 36, 71, 108, -111, 98, 97, 108, 115, 0, 171, 171, -171, 60, 0, 0, 0, 1, 0, 0, - 0, 96, 0, 0, 0, 64, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 120, 0, 0, 0, 0, 0, 0, - 0, 64, 0, 0, 0, 2, 0, 0, - 0, 136, 0, 0, 0, 0, 0, 0, - 0, 95, 67, 67, 95, 77, 86, 80, - 77, 97, 116, 114, 105, 120, 0, 171, -171, 3, 0, 3, 0, 4, 0, 4, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 77, 105, 99, 114, 111, 115, 111, -102, 116, 32, 40, 82, 41, 32, 72, - 76, 83, 76, 32, 83, 104, 97, 100, -101, 114, 32, 67, 111, 109, 112, 105, -108, 101, 114, 32, 54, 46, 51, 46, - 57, 54, 48, 48, 46, 49, 54, 51, - 56, 52, 0, 171, 171, 73, 83, 71, - 78, 68, 0, 0, 0, 2, 0, 0, - 0, 8, 0, 0, 0, 56, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 15, 15, 0, 0, 56, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 1, 0, 0, - 0, 3, 3, 0, 0, 84, 69, 88, - 67, 79, 79, 82, 68, 0, 171, 171, -171, 79, 83, 71, 78, 80, 0, 0, - 0, 2, 0, 0, 0, 8, 0, 0, - 0, 56, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 3, 12, 0, - 0, 65, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 3, 0, 0, - 0, 1, 0, 0, 0, 15, 0, 0, - 0, 84, 69, 88, 67, 79, 79, 82, - 68, 0, 83, 86, 95, 80, 111, 115, -105, 116, 105, 111, 110, 0, 171, 171, -171, -}; - -const unsigned char s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86[] = { - -166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, - 10, 0, 0, 0, 97, 95, 112, 111, -115, 105, 116, 105, 111, 110, 1, 0, - 0, 0, 82, 139, 0, 0, 7, 0, - 0, 0, 97, 95, 99, 111, 108, 111, -114, 0, 0, 0, 0, 80, 139, 0, - 0, 10, 0, 0, 0, 97, 95, 116, -101, 120, 67, 111, 111, 114, 100, 2, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 255, -255, 255, 255, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, - 3, 0, 0, 0, 92, 139, 0, 0, -242, 141, 0, 0, 12, 0, 0, 0, - 67, 67, 95, 77, 86, 80, 77, 97, -116, 114, 105, 120, 0, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 4, 0, 0, 0, 94, 139, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, - 67, 67, 95, 84, 101, 120, 116, 117, -114, 101, 48, 0, 0, 0, 0, 0, - 0, 0, 0, 255, 255, 255, 255, 1, - 0, 0, 0, 82, 139, 0, 0, 240, -141, 0, 0, 11, 0, 0, 0, 117, - 95, 116, 101, 120, 116, 67, 111, 108, -111, 114, 0, 0, 0, 0, 0, 0, - 0, 0, 255, 255, 255, 255, 1, 0, - 0, 0, 3, 0, 0, 0, 12, 0, - 0, 0, 67, 67, 95, 77, 86, 80, - 77, 97, 116, 114, 105, 120, 0, 0, - 0, 0, 0, 0, 0, 0, 11, 0, - 0, 0, 67, 67, 95, 84, 101, 120, -116, 117, 114, 101, 48, 0, 0, 0, - 0, 1, 0, 0, 0, 11, 0, 0, - 0, 117, 95, 116, 101, 120, 116, 67, -111, 108, 111, 114, 0, 0, 0, 0, - 2, 0, 0, 0, 240, 5, 0, 0, - 4, 5, 0, 0, 0, 0, 0, 0, -173, 144, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 68, 88, 66, 67, 223, 173, 203, 80, -172, 13, 170, 215, 168, 128, 228, 5, - 62, 250, 21, 248, 1, 0, 0, 0, -240, 5, 0, 0, 6, 0, 0, 0, - 56, 0, 0, 0, 124, 1, 0, 0, -112, 3, 0, 0, 236, 3, 0, 0, - 40, 5, 0, 0, 116, 5, 0, 0, - 65, 111, 110, 57, 60, 1, 0, 0, - 60, 1, 0, 0, 0, 2, 255, 255, - 8, 1, 0, 0, 52, 0, 0, 0, - 1, 0, 40, 0, 0, 0, 52, 0, - 0, 0, 52, 0, 1, 0, 36, 0, - 0, 0, 52, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 1, 2, 255, 255, - 81, 0, 0, 5, 1, 0, 15, 160, - 31, 133, 235, 190, 254, 255, 71, 65, - 0, 0, 0, 192, 0, 0, 64, 64, - 31, 0, 0, 2, 0, 0, 0, 128, - 0, 0, 15, 176, 31, 0, 0, 2, - 0, 0, 0, 128, 1, 0, 3, 176, - 31, 0, 0, 2, 0, 0, 0, 144, - 0, 8, 15, 160, 66, 0, 0, 3, - 0, 0, 15, 128, 1, 0, 228, 176, - 0, 8, 228, 160, 2, 0, 0, 3, - 0, 0, 1, 128, 0, 0, 255, 128, - 1, 0, 0, 160, 5, 0, 0, 3, - 0, 0, 17, 128, 0, 0, 0, 128, - 1, 0, 85, 160, 4, 0, 0, 4, - 0, 0, 2, 128, 0, 0, 0, 128, - 1, 0, 170, 160, 1, 0, 255, 160, - 5, 0, 0, 3, 0, 0, 1, 128, - 0, 0, 0, 128, 0, 0, 0, 128, - 5, 0, 0, 3, 0, 0, 1, 128, - 0, 0, 0, 128, 0, 0, 85, 128, - 5, 0, 0, 3, 0, 0, 1, 128, - 0, 0, 0, 128, 0, 0, 255, 160, - 5, 0, 0, 3, 0, 0, 8, 128, - 0, 0, 0, 128, 0, 0, 255, 176, - 5, 0, 0, 3, 0, 0, 7, 128, - 0, 0, 228, 176, 0, 0, 228, 160, - 1, 0, 0, 2, 0, 8, 15, 128, - 0, 0, 228, 128, 1, 0, 0, 2, - 1, 8, 15, 128, 0, 0, 228, 128, - 1, 0, 0, 2, 2, 8, 15, 128, - 0, 0, 228, 128, 1, 0, 0, 2, - 3, 8, 15, 128, 0, 0, 228, 128, -255, 255, 0, 0, 83, 72, 68, 82, -236, 1, 0, 0, 64, 0, 0, 0, -123, 0, 0, 0, 89, 0, 0, 4, - 70, 142, 32, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 90, 0, 0, 3, - 0, 96, 16, 0, 0, 0, 0, 0, - 88, 24, 0, 4, 0, 112, 16, 0, - 0, 0, 0, 0, 85, 85, 0, 0, - 98, 16, 0, 3, 242, 16, 16, 0, - 0, 0, 0, 0, 98, 16, 0, 3, - 50, 16, 16, 0, 1, 0, 0, 0, -101, 0, 0, 3, 242, 32, 16, 0, - 0, 0, 0, 0, 101, 0, 0, 3, -242, 32, 16, 0, 1, 0, 0, 0, -101, 0, 0, 3, 242, 32, 16, 0, - 2, 0, 0, 0, 101, 0, 0, 3, -242, 32, 16, 0, 3, 0, 0, 0, -104, 0, 0, 2, 1, 0, 0, 0, - 69, 0, 0, 9, 242, 0, 16, 0, - 0, 0, 0, 0, 70, 16, 16, 0, - 1, 0, 0, 0, 70, 126, 16, 0, - 0, 0, 0, 0, 0, 96, 16, 0, - 0, 0, 0, 0, 0, 0, 0, 7, - 18, 0, 16, 0, 0, 0, 0, 0, - 58, 0, 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 31, 133, 235, 190, - 56, 32, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 1, 64, 0, 0, -254, 255, 71, 65, 50, 0, 0, 9, - 34, 0, 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 0, 0, 0, 192, - 1, 64, 0, 0, 0, 0, 64, 64, - 56, 0, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 56, 0, 0, 7, - 18, 0, 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, 0, 0, - 26, 0, 16, 0, 0, 0, 0, 0, - 56, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 58, 128, 32, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 56, 0, 0, 7, 130, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 58, 16, 16, 0, - 0, 0, 0, 0, 56, 0, 0, 8, -114, 0, 16, 0, 0, 0, 0, 0, - 70, 18, 16, 0, 0, 0, 0, 0, - 70, 130, 32, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -242, 32, 16, 0, 0, 0, 0, 0, - 70, 14, 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 242, 32, 16, 0, - 1, 0, 0, 0, 70, 14, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -242, 32, 16, 0, 2, 0, 0, 0, - 70, 14, 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 242, 32, 16, 0, - 3, 0, 0, 0, 70, 14, 16, 0, - 0, 0, 0, 0, 62, 0, 0, 1, - 83, 84, 65, 84, 116, 0, 0, 0, - 14, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 6, 0, 0, 0, - 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 82, 68, 69, 70, - 52, 1, 0, 0, 1, 0, 0, 0, -176, 0, 0, 0, 3, 0, 0, 0, - 28, 0, 0, 0, 0, 4, 255, 255, - 0, 65, 0, 0, 0, 1, 0, 0, -124, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 1, 0, 0, 0, -145, 0, 0, 0, 2, 0, 0, 0, - 5, 0, 0, 0, 4, 0, 0, 0, -255, 255, 255, 255, 0, 0, 0, 0, - 1, 0, 0, 0, 13, 0, 0, 0, -166, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, -115, 97, 109, 112, 108, 101, 114, 95, - 95, 67, 67, 95, 84, 101, 120, 116, -117, 114, 101, 48, 0, 116, 101, 120, -116, 117, 114, 101, 95, 95, 67, 67, - 95, 84, 101, 120, 116, 117, 114, 101, - 48, 0, 36, 71, 108, 111, 98, 97, -108, 115, 0, 171, 166, 0, 0, 0, - 1, 0, 0, 0, 200, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 224, 0, 0, 0, - 0, 0, 0, 0, 16, 0, 0, 0, - 2, 0, 0, 0, 240, 0, 0, 0, - 0, 0, 0, 0, 95, 117, 95, 116, -101, 120, 116, 67, 111, 108, 111, 114, - 0, 171, 171, 171, 1, 0, 3, 0, - 1, 0, 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 77, 105, 99, 114, -111, 115, 111, 102, 116, 32, 40, 82, - 41, 32, 72, 76, 83, 76, 32, 83, -104, 97, 100, 101, 114, 32, 67, 111, -109, 112, 105, 108, 101, 114, 32, 54, - 46, 51, 46, 57, 54, 48, 48, 46, - 49, 54, 51, 56, 52, 0, 171, 171, - 73, 83, 71, 78, 68, 0, 0, 0, - 2, 0, 0, 0, 8, 0, 0, 0, - 56, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 15, 15, 0, 0, - 56, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 3, 3, 0, 0, - 84, 69, 88, 67, 79, 79, 82, 68, - 0, 171, 171, 171, 79, 83, 71, 78, -116, 0, 0, 0, 4, 0, 0, 0, - 8, 0, 0, 0, 104, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 15, 0, 0, 0, 104, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, 0, 0, - 15, 0, 0, 0, 104, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 2, 0, 0, 0, - 15, 0, 0, 0, 104, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 3, 0, 0, 0, - 15, 0, 0, 0, 83, 86, 95, 84, - 97, 114, 103, 101, 116, 0, 171, 171, - 68, 88, 66, 67, 235, 56, 180, 223, -125, 231, 231, 218, 70, 75, 12, 63, -200, 233, 69, 121, 1, 0, 0, 0, - 4, 5, 0, 0, 6, 0, 0, 0, - 56, 0, 0, 0, 92, 1, 0, 0, -224, 2, 0, 0, 92, 3, 0, 0, - 48, 4, 0, 0, 148, 4, 0, 0, - 65, 111, 110, 57, 28, 1, 0, 0, - 28, 1, 0, 0, 0, 2, 254, 255, -232, 0, 0, 0, 52, 0, 0, 0, - 1, 0, 36, 0, 0, 0, 48, 0, - 0, 0, 48, 0, 0, 0, 36, 0, - 1, 0, 48, 0, 0, 0, 0, 0, - 4, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 2, 254, 255, - 81, 0, 0, 5, 5, 0, 15, 160, - 0, 0, 0, 63, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 31, 0, 0, 2, 5, 0, 0, 128, - 0, 0, 15, 144, 31, 0, 0, 2, - 5, 0, 1, 128, 1, 0, 15, 144, - 31, 0, 0, 2, 5, 0, 2, 128, - 2, 0, 15, 144, 9, 0, 0, 3, - 0, 0, 1, 128, 3, 0, 228, 160, - 1, 0, 228, 144, 9, 0, 0, 3, - 0, 0, 2, 128, 4, 0, 228, 160, - 1, 0, 228, 144, 2, 0, 0, 3, - 0, 0, 1, 128, 0, 0, 85, 128, - 0, 0, 0, 128, 5, 0, 0, 3, - 0, 0, 4, 192, 0, 0, 0, 128, - 5, 0, 0, 160, 9, 0, 0, 3, - 0, 0, 1, 128, 2, 0, 228, 160, - 1, 0, 228, 144, 1, 0, 0, 2, - 1, 0, 2, 128, 0, 0, 0, 129, - 9, 0, 0, 3, 1, 0, 1, 128, - 1, 0, 228, 160, 1, 0, 228, 144, - 4, 0, 0, 4, 0, 0, 3, 192, - 0, 0, 85, 128, 0, 0, 228, 160, - 1, 0, 228, 128, 1, 0, 0, 2, - 0, 0, 8, 192, 0, 0, 85, 128, - 1, 0, 0, 2, 0, 0, 15, 224, - 0, 0, 228, 144, 1, 0, 0, 2, - 1, 0, 3, 224, 2, 0, 228, 144, -255, 255, 0, 0, 83, 72, 68, 82, -124, 1, 0, 0, 64, 0, 1, 0, - 95, 0, 0, 0, 89, 0, 0, 4, - 70, 142, 32, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 95, 0, 0, 3, -242, 16, 16, 0, 0, 0, 0, 0, - 95, 0, 0, 3, 242, 16, 16, 0, - 1, 0, 0, 0, 95, 0, 0, 3, - 50, 16, 16, 0, 2, 0, 0, 0, -101, 0, 0, 3, 242, 32, 16, 0, - 0, 0, 0, 0, 101, 0, 0, 3, - 50, 32, 16, 0, 1, 0, 0, 0, -103, 0, 0, 4, 242, 32, 16, 0, - 2, 0, 0, 0, 1, 0, 0, 0, -104, 0, 0, 2, 1, 0, 0, 0, - 54, 0, 0, 5, 242, 32, 16, 0, - 0, 0, 0, 0, 70, 30, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, - 50, 32, 16, 0, 1, 0, 0, 0, - 70, 16, 16, 0, 2, 0, 0, 0, - 17, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 54, 0, 0, 6, 34, 32, 16, 0, - 2, 0, 0, 0, 10, 0, 16, 128, - 65, 0, 0, 0, 0, 0, 0, 0, - 17, 0, 0, 8, 18, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 2, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 17, 0, 0, 8, 34, 0, 16, 0, - 0, 0, 0, 0, 70, 142, 32, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 70, 30, 16, 0, 1, 0, 0, 0, - 0, 0, 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 26, 0, 16, 0, - 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 54, 0, 0, 5, -130, 32, 16, 0, 2, 0, 0, 0, - 26, 0, 16, 0, 0, 0, 0, 0, - 56, 0, 0, 7, 66, 32, 16, 0, - 2, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 1, 64, 0, 0, - 0, 0, 0, 63, 17, 0, 0, 8, - 18, 32, 16, 0, 2, 0, 0, 0, - 70, 142, 32, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 70, 30, 16, 0, - 1, 0, 0, 0, 62, 0, 0, 1, - 83, 84, 65, 84, 116, 0, 0, 0, - 11, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 6, 0, 0, 0, - 7, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 82, 68, 69, 70, -204, 0, 0, 0, 1, 0, 0, 0, - 72, 0, 0, 0, 1, 0, 0, 0, - 28, 0, 0, 0, 0, 4, 254, 255, - 0, 65, 0, 0, 152, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 36, 71, 108, 111, 98, 97, 108, 115, - 0, 171, 171, 171, 60, 0, 0, 0, - 1, 0, 0, 0, 96, 0, 0, 0, - 64, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 120, 0, 0, 0, - 0, 0, 0, 0, 64, 0, 0, 0, - 2, 0, 0, 0, 136, 0, 0, 0, - 0, 0, 0, 0, 95, 67, 67, 95, - 77, 86, 80, 77, 97, 116, 114, 105, -120, 0, 171, 171, 3, 0, 3, 0, - 4, 0, 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 77, 105, 99, 114, -111, 115, 111, 102, 116, 32, 40, 82, - 41, 32, 72, 76, 83, 76, 32, 83, -104, 97, 100, 101, 114, 32, 67, 111, -109, 112, 105, 108, 101, 114, 32, 54, - 46, 51, 46, 57, 54, 48, 48, 46, - 49, 54, 51, 56, 52, 0, 171, 171, - 73, 83, 71, 78, 92, 0, 0, 0, - 3, 0, 0, 0, 8, 0, 0, 0, - 80, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 15, 15, 0, 0, - 80, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 15, 15, 0, 0, - 80, 0, 0, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 2, 0, 0, 0, 3, 3, 0, 0, - 84, 69, 88, 67, 79, 79, 82, 68, - 0, 171, 171, 171, 79, 83, 71, 78, -104, 0, 0, 0, 3, 0, 0, 0, - 8, 0, 0, 0, 80, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 0, 0, - 15, 0, 0, 0, 80, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, 0, 0, - 3, 12, 0, 0, 89, 0, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, - 3, 0, 0, 0, 2, 0, 0, 0, - 15, 0, 0, 0, 84, 69, 88, 67, - 79, 79, 82, 68, 0, 83, 86, 95, - 80, 111, 115, 105, 116, 105, 111, 110, - 0, 171, 171, 171, -}; - -const unsigned char s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749[] = { - -166, 147, 0, 0, 142, 9, 2, 1, - 0, 128, 0, 0, 82, 139, 0, 0, + 0, 128, 0, 0, 81, 139, 0, 0, 10, 0, 0, 0, 97, 95, 112, 111, 115, 105, 116, 105, 111, 110, 2, 0, 0, 0, 82, 139, 0, 0, 12, 0, @@ -5869,8 +5037,8 @@ const unsigned char s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749[] = { 0, 0, 7, 0, 0, 0, 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 96, 4, 0, - 0, 120, 10, 0, 0, 0, 0, 0, - 0, 173, 144, 0, 0, 0, 0, 0, + 0, 148, 13, 0, 0, 0, 0, 0, + 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 157, 116, 105, 89, 118, 135, 249, 239, 42, 226, 184, @@ -6012,16 +5180,16 @@ const unsigned char s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749[] = { 0, 3, 0, 0, 0, 3, 0, 0, 0, 15, 0, 0, 0, 83, 86, 95, 84, 97, 114, 103, 101, 116, 0, 171, -171, 68, 88, 66, 67, 107, 238, 81, -172, 139, 110, 118, 99, 56, 54, 8, -248, 83, 176, 136, 78, 1, 0, 0, - 0, 120, 10, 0, 0, 6, 0, 0, - 0, 56, 0, 0, 0, 56, 3, 0, - 0, 24, 8, 0, 0, 148, 8, 0, - 0, 164, 9, 0, 0, 32, 10, 0, - 0, 65, 111, 110, 57, 248, 2, 0, - 0, 248, 2, 0, 0, 0, 2, 254, -255, 196, 2, 0, 0, 52, 0, 0, +171, 68, 88, 66, 67, 32, 233, 161, + 94, 234, 31, 215, 162, 44, 12, 38, +161, 61, 0, 59, 104, 1, 0, 0, + 0, 148, 13, 0, 0, 6, 0, 0, + 0, 56, 0, 0, 0, 204, 4, 0, + 0, 52, 11, 0, 0, 176, 11, 0, + 0, 192, 12, 0, 0, 60, 13, 0, + 0, 65, 111, 110, 57, 140, 4, 0, + 0, 140, 4, 0, 0, 0, 2, 254, +255, 88, 4, 0, 0, 52, 0, 0, 0, 1, 0, 36, 0, 0, 0, 48, 0, 0, 0, 48, 0, 0, 0, 36, 0, 1, 0, 48, 0, 0, 0, 0, @@ -6029,8 +5197,8 @@ const unsigned char s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749[] = { 0, 0, 0, 184, 0, 1, 2, 254, 255, 81, 0, 0, 5, 185, 0, 15, 160, 0, 0, 64, 64, 0, 0, 0, - 63, 0, 0, 0, 0, 0, 0, 0, - 0, 81, 0, 0, 5, 186, 0, 15, + 0, 0, 0, 128, 63, 0, 0, 0, + 63, 81, 0, 0, 5, 186, 0, 15, 160, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 2, 5, 0, 0, @@ -6039,97 +5207,330 @@ const unsigned char s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749[] = { 144, 31, 0, 0, 2, 5, 0, 2, 128, 2, 0, 15, 144, 31, 0, 0, 2, 5, 0, 3, 128, 3, 0, 15, -144, 12, 0, 0, 3, 0, 0, 15, -128, 0, 0, 228, 144, 0, 0, 228, -145, 19, 0, 0, 2, 1, 0, 15, -128, 0, 0, 228, 144, 2, 0, 0, - 3, 2, 0, 15, 128, 1, 0, 228, -129, 0, 0, 228, 144, 12, 0, 0, - 3, 1, 0, 15, 128, 1, 0, 228, -129, 1, 0, 228, 128, 4, 0, 0, - 4, 0, 0, 15, 128, 0, 0, 228, -128, 1, 0, 228, 128, 2, 0, 228, -128, 5, 0, 0, 3, 0, 0, 15, -128, 0, 0, 228, 128, 185, 0, 0, -160, 46, 0, 0, 2, 0, 0, 15, -176, 0, 0, 225, 128, 5, 0, 0, - 4, 1, 0, 15, 128, 1, 0, 85, +144, 19, 0, 0, 2, 0, 0, 1, +128, 0, 0, 0, 144, 2, 0, 0, + 3, 0, 0, 2, 128, 0, 0, 0, +129, 0, 0, 0, 144, 12, 0, 0, + 3, 0, 0, 4, 128, 0, 0, 0, +144, 0, 0, 0, 145, 12, 0, 0, + 3, 0, 0, 1, 128, 0, 0, 0, +129, 0, 0, 0, 128, 4, 0, 0, + 4, 0, 0, 1, 128, 0, 0, 170, +128, 0, 0, 0, 128, 0, 0, 85, +128, 5, 0, 0, 3, 0, 0, 1, +128, 0, 0, 0, 128, 185, 0, 0, +160, 46, 0, 0, 2, 0, 0, 1, +176, 0, 0, 0, 128, 5, 0, 0, + 4, 0, 0, 15, 128, 1, 0, 0, 144, 4, 32, 228, 160, 0, 0, 0, -176, 4, 0, 0, 5, 1, 0, 15, -128, 4, 32, 228, 160, 0, 0, 85, -176, 1, 0, 0, 144, 1, 0, 228, -128, 4, 0, 0, 5, 0, 0, 15, -128, 4, 32, 228, 160, 0, 0, 170, -176, 1, 0, 170, 144, 1, 0, 228, -128, 4, 0, 0, 5, 0, 0, 15, -128, 4, 32, 228, 160, 0, 0, 255, -176, 1, 0, 255, 144, 0, 0, 228, -128, 9, 0, 0, 3, 0, 0, 1, -128, 2, 0, 228, 144, 0, 0, 228, -128, 5, 0, 0, 4, 1, 0, 15, -128, 1, 0, 85, 144, 5, 32, 228, +176, 5, 0, 0, 4, 1, 0, 15, +128, 1, 0, 0, 144, 5, 32, 228, 160, 0, 0, 0, 176, 5, 0, 0, - 4, 2, 0, 15, 128, 1, 0, 85, + 4, 2, 0, 15, 128, 1, 0, 0, 144, 6, 32, 228, 160, 0, 0, 0, -176, 4, 0, 0, 5, 2, 0, 15, -128, 6, 32, 228, 160, 0, 0, 85, -176, 1, 0, 0, 144, 2, 0, 228, +176, 41, 0, 4, 2, 185, 0, 85, +160, 1, 0, 85, 144, 19, 0, 0, + 2, 3, 0, 1, 128, 0, 0, 85, +144, 2, 0, 0, 3, 3, 0, 2, +128, 3, 0, 0, 129, 0, 0, 85, +144, 12, 0, 0, 3, 3, 0, 4, +128, 0, 0, 85, 144, 0, 0, 85, +145, 12, 0, 0, 3, 3, 0, 1, +128, 3, 0, 0, 129, 3, 0, 0, +128, 4, 0, 0, 4, 3, 0, 1, +128, 3, 0, 170, 128, 3, 0, 0, +128, 3, 0, 85, 128, 5, 0, 0, + 3, 3, 0, 1, 128, 3, 0, 0, +128, 185, 0, 0, 160, 46, 0, 0, + 2, 0, 0, 1, 176, 3, 0, 0, +128, 4, 0, 0, 5, 0, 0, 15, +128, 4, 32, 228, 160, 0, 0, 0, +176, 1, 0, 85, 144, 0, 0, 228, 128, 4, 0, 0, 5, 1, 0, 15, -128, 5, 32, 228, 160, 0, 0, 85, -176, 1, 0, 0, 144, 1, 0, 228, +128, 5, 32, 228, 160, 0, 0, 0, +176, 1, 0, 85, 144, 1, 0, 228, +128, 4, 0, 0, 5, 2, 0, 15, +128, 6, 32, 228, 160, 0, 0, 0, +176, 1, 0, 85, 144, 2, 0, 228, +128, 42, 0, 0, 0, 43, 0, 0, + 0, 41, 0, 4, 2, 185, 0, 85, +160, 1, 0, 170, 144, 19, 0, 0, + 2, 3, 0, 1, 128, 0, 0, 170, +144, 2, 0, 0, 3, 3, 0, 2, +128, 3, 0, 0, 129, 0, 0, 170, +144, 12, 0, 0, 3, 3, 0, 4, +128, 0, 0, 170, 144, 0, 0, 170, +145, 12, 0, 0, 3, 3, 0, 1, +128, 3, 0, 0, 129, 3, 0, 0, +128, 4, 0, 0, 4, 3, 0, 1, +128, 3, 0, 170, 128, 3, 0, 0, +128, 3, 0, 85, 128, 5, 0, 0, + 3, 3, 0, 1, 128, 3, 0, 0, +128, 185, 0, 0, 160, 46, 0, 0, + 2, 0, 0, 1, 176, 3, 0, 0, +128, 4, 0, 0, 5, 0, 0, 15, +128, 4, 32, 228, 160, 0, 0, 0, +176, 1, 0, 170, 144, 0, 0, 228, 128, 4, 0, 0, 5, 1, 0, 15, -128, 5, 32, 228, 160, 0, 0, 170, +128, 5, 32, 228, 160, 0, 0, 0, 176, 1, 0, 170, 144, 1, 0, 228, 128, 4, 0, 0, 5, 2, 0, 15, -128, 6, 32, 228, 160, 0, 0, 170, +128, 6, 32, 228, 160, 0, 0, 0, 176, 1, 0, 170, 144, 2, 0, 228, -128, 4, 0, 0, 5, 2, 0, 15, -128, 6, 32, 228, 160, 0, 0, 255, -176, 1, 0, 255, 144, 2, 0, 228, +128, 42, 0, 0, 0, 43, 0, 0, + 0, 41, 0, 4, 2, 185, 0, 85, +160, 1, 0, 255, 144, 19, 0, 0, + 2, 3, 0, 1, 128, 0, 0, 255, +144, 2, 0, 0, 3, 3, 0, 2, +128, 3, 0, 0, 129, 0, 0, 255, +144, 12, 0, 0, 3, 3, 0, 4, +128, 0, 0, 255, 144, 0, 0, 255, +145, 12, 0, 0, 3, 3, 0, 1, +128, 3, 0, 0, 129, 3, 0, 0, +128, 4, 0, 0, 4, 3, 0, 1, +128, 3, 0, 170, 128, 3, 0, 0, +128, 3, 0, 85, 128, 5, 0, 0, + 3, 3, 0, 1, 128, 3, 0, 0, +128, 185, 0, 0, 160, 46, 0, 0, + 2, 0, 0, 1, 176, 3, 0, 0, +128, 4, 0, 0, 5, 0, 0, 15, +128, 4, 32, 228, 160, 0, 0, 0, +176, 1, 0, 255, 144, 0, 0, 228, 128, 4, 0, 0, 5, 1, 0, 15, -128, 5, 32, 228, 160, 0, 0, 255, +128, 5, 32, 228, 160, 0, 0, 0, 176, 1, 0, 255, 144, 1, 0, 228, -128, 9, 0, 0, 3, 0, 0, 2, -128, 2, 0, 228, 144, 1, 0, 228, -128, 9, 0, 0, 3, 0, 0, 4, -128, 2, 0, 228, 144, 2, 0, 228, -128, 1, 0, 0, 2, 0, 0, 8, -128, 2, 0, 255, 144, 9, 0, 0, - 3, 1, 0, 1, 128, 2, 0, 228, -160, 0, 0, 228, 128, 9, 0, 0, - 3, 1, 0, 2, 128, 3, 0, 228, -160, 0, 0, 228, 128, 2, 0, 0, - 3, 1, 0, 1, 128, 1, 0, 85, -128, 1, 0, 0, 128, 5, 0, 0, - 3, 0, 0, 4, 192, 1, 0, 0, -128, 185, 0, 85, 160, 9, 0, 0, - 3, 1, 0, 1, 128, 1, 0, 228, -160, 0, 0, 228, 128, 9, 0, 0, - 3, 0, 0, 1, 128, 0, 0, 228, -160, 0, 0, 228, 128, 1, 0, 0, - 2, 0, 0, 2, 128, 1, 0, 0, -129, 4, 0, 0, 4, 0, 0, 3, -192, 1, 0, 85, 128, 184, 0, 228, -160, 0, 0, 228, 128, 1, 0, 0, - 2, 0, 0, 8, 192, 1, 0, 85, +128, 4, 0, 0, 5, 2, 0, 15, +128, 6, 32, 228, 160, 0, 0, 0, +176, 1, 0, 255, 144, 2, 0, 228, +128, 42, 0, 0, 0, 43, 0, 0, + 0, 4, 0, 0, 4, 3, 0, 15, +128, 2, 0, 36, 144, 185, 0, 106, +160, 185, 0, 149, 160, 9, 0, 0, + 3, 0, 0, 1, 128, 3, 0, 228, +128, 0, 0, 228, 128, 9, 0, 0, + 3, 0, 0, 2, 128, 3, 0, 228, +128, 1, 0, 228, 128, 9, 0, 0, + 3, 0, 0, 4, 128, 3, 0, 228, +128, 2, 0, 228, 128, 1, 0, 0, + 2, 0, 0, 8, 128, 185, 0, 170, +160, 9, 0, 0, 3, 1, 0, 1, +128, 0, 0, 228, 160, 0, 0, 228, +128, 9, 0, 0, 3, 1, 0, 4, +128, 1, 0, 228, 160, 0, 0, 228, +128, 9, 0, 0, 3, 1, 0, 8, +128, 2, 0, 228, 160, 0, 0, 228, +128, 9, 0, 0, 3, 0, 0, 1, +128, 3, 0, 228, 160, 0, 0, 228, +128, 1, 0, 0, 2, 1, 0, 2, +128, 1, 0, 170, 129, 2, 0, 0, + 3, 0, 0, 2, 128, 0, 0, 0, +128, 1, 0, 255, 128, 5, 0, 0, + 3, 0, 0, 4, 192, 0, 0, 85, +128, 185, 0, 255, 160, 4, 0, 0, + 4, 0, 0, 3, 192, 0, 0, 0, +128, 184, 0, 228, 160, 1, 0, 228, 128, 4, 0, 0, 4, 0, 0, 3, 224, 3, 0, 228, 144, 186, 0, 228, -160, 186, 0, 226, 160, 255, 255, 0, - 0, 83, 72, 68, 82, 216, 4, 0, - 0, 64, 0, 1, 0, 54, 1, 0, - 0, 89, 8, 0, 4, 70, 142, 32, - 0, 0, 0, 0, 0, 184, 0, 0, +160, 186, 0, 226, 160, 1, 0, 0, + 2, 0, 0, 8, 192, 0, 0, 0, +128, 255, 255, 0, 0, 83, 72, 68, + 82, 96, 6, 0, 0, 64, 0, 1, + 0, 152, 1, 0, 0, 89, 8, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 184, 0, 0, 0, 95, 0, 0, + 3, 242, 16, 16, 0, 0, 0, 0, 0, 95, 0, 0, 3, 242, 16, 16, - 0, 0, 0, 0, 0, 95, 0, 0, - 3, 242, 16, 16, 0, 1, 0, 0, - 0, 95, 0, 0, 3, 242, 16, 16, - 0, 2, 0, 0, 0, 95, 0, 0, - 3, 50, 16, 16, 0, 3, 0, 0, - 0, 101, 0, 0, 3, 50, 32, 16, - 0, 0, 0, 0, 0, 103, 0, 0, - 4, 242, 32, 16, 0, 1, 0, 0, - 0, 1, 0, 0, 0, 104, 0, 0, - 2, 4, 0, 0, 0, 50, 0, 0, + 0, 1, 0, 0, 0, 95, 0, 0, + 3, 114, 16, 16, 0, 2, 0, 0, + 0, 95, 0, 0, 3, 50, 16, 16, + 0, 3, 0, 0, 0, 101, 0, 0, + 3, 50, 32, 16, 0, 0, 0, 0, + 0, 103, 0, 0, 4, 242, 32, 16, + 0, 1, 0, 0, 0, 1, 0, 0, + 0, 104, 0, 0, 2, 4, 0, 0, + 0, 27, 0, 0, 5, 18, 0, 16, + 0, 0, 0, 0, 0, 10, 16, 16, + 0, 0, 0, 0, 0, 38, 0, 0, + 8, 0, 208, 0, 0, 34, 0, 16, + 0, 0, 0, 0, 0, 10, 0, 16, + 0, 0, 0, 0, 0, 1, 64, 0, + 0, 3, 0, 0, 0, 56, 0, 0, + 10, 242, 0, 16, 0, 1, 0, 0, + 0, 6, 16, 16, 0, 1, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 4, 0, 0, 0, 26, 0, 16, + 0, 0, 0, 0, 0, 35, 0, 0, + 15, 50, 0, 16, 0, 0, 0, 0, + 0, 6, 0, 16, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 3, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 2, 64, 0, + 0, 1, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 56, 0, 0, 10, 242, 0, 16, + 0, 2, 0, 0, 0, 6, 16, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 4, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 56, 0, 0, 10, 242, 0, 16, + 0, 0, 0, 0, 0, 6, 16, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 4, 0, 0, + 0, 26, 0, 16, 0, 0, 0, 0, + 0, 49, 0, 0, 10, 114, 0, 16, + 0, 3, 0, 0, 0, 2, 64, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 150, 23, 16, 0, 1, 0, 0, + 0, 31, 0, 4, 3, 10, 0, 16, + 0, 3, 0, 0, 0, 27, 0, 0, + 5, 18, 0, 16, 0, 3, 0, 0, + 0, 26, 16, 16, 0, 0, 0, 0, + 0, 38, 0, 0, 8, 0, 208, 0, + 0, 130, 0, 16, 0, 3, 0, 0, + 0, 10, 0, 16, 0, 3, 0, 0, + 0, 1, 64, 0, 0, 3, 0, 0, + 0, 50, 0, 0, 12, 242, 0, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 4, 0, 0, + 0, 58, 0, 16, 0, 3, 0, 0, + 0, 86, 21, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 35, 0, 0, 15, 146, 0, 16, + 0, 3, 0, 0, 0, 6, 0, 16, + 0, 3, 0, 0, 0, 2, 64, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 2, 64, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 2, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 4, 0, 0, 0, 10, 0, 16, + 0, 3, 0, 0, 0, 86, 21, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 2, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 4, 0, 0, 0, 58, 0, 16, + 0, 3, 0, 0, 0, 86, 21, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 21, 0, 0, + 1, 31, 0, 4, 3, 26, 0, 16, + 0, 3, 0, 0, 0, 27, 0, 0, + 5, 18, 0, 16, 0, 3, 0, 0, + 0, 42, 16, 16, 0, 0, 0, 0, + 0, 38, 0, 0, 8, 0, 208, 0, + 0, 34, 0, 16, 0, 3, 0, 0, + 0, 10, 0, 16, 0, 3, 0, 0, + 0, 1, 64, 0, 0, 3, 0, 0, + 0, 50, 0, 0, 12, 242, 0, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 4, 0, 0, + 0, 26, 0, 16, 0, 3, 0, 0, + 0, 166, 26, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 35, 0, 0, 15, 50, 0, 16, + 0, 3, 0, 0, 0, 6, 0, 16, + 0, 3, 0, 0, 0, 2, 64, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 1, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 2, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 4, 0, 0, 0, 10, 0, 16, + 0, 3, 0, 0, 0, 166, 26, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 2, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 4, 0, 0, 0, 26, 0, 16, + 0, 3, 0, 0, 0, 166, 26, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 21, 0, 0, + 1, 31, 0, 4, 3, 42, 0, 16, + 0, 3, 0, 0, 0, 27, 0, 0, + 5, 18, 0, 16, 0, 3, 0, 0, + 0, 58, 16, 16, 0, 0, 0, 0, + 0, 38, 0, 0, 8, 0, 208, 0, + 0, 34, 0, 16, 0, 3, 0, 0, + 0, 10, 0, 16, 0, 3, 0, 0, + 0, 1, 64, 0, 0, 3, 0, 0, + 0, 50, 0, 0, 12, 242, 0, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 6, 0, 0, 0, 0, 4, 0, 0, + 0, 26, 0, 16, 0, 3, 0, 0, + 0, 246, 31, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 35, 0, 0, 15, 50, 0, 16, + 0, 3, 0, 0, 0, 6, 0, 16, + 0, 3, 0, 0, 0, 2, 64, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 1, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 2, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 4, 0, 0, 0, 10, 0, 16, + 0, 3, 0, 0, 0, 246, 31, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 2, 0, 0, 0, 50, 0, 0, + 12, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 6, 0, 0, 0, + 0, 4, 0, 0, 0, 26, 0, 16, + 0, 3, 0, 0, 0, 246, 31, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 21, 0, 0, + 1, 54, 0, 0, 5, 114, 0, 16, + 0, 3, 0, 0, 0, 70, 18, 16, + 0, 2, 0, 0, 0, 54, 0, 0, + 5, 130, 0, 16, 0, 3, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 128, + 63, 17, 0, 0, 7, 18, 0, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 3, 0, 0, 0, 70, 14, 16, + 0, 1, 0, 0, 0, 17, 0, 0, + 7, 34, 0, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 3, 0, 0, + 0, 70, 14, 16, 0, 2, 0, 0, + 0, 17, 0, 0, 7, 66, 0, 16, + 0, 1, 0, 0, 0, 70, 14, 16, + 0, 3, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 5, 130, 0, 16, 0, 1, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 128, + 63, 17, 0, 0, 8, 18, 32, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 17, 0, 0, 8, 18, 0, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 17, 0, 0, 8, 34, 0, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 2, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 17, 0, 0, 8, 66, 0, 16, + 0, 0, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 70, 14, 16, 0, 1, 0, 0, + 0, 54, 0, 0, 6, 34, 32, 16, + 0, 1, 0, 0, 0, 10, 0, 16, +128, 65, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 18, 0, 16, + 0, 0, 0, 0, 0, 42, 0, 16, + 0, 0, 0, 0, 0, 26, 0, 16, + 0, 0, 0, 0, 0, 56, 0, 0, + 7, 66, 32, 16, 0, 1, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 63, 54, 0, 0, 5, 130, 32, 16, + 0, 1, 0, 0, 0, 42, 0, 16, + 0, 0, 0, 0, 0, 50, 0, 0, 15, 50, 32, 16, 0, 0, 0, 0, 0, 70, 16, 16, 0, 3, 0, 0, 0, 2, 64, 0, 0, 0, 0, 128, @@ -6137,183 +5538,438 @@ const unsigned char s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749[] = { 0, 0, 0, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 0, - 0, 27, 0, 0, 5, 242, 0, 16, - 0, 0, 0, 0, 0, 70, 30, 16, - 0, 0, 0, 0, 0, 38, 0, 0, - 11, 0, 208, 0, 0, 242, 0, 16, - 0, 1, 0, 0, 0, 70, 14, 16, - 0, 0, 0, 0, 0, 2, 64, 0, - 0, 3, 0, 0, 0, 3, 0, 0, - 0, 3, 0, 0, 0, 3, 0, 0, - 0, 56, 0, 0, 10, 242, 0, 16, - 0, 2, 0, 0, 0, 86, 21, 16, - 0, 1, 0, 0, 0, 70, 142, 32, - 6, 0, 0, 0, 0, 4, 0, 0, - 0, 26, 0, 16, 0, 1, 0, 0, - 0, 50, 0, 0, 12, 242, 0, 16, - 0, 2, 0, 0, 0, 70, 142, 32, - 6, 0, 0, 0, 0, 4, 0, 0, - 0, 10, 0, 16, 0, 1, 0, 0, - 0, 6, 16, 16, 0, 1, 0, 0, - 0, 70, 14, 16, 0, 2, 0, 0, - 0, 50, 0, 0, 12, 242, 0, 16, - 0, 2, 0, 0, 0, 70, 142, 32, - 6, 0, 0, 0, 0, 4, 0, 0, - 0, 42, 0, 16, 0, 1, 0, 0, - 0, 166, 26, 16, 0, 1, 0, 0, - 0, 70, 14, 16, 0, 2, 0, 0, - 0, 50, 0, 0, 12, 242, 0, 16, - 0, 1, 0, 0, 0, 70, 142, 32, - 6, 0, 0, 0, 0, 4, 0, 0, - 0, 58, 0, 16, 0, 1, 0, 0, - 0, 246, 31, 16, 0, 1, 0, 0, - 0, 70, 14, 16, 0, 2, 0, 0, - 0, 17, 0, 0, 7, 18, 0, 16, - 0, 1, 0, 0, 0, 70, 30, 16, - 0, 2, 0, 0, 0, 70, 14, 16, - 0, 1, 0, 0, 0, 35, 0, 0, - 15, 242, 0, 16, 0, 2, 0, 0, - 0, 6, 5, 16, 0, 0, 0, 0, - 0, 2, 64, 0, 0, 3, 0, 0, - 0, 3, 0, 0, 0, 3, 0, 0, - 0, 3, 0, 0, 0, 2, 64, 0, - 0, 1, 0, 0, 0, 2, 0, 0, - 0, 1, 0, 0, 0, 2, 0, 0, - 0, 35, 0, 0, 15, 242, 0, 16, - 0, 0, 0, 0, 0, 166, 15, 16, - 0, 0, 0, 0, 0, 2, 64, 0, - 0, 3, 0, 0, 0, 3, 0, 0, - 0, 3, 0, 0, 0, 3, 0, 0, - 0, 2, 64, 0, 0, 1, 0, 0, - 0, 2, 0, 0, 0, 1, 0, 0, - 0, 2, 0, 0, 0, 56, 0, 0, - 10, 242, 0, 16, 0, 3, 0, 0, - 0, 86, 21, 16, 0, 1, 0, 0, - 0, 70, 142, 32, 6, 0, 0, 0, - 0, 4, 0, 0, 0, 42, 0, 16, - 0, 2, 0, 0, 0, 50, 0, 0, - 12, 242, 0, 16, 0, 3, 0, 0, - 0, 70, 142, 32, 6, 0, 0, 0, - 0, 4, 0, 0, 0, 10, 0, 16, - 0, 2, 0, 0, 0, 6, 16, 16, - 0, 1, 0, 0, 0, 70, 14, 16, - 0, 3, 0, 0, 0, 50, 0, 0, - 12, 242, 0, 16, 0, 3, 0, 0, - 0, 70, 142, 32, 6, 0, 0, 0, - 0, 4, 0, 0, 0, 10, 0, 16, - 0, 0, 0, 0, 0, 166, 26, 16, - 0, 1, 0, 0, 0, 70, 14, 16, - 0, 3, 0, 0, 0, 50, 0, 0, - 12, 242, 0, 16, 0, 3, 0, 0, - 0, 70, 142, 32, 6, 0, 0, 0, - 0, 4, 0, 0, 0, 42, 0, 16, - 0, 0, 0, 0, 0, 246, 31, 16, - 0, 1, 0, 0, 0, 70, 14, 16, - 0, 3, 0, 0, 0, 17, 0, 0, - 7, 34, 0, 16, 0, 1, 0, 0, - 0, 70, 30, 16, 0, 2, 0, 0, - 0, 70, 14, 16, 0, 3, 0, 0, - 0, 56, 0, 0, 10, 242, 0, 16, - 0, 3, 0, 0, 0, 86, 21, 16, - 0, 1, 0, 0, 0, 70, 142, 32, - 6, 0, 0, 0, 0, 4, 0, 0, - 0, 58, 0, 16, 0, 2, 0, 0, - 0, 50, 0, 0, 12, 242, 0, 16, - 0, 2, 0, 0, 0, 70, 142, 32, - 6, 0, 0, 0, 0, 4, 0, 0, - 0, 26, 0, 16, 0, 2, 0, 0, - 0, 6, 16, 16, 0, 1, 0, 0, - 0, 70, 14, 16, 0, 3, 0, 0, - 0, 50, 0, 0, 12, 242, 0, 16, - 0, 2, 0, 0, 0, 70, 142, 32, - 6, 0, 0, 0, 0, 4, 0, 0, - 0, 26, 0, 16, 0, 0, 0, 0, - 0, 166, 26, 16, 0, 1, 0, 0, - 0, 70, 14, 16, 0, 2, 0, 0, - 0, 50, 0, 0, 12, 242, 0, 16, - 0, 0, 0, 0, 0, 70, 142, 32, - 6, 0, 0, 0, 0, 4, 0, 0, - 0, 58, 0, 16, 0, 0, 0, 0, - 0, 246, 31, 16, 0, 1, 0, 0, - 0, 70, 14, 16, 0, 2, 0, 0, - 0, 17, 0, 0, 7, 66, 0, 16, - 0, 1, 0, 0, 0, 70, 30, 16, - 0, 2, 0, 0, 0, 70, 14, 16, - 0, 0, 0, 0, 0, 54, 0, 0, - 5, 130, 0, 16, 0, 1, 0, 0, - 0, 58, 16, 16, 0, 2, 0, 0, - 0, 17, 0, 0, 8, 18, 0, 16, - 0, 0, 0, 0, 0, 70, 142, 32, - 0, 0, 0, 0, 0, 2, 0, 0, - 0, 70, 14, 16, 0, 1, 0, 0, - 0, 17, 0, 0, 8, 34, 0, 16, - 0, 0, 0, 0, 0, 70, 142, 32, + 0, 62, 0, 0, 1, 83, 84, 65, + 84, 116, 0, 0, 0, 47, 0, 0, + 0, 4, 0, 0, 0, 0, 0, 0, + 0, 6, 0, 0, 0, 24, 0, 0, + 0, 8, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 82, 68, 69, 70, 8, 1, 0, + 0, 1, 0, 0, 0, 72, 0, 0, + 0, 1, 0, 0, 0, 28, 0, 0, + 0, 0, 4, 254, 255, 0, 65, 0, + 0, 212, 0, 0, 0, 60, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 36, 71, 108, +111, 98, 97, 108, 115, 0, 171, 171, +171, 60, 0, 0, 0, 2, 0, 0, + 0, 96, 0, 0, 0, 128, 11, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 144, 0, 0, 0, 0, 0, 0, + 0, 64, 0, 0, 0, 2, 0, 0, + 0, 160, 0, 0, 0, 0, 0, 0, + 0, 176, 0, 0, 0, 64, 0, 0, + 0, 64, 11, 0, 0, 2, 0, 0, + 0, 196, 0, 0, 0, 0, 0, 0, + 0, 95, 67, 67, 95, 77, 86, 80, + 77, 97, 116, 114, 105, 120, 0, 171, +171, 3, 0, 3, 0, 4, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 109, 97, 116, 114, +105, 120, 80, 97, 108, 101, 116, 116, +101, 0, 171, 171, 171, 1, 0, 3, + 0, 1, 0, 4, 0, 180, 0, 0, + 0, 0, 0, 0, 0, 77, 105, 99, +114, 111, 115, 111, 102, 116, 32, 40, + 82, 41, 32, 72, 76, 83, 76, 32, + 83, 104, 97, 100, 101, 114, 32, 67, +111, 109, 112, 105, 108, 101, 114, 32, + 54, 46, 51, 46, 57, 54, 48, 48, + 46, 49, 54, 51, 56, 52, 0, 171, +171, 73, 83, 71, 78, 116, 0, 0, + 0, 4, 0, 0, 0, 8, 0, 0, + 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, - 0, 70, 14, 16, 0, 1, 0, 0, - 0, 0, 0, 0, 7, 18, 0, 16, - 0, 0, 0, 0, 0, 26, 0, 16, - 0, 0, 0, 0, 0, 10, 0, 16, - 0, 0, 0, 0, 0, 54, 0, 0, - 5, 130, 32, 16, 0, 1, 0, 0, - 0, 26, 0, 16, 0, 0, 0, 0, - 0, 56, 0, 0, 7, 66, 32, 16, - 0, 1, 0, 0, 0, 10, 0, 16, - 0, 0, 0, 0, 0, 1, 64, 0, - 0, 0, 0, 0, 63, 17, 0, 0, - 8, 18, 0, 16, 0, 0, 0, 0, - 0, 70, 142, 32, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 70, 14, 16, - 0, 1, 0, 0, 0, 17, 0, 0, - 8, 18, 32, 16, 0, 1, 0, 0, - 0, 70, 142, 32, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 15, 15, 0, + 0, 104, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 1, 0, 0, 0, 15, 15, 0, + 0, 104, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 2, 0, 0, 0, 7, 7, 0, + 0, 104, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 3, 0, 0, 0, 3, 3, 0, + 0, 84, 69, 88, 67, 79, 79, 82, + 68, 0, 171, 171, 171, 79, 83, 71, + 78, 80, 0, 0, 0, 2, 0, 0, + 0, 8, 0, 0, 0, 56, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 3, 12, 0, 0, 65, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 3, 0, 0, 0, 1, 0, 0, + 0, 15, 0, 0, 0, 84, 69, 88, + 67, 79, 79, 82, 68, 0, 83, 86, + 95, 80, 111, 115, 105, 116, 105, 111, +110, 0, 171, 171, 171, +}; + +const unsigned char s_A2377A827972A5466DA8637681045D32DA8A817D[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, 80, 139, + 0, 0, 10, 0, 0, 0, 97, 95, +116, 101, 120, 67, 111, 111, 114, 100, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 3, 0, 0, 0, 92, 139, 0, + 0, 242, 141, 0, 0, 12, 0, 0, + 0, 67, 67, 95, 77, 86, 80, 77, + 97, 116, 114, 105, 120, 0, 0, 0, + 0, 255, 255, 255, 255, 0, 0, 0, + 0, 4, 0, 0, 0, 94, 139, 0, + 0, 0, 0, 0, 0, 11, 0, 0, + 0, 67, 67, 95, 84, 101, 120, 116, +117, 114, 101, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 255, 255, 255, 255, + 1, 0, 0, 0, 82, 139, 0, 0, +240, 141, 0, 0, 7, 0, 0, 0, +117, 95, 99, 111, 108, 111, 114, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 1, 0, 0, 0, 3, + 0, 0, 0, 12, 0, 0, 0, 67, + 67, 95, 77, 86, 80, 77, 97, 116, +114, 105, 120, 0, 0, 0, 0, 0, + 0, 0, 0, 11, 0, 0, 0, 67, + 67, 95, 84, 101, 120, 116, 117, 114, +101, 48, 0, 0, 0, 0, 1, 0, + 0, 0, 7, 0, 0, 0, 117, 95, + 99, 111, 108, 111, 114, 0, 0, 0, + 0, 2, 0, 0, 0, 96, 4, 0, + 0, 144, 4, 0, 0, 0, 0, 0, + 0, 212, 133, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 68, 88, 66, 67, 157, 116, 105, + 89, 118, 135, 249, 239, 42, 226, 184, + 78, 220, 105, 236, 28, 1, 0, 0, + 0, 96, 4, 0, 0, 6, 0, 0, + 0, 56, 0, 0, 0, 228, 0, 0, + 0, 252, 1, 0, 0, 120, 2, 0, + 0, 176, 3, 0, 0, 228, 3, 0, + 0, 65, 111, 110, 57, 164, 0, 0, + 0, 164, 0, 0, 0, 0, 2, 255, +255, 112, 0, 0, 0, 52, 0, 0, + 0, 1, 0, 40, 0, 0, 0, 52, + 0, 0, 0, 52, 0, 1, 0, 36, + 0, 0, 0, 52, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 1, 2, 255, +255, 31, 0, 0, 2, 0, 0, 0, +128, 0, 0, 3, 176, 31, 0, 0, + 2, 0, 0, 0, 144, 0, 8, 15, +160, 66, 0, 0, 3, 0, 0, 15, +128, 0, 0, 228, 176, 0, 8, 228, +160, 5, 0, 0, 3, 0, 0, 15, +128, 0, 0, 228, 128, 0, 0, 228, +160, 1, 0, 0, 2, 0, 8, 15, +128, 0, 0, 228, 128, 1, 0, 0, + 2, 1, 8, 15, 128, 0, 0, 228, +128, 1, 0, 0, 2, 2, 8, 15, +128, 0, 0, 228, 128, 1, 0, 0, + 2, 3, 8, 15, 128, 0, 0, 228, +128, 255, 255, 0, 0, 83, 72, 68, + 82, 16, 1, 0, 0, 64, 0, 0, + 0, 68, 0, 0, 0, 89, 0, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 90, 0, 0, + 3, 0, 96, 16, 0, 0, 0, 0, + 0, 88, 24, 0, 4, 0, 112, 16, + 0, 0, 0, 0, 0, 85, 85, 0, + 0, 98, 16, 0, 3, 50, 16, 16, + 0, 0, 0, 0, 0, 101, 0, 0, + 3, 242, 32, 16, 0, 0, 0, 0, + 0, 101, 0, 0, 3, 242, 32, 16, + 0, 1, 0, 0, 0, 101, 0, 0, + 3, 242, 32, 16, 0, 2, 0, 0, + 0, 101, 0, 0, 3, 242, 32, 16, + 0, 3, 0, 0, 0, 104, 0, 0, + 2, 1, 0, 0, 0, 69, 0, 0, + 9, 242, 0, 16, 0, 0, 0, 0, + 0, 70, 16, 16, 0, 0, 0, 0, + 0, 70, 126, 16, 0, 0, 0, 0, + 0, 0, 96, 16, 0, 0, 0, 0, + 0, 56, 0, 0, 8, 242, 0, 16, 0, 0, 0, 0, 0, 70, 14, 16, - 0, 1, 0, 0, 0, 54, 0, 0, - 6, 34, 32, 16, 0, 1, 0, 0, - 0, 10, 0, 16, 128, 65, 0, 0, - 0, 0, 0, 0, 0, 62, 0, 0, - 1, 83, 84, 65, 84, 116, 0, 0, - 0, 30, 0, 0, 0, 4, 0, 0, - 0, 0, 0, 0, 0, 6, 0, 0, - 0, 23, 0, 0, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 82, 68, 69, - 70, 8, 1, 0, 0, 1, 0, 0, - 0, 72, 0, 0, 0, 1, 0, 0, - 0, 28, 0, 0, 0, 0, 4, 254, -255, 0, 65, 0, 0, 212, 0, 0, - 0, 60, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 70, 142, 32, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 242, 32, 16, + 0, 0, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 5, 242, 32, 16, 0, 1, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 242, 32, 16, + 0, 2, 0, 0, 0, 70, 14, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 5, 242, 32, 16, 0, 3, 0, 0, + 0, 70, 14, 16, 0, 0, 0, 0, + 0, 62, 0, 0, 1, 83, 84, 65, + 84, 116, 0, 0, 0, 7, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 5, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, - 0, 36, 71, 108, 111, 98, 97, 108, -115, 0, 171, 171, 171, 60, 0, 0, - 0, 2, 0, 0, 0, 96, 0, 0, - 0, 128, 11, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 144, 0, 0, - 0, 0, 0, 0, 0, 64, 0, 0, - 0, 2, 0, 0, 0, 160, 0, 0, - 0, 0, 0, 0, 0, 176, 0, 0, - 0, 64, 0, 0, 0, 64, 11, 0, - 0, 2, 0, 0, 0, 196, 0, 0, - 0, 0, 0, 0, 0, 95, 67, 67, - 95, 77, 86, 80, 77, 97, 116, 114, -105, 120, 0, 171, 171, 3, 0, 3, - 0, 4, 0, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 95, 117, 95, -109, 97, 116, 114, 105, 120, 80, 97, -108, 101, 116, 116, 101, 0, 171, 171, -171, 1, 0, 3, 0, 1, 0, 4, - 0, 180, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 82, 68, 69, 70, 48, 1, 0, + 0, 1, 0, 0, 0, 176, 0, 0, + 0, 3, 0, 0, 0, 28, 0, 0, + 0, 0, 4, 255, 255, 0, 65, 0, + 0, 252, 0, 0, 0, 124, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 1, 0, 0, 0, 145, 0, 0, + 0, 2, 0, 0, 0, 5, 0, 0, + 0, 4, 0, 0, 0, 255, 255, 255, +255, 0, 0, 0, 0, 1, 0, 0, + 0, 13, 0, 0, 0, 166, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 115, 97, 109, +112, 108, 101, 114, 95, 95, 67, 67, + 95, 84, 101, 120, 116, 117, 114, 101, + 48, 0, 116, 101, 120, 116, 117, 114, +101, 95, 95, 67, 67, 95, 84, 101, +120, 116, 117, 114, 101, 48, 0, 36, + 71, 108, 111, 98, 97, 108, 115, 0, +171, 166, 0, 0, 0, 1, 0, 0, + 0, 200, 0, 0, 0, 16, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 224, 0, 0, 0, 0, 0, 0, + 0, 16, 0, 0, 0, 2, 0, 0, + 0, 236, 0, 0, 0, 0, 0, 0, + 0, 95, 117, 95, 99, 111, 108, 111, +114, 0, 171, 171, 171, 1, 0, 3, + 0, 1, 0, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 77, 105, 99, +114, 111, 115, 111, 102, 116, 32, 40, + 82, 41, 32, 72, 76, 83, 76, 32, + 83, 104, 97, 100, 101, 114, 32, 67, +111, 109, 112, 105, 108, 101, 114, 32, + 54, 46, 51, 46, 57, 54, 48, 48, + 46, 49, 54, 51, 56, 52, 0, 171, +171, 73, 83, 71, 78, 44, 0, 0, + 0, 1, 0, 0, 0, 8, 0, 0, + 0, 32, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 3, 3, 0, + 0, 84, 69, 88, 67, 79, 79, 82, + 68, 0, 171, 171, 171, 79, 83, 71, + 78, 116, 0, 0, 0, 4, 0, 0, + 0, 8, 0, 0, 0, 104, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 15, 0, 0, 0, 104, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 1, 0, 0, + 0, 15, 0, 0, 0, 104, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 2, 0, 0, + 0, 15, 0, 0, 0, 104, 0, 0, + 0, 3, 0, 0, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 3, 0, 0, + 0, 15, 0, 0, 0, 83, 86, 95, + 84, 97, 114, 103, 101, 116, 0, 171, +171, 68, 88, 66, 67, 110, 14, 140, +120, 239, 110, 56, 78, 103, 37, 245, +162, 140, 151, 93, 223, 1, 0, 0, + 0, 144, 4, 0, 0, 6, 0, 0, + 0, 56, 0, 0, 0, 68, 1, 0, + 0, 156, 2, 0, 0, 24, 3, 0, + 0, 236, 3, 0, 0, 56, 4, 0, + 0, 65, 111, 110, 57, 4, 1, 0, + 0, 4, 1, 0, 0, 0, 2, 254, +255, 208, 0, 0, 0, 52, 0, 0, + 0, 1, 0, 36, 0, 0, 0, 48, + 0, 0, 0, 48, 0, 0, 0, 36, + 0, 1, 0, 48, 0, 0, 0, 0, + 0, 4, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 2, 254, +255, 81, 0, 0, 5, 5, 0, 15, +160, 0, 0, 0, 63, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 31, 0, 0, 2, 5, 0, 0, +128, 0, 0, 15, 144, 31, 0, 0, + 2, 5, 0, 1, 128, 1, 0, 15, +144, 9, 0, 0, 3, 0, 0, 1, +128, 3, 0, 228, 160, 0, 0, 228, +144, 9, 0, 0, 3, 0, 0, 2, +128, 4, 0, 228, 160, 0, 0, 228, +144, 2, 0, 0, 3, 0, 0, 1, +128, 0, 0, 85, 128, 0, 0, 0, +128, 5, 0, 0, 3, 0, 0, 4, +192, 0, 0, 0, 128, 5, 0, 0, +160, 9, 0, 0, 3, 0, 0, 1, +128, 2, 0, 228, 160, 0, 0, 228, +144, 1, 0, 0, 2, 1, 0, 2, +128, 0, 0, 0, 129, 9, 0, 0, + 3, 1, 0, 1, 128, 1, 0, 228, +160, 0, 0, 228, 144, 4, 0, 0, + 4, 0, 0, 3, 192, 0, 0, 85, +128, 0, 0, 228, 160, 1, 0, 228, +128, 1, 0, 0, 2, 0, 0, 8, +192, 0, 0, 85, 128, 1, 0, 0, + 2, 0, 0, 3, 224, 1, 0, 228, +144, 255, 255, 0, 0, 83, 72, 68, + 82, 80, 1, 0, 0, 64, 0, 1, + 0, 84, 0, 0, 0, 89, 0, 0, + 4, 70, 142, 32, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 95, 0, 0, + 3, 242, 16, 16, 0, 0, 0, 0, + 0, 95, 0, 0, 3, 50, 16, 16, + 0, 1, 0, 0, 0, 101, 0, 0, + 3, 50, 32, 16, 0, 0, 0, 0, + 0, 103, 0, 0, 4, 242, 32, 16, + 0, 1, 0, 0, 0, 1, 0, 0, + 0, 104, 0, 0, 2, 1, 0, 0, + 0, 54, 0, 0, 5, 50, 32, 16, + 0, 0, 0, 0, 0, 70, 16, 16, + 0, 1, 0, 0, 0, 17, 0, 0, + 8, 18, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 70, 30, 16, + 0, 0, 0, 0, 0, 54, 0, 0, + 6, 34, 32, 16, 0, 1, 0, 0, + 0, 10, 0, 16, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 17, 0, 0, + 8, 18, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 70, 30, 16, + 0, 0, 0, 0, 0, 17, 0, 0, + 8, 34, 0, 16, 0, 0, 0, 0, + 0, 70, 142, 32, 0, 0, 0, 0, + 0, 3, 0, 0, 0, 70, 30, 16, + 0, 0, 0, 0, 0, 0, 0, 0, + 7, 18, 0, 16, 0, 0, 0, 0, + 0, 26, 0, 16, 0, 0, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 54, 0, 0, 5, 130, 32, 16, + 0, 1, 0, 0, 0, 26, 0, 16, + 0, 0, 0, 0, 0, 56, 0, 0, + 7, 66, 32, 16, 0, 1, 0, 0, + 0, 10, 0, 16, 0, 0, 0, 0, + 0, 1, 64, 0, 0, 0, 0, 0, + 63, 17, 0, 0, 8, 18, 32, 16, + 0, 1, 0, 0, 0, 70, 142, 32, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 30, 16, 0, 0, 0, 0, + 0, 62, 0, 0, 1, 83, 84, 65, + 84, 116, 0, 0, 0, 10, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 82, 68, 69, 70, 204, 0, 0, + 0, 1, 0, 0, 0, 72, 0, 0, + 0, 1, 0, 0, 0, 28, 0, 0, + 0, 0, 4, 254, 255, 0, 65, 0, + 0, 152, 0, 0, 0, 60, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 36, 71, 108, +111, 98, 97, 108, 115, 0, 171, 171, +171, 60, 0, 0, 0, 1, 0, 0, + 0, 96, 0, 0, 0, 64, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 120, 0, 0, 0, 0, 0, 0, + 0, 64, 0, 0, 0, 2, 0, 0, + 0, 136, 0, 0, 0, 0, 0, 0, + 0, 95, 67, 67, 95, 77, 86, 80, + 77, 97, 116, 114, 105, 120, 0, 171, +171, 3, 0, 3, 0, 4, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, 105, 99, 114, 111, 115, 111, 102, 116, 32, 40, 82, 41, 32, 72, 76, 83, 76, 32, 83, 104, 97, 100, @@ -6321,19 +5977,13 @@ const unsigned char s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749[] = { 108, 101, 114, 32, 54, 46, 51, 46, 57, 54, 48, 48, 46, 49, 54, 51, 56, 52, 0, 171, 171, 73, 83, 71, - 78, 116, 0, 0, 0, 4, 0, 0, - 0, 8, 0, 0, 0, 104, 0, 0, + 78, 68, 0, 0, 0, 2, 0, 0, + 0, 8, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, - 0, 15, 15, 0, 0, 104, 0, 0, + 0, 15, 15, 0, 0, 56, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, - 0, 15, 15, 0, 0, 104, 0, 0, - 0, 2, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 2, 0, 0, - 0, 15, 15, 0, 0, 104, 0, 0, - 0, 3, 0, 0, 0, 0, 0, 0, - 0, 3, 0, 0, 0, 3, 0, 0, 0, 3, 3, 0, 0, 84, 69, 88, 67, 79, 79, 82, 68, 0, 171, 171, 171, 79, 83, 71, 78, 80, 0, 0, @@ -6350,6 +6000,455 @@ const unsigned char s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749[] = { 171, }; +const unsigned char s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86[] = { + +166, 147, 0, 0, 142, 9, 2, 1, + 0, 128, 0, 0, 82, 139, 0, 0, + 10, 0, 0, 0, 97, 95, 112, 111, +115, 105, 116, 105, 111, 110, 1, 0, + 0, 0, 82, 139, 0, 0, 7, 0, + 0, 0, 97, 95, 99, 111, 108, 111, +114, 0, 0, 0, 0, 80, 139, 0, + 0, 10, 0, 0, 0, 97, 95, 116, +101, 120, 67, 111, 111, 114, 100, 2, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 0, + 0, 0, 0, 0, 0, 0, 0, 255, +255, 255, 255, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, + 3, 0, 0, 0, 92, 139, 0, 0, +242, 141, 0, 0, 12, 0, 0, 0, + 67, 67, 95, 77, 86, 80, 77, 97, +116, 114, 105, 120, 0, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 4, 0, 0, 0, 94, 139, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 0, + 67, 67, 95, 84, 101, 120, 116, 117, +114, 101, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 255, 255, 255, 255, 1, + 0, 0, 0, 82, 139, 0, 0, 240, +141, 0, 0, 11, 0, 0, 0, 117, + 95, 116, 101, 120, 116, 67, 111, 108, +111, 114, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 255, 255, 1, 0, + 0, 0, 3, 0, 0, 0, 12, 0, + 0, 0, 67, 67, 95, 77, 86, 80, + 77, 97, 116, 114, 105, 120, 0, 0, + 0, 0, 0, 0, 0, 0, 11, 0, + 0, 0, 67, 67, 95, 84, 101, 120, +116, 117, 114, 101, 48, 0, 0, 0, + 0, 1, 0, 0, 0, 11, 0, 0, + 0, 117, 95, 116, 101, 120, 116, 67, +111, 108, 111, 114, 0, 0, 0, 0, + 2, 0, 0, 0, 240, 5, 0, 0, + 4, 5, 0, 0, 0, 0, 0, 0, +212, 133, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 68, 88, 66, 67, 223, 173, 203, 80, +172, 13, 170, 215, 168, 128, 228, 5, + 62, 250, 21, 248, 1, 0, 0, 0, +240, 5, 0, 0, 6, 0, 0, 0, + 56, 0, 0, 0, 124, 1, 0, 0, +112, 3, 0, 0, 236, 3, 0, 0, + 40, 5, 0, 0, 116, 5, 0, 0, + 65, 111, 110, 57, 60, 1, 0, 0, + 60, 1, 0, 0, 0, 2, 255, 255, + 8, 1, 0, 0, 52, 0, 0, 0, + 1, 0, 40, 0, 0, 0, 52, 0, + 0, 0, 52, 0, 1, 0, 36, 0, + 0, 0, 52, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 2, 255, 255, + 81, 0, 0, 5, 1, 0, 15, 160, + 31, 133, 235, 190, 254, 255, 71, 65, + 0, 0, 0, 192, 0, 0, 64, 64, + 31, 0, 0, 2, 0, 0, 0, 128, + 0, 0, 15, 176, 31, 0, 0, 2, + 0, 0, 0, 128, 1, 0, 3, 176, + 31, 0, 0, 2, 0, 0, 0, 144, + 0, 8, 15, 160, 66, 0, 0, 3, + 0, 0, 15, 128, 1, 0, 228, 176, + 0, 8, 228, 160, 2, 0, 0, 3, + 0, 0, 1, 128, 0, 0, 255, 128, + 1, 0, 0, 160, 5, 0, 0, 3, + 0, 0, 17, 128, 0, 0, 0, 128, + 1, 0, 85, 160, 4, 0, 0, 4, + 0, 0, 2, 128, 0, 0, 0, 128, + 1, 0, 170, 160, 1, 0, 255, 160, + 5, 0, 0, 3, 0, 0, 1, 128, + 0, 0, 0, 128, 0, 0, 0, 128, + 5, 0, 0, 3, 0, 0, 1, 128, + 0, 0, 0, 128, 0, 0, 85, 128, + 5, 0, 0, 3, 0, 0, 1, 128, + 0, 0, 0, 128, 0, 0, 255, 160, + 5, 0, 0, 3, 0, 0, 8, 128, + 0, 0, 0, 128, 0, 0, 255, 176, + 5, 0, 0, 3, 0, 0, 7, 128, + 0, 0, 228, 176, 0, 0, 228, 160, + 1, 0, 0, 2, 0, 8, 15, 128, + 0, 0, 228, 128, 1, 0, 0, 2, + 1, 8, 15, 128, 0, 0, 228, 128, + 1, 0, 0, 2, 2, 8, 15, 128, + 0, 0, 228, 128, 1, 0, 0, 2, + 3, 8, 15, 128, 0, 0, 228, 128, +255, 255, 0, 0, 83, 72, 68, 82, +236, 1, 0, 0, 64, 0, 0, 0, +123, 0, 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 90, 0, 0, 3, + 0, 96, 16, 0, 0, 0, 0, 0, + 88, 24, 0, 4, 0, 112, 16, 0, + 0, 0, 0, 0, 85, 85, 0, 0, + 98, 16, 0, 3, 242, 16, 16, 0, + 0, 0, 0, 0, 98, 16, 0, 3, + 50, 16, 16, 0, 1, 0, 0, 0, +101, 0, 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 101, 0, 0, 3, +242, 32, 16, 0, 1, 0, 0, 0, +101, 0, 0, 3, 242, 32, 16, 0, + 2, 0, 0, 0, 101, 0, 0, 3, +242, 32, 16, 0, 3, 0, 0, 0, +104, 0, 0, 2, 1, 0, 0, 0, + 69, 0, 0, 9, 242, 0, 16, 0, + 0, 0, 0, 0, 70, 16, 16, 0, + 1, 0, 0, 0, 70, 126, 16, 0, + 0, 0, 0, 0, 0, 96, 16, 0, + 0, 0, 0, 0, 0, 0, 0, 7, + 18, 0, 16, 0, 0, 0, 0, 0, + 58, 0, 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 31, 133, 235, 190, + 56, 32, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 1, 64, 0, 0, +254, 255, 71, 65, 50, 0, 0, 9, + 34, 0, 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 0, 0, 0, 192, + 1, 64, 0, 0, 0, 0, 64, 64, + 56, 0, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 56, 0, 0, 7, + 18, 0, 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, 0, 0, + 26, 0, 16, 0, 0, 0, 0, 0, + 56, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 58, 128, 32, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 130, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 58, 16, 16, 0, + 0, 0, 0, 0, 56, 0, 0, 8, +114, 0, 16, 0, 0, 0, 0, 0, + 70, 18, 16, 0, 0, 0, 0, 0, + 70, 130, 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +242, 32, 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 242, 32, 16, 0, + 1, 0, 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +242, 32, 16, 0, 2, 0, 0, 0, + 70, 14, 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 242, 32, 16, 0, + 3, 0, 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 116, 0, 0, 0, + 14, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, + 8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 82, 68, 69, 70, + 52, 1, 0, 0, 1, 0, 0, 0, +176, 0, 0, 0, 3, 0, 0, 0, + 28, 0, 0, 0, 0, 4, 255, 255, + 0, 65, 0, 0, 0, 1, 0, 0, +124, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 1, 0, 0, 0, +145, 0, 0, 0, 2, 0, 0, 0, + 5, 0, 0, 0, 4, 0, 0, 0, +255, 255, 255, 255, 0, 0, 0, 0, + 1, 0, 0, 0, 13, 0, 0, 0, +166, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, +115, 97, 109, 112, 108, 101, 114, 95, + 95, 67, 67, 95, 84, 101, 120, 116, +117, 114, 101, 48, 0, 116, 101, 120, +116, 117, 114, 101, 95, 95, 67, 67, + 95, 84, 101, 120, 116, 117, 114, 101, + 48, 0, 36, 71, 108, 111, 98, 97, +108, 115, 0, 171, 166, 0, 0, 0, + 1, 0, 0, 0, 200, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 224, 0, 0, 0, + 0, 0, 0, 0, 16, 0, 0, 0, + 2, 0, 0, 0, 240, 0, 0, 0, + 0, 0, 0, 0, 95, 117, 95, 116, +101, 120, 116, 67, 111, 108, 111, 114, + 0, 171, 171, 171, 1, 0, 3, 0, + 1, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 77, 105, 99, 114, +111, 115, 111, 102, 116, 32, 40, 82, + 41, 32, 72, 76, 83, 76, 32, 83, +104, 97, 100, 101, 114, 32, 67, 111, +109, 112, 105, 108, 101, 114, 32, 54, + 46, 51, 46, 57, 54, 48, 48, 46, + 49, 54, 51, 56, 52, 0, 171, 171, + 73, 83, 71, 78, 68, 0, 0, 0, + 2, 0, 0, 0, 8, 0, 0, 0, + 56, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 15, 0, 0, + 56, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 3, 3, 0, 0, + 84, 69, 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, 71, 78, +116, 0, 0, 0, 4, 0, 0, 0, + 8, 0, 0, 0, 104, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 104, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, 0, 0, + 15, 0, 0, 0, 104, 0, 0, 0, + 2, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 2, 0, 0, 0, + 15, 0, 0, 0, 104, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 3, 0, 0, 0, + 15, 0, 0, 0, 83, 86, 95, 84, + 97, 114, 103, 101, 116, 0, 171, 171, + 68, 88, 66, 67, 235, 56, 180, 223, +125, 231, 231, 218, 70, 75, 12, 63, +200, 233, 69, 121, 1, 0, 0, 0, + 4, 5, 0, 0, 6, 0, 0, 0, + 56, 0, 0, 0, 92, 1, 0, 0, +224, 2, 0, 0, 92, 3, 0, 0, + 48, 4, 0, 0, 148, 4, 0, 0, + 65, 111, 110, 57, 28, 1, 0, 0, + 28, 1, 0, 0, 0, 2, 254, 255, +232, 0, 0, 0, 52, 0, 0, 0, + 1, 0, 36, 0, 0, 0, 48, 0, + 0, 0, 48, 0, 0, 0, 36, 0, + 1, 0, 48, 0, 0, 0, 0, 0, + 4, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 2, 254, 255, + 81, 0, 0, 5, 5, 0, 15, 160, + 0, 0, 0, 63, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 31, 0, 0, 2, 5, 0, 0, 128, + 0, 0, 15, 144, 31, 0, 0, 2, + 5, 0, 1, 128, 1, 0, 15, 144, + 31, 0, 0, 2, 5, 0, 2, 128, + 2, 0, 15, 144, 9, 0, 0, 3, + 0, 0, 1, 128, 3, 0, 228, 160, + 1, 0, 228, 144, 9, 0, 0, 3, + 0, 0, 2, 128, 4, 0, 228, 160, + 1, 0, 228, 144, 2, 0, 0, 3, + 0, 0, 1, 128, 0, 0, 85, 128, + 0, 0, 0, 128, 5, 0, 0, 3, + 0, 0, 4, 192, 0, 0, 0, 128, + 5, 0, 0, 160, 9, 0, 0, 3, + 0, 0, 1, 128, 2, 0, 228, 160, + 1, 0, 228, 144, 1, 0, 0, 2, + 1, 0, 2, 128, 0, 0, 0, 129, + 9, 0, 0, 3, 1, 0, 1, 128, + 1, 0, 228, 160, 1, 0, 228, 144, + 4, 0, 0, 4, 0, 0, 3, 192, + 0, 0, 85, 128, 0, 0, 228, 160, + 1, 0, 228, 128, 1, 0, 0, 2, + 0, 0, 8, 192, 0, 0, 85, 128, + 1, 0, 0, 2, 0, 0, 15, 224, + 0, 0, 228, 144, 1, 0, 0, 2, + 1, 0, 3, 224, 2, 0, 228, 144, +255, 255, 0, 0, 83, 72, 68, 82, +124, 1, 0, 0, 64, 0, 1, 0, + 95, 0, 0, 0, 89, 0, 0, 4, + 70, 142, 32, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 95, 0, 0, 3, +242, 16, 16, 0, 0, 0, 0, 0, + 95, 0, 0, 3, 242, 16, 16, 0, + 1, 0, 0, 0, 95, 0, 0, 3, + 50, 16, 16, 0, 2, 0, 0, 0, +101, 0, 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 101, 0, 0, 3, + 50, 32, 16, 0, 1, 0, 0, 0, +103, 0, 0, 4, 242, 32, 16, 0, + 2, 0, 0, 0, 1, 0, 0, 0, +104, 0, 0, 2, 1, 0, 0, 0, + 54, 0, 0, 5, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 30, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, + 50, 32, 16, 0, 1, 0, 0, 0, + 70, 16, 16, 0, 2, 0, 0, 0, + 17, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 54, 0, 0, 6, 34, 32, 16, 0, + 2, 0, 0, 0, 10, 0, 16, 128, + 65, 0, 0, 0, 0, 0, 0, 0, + 17, 0, 0, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 2, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 17, 0, 0, 8, 34, 0, 16, 0, + 0, 0, 0, 0, 70, 142, 32, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 70, 30, 16, 0, 1, 0, 0, 0, + 0, 0, 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 26, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 54, 0, 0, 5, +130, 32, 16, 0, 2, 0, 0, 0, + 26, 0, 16, 0, 0, 0, 0, 0, + 56, 0, 0, 7, 66, 32, 16, 0, + 2, 0, 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 1, 64, 0, 0, + 0, 0, 0, 63, 17, 0, 0, 8, + 18, 32, 16, 0, 2, 0, 0, 0, + 70, 142, 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 70, 30, 16, 0, + 1, 0, 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 116, 0, 0, 0, + 11, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, + 7, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 82, 68, 69, 70, +204, 0, 0, 0, 1, 0, 0, 0, + 72, 0, 0, 0, 1, 0, 0, 0, + 28, 0, 0, 0, 0, 4, 254, 255, + 0, 65, 0, 0, 152, 0, 0, 0, + 60, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 36, 71, 108, 111, 98, 97, 108, 115, + 0, 171, 171, 171, 60, 0, 0, 0, + 1, 0, 0, 0, 96, 0, 0, 0, + 64, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 120, 0, 0, 0, + 0, 0, 0, 0, 64, 0, 0, 0, + 2, 0, 0, 0, 136, 0, 0, 0, + 0, 0, 0, 0, 95, 67, 67, 95, + 77, 86, 80, 77, 97, 116, 114, 105, +120, 0, 171, 171, 3, 0, 3, 0, + 4, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 77, 105, 99, 114, +111, 115, 111, 102, 116, 32, 40, 82, + 41, 32, 72, 76, 83, 76, 32, 83, +104, 97, 100, 101, 114, 32, 67, 111, +109, 112, 105, 108, 101, 114, 32, 54, + 46, 51, 46, 57, 54, 48, 48, 46, + 49, 54, 51, 56, 52, 0, 171, 171, + 73, 83, 71, 78, 92, 0, 0, 0, + 3, 0, 0, 0, 8, 0, 0, 0, + 80, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 15, 0, 0, + 80, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 15, 15, 0, 0, + 80, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 3, 3, 0, 0, + 84, 69, 88, 67, 79, 79, 82, 68, + 0, 171, 171, 171, 79, 83, 71, 78, +104, 0, 0, 0, 3, 0, 0, 0, + 8, 0, 0, 0, 80, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 80, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 1, 0, 0, 0, + 3, 12, 0, 0, 89, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, + 3, 0, 0, 0, 2, 0, 0, 0, + 15, 0, 0, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 83, 86, 95, + 80, 111, 115, 105, 116, 105, 111, 110, + 0, 171, 171, 171, +}; + const unsigned char s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893[] = { 166, 147, 0, 0, 142, 9, 2, 1, @@ -6427,7 +6526,7 @@ const unsigned char s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893[] = { 77, 97, 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 204, 2, 0, 0, 144, 4, 0, 0, 0, 0, - 0, 0, 173, 144, 0, 0, 0, 0, + 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, @@ -6757,8 +6856,8 @@ const unsigned char s_E2D56227712263272BD5218FEA117CD06180F81B[] = { 117, 95, 112, 111, 105, 110, 116, 83, 105, 122, 101, 0, 0, 0, 0, 2, 0, 0, 0, 204, 2, 0, 0, 208, - 4, 0, 0, 0, 0, 0, 0, 173, -144, 0, 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 0, 0, 0, 212, +133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, 235, 249, 125, @@ -7108,7 +7207,7 @@ const unsigned char s_F46558C274182079784898CF4968CF431593D5E2[] = { 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 108, 6, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 173, 144, 0, 0, 0, 0, + 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 47, 220, 115, 183, 137, 174, 141, 96, 204, 60, @@ -7564,7 +7663,7 @@ const unsigned char s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6[] = { 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 156, 3, 0, 0, 144, 4, 0, 0, 0, - 0, 0, 0, 173, 144, 0, 0, 0, + 0, 0, 0, 212, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 203, 117, 183, 110, 154, 52, 220, 70, 125, @@ -7831,6 +7930,6 @@ const unsigned char s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6[] = { }; const int s_numPrograms = 18; -const int s_programLengths[] = {2990,2528,4102,3022,2996,3358,2982,3073,2559,3300,3350,3025,3556,9465,2502,2675,3746,2775}; -const unsigned char* s_programs[] = {s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873,s_13E33F532157A58EC77EDE3B3112560A89D272B2,s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE,s_53938AB67AD93ABA0DDB87F3C9889304284E011E,s_67837675F2BB48C0E926316F505FC1538228E0FA,s_78250E25D1929D4A842050738140787BE42541C6,s_7B67DD242152D35ACC079265FAD9D03DC98182DE,s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D,s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C,s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5,s_92BE325B516F887D2C928EDE20ADF428DB01C038,s_A2377A827972A5466DA8637681045D32DA8A817D,s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86,s_BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749,s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893,s_E2D56227712263272BD5218FEA117CD06180F81B,s_F46558C274182079784898CF4968CF431593D5E2,s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6}; -const char* s_programKeys[] = {"133478C5A874C1E6F59B418CE6C7C39F1AE0F873","13E33F532157A58EC77EDE3B3112560A89D272B2","1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE","53938AB67AD93ABA0DDB87F3C9889304284E011E","67837675F2BB48C0E926316F505FC1538228E0FA","78250E25D1929D4A842050738140787BE42541C6","7B67DD242152D35ACC079265FAD9D03DC98182DE","7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D","7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C","847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5","92BE325B516F887D2C928EDE20ADF428DB01C038","A2377A827972A5466DA8637681045D32DA8A817D","B5E27B4F3CF7236633255B28CBA530D6EE5CED86","BF29CAEBBDC45A5100A66F92B9FD1F54BF3E6749","E2C7CE1244DE9C76688EFA9463B2A130B6A08893","E2D56227712263272BD5218FEA117CD06180F81B","F46558C274182079784898CF4968CF431593D5E2","F6BA4519AF2653A53D57FB5D5508F0D8617105D6"}; +const int s_programLengths[] = {2990,2528,4102,3022,2996,3358,2982,3073,2559,3300,3350,10261,3025,3556,2502,2675,3746,2775}; +const unsigned char* s_programs[] = {s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873,s_13E33F532157A58EC77EDE3B3112560A89D272B2,s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE,s_53938AB67AD93ABA0DDB87F3C9889304284E011E,s_67837675F2BB48C0E926316F505FC1538228E0FA,s_78250E25D1929D4A842050738140787BE42541C6,s_7B67DD242152D35ACC079265FAD9D03DC98182DE,s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D,s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C,s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5,s_92BE325B516F887D2C928EDE20ADF428DB01C038,s_976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE,s_A2377A827972A5466DA8637681045D32DA8A817D,s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86,s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893,s_E2D56227712263272BD5218FEA117CD06180F81B,s_F46558C274182079784898CF4968CF431593D5E2,s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6}; +const char* s_programKeys[] = {"133478C5A874C1E6F59B418CE6C7C39F1AE0F873","13E33F532157A58EC77EDE3B3112560A89D272B2","1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE","53938AB67AD93ABA0DDB87F3C9889304284E011E","67837675F2BB48C0E926316F505FC1538228E0FA","78250E25D1929D4A842050738140787BE42541C6","7B67DD242152D35ACC079265FAD9D03DC98182DE","7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D","7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C","847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5","92BE325B516F887D2C928EDE20ADF428DB01C038","976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE","A2377A827972A5466DA8637681045D32DA8A817D","B5E27B4F3CF7236633255B28CBA530D6EE5CED86","E2C7CE1244DE9C76688EFA9463B2A130B6A08893","E2D56227712263272BD5218FEA117CD06180F81B","F46558C274182079784898CF4968CF431593D5E2","F6BA4519AF2653A53D57FB5D5508F0D8617105D6"}; diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp index 6ee4a01e83..2209b40583 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp @@ -43,7 +43,10 @@ static int sceneIdx = -1; static std::function createFunctions[] = { CL(Sprite3DBasicTest), +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) + // 3DEffect use custom shader which is not supported on WP8 yet. CL(Sprite3DEffectTest), +#endif CL(Sprite3DWithSkinTest), CL(Animate3DTest) }; From 40951d586ce80d914ae09f384290fdc73a9e41c6 Mon Sep 17 00:00:00 2001 From: vision Date: Thu, 17 Jul 2014 10:10:33 +0800 Subject: [PATCH 19/32] update --- tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp index 2209b40583..e14ca0d5ab 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp @@ -44,7 +44,7 @@ static std::function createFunctions[] = { CL(Sprite3DBasicTest), #if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) - // 3DEffect use custom shader which is not supported on WP8 yet. + // 3DEffect use custom shader which is not supported on WP8/WinRT yet. CL(Sprite3DEffectTest), #endif CL(Sprite3DWithSkinTest), From e72fffe5c9b7fea33c8016771209a84415e63659 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 17 Jul 2014 02:28:34 +0000 Subject: [PATCH 20/32] [AUTO]: updating luabinding automatically --- .../lua-bindings/auto/api/ActionCamera.lua | 6 +- .../lua-bindings/auto/api/ActionFrame.lua | 6 +- .../lua-bindings/auto/api/ActionManagerEx.lua | 6 +- .../lua-bindings/auto/api/ActionObject.lua | 6 +- .../auto/api/ActionRotationFrame.lua | 6 +- .../lua-bindings/auto/api/ActionTimeline.lua | 12 +-- .../lua-bindings/auto/api/Animate.lua | 6 +- .../lua-bindings/auto/api/Animate3D.lua | 6 +- .../lua-bindings/auto/api/Animation.lua | 6 +- .../lua-bindings/auto/api/AnimationFrame.lua | 6 +- .../lua-bindings/auto/api/Armature.lua | 18 ++--- .../auto/api/ArmatureDataManager.lua | 6 +- .../lua-bindings/auto/api/BatchNode.lua | 6 +- .../scripting/lua-bindings/auto/api/Bone.lua | 18 ++--- .../lua-bindings/auto/api/Button.lua | 6 +- .../lua-bindings/auto/api/CCBReader.lua | 9 +-- .../lua-bindings/auto/api/CheckBox.lua | 6 +- .../lua-bindings/auto/api/ClippingNode.lua | 6 +- .../lua-bindings/auto/api/ComAudio.lua | 24 ++---- .../lua-bindings/auto/api/ComRender.lua | 6 +- .../lua-bindings/auto/api/ControlButton.lua | 18 ++--- .../lua-bindings/auto/api/ControlSlider.lua | 18 ++--- .../lua-bindings/auto/api/ControlSwitch.lua | 18 ++--- .../lua-bindings/auto/api/DisplayManager.lua | 12 +-- .../lua-bindings/auto/api/EaseElasticIn.lua | 6 +- .../auto/api/EaseElasticInOut.lua | 6 +- .../lua-bindings/auto/api/EaseElasticOut.lua | 6 +- .../lua-bindings/auto/api/EventController.lua | 6 +- .../lua-bindings/auto/api/FastTMXLayer.lua | 12 +-- .../lua-bindings/auto/api/FastTMXTiledMap.lua | 6 +- .../lua-bindings/auto/api/GLProgram.lua | 6 +- .../lua-bindings/auto/api/GLProgramState.lua | 48 ++++-------- .../lua-bindings/auto/api/Grid3D.lua | 6 +- .../lua-bindings/auto/api/GridBase.lua | 12 +-- .../scripting/lua-bindings/auto/api/HBox.lua | 6 +- .../lua-bindings/auto/api/ImageView.lua | 6 +- .../scripting/lua-bindings/auto/api/Label.lua | 24 ++---- .../lua-bindings/auto/api/LabelAtlas.lua | 18 ++--- .../lua-bindings/auto/api/LayerColor.lua | 9 +-- .../lua-bindings/auto/api/LayerGradient.lua | 9 +-- .../lua-bindings/auto/api/Layout.lua | 18 ++--- .../lua-bindings/auto/api/ListView.lua | 12 +-- .../lua-bindings/auto/api/LoadingBar.lua | 6 +- .../scripting/lua-bindings/auto/api/Menu.lua | 12 +-- .../lua-bindings/auto/api/MotionStreak.lua | 18 ++--- .../scripting/lua-bindings/auto/api/Node.lua | 78 +++++++------------ .../lua-bindings/auto/api/NodeGrid.lua | 6 +- .../lua-bindings/auto/api/ParallaxNode.lua | 6 +- .../auto/api/ParticleBatchNode.lua | 6 +- .../auto/api/ParticleSystemQuad.lua | 9 +-- .../lua-bindings/auto/api/PhysicsBody.lua | 27 +++---- .../auto/api/PhysicsJointLimit.lua | 6 +- .../auto/api/PhysicsJointRotaryLimit.lua | 6 +- .../lua-bindings/auto/api/PhysicsWorld.lua | 6 +- .../lua-bindings/auto/api/ProgressTimer.lua | 6 +- .../lua-bindings/auto/api/ProtectedNode.lua | 9 +-- .../lua-bindings/auto/api/RelativeBox.lua | 6 +- .../lua-bindings/auto/api/RenderTexture.lua | 30 +++---- .../lua-bindings/auto/api/RichText.lua | 6 +- .../lua-bindings/auto/api/RotateBy.lua | 9 +-- .../lua-bindings/auto/api/RotateTo.lua | 6 +- .../lua-bindings/auto/api/Scale9Sprite.lua | 57 +++++--------- .../lua-bindings/auto/api/ScaleBy.lua | 9 +-- .../lua-bindings/auto/api/ScaleTo.lua | 9 +-- .../scripting/lua-bindings/auto/api/Scene.lua | 6 +- .../lua-bindings/auto/api/ScrollView.lua | 18 ++--- .../scripting/lua-bindings/auto/api/Skin.lua | 6 +- .../lua-bindings/auto/api/Sprite.lua | 45 ++++------- .../lua-bindings/auto/api/Sprite3D.lua | 12 +-- .../lua-bindings/auto/api/SpriteBatchNode.lua | 6 +- .../lua-bindings/auto/api/SpriteFrame.lua | 12 +-- .../auto/api/SpriteFrameCache.lua | 9 +-- .../lua-bindings/auto/api/TMXLayer.lua | 12 +-- .../lua-bindings/auto/api/TMXMapInfo.lua | 24 ++---- .../lua-bindings/auto/api/TMXObjectGroup.lua | 12 +-- .../lua-bindings/auto/api/TMXTiledMap.lua | 6 +- .../lua-bindings/auto/api/TargetedAction.lua | 6 +- .../scripting/lua-bindings/auto/api/Text.lua | 6 +- .../lua-bindings/auto/api/TextAtlas.lua | 6 +- .../lua-bindings/auto/api/TextBMFont.lua | 6 +- .../lua-bindings/auto/api/TextField.lua | 6 +- .../lua-bindings/auto/api/Texture2D.lua | 18 ++--- .../lua-bindings/auto/api/TextureCache.lua | 6 +- .../lua-bindings/auto/api/TiledGrid3D.lua | 6 +- .../lua-bindings/auto/api/TransitionFade.lua | 6 +- .../auto/api/TransitionFlipAngular.lua | 6 +- .../lua-bindings/auto/api/TransitionFlipX.lua | 6 +- .../lua-bindings/auto/api/TransitionFlipY.lua | 6 +- .../auto/api/TransitionZoomFlipAngular.lua | 6 +- .../auto/api/TransitionZoomFlipX.lua | 6 +- .../auto/api/TransitionZoomFlipY.lua | 6 +- .../lua-bindings/auto/api/TurnOffTiles.lua | 6 +- .../lua-bindings/auto/api/UserDefault.lua | 30 +++---- .../scripting/lua-bindings/auto/api/VBox.lua | 6 +- .../lua-bindings/auto/api/Widget.lua | 6 +- 95 files changed, 368 insertions(+), 736 deletions(-) diff --git a/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua b/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua index 5b2004def4..00beabfed2 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: setEye(float, float, float) --- --- overload function: setEye(vec3_table) --- +-- @overload self, float, float, float +-- @overload self, vec3_table -- @function [parent=#ActionCamera] setEye -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/ActionFrame.lua b/cocos/scripting/lua-bindings/auto/api/ActionFrame.lua index ae69470263..1be2073a67 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionFrame.lua @@ -5,10 +5,8 @@ -- @parent_module ccs -------------------------------- --- overload function: getAction(float, ccs.ActionFrame) --- --- overload function: getAction(float) --- +-- @overload self, float, ccs.ActionFrame +-- @overload self, float -- @function [parent=#ActionFrame] getAction -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua b/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua index 0e482bb65e..9d6a8e14b4 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua @@ -5,10 +5,8 @@ -- @parent_module ccs -------------------------------- --- overload function: playActionByName(char, char, cc.CallFunc) --- --- overload function: playActionByName(char, char) --- +-- @overload self, char, char, cc.CallFunc +-- @overload self, char, char -- @function [parent=#ActionManagerEx] playActionByName -- @param self -- @param #char char diff --git a/cocos/scripting/lua-bindings/auto/api/ActionObject.lua b/cocos/scripting/lua-bindings/auto/api/ActionObject.lua index e9a644595f..93f6dec2ec 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionObject.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionObject.lua @@ -38,10 +38,8 @@ -- @param self -------------------------------- --- overload function: play(cc.CallFunc) --- --- overload function: play() --- +-- @overload self, cc.CallFunc +-- @overload self -- @function [parent=#ActionObject] play -- @param self -- @param #cc.CallFunc callfunc diff --git a/cocos/scripting/lua-bindings/auto/api/ActionRotationFrame.lua b/cocos/scripting/lua-bindings/auto/api/ActionRotationFrame.lua index 685d82d1f3..267c36c133 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionRotationFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionRotationFrame.lua @@ -10,10 +10,8 @@ -- @param #float float -------------------------------- --- overload function: getAction(float, ccs.ActionFrame) --- --- overload function: getAction(float) --- +-- @overload self, float, ccs.ActionFrame +-- @overload self, float -- @function [parent=#ActionRotationFrame] getAction -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua b/cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua index 5a22f5c635..5cc4299820 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua @@ -83,14 +83,10 @@ -- @return bool#bool ret (return value: bool) -------------------------------- --- overload function: gotoFrameAndPlay(int, bool) --- --- overload function: gotoFrameAndPlay(int) --- --- overload function: gotoFrameAndPlay(int, int, bool) --- --- overload function: gotoFrameAndPlay(int, int, int, bool) --- +-- @overload self, int, bool +-- @overload self, int +-- @overload self, int, int, bool +-- @overload self, int, int, int, bool -- @function [parent=#ActionTimeline] gotoFrameAndPlay -- @param self -- @param #int int diff --git a/cocos/scripting/lua-bindings/auto/api/Animate.lua b/cocos/scripting/lua-bindings/auto/api/Animate.lua index 88cddd28ac..de15070b65 100644 --- a/cocos/scripting/lua-bindings/auto/api/Animate.lua +++ b/cocos/scripting/lua-bindings/auto/api/Animate.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: getAnimation() --- --- overload function: getAnimation() --- +-- @overload self +-- @overload self -- @function [parent=#Animate] getAnimation -- @param self -- @return Animation#Animation ret (retunr value: cc.Animation) diff --git a/cocos/scripting/lua-bindings/auto/api/Animate3D.lua b/cocos/scripting/lua-bindings/auto/api/Animate3D.lua index 4657cc4cb8..f49ae32b24 100644 --- a/cocos/scripting/lua-bindings/auto/api/Animate3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Animate3D.lua @@ -25,10 +25,8 @@ -- @return float#float ret (return value: float) -------------------------------- --- overload function: create(cc.Animation3D, float, float) --- --- overload function: create(cc.Animation3D) --- +-- @overload self, cc.Animation3D, float, float +-- @overload self, cc.Animation3D -- @function [parent=#Animate3D] create -- @param self -- @param #cc.Animation3D animation3d diff --git a/cocos/scripting/lua-bindings/auto/api/Animation.lua b/cocos/scripting/lua-bindings/auto/api/Animation.lua index faf6075804..43b1d28a90 100644 --- a/cocos/scripting/lua-bindings/auto/api/Animation.lua +++ b/cocos/scripting/lua-bindings/auto/api/Animation.lua @@ -76,10 +76,8 @@ -- @param #rect_table rect -------------------------------- --- overload function: create(array_table, float, unsigned int) --- --- overload function: create() --- +-- @overload self, array_table, float, unsigned int +-- @overload self -- @function [parent=#Animation] create -- @param self -- @param #array_table array diff --git a/cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua b/cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua index 949e62a474..9bdd79a93c 100644 --- a/cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua @@ -10,10 +10,8 @@ -- @param #cc.SpriteFrame spriteframe -------------------------------- --- overload function: getUserInfo() --- --- overload function: getUserInfo() --- +-- @overload self +-- @overload self -- @function [parent=#AnimationFrame] getUserInfo -- @param self -- @return map_table#map_table ret (retunr value: map_table) diff --git a/cocos/scripting/lua-bindings/auto/api/Armature.lua b/cocos/scripting/lua-bindings/auto/api/Armature.lua index 1d9edfe029..3a64f91aad 100644 --- a/cocos/scripting/lua-bindings/auto/api/Armature.lua +++ b/cocos/scripting/lua-bindings/auto/api/Armature.lua @@ -59,12 +59,9 @@ -- @return BatchNode#BatchNode ret (return value: ccs.BatchNode) -------------------------------- --- overload function: init(string) --- --- overload function: init() --- --- overload function: init(string, ccs.Bone) --- +-- @overload self, string +-- @overload self +-- @overload self, string, ccs.Bone -- @function [parent=#Armature] init -- @param self -- @param #string str @@ -117,12 +114,9 @@ -- @return map_table#map_table ret (return value: map_table) -------------------------------- --- overload function: create(string) --- --- overload function: create() --- --- overload function: create(string, ccs.Bone) --- +-- @overload self, string +-- @overload self +-- @overload self, string, ccs.Bone -- @function [parent=#Armature] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua b/cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua index 67cf95040a..8afaf2f804 100644 --- a/cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua @@ -22,10 +22,8 @@ -- @param #string str -------------------------------- --- overload function: addArmatureFileInfo(string, string, string) --- --- overload function: addArmatureFileInfo(string) --- +-- @overload self, string, string, string +-- @overload self, string -- @function [parent=#ArmatureDataManager] addArmatureFileInfo -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/BatchNode.lua b/cocos/scripting/lua-bindings/auto/api/BatchNode.lua index 9f3dd96554..dfb42d2e5e 100644 --- a/cocos/scripting/lua-bindings/auto/api/BatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/BatchNode.lua @@ -15,10 +15,8 @@ -- @return BatchNode#BatchNode ret (return value: ccs.BatchNode) -------------------------------- --- overload function: addChild(cc.Node, int, string) --- --- overload function: addChild(cc.Node, int, int) --- +-- @overload self, cc.Node, int, string +-- @overload self, cc.Node, int, int -- @function [parent=#BatchNode] addChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/Bone.lua b/cocos/scripting/lua-bindings/auto/api/Bone.lua index 3d6e41ff59..a3074d3114 100644 --- a/cocos/scripting/lua-bindings/auto/api/Bone.lua +++ b/cocos/scripting/lua-bindings/auto/api/Bone.lua @@ -73,10 +73,8 @@ -- @param #ccs.BoneData bonedata -------------------------------- --- overload function: init(string) --- --- overload function: init() --- +-- @overload self, string +-- @overload self -- @function [parent=#Bone] init -- @param self -- @param #string str @@ -88,10 +86,8 @@ -- @param #ccs.Bone bone -------------------------------- --- overload function: addDisplay(cc.Node, int) --- --- overload function: addDisplay(ccs.DisplayData, int) --- +-- @overload self, cc.Node, int +-- @overload self, ccs.DisplayData, int -- @function [parent=#Bone] addDisplay -- @param self -- @param #ccs.DisplayData displaydata @@ -171,10 +167,8 @@ -- @return BoneData#BoneData ret (return value: ccs.BoneData) -------------------------------- --- overload function: create(string) --- --- overload function: create() --- +-- @overload self, string +-- @overload self -- @function [parent=#Bone] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/Button.lua b/cocos/scripting/lua-bindings/auto/api/Button.lua index 68617b166f..3e2c559e7d 100644 --- a/cocos/scripting/lua-bindings/auto/api/Button.lua +++ b/cocos/scripting/lua-bindings/auto/api/Button.lua @@ -121,10 +121,8 @@ -- @param #bool bool -------------------------------- --- overload function: create(string, string, string, ccui.Widget::TextureResType) --- --- overload function: create() --- +-- @overload self, string, string, string, ccui.Widget::TextureResType +-- @overload self -- @function [parent=#Button] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/CCBReader.lua b/cocos/scripting/lua-bindings/auto/api/CCBReader.lua index dc6a1e4d0d..6782f3bf49 100644 --- a/cocos/scripting/lua-bindings/auto/api/CCBReader.lua +++ b/cocos/scripting/lua-bindings/auto/api/CCBReader.lua @@ -102,12 +102,9 @@ -- @param #float float -------------------------------- --- overload function: CCBReader(cc.CCBReader) --- --- overload function: CCBReader(cc.NodeLoaderLibrary, cc.CCBMemberVariableAssigner, cc.CCBSelectorResolver, cc.NodeLoaderListener) --- --- overload function: CCBReader() --- +-- @overload self, cc.CCBReader +-- @overload self, cc.NodeLoaderLibrary, cc.CCBMemberVariableAssigner, cc.CCBSelectorResolver, cc.NodeLoaderListener +-- @overload self -- @function [parent=#CCBReader] CCBReader -- @param self -- @param #cc.NodeLoaderLibrary nodeloaderlibrary diff --git a/cocos/scripting/lua-bindings/auto/api/CheckBox.lua b/cocos/scripting/lua-bindings/auto/api/CheckBox.lua index 3768859a61..8e1e054a6b 100644 --- a/cocos/scripting/lua-bindings/auto/api/CheckBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/CheckBox.lua @@ -60,10 +60,8 @@ -- @param #ccui.Widget::TextureResType texturerestype -------------------------------- --- overload function: create(string, string, string, string, string, ccui.Widget::TextureResType) --- --- overload function: create() --- +-- @overload self, string, string, string, string, string, ccui.Widget::TextureResType +-- @overload self -- @function [parent=#CheckBox] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/ClippingNode.lua b/cocos/scripting/lua-bindings/auto/api/ClippingNode.lua index d02fa5c3b4..f9ac0622a2 100644 --- a/cocos/scripting/lua-bindings/auto/api/ClippingNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ClippingNode.lua @@ -35,10 +35,8 @@ -- @param #float float -------------------------------- --- overload function: create(cc.Node) --- --- overload function: create() --- +-- @overload self, cc.Node +-- @overload self -- @function [parent=#ClippingNode] create -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/ComAudio.lua b/cocos/scripting/lua-bindings/auto/api/ComAudio.lua index 09482e2d34..b7d19dbb4b 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComAudio.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComAudio.lua @@ -38,10 +38,8 @@ -- @param self -------------------------------- --- overload function: stopBackgroundMusic() --- --- overload function: stopBackgroundMusic(bool) --- +-- @overload self +-- @overload self, bool -- @function [parent=#ComAudio] stopBackgroundMusic -- @param self -- @param #bool bool @@ -74,24 +72,18 @@ -- @param #char char -------------------------------- --- overload function: playBackgroundMusic(char) --- --- overload function: playBackgroundMusic(char, bool) --- --- overload function: playBackgroundMusic() --- +-- @overload self, char +-- @overload self, char, bool +-- @overload self -- @function [parent=#ComAudio] playBackgroundMusic -- @param self -- @param #char char -- @param #bool bool -------------------------------- --- overload function: playEffect(char) --- --- overload function: playEffect(char, bool) --- --- overload function: playEffect() --- +-- @overload self, char +-- @overload self, char, bool +-- @overload self -- @function [parent=#ComAudio] playEffect -- @param self -- @param #char char diff --git a/cocos/scripting/lua-bindings/auto/api/ComRender.lua b/cocos/scripting/lua-bindings/auto/api/ComRender.lua index 014cb4e1e9..9c69bbac35 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComRender.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComRender.lua @@ -15,10 +15,8 @@ -- @return Node#Node ret (return value: cc.Node) -------------------------------- --- overload function: create(cc.Node, char) --- --- overload function: create() --- +-- @overload self, cc.Node, char +-- @overload self -- @function [parent=#ComRender] create -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua index 3b1d35b203..118d5fb0df 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua @@ -105,10 +105,8 @@ -- @param self -------------------------------- --- overload function: getCurrentTitle() --- --- overload function: getCurrentTitle() --- +-- @overload self +-- @overload self -- @function [parent=#ControlButton] getCurrentTitle -- @param self -- @return string#string ret (retunr value: string) @@ -219,14 +217,10 @@ -- @return string#string ret (return value: string) -------------------------------- --- overload function: create(cc.Scale9Sprite) --- --- overload function: create() --- --- overload function: create(cc.Node, cc.Scale9Sprite) --- --- overload function: create(string, string, float) --- +-- @overload self, cc.Scale9Sprite +-- @overload self +-- @overload self, cc.Node, cc.Scale9Sprite +-- @overload self, string, string, float -- @function [parent=#ControlButton] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua b/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua index 9708cfea37..d192cf7a93 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua @@ -80,10 +80,8 @@ -- @return Sprite#Sprite ret (return value: cc.Sprite) -------------------------------- --- overload function: initWithSprites(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite) --- --- overload function: initWithSprites(cc.Sprite, cc.Sprite, cc.Sprite) --- +-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite +-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite -- @function [parent=#ControlSlider] initWithSprites -- @param self -- @param #cc.Sprite sprite @@ -129,14 +127,10 @@ -- @param #float float -------------------------------- --- overload function: create(cc.Sprite, cc.Sprite, cc.Sprite) --- --- overload function: create(char, char, char) --- --- overload function: create(char, char, char, char) --- --- overload function: create(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite) --- +-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite +-- @overload self, char, char, char +-- @overload self, char, char, char, char +-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite -- @function [parent=#ControlSlider] create -- @param self -- @param #cc.Sprite sprite diff --git a/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua b/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua index f553d252b2..fdff4eddfa 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua @@ -10,10 +10,8 @@ -- @param #bool bool -------------------------------- --- overload function: setOn(bool) --- --- overload function: setOn(bool, bool) --- +-- @overload self, bool +-- @overload self, bool, bool -- @function [parent=#ControlSwitch] setOn -- @param self -- @param #bool bool @@ -25,10 +23,8 @@ -- @return bool#bool ret (return value: bool) -------------------------------- --- overload function: initWithMaskSprite(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.Label, cc.Label) --- --- overload function: initWithMaskSprite(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite) --- +-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.Label, cc.Label +-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite -- @function [parent=#ControlSwitch] initWithMaskSprite -- @param self -- @param #cc.Sprite sprite @@ -51,10 +47,8 @@ -- @return vec2_table#vec2_table ret (return value: vec2_table) -------------------------------- --- overload function: create(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite) --- --- overload function: create(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.Label, cc.Label) --- +-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite +-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.Label, cc.Label -- @function [parent=#ControlSwitch] create -- @param self -- @param #cc.Sprite sprite diff --git a/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua b/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua index c194aa4e8f..ca94a7c51d 100644 --- a/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua @@ -46,20 +46,16 @@ -- @return rect_table#rect_table ret (return value: rect_table) -------------------------------- --- overload function: addDisplay(cc.Node, int) --- --- overload function: addDisplay(ccs.DisplayData, int) --- +-- @overload self, cc.Node, int +-- @overload self, ccs.DisplayData, int -- @function [parent=#DisplayManager] addDisplay -- @param self -- @param #ccs.DisplayData displaydata -- @param #int int -------------------------------- --- overload function: containPoint(float, float) --- --- overload function: containPoint(vec2_table) --- +-- @overload self, float, float +-- @overload self, vec2_table -- @function [parent=#DisplayManager] containPoint -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua index 82c112dcd2..b38769fd4d 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(cc.ActionInterval) --- --- overload function: create(cc.ActionInterval, float) --- +-- @overload self, cc.ActionInterval +-- @overload self, cc.ActionInterval, float -- @function [parent=#EaseElasticIn] create -- @param self -- @param #cc.ActionInterval actioninterval diff --git a/cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua index b6df287c83..5d836c34ae 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(cc.ActionInterval) --- --- overload function: create(cc.ActionInterval, float) --- +-- @overload self, cc.ActionInterval +-- @overload self, cc.ActionInterval, float -- @function [parent=#EaseElasticInOut] create -- @param self -- @param #cc.ActionInterval actioninterval diff --git a/cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua index c735a4bc0c..a3a2498473 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(cc.ActionInterval) --- --- overload function: create(cc.ActionInterval, float) --- +-- @overload self, cc.ActionInterval +-- @overload self, cc.ActionInterval, float -- @function [parent=#EaseElasticOut] create -- @param self -- @param #cc.ActionInterval actioninterval diff --git a/cocos/scripting/lua-bindings/auto/api/EventController.lua b/cocos/scripting/lua-bindings/auto/api/EventController.lua index 289b55d97c..f331f8dd2a 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventController.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventController.lua @@ -35,10 +35,8 @@ -- @return int#int ret (return value: int) -------------------------------- --- overload function: EventController(cc.EventController::ControllerEventType, cc.Controller, bool) --- --- overload function: EventController(cc.EventController::ControllerEventType, cc.Controller, int) --- +-- @overload self, cc.EventController::ControllerEventType, cc.Controller, bool +-- @overload self, cc.EventController::ControllerEventType, cc.Controller, int -- @function [parent=#EventController] EventController -- @param self -- @param #cc.EventController::ControllerEventType controllereventtype diff --git a/cocos/scripting/lua-bindings/auto/api/FastTMXLayer.lua b/cocos/scripting/lua-bindings/auto/api/FastTMXLayer.lua index d159f6f54d..a012c94d2a 100644 --- a/cocos/scripting/lua-bindings/auto/api/FastTMXLayer.lua +++ b/cocos/scripting/lua-bindings/auto/api/FastTMXLayer.lua @@ -46,10 +46,8 @@ -- @param #vec2_table vec2 -------------------------------- --- overload function: getProperties() --- --- overload function: getProperties() --- +-- @overload self +-- @overload self -- @function [parent=#FastTMXLayer] getProperties -- @param self -- @return map_table#map_table ret (retunr value: map_table) @@ -66,10 +64,8 @@ -- @param #int int -------------------------------- --- overload function: setTileGID(int, vec2_table, cc.TMXTileFlags_) --- --- overload function: setTileGID(int, vec2_table) --- +-- @overload self, int, vec2_table, cc.TMXTileFlags_ +-- @overload self, int, vec2_table -- @function [parent=#FastTMXLayer] setTileGID -- @param self -- @param #int int diff --git a/cocos/scripting/lua-bindings/auto/api/FastTMXTiledMap.lua b/cocos/scripting/lua-bindings/auto/api/FastTMXTiledMap.lua index 008fdc4b61..cc6a27c078 100644 --- a/cocos/scripting/lua-bindings/auto/api/FastTMXTiledMap.lua +++ b/cocos/scripting/lua-bindings/auto/api/FastTMXTiledMap.lua @@ -27,10 +27,8 @@ -- @return TMXObjectGroup#TMXObjectGroup ret (return value: cc.TMXObjectGroup) -------------------------------- --- overload function: getObjectGroups() --- --- overload function: getObjectGroups() --- +-- @overload self +-- @overload self -- @function [parent=#FastTMXTiledMap] getObjectGroups -- @param self -- @return array_table#array_table ret (retunr value: array_table) diff --git a/cocos/scripting/lua-bindings/auto/api/GLProgram.lua b/cocos/scripting/lua-bindings/auto/api/GLProgram.lua index fdeb5ae58e..21a267ccf7 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLProgram.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLProgram.lua @@ -33,10 +33,8 @@ -- @return string#string ret (return value: string) -------------------------------- --- overload function: setUniformsForBuiltins(mat4_table) --- --- overload function: setUniformsForBuiltins() --- +-- @overload self, mat4_table +-- @overload self -- @function [parent=#GLProgram] setUniformsForBuiltins -- @param self -- @param #mat4_table mat4 diff --git a/cocos/scripting/lua-bindings/auto/api/GLProgramState.lua b/cocos/scripting/lua-bindings/auto/api/GLProgramState.lua index a0cd6455d6..45e1e90168 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLProgramState.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLProgramState.lua @@ -5,24 +5,18 @@ -- @parent_module cc -------------------------------- --- overload function: setUniformTexture(string, unsigned int) --- --- overload function: setUniformTexture(string, cc.Texture2D) --- --- overload function: setUniformTexture(int, cc.Texture2D) --- --- overload function: setUniformTexture(int, unsigned int) --- +-- @overload self, string, unsigned int +-- @overload self, string, cc.Texture2D +-- @overload self, int, cc.Texture2D +-- @overload self, int, unsigned int -- @function [parent=#GLProgramState] setUniformTexture -- @param self -- @param #int int -- @param #unsigned int int -------------------------------- --- overload function: setUniformMat4(int, mat4_table) --- --- overload function: setUniformMat4(string, mat4_table) --- +-- @overload self, int, mat4_table +-- @overload self, string, mat4_table -- @function [parent=#GLProgramState] setUniformMat4 -- @param self -- @param #string str @@ -47,30 +41,24 @@ -- @param self -------------------------------- --- overload function: setUniformFloat(int, float) --- --- overload function: setUniformFloat(string, float) --- +-- @overload self, int, float +-- @overload self, string, float -- @function [parent=#GLProgramState] setUniformFloat -- @param self -- @param #string str -- @param #float float -------------------------------- --- overload function: setUniformVec3(int, vec3_table) --- --- overload function: setUniformVec3(string, vec3_table) --- +-- @overload self, int, vec3_table +-- @overload self, string, vec3_table -- @function [parent=#GLProgramState] setUniformVec3 -- @param self -- @param #string str -- @param #vec3_table vec3 -------------------------------- --- overload function: setUniformInt(int, int) --- --- overload function: setUniformInt(string, int) --- +-- @overload self, int, int +-- @overload self, string, int -- @function [parent=#GLProgramState] setUniformInt -- @param self -- @param #string str @@ -82,10 +70,8 @@ -- @return long#long ret (return value: long) -------------------------------- --- overload function: setUniformVec4(int, vec4_table) --- --- overload function: setUniformVec4(string, vec4_table) --- +-- @overload self, int, vec4_table +-- @overload self, string, vec4_table -- @function [parent=#GLProgramState] setUniformVec4 -- @param self -- @param #string str @@ -97,10 +83,8 @@ -- @param #cc.GLProgram glprogram -------------------------------- --- overload function: setUniformVec2(int, vec2_table) --- --- overload function: setUniformVec2(string, vec2_table) --- +-- @overload self, int, vec2_table +-- @overload self, string, vec2_table -- @function [parent=#GLProgramState] setUniformVec2 -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/Grid3D.lua b/cocos/scripting/lua-bindings/auto/api/Grid3D.lua index e8bec38e53..8adbad9174 100644 --- a/cocos/scripting/lua-bindings/auto/api/Grid3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Grid3D.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(size_table) --- --- overload function: create(size_table, cc.Texture2D, bool) --- +-- @overload self, size_table +-- @overload self, size_table, cc.Texture2D, bool -- @function [parent=#Grid3D] create -- @param self -- @param #size_table size diff --git a/cocos/scripting/lua-bindings/auto/api/GridBase.lua b/cocos/scripting/lua-bindings/auto/api/GridBase.lua index 1aff5ed5a8..e42656495f 100644 --- a/cocos/scripting/lua-bindings/auto/api/GridBase.lua +++ b/cocos/scripting/lua-bindings/auto/api/GridBase.lua @@ -66,10 +66,8 @@ -- @return int#int ret (return value: int) -------------------------------- --- overload function: initWithSize(size_table) --- --- overload function: initWithSize(size_table, cc.Texture2D, bool) --- +-- @overload self, size_table +-- @overload self, size_table, cc.Texture2D, bool -- @function [parent=#GridBase] initWithSize -- @param self -- @param #size_table size @@ -92,10 +90,8 @@ -- @param self -------------------------------- --- overload function: create(size_table) --- --- overload function: create(size_table, cc.Texture2D, bool) --- +-- @overload self, size_table +-- @overload self, size_table, cc.Texture2D, bool -- @function [parent=#GridBase] create -- @param self -- @param #size_table size diff --git a/cocos/scripting/lua-bindings/auto/api/HBox.lua b/cocos/scripting/lua-bindings/auto/api/HBox.lua index 181a10056b..54ce53f9e3 100644 --- a/cocos/scripting/lua-bindings/auto/api/HBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/HBox.lua @@ -5,10 +5,8 @@ -- @parent_module ccui -------------------------------- --- overload function: create(size_table) --- --- overload function: create() --- +-- @overload self, size_table +-- @overload self -- @function [parent=#HBox] create -- @param self -- @param #size_table size diff --git a/cocos/scripting/lua-bindings/auto/api/ImageView.lua b/cocos/scripting/lua-bindings/auto/api/ImageView.lua index d5bbc0662c..fe3f5d6446 100644 --- a/cocos/scripting/lua-bindings/auto/api/ImageView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ImageView.lua @@ -36,10 +36,8 @@ -- @return bool#bool ret (return value: bool) -------------------------------- --- overload function: create(string, ccui.Widget::TextureResType) --- --- overload function: create() --- +-- @overload self, string, ccui.Widget::TextureResType +-- @overload self -- @function [parent=#ImageView] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/Label.lua b/cocos/scripting/lua-bindings/auto/api/Label.lua index 976af067da..36dee247ef 100644 --- a/cocos/scripting/lua-bindings/auto/api/Label.lua +++ b/cocos/scripting/lua-bindings/auto/api/Label.lua @@ -127,12 +127,9 @@ -- @return float#float ret (return value: float) -------------------------------- --- overload function: setCharMap(cc.Texture2D, int, int, int) --- --- overload function: setCharMap(string, int, int, int) --- --- overload function: setCharMap(string) --- +-- @overload self, cc.Texture2D, int, int, int +-- @overload self, string, int, int, int +-- @overload self, string -- @function [parent=#Label] setCharMap -- @param self -- @param #string str @@ -228,10 +225,8 @@ -- @param #cc.TextHAlignment texthalignment -------------------------------- --- overload function: setAlignment(cc.TextHAlignment, cc.TextVAlignment) --- --- overload function: setAlignment(cc.TextHAlignment) --- +-- @overload self, cc.TextHAlignment, cc.TextVAlignment +-- @overload self, cc.TextHAlignment -- @function [parent=#Label] setAlignment -- @param self -- @param #cc.TextHAlignment texthalignment @@ -253,12 +248,9 @@ -- @return Label#Label ret (return value: cc.Label) -------------------------------- --- overload function: createWithCharMap(cc.Texture2D, int, int, int) --- --- overload function: createWithCharMap(string, int, int, int) --- --- overload function: createWithCharMap(string) --- +-- @overload self, cc.Texture2D, int, int, int +-- @overload self, string, int, int, int +-- @overload self, string -- @function [parent=#Label] createWithCharMap -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/LabelAtlas.lua b/cocos/scripting/lua-bindings/auto/api/LabelAtlas.lua index 16578c5420..50753ea4c0 100644 --- a/cocos/scripting/lua-bindings/auto/api/LabelAtlas.lua +++ b/cocos/scripting/lua-bindings/auto/api/LabelAtlas.lua @@ -10,12 +10,9 @@ -- @param #string str -------------------------------- --- overload function: initWithString(string, string) --- --- overload function: initWithString(string, string, int, int, int) --- --- overload function: initWithString(string, cc.Texture2D, int, int, int) --- +-- @overload self, string, string +-- @overload self, string, string, int, int, int +-- @overload self, string, cc.Texture2D, int, int, int -- @function [parent=#LabelAtlas] initWithString -- @param self -- @param #string str @@ -35,12 +32,9 @@ -- @return string#string ret (return value: string) -------------------------------- --- overload function: create(string, string, int, int, int) --- --- overload function: create() --- --- overload function: create(string, string) --- +-- @overload self, string, string, int, int, int +-- @overload self +-- @overload self, string, string -- @function [parent=#LabelAtlas] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/LayerColor.lua b/cocos/scripting/lua-bindings/auto/api/LayerColor.lua index 0196157212..6a190c9eb1 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayerColor.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayerColor.lua @@ -21,12 +21,9 @@ -- @param #float float -------------------------------- --- overload function: create(color4b_table, float, float) --- --- overload function: create() --- --- overload function: create(color4b_table) --- +-- @overload self, color4b_table, float, float +-- @overload self +-- @overload self, color4b_table -- @function [parent=#LayerColor] create -- @param self -- @param #color4b_table color4b diff --git a/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua b/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua index d7f1b3c4df..8f18269408 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua @@ -65,12 +65,9 @@ -- @param #color3b_table color3b -------------------------------- --- overload function: create(color4b_table, color4b_table) --- --- overload function: create() --- --- overload function: create(color4b_table, color4b_table, vec2_table) --- +-- @overload self, color4b_table, color4b_table +-- @overload self +-- @overload self, color4b_table, color4b_table, vec2_table -- @function [parent=#LayerGradient] create -- @param self -- @param #color4b_table color4b diff --git a/cocos/scripting/lua-bindings/auto/api/Layout.lua b/cocos/scripting/lua-bindings/auto/api/Layout.lua index 507e8d56ef..f6991db815 100644 --- a/cocos/scripting/lua-bindings/auto/api/Layout.lua +++ b/cocos/scripting/lua-bindings/auto/api/Layout.lua @@ -70,10 +70,8 @@ -- @param #ccui.Widget::TextureResType texturerestype -------------------------------- --- overload function: setBackGroundColor(color3b_table, color3b_table) --- --- overload function: setBackGroundColor(color3b_table) --- +-- @overload self, color3b_table, color3b_table +-- @overload self, color3b_table -- @function [parent=#Layout] setBackGroundColor -- @param self -- @param #color3b_table color3b @@ -179,14 +177,10 @@ -- @return Ref#Ref ret (return value: cc.Ref) -------------------------------- --- overload function: addChild(cc.Node, int) --- --- overload function: addChild(cc.Node) --- --- overload function: addChild(cc.Node, int, int) --- --- overload function: addChild(cc.Node, int, string) --- +-- @overload self, cc.Node, int +-- @overload self, cc.Node +-- @overload self, cc.Node, int, int +-- @overload self, cc.Node, int, string -- @function [parent=#Layout] addChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/ListView.lua b/cocos/scripting/lua-bindings/auto/api/ListView.lua index 0ac5fec932..934000b12f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ListView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ListView.lua @@ -107,14 +107,10 @@ -- @return Ref#Ref ret (return value: cc.Ref) -------------------------------- --- overload function: addChild(cc.Node, int) --- --- overload function: addChild(cc.Node) --- --- overload function: addChild(cc.Node, int, int) --- --- overload function: addChild(cc.Node, int, string) --- +-- @overload self, cc.Node, int +-- @overload self, cc.Node +-- @overload self, cc.Node, int, int +-- @overload self, cc.Node, int, string -- @function [parent=#ListView] addChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua b/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua index 06bd2861bf..ce7cc9cff1 100644 --- a/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua +++ b/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua @@ -51,10 +51,8 @@ -- @return float#float ret (return value: float) -------------------------------- --- overload function: create(string, float) --- --- overload function: create() --- +-- @overload self, string, float +-- @overload self -- @function [parent=#LoadingBar] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/Menu.lua b/cocos/scripting/lua-bindings/auto/api/Menu.lua index 52362692c9..3a228e3443 100644 --- a/cocos/scripting/lua-bindings/auto/api/Menu.lua +++ b/cocos/scripting/lua-bindings/auto/api/Menu.lua @@ -33,14 +33,10 @@ -- @param self -------------------------------- --- overload function: addChild(cc.Node, int) --- --- overload function: addChild(cc.Node) --- --- overload function: addChild(cc.Node, int, int) --- --- overload function: addChild(cc.Node, int, string) --- +-- @overload self, cc.Node, int +-- @overload self, cc.Node +-- @overload self, cc.Node, int, int +-- @overload self, cc.Node, int, string -- @function [parent=#Menu] addChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua b/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua index 817e2c4984..47f6c9dbeb 100644 --- a/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua +++ b/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua @@ -44,10 +44,8 @@ -- @param #bool bool -------------------------------- --- overload function: create(float, float, float, color3b_table, cc.Texture2D) --- --- overload function: create(float, float, float, color3b_table, string) --- +-- @overload self, float, float, float, color3b_table, cc.Texture2D +-- @overload self, float, float, float, color3b_table, string -- @function [parent=#MotionStreak] create -- @param self -- @param #float float @@ -98,20 +96,16 @@ -- @return unsigned char#unsigned char ret (return value: unsigned char) -------------------------------- --- overload function: setPosition(float, float) --- --- overload function: setPosition(vec2_table) --- +-- @overload self, float, float +-- @overload self, vec2_table -- @function [parent=#MotionStreak] setPosition -- @param self -- @param #float float -- @param #float float -------------------------------- --- overload function: getPosition(float, float) --- --- overload function: getPosition() --- +-- @overload self, float, float +-- @overload self -- @function [parent=#MotionStreak] getPosition -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/Node.lua b/cocos/scripting/lua-bindings/auto/api/Node.lua index 6dbd131ab7..33f956653b 100644 --- a/cocos/scripting/lua-bindings/auto/api/Node.lua +++ b/cocos/scripting/lua-bindings/auto/api/Node.lua @@ -5,14 +5,10 @@ -- @parent_module cc -------------------------------- --- overload function: addChild(cc.Node, int) --- --- overload function: addChild(cc.Node) --- --- overload function: addChild(cc.Node, int, int) --- --- overload function: addChild(cc.Node, int, string) --- +-- @overload self, cc.Node, int +-- @overload self, cc.Node +-- @overload self, cc.Node, int, int +-- @overload self, cc.Node, int, string -- @function [parent=#Node] addChild -- @param self -- @param #cc.Node node @@ -51,10 +47,8 @@ -- @param #bool bool -------------------------------- --- overload function: getChildren() --- --- overload function: getChildren() --- +-- @overload self +-- @overload self -- @function [parent=#Node] getChildren -- @param self -- @return array_table#array_table ret (retunr value: array_table) @@ -208,10 +202,8 @@ -- @return vec2_table#vec2_table ret (return value: vec2_table) -------------------------------- --- overload function: removeAllChildrenWithCleanup(bool) --- --- overload function: removeAllChildrenWithCleanup() --- +-- @overload self, bool +-- @overload self -- @function [parent=#Node] removeAllChildrenWithCleanup -- @param self -- @param #bool bool @@ -268,10 +260,8 @@ -- @return PhysicsBody#PhysicsBody ret (return value: cc.PhysicsBody) -------------------------------- --- overload function: setPosition(float, float) --- --- overload function: setPosition(vec2_table) --- +-- @overload self, float, float +-- @overload self, vec2_table -- @function [parent=#Node] setPosition -- @param self -- @param #float float @@ -381,10 +371,8 @@ -- @return vec2_table#vec2_table ret (return value: vec2_table) -------------------------------- --- overload function: visit() --- --- overload function: visit(cc.Renderer, mat4_table, unsigned int) --- +-- @overload self +-- @overload self, cc.Renderer, mat4_table, unsigned int -- @function [parent=#Node] visit -- @param self -- @param #cc.Renderer renderer @@ -438,10 +426,8 @@ -- @param #string str -------------------------------- --- overload function: setAdditionalTransform(cc.AffineTransform) --- --- overload function: setAdditionalTransform(mat4_table) --- +-- @overload self, cc.AffineTransform +-- @overload self, mat4_table -- @function [parent=#Node] setAdditionalTransform -- @param self -- @param #mat4_table mat4 @@ -457,10 +443,8 @@ -- @return int#int ret (return value: int) -------------------------------- --- overload function: getScheduler() --- --- overload function: getScheduler() --- +-- @overload self +-- @overload self -- @function [parent=#Node] getScheduler -- @param self -- @return Scheduler#Scheduler ret (retunr value: cc.Scheduler) @@ -491,10 +475,8 @@ -- @return bool#bool ret (return value: bool) -------------------------------- --- overload function: getParent() --- --- overload function: getParent() --- +-- @overload self +-- @overload self -- @function [parent=#Node] getParent -- @param self -- @return Node#Node ret (retunr value: cc.Node) @@ -551,10 +533,8 @@ -- @param #float float -------------------------------- --- overload function: setScale(float, float) --- --- overload function: setScale(float) --- +-- @overload self, float, float +-- @overload self, float -- @function [parent=#Node] setScale -- @param self -- @param #float float @@ -642,10 +622,8 @@ -- @return float#float ret (return value: float) -------------------------------- --- overload function: draw() --- --- overload function: draw(cc.Renderer, mat4_table, unsigned int) --- +-- @overload self +-- @overload self, cc.Renderer, mat4_table, unsigned int -- @function [parent=#Node] draw -- @param self -- @param #cc.Renderer renderer @@ -658,10 +636,8 @@ -- @param #cc.Ref ref -------------------------------- --- overload function: removeFromParentAndCleanup(bool) --- --- overload function: removeFromParentAndCleanup() --- +-- @overload self, bool +-- @overload self -- @function [parent=#Node] removeFromParentAndCleanup -- @param self -- @param #bool bool @@ -721,10 +697,8 @@ -- @param #cc.Action action -------------------------------- --- overload function: getActionManager() --- --- overload function: getActionManager() --- +-- @overload self +-- @overload self -- @function [parent=#Node] getActionManager -- @param self -- @return ActionManager#ActionManager ret (retunr value: cc.ActionManager) diff --git a/cocos/scripting/lua-bindings/auto/api/NodeGrid.lua b/cocos/scripting/lua-bindings/auto/api/NodeGrid.lua index c441d06407..2d99049a3c 100644 --- a/cocos/scripting/lua-bindings/auto/api/NodeGrid.lua +++ b/cocos/scripting/lua-bindings/auto/api/NodeGrid.lua @@ -10,10 +10,8 @@ -- @param #cc.Node node -------------------------------- --- overload function: getGrid() --- --- overload function: getGrid() --- +-- @overload self +-- @overload self -- @function [parent=#NodeGrid] getGrid -- @param self -- @return GridBase#GridBase ret (retunr value: cc.GridBase) diff --git a/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua b/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua index 5cc4cb76a0..3a55ee2e5a 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua @@ -23,10 +23,8 @@ -- @return ParallaxNode#ParallaxNode ret (return value: cc.ParallaxNode) -------------------------------- --- overload function: addChild(cc.Node, int, string) --- --- overload function: addChild(cc.Node, int, int) --- +-- @overload self, cc.Node, int, string +-- @overload self, cc.Node, int, int -- @function [parent=#ParallaxNode] addChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua b/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua index 7329dd4887..1adde946b7 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua @@ -61,10 +61,8 @@ -- @return ParticleBatchNode#ParticleBatchNode ret (return value: cc.ParticleBatchNode) -------------------------------- --- overload function: addChild(cc.Node, int, string) --- --- overload function: addChild(cc.Node, int, int) --- +-- @overload self, cc.Node, int, string +-- @overload self, cc.Node, int, int -- @function [parent=#ParticleBatchNode] addChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua index 3b41c5710a..92e7402676 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua @@ -21,12 +21,9 @@ -- @param #cc.EventCustom eventcustom -------------------------------- --- overload function: create(string) --- --- overload function: create() --- --- overload function: create(map_table) --- +-- @overload self, string +-- @overload self +-- @overload self, map_table -- @function [parent=#ParticleSystemQuad] create -- @param self -- @param #map_table map diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua index 8b250c7e07..6e90f80f52 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua @@ -49,10 +49,8 @@ -- @return float#float ret (return value: float) -------------------------------- --- overload function: applyImpulse(vec2_table, vec2_table) --- --- overload function: applyImpulse(vec2_table) --- +-- @overload self, vec2_table, vec2_table +-- @overload self, vec2_table -- @function [parent=#PhysicsBody] applyImpulse -- @param self -- @param #vec2_table vec2 @@ -64,10 +62,8 @@ -- @param #float float -------------------------------- --- overload function: applyForce(vec2_table, vec2_table) --- --- overload function: applyForce(vec2_table) --- +-- @overload self, vec2_table, vec2_table +-- @overload self, vec2_table -- @function [parent=#PhysicsBody] applyForce -- @param self -- @param #vec2_table vec2 @@ -222,10 +218,8 @@ -- @return bool#bool ret (return value: bool) -------------------------------- --- overload function: removeShape(int, bool) --- --- overload function: removeShape(cc.PhysicsShape, bool) --- +-- @overload self, int, bool +-- @overload self, cc.PhysicsShape, bool -- @function [parent=#PhysicsBody] removeShape -- @param self -- @param #cc.PhysicsShape physicsshape @@ -346,12 +340,9 @@ -- @return PhysicsBody#PhysicsBody ret (return value: cc.PhysicsBody) -------------------------------- --- overload function: create(float) --- --- overload function: create() --- --- overload function: create(float, float) --- +-- @overload self, float +-- @overload self +-- @overload self, float, float -- @function [parent=#PhysicsBody] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua index c94147a645..796d4143c2 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua @@ -45,10 +45,8 @@ -- @param #float float -------------------------------- --- overload function: construct(cc.PhysicsBody, cc.PhysicsBody, vec2_table, vec2_table, float, float) --- --- overload function: construct(cc.PhysicsBody, cc.PhysicsBody, vec2_table, vec2_table) --- +-- @overload self, cc.PhysicsBody, cc.PhysicsBody, vec2_table, vec2_table, float, float +-- @overload self, cc.PhysicsBody, cc.PhysicsBody, vec2_table, vec2_table -- @function [parent=#PhysicsJointLimit] construct -- @param self -- @param #cc.PhysicsBody physicsbody diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotaryLimit.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotaryLimit.lua index 28052bb064..db5d66222e 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotaryLimit.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotaryLimit.lua @@ -25,10 +25,8 @@ -- @return float#float ret (return value: float) -------------------------------- --- overload function: construct(cc.PhysicsBody, cc.PhysicsBody) --- --- overload function: construct(cc.PhysicsBody, cc.PhysicsBody, float, float) --- +-- @overload self, cc.PhysicsBody, cc.PhysicsBody +-- @overload self, cc.PhysicsBody, cc.PhysicsBody, float, float -- @function [parent=#PhysicsJointRotaryLimit] construct -- @param self -- @param #cc.PhysicsBody physicsbody diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua index 373323444e..df5c6d9783 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua @@ -24,10 +24,8 @@ -- @return float#float ret (return value: float) -------------------------------- --- overload function: removeBody(int) --- --- overload function: removeBody(cc.PhysicsBody) --- +-- @overload self, int +-- @overload self, cc.PhysicsBody -- @function [parent=#PhysicsWorld] removeBody -- @param self -- @param #cc.PhysicsBody physicsbody diff --git a/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua b/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua index 4fb722c3c1..02c27984ee 100644 --- a/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua +++ b/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua @@ -45,10 +45,8 @@ -- @return vec2_table#vec2_table ret (return value: vec2_table) -------------------------------- --- overload function: setReverseDirection(bool) --- --- overload function: setReverseDirection(bool) --- +-- @overload self, bool +-- @overload self, bool -- @function [parent=#ProgressTimer] setReverseDirection -- @param self -- @param #bool bool diff --git a/cocos/scripting/lua-bindings/auto/api/ProtectedNode.lua b/cocos/scripting/lua-bindings/auto/api/ProtectedNode.lua index e3b177c2a1..7cdaa73327 100644 --- a/cocos/scripting/lua-bindings/auto/api/ProtectedNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ProtectedNode.lua @@ -5,12 +5,9 @@ -- @parent_module cc -------------------------------- --- overload function: addProtectedChild(cc.Node, int) --- --- overload function: addProtectedChild(cc.Node) --- --- overload function: addProtectedChild(cc.Node, int, int) --- +-- @overload self, cc.Node, int +-- @overload self, cc.Node +-- @overload self, cc.Node, int, int -- @function [parent=#ProtectedNode] addProtectedChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/RelativeBox.lua b/cocos/scripting/lua-bindings/auto/api/RelativeBox.lua index 92702c7770..a12a3b8f4a 100644 --- a/cocos/scripting/lua-bindings/auto/api/RelativeBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/RelativeBox.lua @@ -5,10 +5,8 @@ -- @parent_module ccui -------------------------------- --- overload function: create(size_table) --- --- overload function: create() --- +-- @overload self, size_table +-- @overload self -- @function [parent=#RelativeBox] create -- @param self -- @param #size_table size diff --git a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua index 35d6c9e5f2..91fc61c210 100644 --- a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua +++ b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua @@ -65,10 +65,8 @@ -- @param self -------------------------------- --- overload function: saveToFile(string, cc.Image::Format, bool) --- --- overload function: saveToFile(string, bool) --- +-- @overload self, string, cc.Image::Format, bool +-- @overload self, string, bool -- @function [parent=#RenderTexture] saveToFile -- @param self -- @param #string str @@ -91,12 +89,9 @@ -- @param self -------------------------------- --- overload function: beginWithClear(float, float, float, float, float) --- --- overload function: beginWithClear(float, float, float, float) --- --- overload function: beginWithClear(float, float, float, float, float, int) --- +-- @overload self, float, float, float, float, float +-- @overload self, float, float, float, float +-- @overload self, float, float, float, float, float, int -- @function [parent=#RenderTexture] beginWithClear -- @param self -- @param #float float @@ -140,10 +135,8 @@ -- @param #float float -------------------------------- --- overload function: initWithWidthAndHeight(int, int, cc.Texture2D::PixelFormat, unsigned int) --- --- overload function: initWithWidthAndHeight(int, int, cc.Texture2D::PixelFormat) --- +-- @overload self, int, int, cc.Texture2D::PixelFormat, unsigned int +-- @overload self, int, int, cc.Texture2D::PixelFormat -- @function [parent=#RenderTexture] initWithWidthAndHeight -- @param self -- @param #int int @@ -153,12 +146,9 @@ -- @return bool#bool ret (retunr value: bool) -------------------------------- --- overload function: create(int, int, cc.Texture2D::PixelFormat) --- --- overload function: create(int, int, cc.Texture2D::PixelFormat, unsigned int) --- --- overload function: create(int, int) --- +-- @overload self, int, int, cc.Texture2D::PixelFormat +-- @overload self, int, int, cc.Texture2D::PixelFormat, unsigned int +-- @overload self, int, int -- @function [parent=#RenderTexture] create -- @param self -- @param #int int diff --git a/cocos/scripting/lua-bindings/auto/api/RichText.lua b/cocos/scripting/lua-bindings/auto/api/RichText.lua index 1785502d9c..c332a6f8e7 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichText.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichText.lua @@ -35,10 +35,8 @@ -- @param self -------------------------------- --- overload function: removeElement(ccui.RichElement) --- --- overload function: removeElement(int) --- +-- @overload self, ccui.RichElement +-- @overload self, int -- @function [parent=#RichText] removeElement -- @param self -- @param #int int diff --git a/cocos/scripting/lua-bindings/auto/api/RotateBy.lua b/cocos/scripting/lua-bindings/auto/api/RotateBy.lua index 3737e0502a..8d1d33c55e 100644 --- a/cocos/scripting/lua-bindings/auto/api/RotateBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/RotateBy.lua @@ -5,12 +5,9 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, float, float) --- --- overload function: create(float, float) --- --- overload function: create(float, vec3_table) --- +-- @overload self, float, float, float +-- @overload self, float, float +-- @overload self, float, vec3_table -- @function [parent=#RotateBy] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/RotateTo.lua b/cocos/scripting/lua-bindings/auto/api/RotateTo.lua index a6ec1f2149..49f29e13b4 100644 --- a/cocos/scripting/lua-bindings/auto/api/RotateTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/RotateTo.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, float) --- --- overload function: create(float, float, float) --- +-- @overload self, float, float +-- @overload self, float, float, float -- @function [parent=#RotateTo] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua b/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua index 27ed890c1a..5a394237fa 100644 --- a/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua +++ b/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua @@ -16,10 +16,8 @@ -- @param #float float -------------------------------- --- overload function: initWithSpriteFrameName(string) --- --- overload function: initWithSpriteFrameName(string, rect_table) --- +-- @overload self, string +-- @overload self, string, rect_table -- @function [parent=#Scale9Sprite] initWithSpriteFrameName -- @param self -- @param #string str @@ -47,10 +45,8 @@ -- @param #cc.SpriteFrame spriteframe -------------------------------- --- overload function: initWithBatchNode(cc.SpriteBatchNode, rect_table, rect_table) --- --- overload function: initWithBatchNode(cc.SpriteBatchNode, rect_table, bool, rect_table) --- +-- @overload self, cc.SpriteBatchNode, rect_table, rect_table +-- @overload self, cc.SpriteBatchNode, rect_table, bool, rect_table -- @function [parent=#Scale9Sprite] initWithBatchNode -- @param self -- @param #cc.SpriteBatchNode spritebatchnode @@ -89,14 +85,10 @@ -- @return size_table#size_table ret (return value: size_table) -------------------------------- --- overload function: initWithFile(string, rect_table) --- --- overload function: initWithFile(string, rect_table, rect_table) --- --- overload function: initWithFile(rect_table, string) --- --- overload function: initWithFile(string) --- +-- @overload self, string, rect_table +-- @overload self, string, rect_table, rect_table +-- @overload self, rect_table, string +-- @overload self, string -- @function [parent=#Scale9Sprite] initWithFile -- @param self -- @param #string str @@ -115,10 +107,8 @@ -- @param #float float -------------------------------- --- overload function: initWithSpriteFrame(cc.SpriteFrame) --- --- overload function: initWithSpriteFrame(cc.SpriteFrame, rect_table) --- +-- @overload self, cc.SpriteFrame +-- @overload self, cc.SpriteFrame, rect_table -- @function [parent=#Scale9Sprite] initWithSpriteFrame -- @param self -- @param #cc.SpriteFrame spriteframe @@ -146,16 +136,11 @@ -- @param #float float -------------------------------- --- overload function: create(string, rect_table, rect_table) --- --- overload function: create() --- --- overload function: create(rect_table, string) --- --- overload function: create(string, rect_table) --- --- overload function: create(string) --- +-- @overload self, string, rect_table, rect_table +-- @overload self +-- @overload self, rect_table, string +-- @overload self, string, rect_table +-- @overload self, string -- @function [parent=#Scale9Sprite] create -- @param self -- @param #string str @@ -164,10 +149,8 @@ -- @return Scale9Sprite#Scale9Sprite ret (retunr value: cc.Scale9Sprite) -------------------------------- --- overload function: createWithSpriteFrameName(string, rect_table) --- --- overload function: createWithSpriteFrameName(string) --- +-- @overload self, string, rect_table +-- @overload self, string -- @function [parent=#Scale9Sprite] createWithSpriteFrameName -- @param self -- @param #string str @@ -175,10 +158,8 @@ -- @return Scale9Sprite#Scale9Sprite ret (retunr value: cc.Scale9Sprite) -------------------------------- --- overload function: createWithSpriteFrame(cc.SpriteFrame, rect_table) --- --- overload function: createWithSpriteFrame(cc.SpriteFrame) --- +-- @overload self, cc.SpriteFrame, rect_table +-- @overload self, cc.SpriteFrame -- @function [parent=#Scale9Sprite] createWithSpriteFrame -- @param self -- @param #cc.SpriteFrame spriteframe diff --git a/cocos/scripting/lua-bindings/auto/api/ScaleBy.lua b/cocos/scripting/lua-bindings/auto/api/ScaleBy.lua index b414e11083..3d2e657b72 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScaleBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScaleBy.lua @@ -5,12 +5,9 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, float, float) --- --- overload function: create(float, float) --- --- overload function: create(float, float, float, float) --- +-- @overload self, float, float, float +-- @overload self, float, float +-- @overload self, float, float, float, float -- @function [parent=#ScaleBy] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/ScaleTo.lua b/cocos/scripting/lua-bindings/auto/api/ScaleTo.lua index d6b9894f1e..3869dffc97 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScaleTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScaleTo.lua @@ -5,12 +5,9 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, float, float) --- --- overload function: create(float, float) --- --- overload function: create(float, float, float, float) --- +-- @overload self, float, float, float +-- @overload self, float, float +-- @overload self, float, float, float, float -- @function [parent=#ScaleTo] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/Scene.lua b/cocos/scripting/lua-bindings/auto/api/Scene.lua index 070e380146..ba1bec9356 100644 --- a/cocos/scripting/lua-bindings/auto/api/Scene.lua +++ b/cocos/scripting/lua-bindings/auto/api/Scene.lua @@ -41,10 +41,8 @@ -- @param #float float -------------------------------- --- overload function: addChild(cc.Node, int, string) --- --- overload function: addChild(cc.Node, int, int) --- +-- @overload self, cc.Node, int, string +-- @overload self, cc.Node, int, int -- @function [parent=#Scene] addChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/ScrollView.lua b/cocos/scripting/lua-bindings/auto/api/ScrollView.lua index ca67c9aeef..6a6766fce1 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScrollView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScrollView.lua @@ -181,14 +181,10 @@ -- @return Ref#Ref ret (return value: cc.Ref) -------------------------------- --- overload function: addChild(cc.Node, int) --- --- overload function: addChild(cc.Node) --- --- overload function: addChild(cc.Node, int, int) --- --- overload function: addChild(cc.Node, int, string) --- +-- @overload self, cc.Node, int +-- @overload self, cc.Node +-- @overload self, cc.Node, int, int +-- @overload self, cc.Node, int, string -- @function [parent=#ScrollView] addChild -- @param self -- @param #cc.Node node @@ -239,10 +235,8 @@ -- @param #bool bool -------------------------------- --- overload function: getChildren() --- --- overload function: getChildren() --- +-- @overload self +-- @overload self -- @function [parent=#ScrollView] getChildren -- @param self -- @return array_table#array_table ret (retunr value: array_table) diff --git a/cocos/scripting/lua-bindings/auto/api/Skin.lua b/cocos/scripting/lua-bindings/auto/api/Skin.lua index 4f3f58bc67..10b1e77183 100644 --- a/cocos/scripting/lua-bindings/auto/api/Skin.lua +++ b/cocos/scripting/lua-bindings/auto/api/Skin.lua @@ -41,10 +41,8 @@ -- @param #ccs.Bone bone -------------------------------- --- overload function: create(string) --- --- overload function: create() --- +-- @overload self, string +-- @overload self -- @function [parent=#Skin] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite.lua b/cocos/scripting/lua-bindings/auto/api/Sprite.lua index 942735e816..7be402618d 100644 --- a/cocos/scripting/lua-bindings/auto/api/Sprite.lua +++ b/cocos/scripting/lua-bindings/auto/api/Sprite.lua @@ -5,19 +5,15 @@ -- @parent_module cc -------------------------------- --- overload function: setSpriteFrame(cc.SpriteFrame) --- --- overload function: setSpriteFrame(string) --- +-- @overload self, cc.SpriteFrame +-- @overload self, string -- @function [parent=#Sprite] setSpriteFrame -- @param self -- @param #string str -------------------------------- --- overload function: setTexture(cc.Texture2D) --- --- overload function: setTexture(string) --- +-- @overload self, cc.Texture2D +-- @overload self, string -- @function [parent=#Sprite] setTexture -- @param self -- @param #string str @@ -57,10 +53,8 @@ -- @param self -------------------------------- --- overload function: setTextureRect(rect_table, bool, size_table) --- --- overload function: setTextureRect(rect_table) --- +-- @overload self, rect_table, bool, size_table +-- @overload self, rect_table -- @function [parent=#Sprite] setTextureRect -- @param self -- @param #rect_table rect @@ -145,12 +139,9 @@ -- @param #rect_table rect -------------------------------- --- overload function: create(string) --- --- overload function: create() --- --- overload function: create(string, rect_table) --- +-- @overload self, string +-- @overload self +-- @overload self, string, rect_table -- @function [parent=#Sprite] create -- @param self -- @param #string str @@ -158,10 +149,8 @@ -- @return Sprite#Sprite ret (retunr value: cc.Sprite) -------------------------------- --- overload function: createWithTexture(cc.Texture2D, rect_table, bool) --- --- overload function: createWithTexture(cc.Texture2D) --- +-- @overload self, cc.Texture2D, rect_table, bool +-- @overload self, cc.Texture2D -- @function [parent=#Sprite] createWithTexture -- @param self -- @param #cc.Texture2D texture2d @@ -189,10 +178,8 @@ -- @param #unsigned int int -------------------------------- --- overload function: addChild(cc.Node, int, string) --- --- overload function: addChild(cc.Node, int, int) --- +-- @overload self, cc.Node, int, string +-- @overload self, cc.Node, int, int -- @function [parent=#Sprite] addChild -- @param self -- @param #cc.Node node @@ -240,10 +227,8 @@ -- @param #float float -------------------------------- --- overload function: setScale(float) --- --- overload function: setScale(float, float) --- +-- @overload self, float +-- @overload self, float, float -- @function [parent=#Sprite] setScale -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua index 7ccbd43161..1af4d44bcd 100644 --- a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: setTexture(cc.Texture2D) --- --- overload function: setTexture(string) --- +-- @overload self, cc.Texture2D +-- @overload self, string -- @function [parent=#Sprite3D] setTexture -- @param self -- @param #string str @@ -29,10 +27,8 @@ -- @param #cc.BlendFunc blendfunc -------------------------------- --- overload function: create(string, string) --- --- overload function: create(string) --- +-- @overload self, string, string +-- @overload self, string -- @function [parent=#Sprite3D] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua b/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua index c90efa107d..66321568dd 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua @@ -109,10 +109,8 @@ -- @return SpriteBatchNode#SpriteBatchNode ret (return value: cc.SpriteBatchNode) -------------------------------- --- overload function: addChild(cc.Node, int, string) --- --- overload function: addChild(cc.Node, int, int) --- +-- @overload self, cc.Node, int, string +-- @overload self, cc.Node, int, int -- @function [parent=#SpriteBatchNode] addChild -- @param self -- @param #cc.Node node diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua b/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua index 4751bae0ad..cca90af1d0 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua @@ -90,10 +90,8 @@ -- @return size_table#size_table ret (return value: size_table) -------------------------------- --- overload function: create(string, rect_table, bool, vec2_table, size_table) --- --- overload function: create(string, rect_table) --- +-- @overload self, string, rect_table, bool, vec2_table, size_table +-- @overload self, string, rect_table -- @function [parent=#SpriteFrame] create -- @param self -- @param #string str @@ -104,10 +102,8 @@ -- @return SpriteFrame#SpriteFrame ret (retunr value: cc.SpriteFrame) -------------------------------- --- overload function: createWithTexture(cc.Texture2D, rect_table, bool, vec2_table, size_table) --- --- overload function: createWithTexture(cc.Texture2D, rect_table) --- +-- @overload self, cc.Texture2D, rect_table, bool, vec2_table, size_table +-- @overload self, cc.Texture2D, rect_table -- @function [parent=#SpriteFrame] createWithTexture -- @param self -- @param #cc.Texture2D texture2d diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua b/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua index 8c1cc29b20..0d8ee97edf 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua @@ -5,12 +5,9 @@ -- @parent_module cc -------------------------------- --- overload function: addSpriteFramesWithFile(string, string) --- --- overload function: addSpriteFramesWithFile(string) --- --- overload function: addSpriteFramesWithFile(string, cc.Texture2D) --- +-- @overload self, string, string +-- @overload self, string +-- @overload self, string, cc.Texture2D -- @function [parent=#SpriteFrameCache] addSpriteFramesWithFile -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua b/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua index 6fb6367046..2ac1d3be5a 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua @@ -62,10 +62,8 @@ -- @param self -------------------------------- --- overload function: setTileGID(unsigned int, vec2_table, cc.TMXTileFlags_) --- --- overload function: setTileGID(unsigned int, vec2_table) --- +-- @overload self, unsigned int, vec2_table, cc.TMXTileFlags_ +-- @overload self, unsigned int, vec2_table -- @function [parent=#TMXLayer] setTileGID -- @param self -- @param #unsigned int int @@ -104,10 +102,8 @@ -- @return TMXTilesetInfo#TMXTilesetInfo ret (return value: cc.TMXTilesetInfo) -------------------------------- --- overload function: getProperties() --- --- overload function: getProperties() --- +-- @overload self +-- @overload self -- @function [parent=#TMXLayer] getProperties -- @param self -- @return map_table#map_table ret (retunr value: map_table) diff --git a/cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua b/cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua index e5b3ab7d62..ef098ce6f2 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua @@ -57,19 +57,15 @@ -- @return bool#bool ret (return value: bool) -------------------------------- --- overload function: getLayers() --- --- overload function: getLayers() --- +-- @overload self +-- @overload self -- @function [parent=#TMXMapInfo] getLayers -- @param self -- @return array_table#array_table ret (retunr value: array_table) -------------------------------- --- overload function: getTilesets() --- --- overload function: getTilesets() --- +-- @overload self +-- @overload self -- @function [parent=#TMXMapInfo] getTilesets -- @param self -- @return array_table#array_table ret (retunr value: array_table) @@ -112,10 +108,8 @@ -- @return map_table#map_table ret (return value: map_table) -------------------------------- --- overload function: getObjectGroups() --- --- overload function: getObjectGroups() --- +-- @overload self +-- @overload self -- @function [parent=#TMXMapInfo] getObjectGroups -- @param self -- @return array_table#array_table ret (retunr value: array_table) @@ -166,10 +160,8 @@ -- @param #array_table array -------------------------------- --- overload function: getProperties() --- --- overload function: getProperties() --- +-- @overload self +-- @overload self -- @function [parent=#TMXMapInfo] getProperties -- @param self -- @return map_table#map_table ret (retunr value: map_table) diff --git a/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua b/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua index e5d58455c7..2a2330d036 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua @@ -27,10 +27,8 @@ -- @return map_table#map_table ret (return value: map_table) -------------------------------- --- overload function: getObjects() --- --- overload function: getObjects() --- +-- @overload self +-- @overload self -- @function [parent=#TMXObjectGroup] getObjects -- @param self -- @return array_table#array_table ret (retunr value: array_table) @@ -41,10 +39,8 @@ -- @param #string str -------------------------------- --- overload function: getProperties() --- --- overload function: getProperties() --- +-- @overload self +-- @overload self -- @function [parent=#TMXObjectGroup] getProperties -- @param self -- @return map_table#map_table ret (retunr value: map_table) diff --git a/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua b/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua index ad971f4749..667aa48c50 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua @@ -27,10 +27,8 @@ -- @return TMXObjectGroup#TMXObjectGroup ret (return value: cc.TMXObjectGroup) -------------------------------- --- overload function: getObjectGroups() --- --- overload function: getObjectGroups() --- +-- @overload self +-- @overload self -- @function [parent=#TMXTiledMap] getObjectGroups -- @param self -- @return array_table#array_table ret (retunr value: array_table) diff --git a/cocos/scripting/lua-bindings/auto/api/TargetedAction.lua b/cocos/scripting/lua-bindings/auto/api/TargetedAction.lua index d5be1e7cf1..82d934aab5 100644 --- a/cocos/scripting/lua-bindings/auto/api/TargetedAction.lua +++ b/cocos/scripting/lua-bindings/auto/api/TargetedAction.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: getForcedTarget() --- --- overload function: getForcedTarget() --- +-- @overload self +-- @overload self -- @function [parent=#TargetedAction] getForcedTarget -- @param self -- @return Node#Node ret (retunr value: cc.Node) diff --git a/cocos/scripting/lua-bindings/auto/api/Text.lua b/cocos/scripting/lua-bindings/auto/api/Text.lua index 59aabe41e9..95ebb07893 100644 --- a/cocos/scripting/lua-bindings/auto/api/Text.lua +++ b/cocos/scripting/lua-bindings/auto/api/Text.lua @@ -104,10 +104,8 @@ -- @param #size_table size -------------------------------- --- overload function: create(string, string, int) --- --- overload function: create() --- +-- @overload self, string, string, int +-- @overload self -- @function [parent=#Text] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/TextAtlas.lua b/cocos/scripting/lua-bindings/auto/api/TextAtlas.lua index 5b331fcce3..2ee69b8e6e 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextAtlas.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextAtlas.lua @@ -33,10 +33,8 @@ -- @param self -------------------------------- --- overload function: create(string, string, int, int, string) --- --- overload function: create() --- +-- @overload self, string, string, int, int, string +-- @overload self -- @function [parent=#TextAtlas] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/TextBMFont.lua b/cocos/scripting/lua-bindings/auto/api/TextBMFont.lua index 73c0b93931..424c43eda3 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextBMFont.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextBMFont.lua @@ -25,10 +25,8 @@ -- @return string#string ret (return value: string) -------------------------------- --- overload function: create(string, string) --- --- overload function: create() --- +-- @overload self, string, string +-- @overload self -- @function [parent=#TextBMFont] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/TextField.lua b/cocos/scripting/lua-bindings/auto/api/TextField.lua index 89ae5c77f1..bb9e42d2ac 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextField.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextField.lua @@ -179,10 +179,8 @@ -- @return size_table#size_table ret (return value: size_table) -------------------------------- --- overload function: create(string, string, int) --- --- overload function: create() --- +-- @overload self, string, string, int +-- @overload self -- @function [parent=#TextField] create -- @param self -- @param #string str diff --git a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua index d1db2503f1..f09da19646 100644 --- a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua @@ -15,10 +15,8 @@ -- @return char#char ret (return value: char) -------------------------------- --- overload function: initWithImage(cc.Image, cc.Texture2D::PixelFormat) --- --- overload function: initWithImage(cc.Image) --- +-- @overload self, cc.Image, cc.Texture2D::PixelFormat +-- @overload self, cc.Image -- @function [parent=#Texture2D] initWithImage -- @param self -- @param #cc.Image image @@ -45,10 +43,8 @@ -- @return int#int ret (return value: int) -------------------------------- --- overload function: getBitsPerPixelForFormat(cc.Texture2D::PixelFormat) --- --- overload function: getBitsPerPixelForFormat() --- +-- @overload self, cc.Texture2D::PixelFormat +-- @overload self -- @function [parent=#Texture2D] getBitsPerPixelForFormat -- @param self -- @param #cc.Texture2D::PixelFormat pixelformat @@ -60,10 +56,8 @@ -- @return unsigned int#unsigned int ret (return value: unsigned int) -------------------------------- --- overload function: initWithString(char, cc.FontDefinition) --- --- overload function: initWithString(char, string, float, size_table, cc.TextHAlignment, cc.TextVAlignment) --- +-- @overload self, char, cc.FontDefinition +-- @overload self, char, string, float, size_table, cc.TextHAlignment, cc.TextVAlignment -- @function [parent=#Texture2D] initWithString -- @param self -- @param #char char diff --git a/cocos/scripting/lua-bindings/auto/api/TextureCache.lua b/cocos/scripting/lua-bindings/auto/api/TextureCache.lua index 74b93c8ded..fbcaadd1ac 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextureCache.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextureCache.lua @@ -34,10 +34,8 @@ -- @return string#string ret (return value: string) -------------------------------- --- overload function: addImage(cc.Image, string) --- --- overload function: addImage(string) --- +-- @overload self, cc.Image, string +-- @overload self, string -- @function [parent=#TextureCache] addImage -- @param self -- @param #cc.Image image diff --git a/cocos/scripting/lua-bindings/auto/api/TiledGrid3D.lua b/cocos/scripting/lua-bindings/auto/api/TiledGrid3D.lua index 01a779f136..53ad06354a 100644 --- a/cocos/scripting/lua-bindings/auto/api/TiledGrid3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/TiledGrid3D.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(size_table) --- --- overload function: create(size_table, cc.Texture2D, bool) --- +-- @overload self, size_table +-- @overload self, size_table, cc.Texture2D, bool -- @function [parent=#TiledGrid3D] create -- @param self -- @param #size_table size diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFade.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFade.lua index 14da7ec620..73bd19113b 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFade.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFade.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, cc.Scene) --- --- overload function: create(float, cc.Scene, color3b_table) --- +-- @overload self, float, cc.Scene +-- @overload self, float, cc.Scene, color3b_table -- @function [parent=#TransitionFade] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua index 909801bbb8..85dc373a56 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, cc.Scene) --- --- overload function: create(float, cc.Scene, cc.TransitionScene::Orientation) --- +-- @overload self, float, cc.Scene +-- @overload self, float, cc.Scene, cc.TransitionScene::Orientation -- @function [parent=#TransitionFlipAngular] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua index 721f23f447..b1c588d862 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, cc.Scene) --- --- overload function: create(float, cc.Scene, cc.TransitionScene::Orientation) --- +-- @overload self, float, cc.Scene +-- @overload self, float, cc.Scene, cc.TransitionScene::Orientation -- @function [parent=#TransitionFlipX] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua index fe23b1bf0c..a90378fc78 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, cc.Scene) --- --- overload function: create(float, cc.Scene, cc.TransitionScene::Orientation) --- +-- @overload self, float, cc.Scene +-- @overload self, float, cc.Scene, cc.TransitionScene::Orientation -- @function [parent=#TransitionFlipY] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua index 039e476142..e9cdec7159 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, cc.Scene) --- --- overload function: create(float, cc.Scene, cc.TransitionScene::Orientation) --- +-- @overload self, float, cc.Scene +-- @overload self, float, cc.Scene, cc.TransitionScene::Orientation -- @function [parent=#TransitionZoomFlipAngular] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua index 92bae22d88..8e06230a90 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, cc.Scene) --- --- overload function: create(float, cc.Scene, cc.TransitionScene::Orientation) --- +-- @overload self, float, cc.Scene +-- @overload self, float, cc.Scene, cc.TransitionScene::Orientation -- @function [parent=#TransitionZoomFlipX] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua index d9ec479508..461e6c1e51 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua @@ -5,10 +5,8 @@ -- @parent_module cc -------------------------------- --- overload function: create(float, cc.Scene) --- --- overload function: create(float, cc.Scene, cc.TransitionScene::Orientation) --- +-- @overload self, float, cc.Scene +-- @overload self, float, cc.Scene, cc.TransitionScene::Orientation -- @function [parent=#TransitionZoomFlipY] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua b/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua index 74f28e88f5..c7ffd3d8f4 100644 --- a/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua @@ -15,10 +15,8 @@ -- @param #vec2_table vec2 -------------------------------- --- overload function: create(float, size_table, unsigned int) --- --- overload function: create(float, size_table) --- +-- @overload self, float, size_table, unsigned int +-- @overload self, float, size_table -- @function [parent=#TurnOffTiles] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/UserDefault.lua b/cocos/scripting/lua-bindings/auto/api/UserDefault.lua index 5d733a2c9e..173263c472 100644 --- a/cocos/scripting/lua-bindings/auto/api/UserDefault.lua +++ b/cocos/scripting/lua-bindings/auto/api/UserDefault.lua @@ -10,10 +10,8 @@ -- @param #int int -------------------------------- --- overload function: getFloatForKey(char, float) --- --- overload function: getFloatForKey(char) --- +-- @overload self, char, float +-- @overload self, char -- @function [parent=#UserDefault] getFloatForKey -- @param self -- @param #char char @@ -21,10 +19,8 @@ -- @return float#float ret (retunr value: float) -------------------------------- --- overload function: getBoolForKey(char, bool) --- --- overload function: getBoolForKey(char) --- +-- @overload self, char, bool +-- @overload self, char -- @function [parent=#UserDefault] getBoolForKey -- @param self -- @param #char char @@ -44,10 +40,8 @@ -- @param #float float -------------------------------- --- overload function: getStringForKey(char, string) --- --- overload function: getStringForKey(char) --- +-- @overload self, char, string +-- @overload self, char -- @function [parent=#UserDefault] getStringForKey -- @param self -- @param #char char @@ -65,10 +59,8 @@ -- @param self -------------------------------- --- overload function: getIntegerForKey(char, int) --- --- overload function: getIntegerForKey(char) --- +-- @overload self, char, int +-- @overload self, char -- @function [parent=#UserDefault] getIntegerForKey -- @param self -- @param #char char @@ -76,10 +68,8 @@ -- @return int#int ret (retunr value: int) -------------------------------- --- overload function: getDoubleForKey(char, double) --- --- overload function: getDoubleForKey(char) --- +-- @overload self, char, double +-- @overload self, char -- @function [parent=#UserDefault] getDoubleForKey -- @param self -- @param #char char diff --git a/cocos/scripting/lua-bindings/auto/api/VBox.lua b/cocos/scripting/lua-bindings/auto/api/VBox.lua index ddc31a60b1..0955ae7c9e 100644 --- a/cocos/scripting/lua-bindings/auto/api/VBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/VBox.lua @@ -5,10 +5,8 @@ -- @parent_module ccui -------------------------------- --- overload function: create(size_table) --- --- overload function: create() --- +-- @overload self, size_table +-- @overload self -- @function [parent=#VBox] create -- @param self -- @param #size_table size diff --git a/cocos/scripting/lua-bindings/auto/api/Widget.lua b/cocos/scripting/lua-bindings/auto/api/Widget.lua index 2a254f1f5f..e5933d173d 100644 --- a/cocos/scripting/lua-bindings/auto/api/Widget.lua +++ b/cocos/scripting/lua-bindings/auto/api/Widget.lua @@ -196,10 +196,8 @@ -- @param self -------------------------------- --- overload function: updateSizeAndPosition(size_table) --- --- overload function: updateSizeAndPosition() --- +-- @overload self, size_table +-- @overload self -- @function [parent=#Widget] updateSizeAndPosition -- @param self -- @param #size_table size From 514309dbd0f91ab6b844332201d9a1a38fb1313c Mon Sep 17 00:00:00 2001 From: zhangbin Date: Thu, 17 Jul 2014 10:29:43 +0800 Subject: [PATCH 21/32] Update the reference of submodule plugin-x. --- plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin b/plugin index 51ceded726..8d1888ac8f 160000 --- a/plugin +++ b/plugin @@ -1 +1 @@ -Subproject commit 51ceded726cc034cdc939e379e1b24249e0ebad4 +Subproject commit 8d1888ac8f2846a67094905b7f362f746ae5a31f From 880c2c4c3f5dea53a6cb2d45eb348c840f870878 Mon Sep 17 00:00:00 2001 From: andyque Date: Thu, 17 Jul 2014 10:46:20 +0800 Subject: [PATCH 22/32] change FastTiledMap namespace to cocos2d::experimental --- cocos/2d/CCFastTMXLayer.cpp | 3 +++ cocos/2d/CCFastTMXLayer.h | 4 +++- cocos/2d/CCFastTMXTiledMap.cpp | 2 ++ cocos/2d/CCFastTMXTiledMap.h | 7 ++++++- tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/cocos/2d/CCFastTMXLayer.cpp b/cocos/2d/CCFastTMXLayer.cpp index 15d5717330..86a5efae27 100644 --- a/cocos/2d/CCFastTMXLayer.cpp +++ b/cocos/2d/CCFastTMXLayer.cpp @@ -49,6 +49,7 @@ THE SOFTWARE. #include NS_CC_BEGIN +namespace experimental { const int FastTMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0; const int FastTMXLayer::FAST_TMX_ORIENTATION_HEX = 1; @@ -857,4 +858,6 @@ std::string FastTMXLayer::getDescription() const return StringUtils::format("", _tag, (int)_mapTileSize.width, (int)_mapTileSize.height); } +} //end of namespace experimental + NS_CC_END diff --git a/cocos/2d/CCFastTMXLayer.h b/cocos/2d/CCFastTMXLayer.h index fa377bb0d0..6713399d80 100644 --- a/cocos/2d/CCFastTMXLayer.h +++ b/cocos/2d/CCFastTMXLayer.h @@ -45,6 +45,8 @@ class Texture2D; class Sprite; struct _ccCArray; +namespace experimental{ + /** * @addtogroup tilemap_parallax_nodes * @{ @@ -256,7 +258,7 @@ public: // end of tilemap_parallax_nodes group /// @} - +} //end of namespace experimental NS_CC_END #endif //__CCTMX_LAYER2_H__ diff --git a/cocos/2d/CCFastTMXTiledMap.cpp b/cocos/2d/CCFastTMXTiledMap.cpp index af81acc6e1..3c876b3055 100644 --- a/cocos/2d/CCFastTMXTiledMap.cpp +++ b/cocos/2d/CCFastTMXTiledMap.cpp @@ -34,6 +34,7 @@ THE SOFTWARE. #include "deprecated/CCString.h" NS_CC_BEGIN +namespace experimental { // implementation FastTMXTiledMap @@ -251,6 +252,7 @@ std::string FastTMXTiledMap::getDescription() const return StringUtils::format("(_children.size())); } +} //end of namespace experimental NS_CC_END diff --git a/cocos/2d/CCFastTMXTiledMap.h b/cocos/2d/CCFastTMXTiledMap.h index 9dfc098552..4b2d006f50 100644 --- a/cocos/2d/CCFastTMXTiledMap.h +++ b/cocos/2d/CCFastTMXTiledMap.h @@ -33,11 +33,14 @@ THE SOFTWARE. NS_CC_BEGIN class TMXObjectGroup; -class FastTMXLayer; class TMXLayerInfo; class TMXTilesetInfo; class TMXMapInfo; +namespace experimental { + +class FastTMXLayer; + /** @brief FastTMXTiledMap knows how to parse and render a TMX map. It adds support for the TMX tiled map format used by http://www.mapeditor.org @@ -179,6 +182,8 @@ private: // end of tilemap_parallax_nodes group /// @} + +} //end of namespace experimental NS_CC_END diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp index f89cb73e62..cba25b04ad 100644 --- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp +++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp @@ -4,6 +4,9 @@ #include "2d/CCFastTMXLayer.h" #include "2d/CCFastTMXTiledMap.h" +using cocos2d::experimental::FastTMXLayer; +using cocos2d::experimental::FastTMXTiledMap; + namespace { enum From 9217589b9fb7cb03dfd1a3464871db160737a874 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 17 Jul 2014 03:04:08 +0000 Subject: [PATCH 23/32] [AUTO]: updating luabinding automatically --- .../lua-bindings/auto/api/FileUtils.lua | 2 ++ .../lua-bindings/auto/lua_cocos2dx_auto.cpp | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/cocos/scripting/lua-bindings/auto/api/FileUtils.lua b/cocos/scripting/lua-bindings/auto/api/FileUtils.lua index 015c13c8bb..55ba23c983 100644 --- a/cocos/scripting/lua-bindings/auto/api/FileUtils.lua +++ b/cocos/scripting/lua-bindings/auto/api/FileUtils.lua @@ -74,11 +74,13 @@ -- @function [parent=#FileUtils] addSearchResolutionsOrder -- @param self -- @param #string str +-- @param #bool bool -------------------------------- -- @function [parent=#FileUtils] addSearchPath -- @param self -- @param #string str +-- @param #bool bool -------------------------------- -- @function [parent=#FileUtils] isFileExist diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 5bacc30a91..5a18e5c499 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -15520,6 +15520,19 @@ int lua_cocos2dx_FileUtils_addSearchResolutionsOrder(lua_State* tolua_S) cobj->addSearchResolutionsOrder(arg0); return 0; } + if (argc == 2) + { + std::string arg0; + bool arg1; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1); + if(!ok) + return 0; + cobj->addSearchResolutionsOrder(arg0, arg1); + return 0; + } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSearchResolutionsOrder",argc, 1); return 0; @@ -15566,6 +15579,19 @@ int lua_cocos2dx_FileUtils_addSearchPath(lua_State* tolua_S) cobj->addSearchPath(arg0); return 0; } + if (argc == 2) + { + std::string arg0; + bool arg1; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1); + if(!ok) + return 0; + cobj->addSearchPath(arg0, arg1); + return 0; + } CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSearchPath",argc, 1); return 0; From 1ff937aa48089a01ecfcad52e1d6aba4024856b6 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Thu, 17 Jul 2014 11:09:08 +0800 Subject: [PATCH 24/32] Fixed bugs[Ouya controller]: 1.fix joysticks are reporting the same keycode 2.fix lose disconnected event --- .../cocos2dx/lib/GameControllerActivity.java | 2 +- .../cocos2dx/lib/GameControllerHelper.java | 20 ++++++------ .../org/cocos2dx/lib/GameControllerOuya.java | 32 +++++++++++-------- .../Classes/GameControllerTest.cpp | 12 +++++++ 4 files changed, 43 insertions(+), 23 deletions(-) diff --git a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerActivity.java b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerActivity.java index f5bc665c2b..b527751778 100644 --- a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerActivity.java +++ b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerActivity.java @@ -270,7 +270,7 @@ public abstract class GameControllerActivity extends Cocos2dxActivity implements mControllerOuya.onResume(); } - mControllerHelper.gatherControllers(); + GameControllerHelper.gatherControllers(mControllerHelper.mGameController); } @Override diff --git a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerHelper.java b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerHelper.java index e4c756e074..f1cec07d11 100644 --- a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerHelper.java +++ b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerHelper.java @@ -80,6 +80,7 @@ public class GameControllerHelper { int deviceId = event.getDeviceId(); String deviceName = event.getDevice().getName(); if(mGameController.get(deviceId) == null){ + gatherControllers(mGameController); mGameController.append(deviceId, deviceName); } @@ -167,6 +168,7 @@ public class GameControllerHelper { String deviceName = event.getDevice().getName(); if(mGameController.get(deviceId) == null){ + gatherControllers(mGameController); mGameController.append(deviceId, deviceName); } @@ -224,7 +226,7 @@ public class GameControllerHelper { } void onInputDeviceChanged(int deviceId){ - gatherControllers(); + gatherControllers(mGameController); } void onInputDeviceRemoved(int deviceId) { @@ -234,20 +236,20 @@ public class GameControllerHelper { } } - void gatherControllers(){ - int controllerCount = mGameController.size(); + static void gatherControllers(SparseArray controllers){ + int controllerCount = controllers.size(); for (int i = 0; i < controllerCount; i++) { try { - int controllerDeveceId = mGameController.keyAt(i); + int controllerDeveceId = controllers.keyAt(i); InputDevice device = InputDevice.getDevice(controllerDeveceId); if (device == null) { - GameControllerAdapter.onDisconnected(mGameController.get(controllerDeveceId), controllerDeveceId); - mGameController.delete(controllerDeveceId); + GameControllerAdapter.onDisconnected(controllers.get(controllerDeveceId), controllerDeveceId); + controllers.delete(controllerDeveceId); } } catch (Exception e) { - int controllerDeveceId = mGameController.keyAt(i); - GameControllerAdapter.onDisconnected(mGameController.get(controllerDeveceId), controllerDeveceId); - mGameController.delete(controllerDeveceId); + int controllerDeveceId = controllers.keyAt(i); + GameControllerAdapter.onDisconnected(controllers.get(controllerDeveceId), controllerDeveceId); + controllers.delete(controllerDeveceId); e.printStackTrace(); } } diff --git a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerOuya.java b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerOuya.java index ca6ccede4f..fab0fdc80a 100644 --- a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerOuya.java +++ b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerOuya.java @@ -5,6 +5,7 @@ import org.cocos2dx.lib.GameControllerDelegate; import tv.ouya.console.api.OuyaController; import android.content.Context; +import android.util.SparseArray; import android.util.SparseIntArray; import android.view.KeyEvent; import android.view.MotionEvent; @@ -13,6 +14,8 @@ public class GameControllerOuya implements GameControllerDelegate{ private SparseIntArray mKeyMap; + private SparseArray mGameController = new SparseArray(); + public GameControllerOuya(){ mKeyMap = new SparseIntArray(20); mKeyMap.put(OuyaController.BUTTON_A, GameControllerDelegate.BUTTON_B); @@ -25,13 +28,9 @@ public class GameControllerOuya implements GameControllerDelegate{ mKeyMap.put(OuyaController.BUTTON_DPAD_UP, GameControllerDelegate.BUTTON_DPAD_UP); mKeyMap.put(OuyaController.BUTTON_L1, GameControllerDelegate.BUTTON_LEFT_SHOULDER); mKeyMap.put(OuyaController.BUTTON_R1, GameControllerDelegate.BUTTON_RIGHT_SHOULDER); - mKeyMap.put(OuyaController.AXIS_L2, GameControllerDelegate.BUTTON_LEFT_TRIGGER); - mKeyMap.put(OuyaController.AXIS_R2, GameControllerDelegate.BUTTON_RIGHT_TRIGGER); - mKeyMap.put(OuyaController.AXIS_LS_X, GameControllerDelegate.BUTTON_LEFT_THUMBSTICK); - mKeyMap.put(OuyaController.AXIS_LS_Y, GameControllerDelegate.BUTTON_LEFT_THUMBSTICK); - mKeyMap.put(OuyaController.AXIS_RS_X, GameControllerDelegate.BUTTON_RIGHT_THUMBSTICK); - mKeyMap.put(OuyaController.AXIS_RS_Y, GameControllerDelegate.BUTTON_RIGHT_THUMBSTICK); + mKeyMap.put(OuyaController.BUTTON_L3, GameControllerDelegate.BUTTON_LEFT_THUMBSTICK); + mKeyMap.put(OuyaController.BUTTON_R3, GameControllerDelegate.BUTTON_RIGHT_THUMBSTICK); } public void onCreate(Context context) { @@ -61,7 +60,11 @@ public class GameControllerOuya implements GameControllerDelegate{ { int deviceId = event.getDeviceId(); String deviceName = event.getDevice().getName(); - OuyaController c = OuyaController.getControllerByDeviceId(deviceId); + OuyaController c = OuyaController.getControllerByDeviceId(deviceId); + if (mGameController.get(deviceId) == null) { + GameControllerHelper.gatherControllers(mGameController); + mGameController.append(deviceId, deviceName); + } float newLeftTrigger = c.getAxisValue(OuyaController.AXIS_L2); if (Float.compare(newLeftTrigger, mOldLeftTrigger) != 0) { @@ -125,10 +128,6 @@ public class GameControllerOuya implements GameControllerDelegate{ int action = event.getAction(); int keyCode = event.getKeyCode(); - if (keyCode == KeyEvent.KEYCODE_BUTTON_L2 || keyCode == KeyEvent.KEYCODE_BUTTON_R2) { - return true; - } - if (action == KeyEvent.ACTION_DOWN) { handled = OuyaController.onKeyDown(keyCode, event); } @@ -143,10 +142,17 @@ public class GameControllerOuya implements GameControllerDelegate{ isAnalog = true; } + int deviceId = event.getDeviceId(); + String deviceName = event.getDevice().getName(); + + if (mGameController.get(deviceId) == null) { + GameControllerHelper.gatherControllers(mGameController); + mGameController.append(deviceId, deviceName); + } if (action == KeyEvent.ACTION_DOWN) { - mControllerEventListener.onButtonEvent(event.getDevice().getName(), event.getDeviceId(), mKeyMap.get(keyCode), true, 1.0f, isAnalog); + mControllerEventListener.onButtonEvent(deviceName, deviceId, mKeyMap.get(keyCode), true, 1.0f, isAnalog); }else { - mControllerEventListener.onButtonEvent(event.getDevice().getName(), event.getDeviceId(), mKeyMap.get(keyCode), false, 0.0f, isAnalog); + mControllerEventListener.onButtonEvent(deviceName, deviceId, mKeyMap.get(keyCode), false, 0.0f, isAnalog); } } diff --git a/tests/game-controller-test/Classes/GameControllerTest.cpp b/tests/game-controller-test/Classes/GameControllerTest.cpp index ef27469315..de5a0d6c5c 100644 --- a/tests/game-controller-test/Classes/GameControllerTest.cpp +++ b/tests/game-controller-test/Classes/GameControllerTest.cpp @@ -196,6 +196,12 @@ void GameControllerTest::showButtonState(cocos2d::Controller *controller, int ke case Controller::Key::BUTTON_RIGHT_SHOULDER: holder->_buttonR1->setColor(Color3B(19,231,238)); break; + case Controller::Key::BUTTON_LEFT_THUMBSTICK: + holder->_leftJoystick->setColor(Color3B(19,231,238)); + break; + case Controller::Key::BUTTON_RIGHT_THUMBSTICK: + holder->_rightJoystick->setColor(Color3B(19,231,238)); + break; default: { char ketStatus[30]; @@ -239,6 +245,12 @@ void GameControllerTest::showButtonState(cocos2d::Controller *controller, int ke case Controller::Key::BUTTON_RIGHT_SHOULDER: holder->_buttonR1->setColor(Color3B::WHITE); break; + case Controller::Key::BUTTON_LEFT_THUMBSTICK: + holder->_leftJoystick->setColor(Color3B::WHITE); + break; + case Controller::Key::BUTTON_RIGHT_THUMBSTICK: + holder->_rightJoystick->setColor(Color3B::WHITE); + break; default: { char ketStatus[30]; From 6429cf06fbbfc0838d6669e714d706aa425ea410 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Thu, 17 Jul 2014 11:26:26 +0800 Subject: [PATCH 25/32] update test case of game controller[lua] --- tests/lua-game-controller-test/src/GameControllerTest.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/lua-game-controller-test/src/GameControllerTest.lua b/tests/lua-game-controller-test/src/GameControllerTest.lua index ca87a39bef..9b186fb84b 100644 --- a/tests/lua-game-controller-test/src/GameControllerTest.lua +++ b/tests/lua-game-controller-test/src/GameControllerTest.lua @@ -276,6 +276,10 @@ function GameControllerTest:registerControllerListener() holder._buttonL1:setColor(cc.c3b(19,231,238)) elseif keyCode == cc.ControllerKey.BUTTON_RIGHT_SHOULDER then holder._buttonR1:setColor(cc.c3b(19,231,238)) + elseif keyCode == cc.ControllerKey.BUTTON_LEFT_THUMBSTICK then + holder._leftJoystick:setColor(cc.c3b(19,231,238)) + elseif keyCode == cc.ControllerKey.BUTTON_RIGHT_THUMBSTICK then + holder._rightJoystick:setColor(cc.c3b(19,231,238)) else local ketStatus = string.format("Key Down:%d",keyCode) holder._externalKeyLabel:setString(ketStatus) @@ -301,6 +305,10 @@ function GameControllerTest:registerControllerListener() holder._buttonL1:setColor(cc.c3b(250,255,255)) elseif keyCode == cc.ControllerKey.BUTTON_RIGHT_SHOULDER then holder._buttonR1:setColor(cc.c3b(250,255,255)) + elseif keyCode == cc.ControllerKey.BUTTON_LEFT_THUMBSTICK then + holder._leftJoystick:setColor(cc.c3b(250,255,255)) + elseif keyCode == cc.ControllerKey.BUTTON_RIGHT_THUMBSTICK then + holder._rightJoystick:setColor(cc.c3b(250,255,255)) else local ketStatus = string.format("Key Up:%d",keyCode) holder._externalKeyLabel:setString(ketStatus) From 9a3886dca676b6defd13133637efb59563506bdf Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 17 Jul 2014 11:47:38 +0800 Subject: [PATCH 26/32] [ci skip] --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 0db85c3f16..ec9993c27e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -888,6 +888,7 @@ Developers: Added TextField::getStringLength() Add shadow, outline, glow filter support for UIText Fix UITextField IME can't auto detach + Add getChildByName method for get a node that can be cast to Type T QiuleiWang Fix the bug that calculated height of multi-line string was incorrect on iOS From 7ef77027d1d0a503fcc4d0643058f1434b744893 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 17 Jul 2014 11:50:09 +0800 Subject: [PATCH 27/32] [ci skip] --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 673ca472de..006c72d759 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ cocos2d-x-3.2 ?? + [NEW] Node: added getChildByName method for get a node that can be cast to Type T + [FIX] Animation3D: getOrCreate is deprecated and replaced with Animation3D::create [FIX] Animate3D: setSpeed() accept negtive value, which means play reverse, getPlayback and setPlayBack are deprecated [FIX] EditBox: can not set/get text in password mode on Mac OS X From 258361b429ea168ca248dbd44f619a5b43ba6608 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 17 Jul 2014 11:53:47 +0800 Subject: [PATCH 28/32] [ci skip] --- AUTHORS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AUTHORS b/AUTHORS index ec9993c27e..a9a5840ec0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -913,6 +913,9 @@ Developers: chareice Make `setup.py` work on zsh + + taug + Could add seach path and resolution order path in front. Retired Core Developers: WenSheng Yang From d8a2acfdeafe0d66717063dd2d185e7e0d0e0cf6 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 17 Jul 2014 11:57:11 +0800 Subject: [PATCH 29/32] [ci skip] --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 006c72d759..c24f72abc2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ cocos2d-x-3.2 ?? [NEW] Node: added getChildByName method for get a node that can be cast to Type T + [NEW] FileUtils: could add seach path and resolution order path in front [FIX] Animation3D: getOrCreate is deprecated and replaced with Animation3D::create [FIX] Animate3D: setSpeed() accept negtive value, which means play reverse, getPlayback and setPlayBack are deprecated From a85e54cb691b0399ae55b848c5beb4ce3ecf06fc Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 17 Jul 2014 12:03:59 +0800 Subject: [PATCH 30/32] [ci skip] --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c24f72abc2..9920a5baa6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ cocos2d-x-3.2 ?? [FIX] Lua-binding: support UIVideoPlayer [FIX] Node: setRotation3D not work based on anchor point [FIX] Node: modify regular of enumerateChildren, now it just searchs its children + [FIX] ScrollViewDelegate: make the scrollView delegate methods optional [FIX] Setup.py: not work if using zsh [FIX] SpriteBatchNode: opacity can not work [FIX] Sprite3D: may crash on Android if playing animation and replace Scene after come from background From c29766a4ad8c8e21e577c711bc260a4a6e6f1ba3 Mon Sep 17 00:00:00 2001 From: vision Date: Thu, 17 Jul 2014 12:56:58 +0800 Subject: [PATCH 31/32] disable FastTileMapTest on WP8 --- tests/cpp-tests/Classes/controller.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/cpp-tests/Classes/controller.cpp b/tests/cpp-tests/Classes/controller.cpp index e02aed5089..84638e11da 100644 --- a/tests/cpp-tests/Classes/controller.cpp +++ b/tests/cpp-tests/Classes/controller.cpp @@ -77,7 +77,9 @@ Controller g_aTestNames[] = { { "Node: Sprite", [](){return new SpriteTestScene(); } }, { "Node: Sprite3D", [](){ return new Sprite3DTestScene(); }}, { "Node: TileMap", [](){return new TileMapTestScene(); } }, +#if CC_TARGET_PLATFORM != CC_PLATFORM_WP8 { "Node: FastTileMap", [](){return new TileMapTestSceneNew(); } }, +#endif { "Node: Text Input", [](){return new TextInputTestScene(); } }, { "Node: UI", [](){ return new UITestScene(); }}, { "Mouse", []() { return new MouseTestScene(); } }, From 4f5cd2a368bf42d3951184c1efba4bd8bc6ab142 Mon Sep 17 00:00:00 2001 From: andyque Date: Thu, 17 Jul 2014 14:09:53 +0800 Subject: [PATCH 32/32] change FastTileMap to TileMap --- cocos/2d/CCFastTMXLayer.cpp | 64 +++++++------- cocos/2d/CCFastTMXLayer.h | 8 +- cocos/2d/CCFastTMXTiledMap.cpp | 38 ++++---- cocos/2d/CCFastTMXTiledMap.h | 18 ++-- .../Classes/TileMapTest/TileMapTest2.cpp | 86 +++++++++---------- 5 files changed, 106 insertions(+), 108 deletions(-) diff --git a/cocos/2d/CCFastTMXLayer.cpp b/cocos/2d/CCFastTMXLayer.cpp index 86a5efae27..7b422e766a 100644 --- a/cocos/2d/CCFastTMXLayer.cpp +++ b/cocos/2d/CCFastTMXLayer.cpp @@ -51,14 +51,14 @@ THE SOFTWARE. NS_CC_BEGIN namespace experimental { -const int FastTMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0; -const int FastTMXLayer::FAST_TMX_ORIENTATION_HEX = 1; -const int FastTMXLayer::FAST_TMX_ORIENTATION_ISO = 2; +const int TMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0; +const int TMXLayer::FAST_TMX_ORIENTATION_HEX = 1; +const int TMXLayer::FAST_TMX_ORIENTATION_ISO = 2; // FastTMXLayer - init & alloc & dealloc -FastTMXLayer * FastTMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) +TMXLayer * TMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) { - FastTMXLayer *ret = new FastTMXLayer(); + TMXLayer *ret = new TMXLayer(); if (ret->initWithTilesetInfo(tilesetInfo, layerInfo, mapInfo)) { ret->autorelease(); @@ -67,7 +67,7 @@ FastTMXLayer * FastTMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *l return nullptr; } -bool FastTMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) +bool TMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) { if( tilesetInfo ) @@ -109,7 +109,7 @@ bool FastTMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo return true; } -FastTMXLayer::FastTMXLayer() +TMXLayer::TMXLayer() : _layerName("") , _layerSize(Size::ZERO) , _mapTileSize(Size::ZERO) @@ -125,7 +125,7 @@ FastTMXLayer::FastTMXLayer() _buffersVBO[0] = _buffersVBO[1] = 0; } -FastTMXLayer::~FastTMXLayer() +TMXLayer::~TMXLayer() { CC_SAFE_RELEASE(_tileSet); CC_SAFE_RELEASE(_texture); @@ -141,7 +141,7 @@ FastTMXLayer::~FastTMXLayer() } } -void FastTMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags) +void TMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags) { updateTotalQuads(); @@ -170,13 +170,13 @@ void FastTMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flag auto& cmd = _renderCommands[index++]; cmd.init(iter.first); - cmd.func = CC_CALLBACK_0(FastTMXLayer::onDraw, this, _indicesVertexZOffsets[iter.first], iter.second); + cmd.func = CC_CALLBACK_0(TMXLayer::onDraw, this, _indicesVertexZOffsets[iter.first], iter.second); renderer->addCommand(&cmd); } } -void FastTMXLayer::onDraw(int offset, int count) +void TMXLayer::onDraw(int offset, int count) { GL::bindTexture2D(_texture->getName()); getGLProgramState()->apply(_modelViewTransform); @@ -195,7 +195,7 @@ void FastTMXLayer::onDraw(int offset, int count) CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, count * 4); } -void FastTMXLayer::updateTiles(const Rect& culledRect) +void TMXLayer::updateTiles(const Rect& culledRect) { Rect visibleTiles = culledRect; Size mapTileSize = CC_SIZE_PIXELS_TO_POINTS(_mapTileSize); @@ -288,7 +288,7 @@ void FastTMXLayer::updateTiles(const Rect& culledRect) } -void FastTMXLayer::updateVertexBuffer() +void TMXLayer::updateVertexBuffer() { GL::bindVAO(0); if(!glIsBuffer(_buffersVBO[0])) @@ -301,7 +301,7 @@ void FastTMXLayer::updateVertexBuffer() glBindBuffer(GL_ARRAY_BUFFER, 0); } -void FastTMXLayer::updateIndexBuffer() +void TMXLayer::updateIndexBuffer() { if(!glIsBuffer(_buffersVBO[1])) { @@ -313,7 +313,7 @@ void FastTMXLayer::updateIndexBuffer() } // FastTMXLayer - setup Tiles -void FastTMXLayer::setupTiles() +void TMXLayer::setupTiles() { // Optimization: quick hack that sets the image size on the tileset _tileSet->_imageSize = _texture->getContentSizeInPixels(); @@ -353,7 +353,7 @@ void FastTMXLayer::setupTiles() } -Mat4 FastTMXLayer::tileToNodeTransform() +Mat4 TMXLayer::tileToNodeTransform() { float w = _mapTileSize.width / CC_CONTENT_SCALE_FACTOR(); float h = _mapTileSize.height / CC_CONTENT_SCALE_FACTOR(); @@ -405,7 +405,7 @@ Mat4 FastTMXLayer::tileToNodeTransform() } -void FastTMXLayer::updateTotalQuads() +void TMXLayer::updateTotalQuads() { if(_quadsDirty) { @@ -537,7 +537,7 @@ void FastTMXLayer::updateTotalQuads() } // removing / getting tiles -Sprite* FastTMXLayer::getTileAt(const Vec2& tileCoordinate) +Sprite* TMXLayer::getTileAt(const Vec2& tileCoordinate) { CCASSERT( tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position"); CCASSERT( _tiles, "TMXLayer: the tiles map has been released"); @@ -577,7 +577,7 @@ Sprite* FastTMXLayer::getTileAt(const Vec2& tileCoordinate) return tile; } -int FastTMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/* = nullptr*/) +int TMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/* = nullptr*/) { CCASSERT(tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position"); CCASSERT(_tiles, "TMXLayer: the tiles map has been released"); @@ -603,12 +603,12 @@ int FastTMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/* return (tile & kTMXFlippedMask); } -Vec2 FastTMXLayer::getPositionAt(const Vec2& pos) +Vec2 TMXLayer::getPositionAt(const Vec2& pos) { return PointApplyTransform(pos, _tileToNodeTransform); } -int FastTMXLayer::getVertexZForPos(const Vec2& pos) +int TMXLayer::getVertexZForPos(const Vec2& pos) { int ret = 0; int maxVal = 0; @@ -639,7 +639,7 @@ int FastTMXLayer::getVertexZForPos(const Vec2& pos) return ret; } -void FastTMXLayer::removeTileAt(const Vec2& tileCoordinate) +void TMXLayer::removeTileAt(const Vec2& tileCoordinate) { CCASSERT( tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position"); @@ -662,7 +662,7 @@ void FastTMXLayer::removeTileAt(const Vec2& tileCoordinate) } } -void FastTMXLayer::setFlaggedTileGIDByIndex(int index, int gid) +void TMXLayer::setFlaggedTileGIDByIndex(int index, int gid) { if(gid == _tiles[index]) return; _tiles[index] = gid; @@ -670,7 +670,7 @@ void FastTMXLayer::setFlaggedTileGIDByIndex(int index, int gid) _dirty = true; } -void FastTMXLayer::removeChild(Node* node, bool cleanup) +void TMXLayer::removeChild(Node* node, bool cleanup) { int tag = node->getTag(); auto it = _spriteContainer.find(tag); @@ -681,8 +681,8 @@ void FastTMXLayer::removeChild(Node* node, bool cleanup) Node::removeChild(node, cleanup); } -// FastTMXLayer - Properties -Value FastTMXLayer::getProperty(const std::string& propertyName) const +// TMXLayer - Properties +Value TMXLayer::getProperty(const std::string& propertyName) const { if (_properties.find(propertyName) != _properties.end()) return _properties.at(propertyName); @@ -690,7 +690,7 @@ Value FastTMXLayer::getProperty(const std::string& propertyName) const return Value(); } -void FastTMXLayer::parseInternalProperties() +void TMXLayer::parseInternalProperties() { auto vertexz = getProperty("cc_vertexz"); if (vertexz.isNull()) return; @@ -720,7 +720,7 @@ void FastTMXLayer::parseInternalProperties() } //CCTMXLayer2 - obtaining positions, offset -Vec2 FastTMXLayer::calculateLayerOffset(const Vec2& pos) +Vec2 TMXLayer::calculateLayerOffset(const Vec2& pos) { Vec2 ret = Vec2::ZERO; switch (_layerOrientation) @@ -741,12 +741,12 @@ Vec2 FastTMXLayer::calculateLayerOffset(const Vec2& pos) } // TMXLayer - adding / remove tiles -void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate) +void TMXLayer::setTileGID(int gid, const Vec2& tileCoordinate) { setTileGID(gid, tileCoordinate, (TMXTileFlags)0); } -void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags flags) +void TMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags flags) { CCASSERT(tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position"); CCASSERT(_tiles, "TMXLayer: the tiles map has been released"); @@ -797,7 +797,7 @@ void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags } } -void FastTMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid) +void TMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid) { sprite->setPosition(getPositionAt(pos)); sprite->setPositionZ((float)getVertexZForPos(pos)); @@ -853,7 +853,7 @@ void FastTMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid) } } -std::string FastTMXLayer::getDescription() const +std::string TMXLayer::getDescription() const { return StringUtils::format("", _tag, (int)_mapTileSize.width, (int)_mapTileSize.height); } diff --git a/cocos/2d/CCFastTMXLayer.h b/cocos/2d/CCFastTMXLayer.h index 6713399d80..f148eccc19 100644 --- a/cocos/2d/CCFastTMXLayer.h +++ b/cocos/2d/CCFastTMXLayer.h @@ -78,20 +78,20 @@ http://www.cocos2d-iphone.org/wiki/doku.php/prog_guide:tiled_maps @since v3.2 */ -class CC_DLL FastTMXLayer : public Node +class CC_DLL TMXLayer : public Node { public: /** creates a FastTMXLayer with an tileset info, a layer info and a map info */ - static FastTMXLayer * create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); + static TMXLayer * create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); /** * @js ctor */ - FastTMXLayer(); + TMXLayer(); /** * @js NA * @lua NA */ - virtual ~FastTMXLayer(); + virtual ~TMXLayer(); /** returns the tile gid at a given tile coordinate. It also returns the tile flags. */ diff --git a/cocos/2d/CCFastTMXTiledMap.cpp b/cocos/2d/CCFastTMXTiledMap.cpp index 3c876b3055..89bec47562 100644 --- a/cocos/2d/CCFastTMXTiledMap.cpp +++ b/cocos/2d/CCFastTMXTiledMap.cpp @@ -38,9 +38,9 @@ namespace experimental { // implementation FastTMXTiledMap -FastTMXTiledMap * FastTMXTiledMap::create(const std::string& tmxFile) +TMXTiledMap * TMXTiledMap::create(const std::string& tmxFile) { - FastTMXTiledMap *ret = new FastTMXTiledMap(); + TMXTiledMap *ret = new TMXTiledMap(); if (ret->initWithTMXFile(tmxFile)) { ret->autorelease(); @@ -50,9 +50,9 @@ FastTMXTiledMap * FastTMXTiledMap::create(const std::string& tmxFile) return nullptr; } -FastTMXTiledMap* FastTMXTiledMap::createWithXML(const std::string& tmxString, const std::string& resourcePath) +TMXTiledMap* TMXTiledMap::createWithXML(const std::string& tmxString, const std::string& resourcePath) { - FastTMXTiledMap *ret = new FastTMXTiledMap(); + TMXTiledMap *ret = new TMXTiledMap(); if (ret->initWithXML(tmxString, resourcePath)) { ret->autorelease(); @@ -62,7 +62,7 @@ FastTMXTiledMap* FastTMXTiledMap::createWithXML(const std::string& tmxString, co return nullptr; } -bool FastTMXTiledMap::initWithTMXFile(const std::string& tmxFile) +bool TMXTiledMap::initWithTMXFile(const std::string& tmxFile) { CCASSERT(tmxFile.size()>0, "FastTMXTiledMap: tmx file should not be empty"); @@ -80,7 +80,7 @@ bool FastTMXTiledMap::initWithTMXFile(const std::string& tmxFile) return true; } -bool FastTMXTiledMap::initWithXML(const std::string& tmxString, const std::string& resourcePath) +bool TMXTiledMap::initWithXML(const std::string& tmxString, const std::string& resourcePath) { setContentSize(Size::ZERO); @@ -92,21 +92,21 @@ bool FastTMXTiledMap::initWithXML(const std::string& tmxString, const std::strin return true; } -FastTMXTiledMap::FastTMXTiledMap() +TMXTiledMap::TMXTiledMap() :_mapSize(Size::ZERO) ,_tileSize(Size::ZERO) { } -FastTMXTiledMap::~FastTMXTiledMap() +TMXTiledMap::~TMXTiledMap() { } // private -FastTMXLayer * FastTMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) +TMXLayer * TMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) { TMXTilesetInfo *tileset = tilesetForLayer(layerInfo, mapInfo); - FastTMXLayer *layer = FastTMXLayer::create(tileset, layerInfo, mapInfo); + TMXLayer *layer = TMXLayer::create(tileset, layerInfo, mapInfo); // tell the layerinfo to release the ownership of the tiles map. layerInfo->_ownTiles = false; @@ -115,7 +115,7 @@ FastTMXLayer * FastTMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo * return layer; } -TMXTilesetInfo * FastTMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) +TMXTilesetInfo * TMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) { Size size = layerInfo->_layerSize; auto& tilesets = mapInfo->getTilesets(); @@ -156,7 +156,7 @@ TMXTilesetInfo * FastTMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMa return nullptr; } -void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo) +void TMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo) { _mapSize = mapInfo->getMapSize(); _tileSize = mapInfo->getTileSize(); @@ -174,7 +174,7 @@ void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo) for(const auto &layerInfo : layers) { if (layerInfo->_visible) { - FastTMXLayer *child = parseLayer(layerInfo, mapInfo); + TMXLayer *child = parseLayer(layerInfo, mapInfo); addChild(child, idx, idx); // update content size with the max size @@ -190,13 +190,13 @@ void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo) } // public -FastTMXLayer * FastTMXTiledMap::getLayer(const std::string& layerName) const +TMXLayer * TMXTiledMap::getLayer(const std::string& layerName) const { CCASSERT(layerName.size() > 0, "Invalid layer name!"); for (auto& child : _children) { - FastTMXLayer* layer = dynamic_cast(child); + TMXLayer* layer = dynamic_cast(child); if(layer) { if(layerName.compare( layer->getLayerName()) == 0) @@ -210,7 +210,7 @@ FastTMXLayer * FastTMXTiledMap::getLayer(const std::string& layerName) const return nullptr; } -TMXObjectGroup * FastTMXTiledMap::getObjectGroup(const std::string& groupName) const +TMXObjectGroup * TMXTiledMap::getObjectGroup(const std::string& groupName) const { CCASSERT(groupName.size() > 0, "Invalid group name!"); @@ -231,7 +231,7 @@ TMXObjectGroup * FastTMXTiledMap::getObjectGroup(const std::string& groupName) c return nullptr; } -Value FastTMXTiledMap::getProperty(const std::string& propertyName) const +Value TMXTiledMap::getProperty(const std::string& propertyName) const { if (_properties.find(propertyName) != _properties.end()) return _properties.at(propertyName); @@ -239,7 +239,7 @@ Value FastTMXTiledMap::getProperty(const std::string& propertyName) const return Value(); } -Value FastTMXTiledMap::getPropertiesForGID(int GID) const +Value TMXTiledMap::getPropertiesForGID(int GID) const { if (_tileProperties.find(GID) != _tileProperties.end()) return _tileProperties.at(GID); @@ -247,7 +247,7 @@ Value FastTMXTiledMap::getPropertiesForGID(int GID) const return Value(); } -std::string FastTMXTiledMap::getDescription() const +std::string TMXTiledMap::getDescription() const { return StringUtils::format("(_children.size())); } diff --git a/cocos/2d/CCFastTMXTiledMap.h b/cocos/2d/CCFastTMXTiledMap.h index 4b2d006f50..07a544a775 100644 --- a/cocos/2d/CCFastTMXTiledMap.h +++ b/cocos/2d/CCFastTMXTiledMap.h @@ -39,7 +39,7 @@ class TMXMapInfo; namespace experimental { -class FastTMXLayer; +class TMXLayer; /** @brief FastTMXTiledMap knows how to parse and render a TMX map. @@ -92,17 +92,17 @@ object->getProperty(name_of_the_property); @since v3.2 */ -class CC_DLL FastTMXTiledMap : public Node +class CC_DLL TMXTiledMap : public Node { public: /** creates a TMX Tiled Map with a TMX file.*/ - static FastTMXTiledMap* create(const std::string& tmxFile); + static TMXTiledMap* create(const std::string& tmxFile); /** initializes a TMX Tiled Map with a TMX formatted XML string and a path to TMX resources */ - static FastTMXTiledMap* createWithXML(const std::string& tmxString, const std::string& resourcePath); + static TMXTiledMap* createWithXML(const std::string& tmxString, const std::string& resourcePath); /** return the FastTMXLayer for the specific layer */ - FastTMXLayer* getLayer(const std::string& layerName) const; + TMXLayer* getLayer(const std::string& layerName) const; /** return the TMXObjectGroup for the specific group */ TMXObjectGroup* getObjectGroup(const std::string& groupName) const; @@ -144,12 +144,12 @@ protected: /** * @js ctor */ - FastTMXTiledMap(); + TMXTiledMap(); /** * @js NA * @lua NA */ - virtual ~FastTMXTiledMap(); + virtual ~TMXTiledMap(); /** initializes a TMX Tiled Map with a TMX file */ bool initWithTMXFile(const std::string& tmxFile); @@ -157,7 +157,7 @@ protected: /** initializes a TMX Tiled Map with a TMX formatted XML string and a path to TMX resources */ bool initWithXML(const std::string& tmxString, const std::string& resourcePath); - FastTMXLayer * parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); + TMXLayer * parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); TMXTilesetInfo * tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); void buildWithMapInfo(TMXMapInfo* mapInfo); @@ -176,7 +176,7 @@ protected: ValueMapIntKey _tileProperties; private: - CC_DISALLOW_COPY_AND_ASSIGN(FastTMXTiledMap); + CC_DISALLOW_COPY_AND_ASSIGN(TMXTiledMap); }; diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp index cba25b04ad..bac5608530 100644 --- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp +++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp @@ -4,8 +4,6 @@ #include "2d/CCFastTMXLayer.h" #include "2d/CCFastTMXTiledMap.h" -using cocos2d::experimental::FastTMXLayer; -using cocos2d::experimental::FastTMXTiledMap; namespace { @@ -290,7 +288,7 @@ TMXOrthoTestNew::TMXOrthoTestNew() //auto color = LayerColor::create( Color4B(64,64,64,255) ); //addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test2.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test2.tmx"); addChild(map, 0, kTagTileMap); @@ -333,7 +331,7 @@ std::string TMXOrthoTestNew::title() const //------------------------------------------------------------------ TMXOrthoTest2New::TMXOrthoTest2New() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test1.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test1.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -354,7 +352,7 @@ std::string TMXOrthoTest2New::title() const //------------------------------------------------------------------ TMXOrthoTest3New::TMXOrthoTest3New() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test3.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test3.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -376,7 +374,7 @@ std::string TMXOrthoTest3New::title() const //------------------------------------------------------------------ TMXOrthoTest4New::TMXOrthoTest4New() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test4.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test4.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s1 = map->getContentSize(); @@ -405,7 +403,7 @@ void TMXOrthoTest4New::removeSprite(float dt) { unschedule(schedule_selector(TMXOrthoTest4New::removeSprite)); - auto map = static_cast( getChildByTag(kTagTileMap) ); + auto map = static_cast( getChildByTag(kTagTileMap) ); auto layer = map->getLayer("Layer 0"); auto s = layer->getLayerSize(); @@ -438,7 +436,7 @@ TMXReadWriteTestNew::TMXReadWriteTestNew() { _gid = 0; - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test2.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test2.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -504,8 +502,8 @@ void TMXReadWriteTestNew::removeSprite(Node* sender) void TMXReadWriteTestNew::updateCol(float dt) { - auto map = (FastTMXTiledMap*)getChildByTag(kTagTileMap); - auto layer = (FastTMXLayer*)map->getChildByTag(0); + auto map = (cocos2d::experimental::TMXTiledMap*)getChildByTag(kTagTileMap); + auto layer = (cocos2d::experimental::TMXLayer*)map->getChildByTag(0); ////----CCLOG("++++atlas quantity: %d", layer->textureAtlas()->getTotalQuads()); ////----CCLOG("++++children: %d", layer->getChildren()->count() ); @@ -525,8 +523,8 @@ void TMXReadWriteTestNew::repaintWithGID(float dt) { // unschedule:_cmd); - auto map = (FastTMXTiledMap*)getChildByTag(kTagTileMap); - auto layer = (FastTMXLayer*)map->getChildByTag(0); + auto map = (cocos2d::experimental::TMXTiledMap*)getChildByTag(kTagTileMap); + auto layer = (cocos2d::experimental::TMXLayer*)map->getChildByTag(0); auto s = layer->getLayerSize(); for( int x=0; xgetChildByTag(0); + auto map = (cocos2d::experimental::TMXTiledMap*)getChildByTag(kTagTileMap); + auto layer = (cocos2d::experimental::TMXLayer*)map->getChildByTag(0); auto s = layer->getLayerSize(); for( int y=0; y< s.height; y++ ) @@ -568,7 +566,7 @@ TMXHexTestNew::TMXHexTestNew() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/hexa-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/hexa-test.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -590,7 +588,7 @@ TMXIsoTestNew::TMXIsoTestNew() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/iso-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test.tmx"); addChild(map, 0, kTagTileMap); // move map to the center of the screen @@ -614,7 +612,7 @@ TMXIsoTest1New::TMXIsoTest1New() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/iso-test1.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test1.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -638,7 +636,7 @@ TMXIsoTest2New::TMXIsoTest2New() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/iso-test2.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test2.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -665,7 +663,7 @@ TMXUncompressedTestNew::TMXUncompressedTestNew() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/iso-test2-uncompressed.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test2-uncompressed.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -678,11 +676,11 @@ TMXUncompressedTestNew::TMXUncompressedTestNew() //unsupported // // testing release map -// FastTMXLayer* layer; +// TMXLayer* layer; // // auto& children = map->getChildren(); // for(const auto &node : children) { -// layer= static_cast(node); +// layer= static_cast(node); // layer->releaseMap(); // } @@ -700,7 +698,7 @@ std::string TMXUncompressedTestNew::title() const //------------------------------------------------------------------ TMXTilesetTestNew::TMXTilesetTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test5.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test5.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -719,7 +717,7 @@ std::string TMXTilesetTestNew::title() const //------------------------------------------------------------------ TMXOrthoObjectsTestNew::TMXOrthoObjectsTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/ortho-objects.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/ortho-objects.tmx"); addChild(map, -1, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -746,7 +744,7 @@ void TMXOrthoObjectsTestNew::onDraw(const Mat4 &transform, uint32_t flags) director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform); - auto map = static_cast( getChildByTag(kTagTileMap) ); + auto map = static_cast( getChildByTag(kTagTileMap) ); auto pos = map->getPosition(); auto group = map->getObjectGroup("Object Group 1"); @@ -793,7 +791,7 @@ std::string TMXOrthoObjectsTestNew::subtitle() const TMXIsoObjectsTestNew::TMXIsoObjectsTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-objectgroup.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-objectgroup.tmx"); addChild(map, -1, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -821,7 +819,7 @@ void TMXIsoObjectsTestNew::onDraw(const Mat4 &transform, uint32_t flags) director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform); - auto map = (FastTMXTiledMap*) getChildByTag(kTagTileMap); + auto map = (cocos2d::experimental::TMXTiledMap*) getChildByTag(kTagTileMap); auto pos = map->getPosition(); auto group = map->getObjectGroup("Object Group 1"); @@ -866,13 +864,13 @@ std::string TMXIsoObjectsTestNew::subtitle() const TMXResizeTestNew::TMXResizeTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test5.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test5.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); CCLOG("ContentSize: %f, %f", s.width,s.height); - FastTMXLayer* layer; + cocos2d::experimental::TMXLayer* layer; layer = map->getLayer("Layer 0"); auto ls = layer->getLayerSize(); @@ -903,7 +901,7 @@ std::string TMXResizeTestNew::subtitle() const //------------------------------------------------------------------ TMXIsoZorderNew::TMXIsoZorderNew() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-zorder.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-zorder.tmx"); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -972,7 +970,7 @@ std::string TMXIsoZorderNew::subtitle() const //------------------------------------------------------------------ TMXOrthoZorderNew::TMXOrthoZorderNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test-zorder.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test-zorder.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1033,7 +1031,7 @@ std::string TMXOrthoZorderNew::subtitle() const //------------------------------------------------------------------ TMXIsoVertexZNew::TMXIsoVertexZNew() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-vertexz.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-vertexz.tmx"); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -1105,7 +1103,7 @@ std::string TMXIsoVertexZNew::subtitle() const //------------------------------------------------------------------ TMXOrthoVertexZNew::TMXOrthoVertexZNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test-vertexz.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test-vertexz.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1176,7 +1174,7 @@ std::string TMXOrthoVertexZNew::subtitle() const //------------------------------------------------------------------ TMXIsoMoveLayerNew::TMXIsoMoveLayerNew() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-movelayer.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-movelayer.tmx"); addChild(map, 0, kTagTileMap); map->setPosition(Vec2(-700,-50)); @@ -1203,7 +1201,7 @@ std::string TMXIsoMoveLayerNew::subtitle() const //------------------------------------------------------------------ TMXOrthoMoveLayerNew::TMXOrthoMoveLayerNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test-movelayer.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test-movelayer.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1228,7 +1226,7 @@ std::string TMXOrthoMoveLayerNew::subtitle() const TMXTilePropertyTestNew::TMXTilePropertyTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/ortho-tile-property.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/ortho-tile-property.tmx"); addChild(map ,0 ,kTagTileMap); for(int i=1;i<=20;i++){ @@ -1257,7 +1255,7 @@ std::string TMXTilePropertyTestNew::subtitle() const TMXOrthoFlipTestNew::TMXOrthoFlipTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/ortho-rotation-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/ortho-rotation-test.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1280,7 +1278,7 @@ std::string TMXOrthoFlipTestNew::title() const TMXOrthoFlipRunTimeTestNew::TMXOrthoFlipRunTimeTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/ortho-rotation-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/ortho-rotation-test.tmx"); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -1304,7 +1302,7 @@ std::string TMXOrthoFlipRunTimeTestNew::subtitle() const void TMXOrthoFlipRunTimeTestNew::flipIt(float dt) { - auto map = (FastTMXTiledMap*) getChildByTag(kTagTileMap); + auto map = (cocos2d::experimental::TMXTiledMap*) getChildByTag(kTagTileMap); auto layer = map->getLayer("Layer 0"); //blue diamond @@ -1352,7 +1350,7 @@ TMXOrthoFromXMLTestNew::TMXOrthoFromXMLTestNew() auto str = String::createWithContentsOfFile(FileUtils::getInstance()->fullPathForFilename(file.c_str()).c_str()); CCASSERT(str != nullptr, "Unable to open file"); - auto map = FastTMXTiledMap::createWithXML(str->getCString() ,resources.c_str()); + auto map = cocos2d::experimental::TMXTiledMap::createWithXML(str->getCString() ,resources.c_str()); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -1378,7 +1376,7 @@ TMXOrthoXMLFormatTestNew::TMXOrthoXMLFormatTestNew() // 1. load xml format tilemap // 2. gid lower than firstgid is ignored // 3. firstgid in tsx is ignored, tile property in tsx loaded correctly. - auto map = FastTMXTiledMap::create("TileMaps/xml-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/xml-test.tmx"); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -1404,7 +1402,7 @@ std::string TMXOrthoXMLFormatTestNew::title() const //------------------------------------------------------------------ TMXBug987New::TMXBug987New() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test6.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test6.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s1 = map->getContentSize(); @@ -1432,7 +1430,7 @@ std::string TMXBug987New::subtitle() const //------------------------------------------------------------------ TMXBug787New::TMXBug787New() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-bug787.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-bug787.tmx"); addChild(map, 0, kTagTileMap); map->setScale(0.25f); @@ -1455,7 +1453,7 @@ std::string TMXBug787New::subtitle() const //------------------------------------------------------------------ TMXGIDObjectsTestNew::TMXGIDObjectsTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/test-object-layer.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/test-object-layer.tmx"); addChild(map, -1, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1480,7 +1478,7 @@ void TMXGIDObjectsTestNew::onDraw(const Mat4 &transform, uint32_t flags) director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform); - auto map = (FastTMXTiledMap*)getChildByTag(kTagTileMap); + auto map = (cocos2d::experimental::TMXTiledMap*)getChildByTag(kTagTileMap); auto pos = map->getPosition(); auto group = map->getObjectGroup("Object Layer 1");