axmol/cocos/editor-support/cocostudio/CCSGUIReader.cpp

1591 lines
63 KiB
C++
Raw Normal View History

2013-09-13 22:20:20 +08:00
/****************************************************************************
2019-11-25 01:35:26 +08:00
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2019-2020 simdsoft, @HALX99
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "editor-support/cocostudio/CCSGUIReader.h"
2016-04-18 15:09:21 +08:00
2013-09-13 22:20:20 +08:00
#include <fstream>
#include <iostream>
2016-04-18 15:09:21 +08:00
#include "ui/CocosGUI.h"
#include "platform/CCFileUtils.h"
#include "2d/CCSpriteFrameCache.h"
#include "base/CCDirector.h"
#include "base/ccUtils.h"
#include "editor-support/cocostudio/CCActionManagerEx.h"
#include "editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h"
#include "editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h"
#include "editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h"
#include "editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h"
#include "editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h"
#include "editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h"
#include "editor-support/cocostudio/WidgetReader/TextReader/TextReader.h"
#include "editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h"
#include "editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h"
#include "editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h"
#include "editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h"
#include "editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h"
#include "editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h"
#include "editor-support/cocostudio/CocoLoader.h"
2013-12-23 15:02:52 +08:00
using namespace cocos2d;
using namespace cocos2d::ui;
namespace cocostudio {
2013-09-13 22:20:20 +08:00
2013-11-14 11:37:46 +08:00
static GUIReader* sharedReader = nullptr;
2013-09-13 22:20:20 +08:00
2013-11-11 18:22:14 +08:00
GUIReader::GUIReader():
m_strFilePath("")
2013-09-13 22:20:20 +08:00
{
2014-03-04 16:51:35 +08:00
ObjectFactory* factoryCreate = ObjectFactory::getInstance();
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(ButtonReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(CheckBoxReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(SliderReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(ImageViewReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(LoadingBarReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(TextAtlasReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(TextReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(TextBMFontReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(TextFieldReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(LayoutReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(PageViewReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(ScrollViewReader));
factoryCreate->registerType(CREATE_CLASS_WIDGET_READER_INFO(ListViewReader));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(Button));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(CheckBox));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(ImageView));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(Text));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(TextAtlas));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(TextBMFont));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(LoadingBar));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(Slider));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(TextField));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(Layout));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(ListView));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(PageView));
factoryCreate->registerType(CREATE_CLASS_GUI_INFO(ScrollView));
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
GUIReader::~GUIReader()
2013-09-13 22:20:20 +08:00
{
}
GUIReader* GUIReader::getInstance()
2013-09-13 22:20:20 +08:00
{
if (!sharedReader)
{
sharedReader = new (std::nothrow) GUIReader();
2013-09-13 22:20:20 +08:00
}
return sharedReader;
}
void GUIReader::destroyInstance()
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
CC_SAFE_DELETE(sharedReader);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
int GUIReader::getVersionInteger(const char *str)
2013-09-13 22:20:20 +08:00
{
std::string strVersion = str;
2013-12-28 14:34:52 +08:00
size_t length = strVersion.length();
2013-09-13 22:20:20 +08:00
if (length < 7)
{
return 0;
}
2019-11-25 01:35:26 +08:00
size_t pos = strVersion.find_first_of('.');
2013-09-13 22:20:20 +08:00
std::string t = strVersion.substr(0,pos);
strVersion = strVersion.substr(pos+1,strVersion.length()-1);
2019-11-25 01:35:26 +08:00
pos = strVersion.find_first_of('.');
2013-09-13 22:20:20 +08:00
std::string h = strVersion.substr(0,pos);
strVersion = strVersion.substr(pos+1,strVersion.length()-1);
2019-11-25 01:35:26 +08:00
pos = strVersion.find_first_of('.');
2013-09-13 22:20:20 +08:00
std::string te = strVersion.substr(0,pos);
strVersion = strVersion.substr(pos+1,strVersion.length()-1);
2019-11-25 01:35:26 +08:00
pos = strVersion.find_first_of('.');
2013-09-13 22:20:20 +08:00
std::string s = strVersion.substr(0,pos);
int it = atoi(t.c_str());
int ih = atoi(h.c_str());
int ite = atoi(te.c_str());
int is = atoi(s.c_str());
int iVersion = it*1000+ih*100+ite*10+is;
// CCLOG("iversion %d",iVersion);
2013-09-13 22:20:20 +08:00
return iVersion;
/************************/
}
2013-11-11 18:22:14 +08:00
void GUIReader::storeFileDesignSize(const char *fileName, const cocos2d::Size &size)
2013-09-13 22:20:20 +08:00
{
2013-12-24 10:41:01 +08:00
std::string keyWidth = fileName;
keyWidth.append("width");
std::string keyHeight = fileName;
keyHeight.append("height");
_fileDesignSizes[keyWidth] = cocos2d::Value(size.width);
_fileDesignSizes[keyHeight] = cocos2d::Value(size.height);
2013-11-11 18:22:14 +08:00
}
cocos2d::Size GUIReader::getFileDesignSize(const char* fileName) const
2013-11-11 18:22:14 +08:00
{
2013-12-24 10:41:01 +08:00
std::string keyWidth = fileName;
keyWidth.append("width");
std::string keyHeight = fileName;
keyHeight.append("height");
2020-03-03 19:24:07 +08:00
float w = _fileDesignSizes.at(keyWidth).toFloat();
float h = _fileDesignSizes.at(keyHeight).toFloat();
2013-12-24 10:41:01 +08:00
return Size(w, h);
2013-11-11 18:22:14 +08:00
}
2014-03-04 16:51:35 +08:00
void GUIReader::registerTypeAndCallBack(const std::string& classType,
ObjectFactory::Instance ins,
2014-03-14 15:38:43 +08:00
Ref *object,
2014-03-04 16:51:35 +08:00
SEL_ParseEvent callBack)
{
ObjectFactory* factoryCreate = ObjectFactory::getInstance();
ObjectFactory::TInfo t(classType, ins);
factoryCreate->registerType(t);
if (object)
{
_mapObject.insert(ParseObjectMap::value_type(classType, object));
}
if (callBack)
{
_mapParseSelector.insert(ParseCallBackMap::value_type(classType, callBack));
}
}
2013-11-11 18:22:14 +08:00
void GUIReader::registerTypeAndCallBack(const std::string& classType,
ObjectFactory::InstanceFunc ins,
Ref *object,
SEL_ParseEvent callBack)
{
ObjectFactory* factoryCreate = ObjectFactory::getInstance();
ObjectFactory::TInfo t(classType, ins);
factoryCreate->registerType(t);
if (object)
{
_mapObject.insert(ParseObjectMap::value_type(classType, object));
}
if (callBack)
{
_mapParseSelector.insert(ParseCallBackMap::value_type(classType, callBack));
}
}
2013-11-11 18:22:14 +08:00
2013-12-23 15:02:52 +08:00
Widget* GUIReader::widgetFromJsonFile(const char *fileName)
2013-11-11 18:22:14 +08:00
{
2019-11-24 23:15:56 +08:00
auto thiz = GUIReader::getInstance();
std::string jsonpath;
rapidjson::Document jsonDict;
2014-06-11 21:11:22 +08:00
jsonpath = fileName;
// jsonpath = CCFileUtils::getInstance()->fullPathForFilename(fileName);
2013-12-28 14:34:52 +08:00
size_t pos = jsonpath.find_last_of('/');
2019-11-24 23:15:56 +08:00
thiz->m_strFilePath = jsonpath.substr(0,pos+1);
std::string contentStr = FileUtils::getInstance()->getStringFromFile(jsonpath);
jsonDict.Parse<0>(contentStr.c_str());
if (jsonDict.HasParseError())
{
2015-05-25 11:43:03 +08:00
CCLOG("GetParseError %d\n",jsonDict.GetParseError());
2013-11-11 18:22:14 +08:00
}
2013-12-23 15:02:52 +08:00
Widget* widget = nullptr;
const char* fileVersion = DICTOOL->getStringValue_json(jsonDict, "version");
2013-11-14 11:37:46 +08:00
WidgetPropertiesReader * pReader = nullptr;
2013-11-11 18:22:14 +08:00
if (fileVersion)
{
2019-11-24 23:15:56 +08:00
int versionInteger = thiz->getVersionInteger(fileVersion);
2013-11-11 18:22:14 +08:00
if (versionInteger < 250)
{
pReader = new (std::nothrow) WidgetPropertiesReader0250();
2019-11-24 23:15:56 +08:00
widget = pReader->createWidget(jsonDict, thiz->m_strFilePath.c_str(), fileName);
2013-11-11 18:22:14 +08:00
}
else
{
pReader = new (std::nothrow) WidgetPropertiesReader0300();
2019-11-24 23:15:56 +08:00
widget = pReader->createWidget(jsonDict, thiz->m_strFilePath.c_str(), fileName);
2013-11-11 18:22:14 +08:00
}
}
else
{
pReader = new (std::nothrow) WidgetPropertiesReader0250();
2019-11-24 23:15:56 +08:00
widget = pReader->createWidget(jsonDict, thiz->m_strFilePath.c_str(), fileName);
2013-11-11 18:22:14 +08:00
}
CC_SAFE_DELETE(pReader);
return widget;
}
2014-06-04 14:27:14 +08:00
2014-06-11 14:45:35 +08:00
std::string WidgetPropertiesReader::getWidgetReaderClassName(Widget* widget)
{
std::string readerName;
// 1st., custom widget parse properties of parent widget with parent widget reader
if (dynamic_cast<Button*>(widget))
{
readerName = "ButtonReader";
}
else if (dynamic_cast<CheckBox*>(widget))
{
readerName = "CheckBoxReader";
}
else if (dynamic_cast<ImageView*>(widget))
{
readerName = "ImageViewReader";
}
else if (dynamic_cast<TextAtlas*>(widget))
{
readerName = "TextAtlasReader";
}
else if (dynamic_cast<TextBMFont*>(widget))
{
readerName = "TextBMFontReader";
}
else if (dynamic_cast<Text*>(widget))
{
readerName = "TextReader";
}
else if (dynamic_cast<LoadingBar*>(widget))
{
readerName = "LoadingBarReader";
}
else if (dynamic_cast<Slider*>(widget))
{
readerName = "SliderReader";
}
else if (dynamic_cast<TextField*>(widget))
{
readerName = "TextFieldReader";
}
else if (dynamic_cast<ListView*>(widget))
{
readerName = "ListViewReader";
}
else if (dynamic_cast<PageView*>(widget))
{
readerName = "PageViewReader";
}
2014-06-26 17:29:07 +08:00
else if (dynamic_cast<ScrollView*>(widget))
{
readerName = "ScrollViewReader";
}
else if (dynamic_cast<Layout*>(widget))
{
readerName = "LayoutReader";
}
2014-06-11 14:45:35 +08:00
else if (dynamic_cast<Widget*>(widget))
{
readerName = "WidgetReader";
}
return readerName;
}
2014-06-04 14:27:14 +08:00
std::string WidgetPropertiesReader::getGUIClassName(const std::string &name)
{
std::string convertedClassName = name;
if (name == "Panel")
{
convertedClassName = "Layout";
}
else if (name == "TextArea")
{
convertedClassName = "Text";
}
else if (name == "TextButton")
{
convertedClassName = "Button";
}
else if (name == "Label")
{
convertedClassName = "Text";
}
else if (name == "LabelAtlas")
{
convertedClassName = "TextAtlas";
}
else if (name == "LabelBMFont")
{
convertedClassName = "TextBMFont";
}
return convertedClassName;
}
cocos2d::ui::Widget* WidgetPropertiesReader::createGUI(const std::string &classname)
{
std::string name = this->getGUIClassName(classname);
Ref* object = ObjectFactory::getInstance()->createObject(name);
return dynamic_cast<ui::Widget*>(object);
}
WidgetReaderProtocol* WidgetPropertiesReader::createWidgetReaderProtocol(const std::string &classname)
{
Ref* object = ObjectFactory::getInstance()->createObject(classname);
return dynamic_cast<WidgetReaderProtocol*>(object);
}
2013-11-11 18:22:14 +08:00
Widget* GUIReader::widgetFromBinaryFile(const char *fileName)
{
2019-11-24 23:15:56 +08:00
auto thiz = GUIReader::getInstance();
std::string jsonpath;
rapidjson::Document jsonDict;
2014-10-09 18:28:09 +08:00
jsonpath = fileName;
// jsonpath = CCFileUtils::getInstance()->fullPathForFilename(fileName);
size_t pos = jsonpath.find_last_of('/');
2019-11-24 23:15:56 +08:00
thiz->m_strFilePath = jsonpath.substr(0,pos+1);
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName);
2014-10-09 17:19:43 +08:00
auto fileData = FileUtils::getInstance()->getDataFromFile(fullPath);
auto fileDataBytes = fileData.getBytes();
auto fileDataSize = fileData.getSize();
const char* fileVersion = "";
ui::Widget* widget = nullptr;
2014-10-09 17:19:43 +08:00
if (fileDataBytes != nullptr && fileDataSize > 0)
{
CocoLoader tCocoLoader;
2014-10-09 17:19:43 +08:00
if(true == tCocoLoader.ReadCocoBinBuff((char*)fileDataBytes))
{
stExpCocoNode* tpRootCocoNode = tCocoLoader.GetRootCocoNode();
rapidjson::Type tType = tpRootCocoNode->GetType(&tCocoLoader);
2014-06-11 09:35:24 +08:00
if (rapidjson::kObjectType == tType || rapidjson::kArrayType == tType)
{
2014-07-01 16:31:17 +08:00
stExpCocoNode *tpChildArray = tpRootCocoNode->GetChildArray(&tCocoLoader);
2014-06-11 14:45:35 +08:00
for (int i = 0; i < tpRootCocoNode->GetChildNum(); ++i) {
std::string key = tpChildArray[i].GetName(&tCocoLoader);
if (key == "version") {
2014-07-01 16:31:17 +08:00
fileVersion = tpChildArray[i].GetValue(&tCocoLoader);
2014-06-11 14:45:35 +08:00
break;
}
}
WidgetPropertiesReader * pReader = nullptr;
if (fileVersion)
{
2019-11-24 23:15:56 +08:00
int versionInteger = thiz->getVersionInteger(fileVersion);
if (versionInteger < 250)
{
2014-06-11 14:45:35 +08:00
CCASSERT(0, "You current studio doesn't support binary format, please upgrade to the latest version!");
pReader = new (std::nothrow) WidgetPropertiesReader0250();
widget = pReader->createWidgetFromBinary(&tCocoLoader, tpRootCocoNode, fileName);
}
else
{
pReader = new (std::nothrow) WidgetPropertiesReader0300();
widget = pReader->createWidgetFromBinary(&tCocoLoader, tpRootCocoNode, fileName);
}
}
else
{
pReader = new (std::nothrow) WidgetPropertiesReader0250();
widget = pReader->createWidgetFromBinary(&tCocoLoader, tpRootCocoNode, fileName);
}
CC_SAFE_DELETE(pReader);
}
}
}
return widget;
}
std::string WidgetPropertiesReader::getWidgetReaderClassName(const std::string& classname)
{
// create widget reader to parse properties of widget
std::string readerName = classname;
if (readerName == "Panel")
{
readerName = "Layout";
}
else if (readerName == "TextArea")
{
readerName = "Text";
}
else if (readerName == "TextButton")
{
readerName = "Button";
}
else if (readerName == "Label")
{
readerName = "Text";
}
else if (readerName == "LabelAtlas")
{
readerName = "TextAtlas";
}
else if (readerName == "LabelBMFont")
{
readerName = "TextBMFont";
}
readerName.append("Reader");
return readerName;
}
2013-11-11 18:22:14 +08:00
void WidgetPropertiesReader::setAnchorPointForWidget(cocos2d::ui::Widget *widget, const rapidjson::Value &options)
{
bool isAnchorPointXExists = DICTOOL->checkObjectExist_json(options, "anchorPointX");
float anchorPointXInFile;
if (isAnchorPointXExists) {
anchorPointXInFile = DICTOOL->getFloatValue_json(options, "anchorPointX");
}else{
anchorPointXInFile = widget->getAnchorPoint().x;
}
bool isAnchorPointYExists = DICTOOL->checkObjectExist_json(options, "anchorPointY");
float anchorPointYInFile;
if (isAnchorPointYExists) {
anchorPointYInFile = DICTOOL->getFloatValue_json(options, "anchorPointY");
}
else{
anchorPointYInFile = widget->getAnchorPoint().y;
}
if (isAnchorPointXExists || isAnchorPointYExists) {
Squashed commit of the following: commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2
2014-05-15 01:07:09 +08:00
widget->setAnchorPoint(Vec2(anchorPointXInFile, anchorPointYInFile));
}
}
2014-06-11 14:15:34 +08:00
2013-11-11 18:22:14 +08:00
Widget* WidgetPropertiesReader0250::createWidget(const rapidjson::Value& data, const char* fullPath, const char* fileName)
2013-11-11 18:22:14 +08:00
{
m_strFilePath = fullPath;
int texturesCount = DICTOOL->getArrayCount_json(data, "textures");
2013-11-11 18:22:14 +08:00
for (int i=0; i<texturesCount; i++)
{
const char* file = DICTOOL->getStringValueFromArray_json(data, "textures", i);
2013-11-11 18:22:14 +08:00
std::string tp = fullPath;
tp.append(file);
2016-02-04 10:52:14 +08:00
SpriteFrameCache::getInstance()->addSpriteFramesWithFile(tp);
2013-11-11 18:22:14 +08:00
}
float fileDesignWidth = DICTOOL->getFloatValue_json(data, "designWidth");
float fileDesignHeight = DICTOOL->getFloatValue_json(data, "designHeight");
2013-11-11 18:22:14 +08:00
if (fileDesignWidth <= 0 || fileDesignHeight <= 0) {
CCLOGERROR("Read design size error!\n");
2013-11-11 18:22:14 +08:00
Size winSize = Director::getInstance()->getWinSize();
GUIReader::getInstance()->storeFileDesignSize(fileName, winSize);
2013-11-11 18:22:14 +08:00
}
else
{
GUIReader::getInstance()->storeFileDesignSize(fileName, Size(fileDesignWidth, fileDesignHeight));
2013-11-11 18:22:14 +08:00
}
const rapidjson::Value& widgetTree = DICTOOL->getSubDictionary_json(data, "widgetTree");
2013-12-23 15:02:52 +08:00
Widget* widget = widgetFromJsonDictionary(widgetTree);
2013-11-11 18:22:14 +08:00
/* *********temp********* */
if (widget->getContentSize().equals(Size::ZERO))
{
2013-12-23 15:02:52 +08:00
Layout* rootWidget = dynamic_cast<Layout*>(widget);
rootWidget->setContentSize(Size(fileDesignWidth, fileDesignHeight));
2013-11-11 18:22:14 +08:00
}
/* ********************** */
// widget->setFileDesignSize(Size(fileDesignWidth, fileDesignHeight));
const rapidjson::Value& actions = DICTOOL->getSubDictionary_json(data, "animation");
2013-11-11 18:22:14 +08:00
/* *********temp********* */
// ActionManager::getInstance()->releaseActions();
2013-11-11 18:22:14 +08:00
/* ********************** */
// CCLOG("file name == [%s]",fileName);
Ref* rootWidget = (Ref*) widget;
ActionManagerEx::getInstance()->initWithDictionary(fileName,actions,rootWidget);
2013-11-11 18:22:14 +08:00
return widget;
}
2014-06-11 14:15:34 +08:00
2013-11-11 18:22:14 +08:00
Widget* WidgetPropertiesReader0250::widgetFromJsonDictionary(const rapidjson::Value&data)
2013-11-11 18:22:14 +08:00
{
2013-12-23 15:02:52 +08:00
Widget* widget = nullptr;
const char* classname = DICTOOL->getStringValue_json(data, "classname");
const rapidjson::Value& uiOptions = DICTOOL->getSubDictionary_json(data, "options");
2013-09-13 22:20:20 +08:00
if (classname && strcmp(classname, "Button") == 0)
{
widget = cocos2d::ui::Button::create();
2013-09-13 22:20:20 +08:00
setPropsForButtonFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "CheckBox") == 0)
{
2013-12-23 15:02:52 +08:00
widget = CheckBox::create();
2013-09-13 22:20:20 +08:00
setPropsForCheckBoxFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "Label") == 0)
{
widget = cocos2d::ui::Text::create();
2013-09-13 22:20:20 +08:00
setPropsForLabelFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "LabelAtlas") == 0)
{
widget = cocos2d::ui::TextAtlas::create();
2013-09-13 22:20:20 +08:00
setPropsForLabelAtlasFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "LoadingBar") == 0)
{
widget = cocos2d::ui::LoadingBar::create();
2013-09-13 22:20:20 +08:00
setPropsForLoadingBarFromJsonDictionary(widget, uiOptions);
}else if (classname && strcmp(classname, "ScrollView") == 0){
widget = cocos2d::ui::ScrollView::create();
2013-09-13 22:20:20 +08:00
setPropsForScrollViewFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "TextArea") == 0)
{
widget = cocos2d::ui::Text::create();
2013-11-11 18:22:14 +08:00
setPropsForLabelFromJsonDictionary(widget, uiOptions);
2013-09-13 22:20:20 +08:00
}
else if (classname && strcmp(classname, "TextButton") == 0)
{
widget = cocos2d::ui::Button::create();
2013-11-11 18:22:14 +08:00
setPropsForButtonFromJsonDictionary(widget, uiOptions);
2013-09-13 22:20:20 +08:00
}
else if (classname && strcmp(classname, "TextField") == 0)
{
widget = cocos2d::ui::TextField::create();
2013-09-13 22:20:20 +08:00
setPropsForTextFieldFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "ImageView") == 0)
{
widget = cocos2d::ui::ImageView::create();
2013-09-13 22:20:20 +08:00
setPropsForImageViewFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "Panel") == 0)
{
2013-12-23 15:02:52 +08:00
widget = Layout::create();
2013-11-11 18:22:14 +08:00
setPropsForLayoutFromJsonDictionary(widget, uiOptions);
2013-09-13 22:20:20 +08:00
}
else if (classname && strcmp(classname, "Slider") == 0)
{
widget = cocos2d::ui::Slider::create();
2013-09-13 22:20:20 +08:00
setPropsForSliderFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "LabelBMFont") == 0)
{
widget = cocos2d::ui::TextBMFont::create();
2013-09-13 22:20:20 +08:00
setPropsForLabelBMFontFromJsonDictionary(widget, uiOptions);
}
else if (classname && strcmp(classname, "DragPanel") == 0)
{
widget = cocos2d::ui::ScrollView::create();
2013-11-11 18:22:14 +08:00
setPropsForScrollViewFromJsonDictionary(widget, uiOptions);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
int childrenCount = DICTOOL->getArrayCount_json(data, "children");
2013-09-13 22:20:20 +08:00
for (int i=0;i<childrenCount;i++)
{
const rapidjson::Value& subData = DICTOOL->getDictionaryFromArray_json(data, "children", i);
2013-12-23 15:02:52 +08:00
Widget* child = widgetFromJsonDictionary(subData);
2013-09-13 22:20:20 +08:00
if (child)
{
widget->addChild(child);
}
}
return widget;
}
void WidgetPropertiesReader0250::setPropsForWidgetFromJsonDictionary(Widget*widget,const rapidjson::Value&options)
2013-09-13 22:20:20 +08:00
{
bool ignoreSizeExsit = DICTOOL->checkObjectExist_json(options, "ignoreSize");
2013-09-13 22:20:20 +08:00
if (ignoreSizeExsit)
{
widget->ignoreContentAdaptWithSize(DICTOOL->getBooleanValue_json(options, "ignoreSize"));
2013-09-13 22:20:20 +08:00
}
float w = DICTOOL->getFloatValue_json(options, "width");
float h = DICTOOL->getFloatValue_json(options, "height");
widget->setContentSize(Size(w, h));
2013-09-13 22:20:20 +08:00
widget->setTag(DICTOOL->getIntValue_json(options, "tag"));
widget->setActionTag(DICTOOL->getIntValue_json(options, "actiontag"));
widget->setTouchEnabled(DICTOOL->getBooleanValue_json(options, "touchAble"));
const char* name = DICTOOL->getStringValue_json(options, "name");
2013-09-13 22:20:20 +08:00
const char* widgetName = name?name:"default";
widget->setName(widgetName);
float x = DICTOOL->getFloatValue_json(options, "x");
float y = DICTOOL->getFloatValue_json(options, "y");
Squashed commit of the following: commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2
2014-05-15 01:07:09 +08:00
widget->setPosition(Vec2(x,y));
bool sx = DICTOOL->checkObjectExist_json(options, "scaleX");
2013-09-13 22:20:20 +08:00
if (sx)
{
widget->setScaleX(DICTOOL->getFloatValue_json(options, "scaleX"));
2013-09-13 22:20:20 +08:00
}
bool sy = DICTOOL->checkObjectExist_json(options, "scaleY");
2013-09-13 22:20:20 +08:00
if (sy)
{
widget->setScaleY(DICTOOL->getFloatValue_json(options, "scaleY"));
2013-09-13 22:20:20 +08:00
}
bool rt = DICTOOL->checkObjectExist_json(options, "rotation");
2013-09-13 22:20:20 +08:00
if (rt)
{
widget->setRotation(DICTOOL->getFloatValue_json(options, "rotation"));
2013-09-13 22:20:20 +08:00
}
bool vb = DICTOOL->checkObjectExist_json(options, "visible");
2013-09-13 22:20:20 +08:00
if (vb)
{
widget->setVisible(DICTOOL->getBooleanValue_json(options, "visible"));
2013-09-13 22:20:20 +08:00
}
int z = DICTOOL->getIntValue_json(options, "ZOrder");
widget->setLocalZOrder(z);
2013-09-13 22:20:20 +08:00
}
void WidgetPropertiesReader0250::setColorPropsForWidgetFromJsonDictionary(Widget *widget, const rapidjson::Value&options)
2013-09-13 22:20:20 +08:00
{
bool op = DICTOOL->checkObjectExist_json(options, "opacity");
2013-09-13 22:20:20 +08:00
if (op)
{
widget->setOpacity(DICTOOL->getIntValue_json(options, "opacity"));
2013-09-13 22:20:20 +08:00
}
bool cr = DICTOOL->checkObjectExist_json(options, "colorR");
bool cg = DICTOOL->checkObjectExist_json(options, "colorG");
bool cb = DICTOOL->checkObjectExist_json(options, "colorB");
int colorR = cr ? DICTOOL->getIntValue_json(options, "colorR") : 255;
int colorG = cg ? DICTOOL->getIntValue_json(options, "colorG") : 255;
int colorB = cb ? DICTOOL->getIntValue_json(options, "colorB") : 255;
2013-09-16 15:32:52 +08:00
widget->setColor(Color3B(colorR, colorG, colorB));
this->setAnchorPointForWidget(widget, options);
bool flipX = DICTOOL->getBooleanValue_json(options, "flipX");
bool flipY = DICTOOL->getBooleanValue_json(options, "flipY");
2014-03-05 15:04:30 +08:00
widget->setFlippedX(flipX);
widget->setFlippedY(flipY);
2013-09-13 22:20:20 +08:00
}
void WidgetPropertiesReader0250::setPropsForButtonFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
setPropsForWidgetFromJsonDictionary(widget, options);
cocos2d::ui::Button* button = static_cast<Button*>(widget);
bool scale9Enable = DICTOOL->getBooleanValue_json(options, "scale9Enable");
2013-11-11 18:22:14 +08:00
button->setScale9Enabled(scale9Enable);
std::string tp_n = m_strFilePath;
std::string tp_p = m_strFilePath;
std::string tp_d = m_strFilePath;
const char* normalFileName = DICTOOL->getStringValue_json(options, "normal");
const char* pressedFileName = DICTOOL->getStringValue_json(options, "pressed");
const char* disabledFileName = DICTOOL->getStringValue_json(options, "disabled");
2013-11-11 18:22:14 +08:00
2013-11-14 11:37:46 +08:00
const char* normalFileName_tp = (normalFileName && (strcmp(normalFileName, "") != 0))?tp_n.append(normalFileName).c_str():nullptr;
const char* pressedFileName_tp = (pressedFileName && (strcmp(pressedFileName, "") != 0))?tp_p.append(pressedFileName).c_str():nullptr;
const char* disabledFileName_tp = (disabledFileName && (strcmp(disabledFileName, "") != 0))?tp_d.append(disabledFileName).c_str():nullptr;
bool useMergedTexture = DICTOOL->getBooleanValue_json(options, "useMergedTexture");
2013-11-11 18:22:14 +08:00
if (scale9Enable)
2013-09-13 22:20:20 +08:00
{
float cx = DICTOOL->getFloatValue_json(options, "capInsetsX");
float cy = DICTOOL->getFloatValue_json(options, "capInsetsY");
float cw = DICTOOL->getFloatValue_json(options, "capInsetsWidth");
float ch = DICTOOL->getFloatValue_json(options, "capInsetsHeight");
2013-09-13 22:20:20 +08:00
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
2013-09-13 22:20:20 +08:00
{
2015-07-15 12:04:48 +08:00
button->loadTextures(normalFileName, pressedFileName, disabledFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
else
{
2013-11-11 18:22:14 +08:00
button->loadTextures(normalFileName_tp, pressedFileName_tp, disabledFileName_tp);
}
button->setCapInsets(Rect(cx, cy, cw, ch));
bool sw = DICTOOL->checkObjectExist_json(options, "scale9Width");
bool sh = DICTOOL->checkObjectExist_json(options, "scale9Height");
2013-11-11 18:22:14 +08:00
if (sw && sh)
{
float swf = DICTOOL->getFloatValue_json(options, "scale9Width");
float shf = DICTOOL->getFloatValue_json(options, "scale9Height");
button->setContentSize(Size(swf, shf));
2013-09-13 22:20:20 +08:00
}
}
else
{
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
2013-09-13 22:20:20 +08:00
{
2015-07-15 12:04:48 +08:00
button->loadTextures(normalFileName, pressedFileName, disabledFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
else
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
button->loadTextures(normalFileName_tp, pressedFileName_tp, disabledFileName_tp);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
}
bool tt = DICTOOL->checkObjectExist_json(options, "text");
2013-11-11 18:22:14 +08:00
if (tt)
{
const char* text = DICTOOL->getStringValue_json(options, "text");
2013-11-11 18:22:14 +08:00
if (text)
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
button->setTitleText(text);
2013-09-13 22:20:20 +08:00
}
}
bool cr = DICTOOL->checkObjectExist_json(options, "textColorR");
bool cg = DICTOOL->checkObjectExist_json(options, "textColorG");
bool cb = DICTOOL->checkObjectExist_json(options, "textColorB");
int cri = cr?DICTOOL->getIntValue_json(options, "textColorR"):255;
int cgi = cg?DICTOOL->getIntValue_json(options, "textColorG"):255;
int cbi = cb?DICTOOL->getIntValue_json(options, "textColorB"):255;
2013-11-11 18:22:14 +08:00
button->setTitleColor(Color3B(cri,cgi,cbi));
bool fs = DICTOOL->checkObjectExist_json(options, "fontSize");
2013-11-11 18:22:14 +08:00
if (fs)
{
button->setTitleFontSize(DICTOOL->getIntValue_json(options, "fontSize"));
2013-11-11 18:22:14 +08:00
}
bool fn = DICTOOL->checkObjectExist_json(options, "fontName");
2013-11-11 18:22:14 +08:00
if (fn)
{
const char * szTemp = DICTOOL->getStringValue_json(options, "fontName");
if (szTemp && *szTemp)
button->setTitleFontName(szTemp);
else
button->setTitleFontName(std::string(""));
2013-11-11 18:22:14 +08:00
}
setColorPropsForWidgetFromJsonDictionary(widget,options);
2013-09-13 22:20:20 +08:00
}
void WidgetPropertiesReader0250::setPropsForCheckBoxFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
setPropsForWidgetFromJsonDictionary(widget, options);
2013-12-25 22:13:19 +08:00
CheckBox* checkBox = static_cast<CheckBox*>(widget);
const char* backGroundFileName = DICTOOL->getStringValue_json(options, "backGroundBox");
const char* backGroundSelectedFileName = DICTOOL->getStringValue_json(options, "backGroundBoxSelected");
const char* frontCrossFileName = DICTOOL->getStringValue_json(options, "frontCross");
const char* backGroundDisabledFileName = DICTOOL->getStringValue_json(options, "backGroundBoxDisabled");
const char* frontCrossDisabledFileName = DICTOOL->getStringValue_json(options, "frontCrossDisabled");
2013-11-11 18:22:14 +08:00
std::string tp_b = m_strFilePath;
std::string tp_bs = m_strFilePath;
std::string tp_c = m_strFilePath;
std::string tp_bd = m_strFilePath;
std::string tp_cd = m_strFilePath;
2013-11-14 11:37:46 +08:00
const char* backGroundFileName_tp = (backGroundFileName && (strcmp(backGroundFileName, "") != 0))?tp_b.append(backGroundFileName).c_str():nullptr;
const char* backGroundSelectedFileName_tp = (backGroundSelectedFileName && (strcmp(backGroundSelectedFileName, "") != 0))?tp_bs.append(backGroundSelectedFileName).c_str():nullptr;
const char* frontCrossFileName_tp = (frontCrossFileName && (strcmp(frontCrossFileName, "") != 0))?tp_c.append(frontCrossFileName).c_str():nullptr;
const char* backGroundDisabledFileName_tp = (backGroundDisabledFileName && (strcmp(backGroundDisabledFileName, "") != 0))?tp_bd.append(backGroundDisabledFileName).c_str():nullptr;
const char* frontCrossDisabledFileName_tp = (frontCrossDisabledFileName && (strcmp(frontCrossDisabledFileName, "") != 0))?tp_cd.append(frontCrossDisabledFileName).c_str():nullptr;
bool useMergedTexture = DICTOOL->getBooleanValue_json(options, "useMergedTexture");
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
{
2015-07-15 12:04:48 +08:00
checkBox->loadTextures(backGroundFileName, backGroundSelectedFileName, frontCrossFileName,backGroundDisabledFileName,frontCrossDisabledFileName,Widget::TextureResType::PLIST);
2013-11-11 18:22:14 +08:00
}
else
{
checkBox->loadTextures(backGroundFileName_tp, backGroundSelectedFileName_tp, frontCrossFileName_tp,backGroundDisabledFileName_tp,frontCrossDisabledFileName_tp);
}
2014-08-21 16:21:23 +08:00
checkBox->setSelected(DICTOOL->getBooleanValue_json(options, "selectedState"));
2013-11-11 18:22:14 +08:00
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
void WidgetPropertiesReader0250::setPropsForImageViewFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-11-11 18:22:14 +08:00
{
setPropsForWidgetFromJsonDictionary(widget, options);
cocos2d::ui::ImageView* imageView = static_cast<ImageView*>(widget);
const char* imageFileName = DICTOOL->getStringValue_json(options, "fileName");
bool scale9EnableExist = DICTOOL->checkObjectExist_json(options, "scale9Enable");
2013-11-11 18:22:14 +08:00
bool scale9Enable = false;
if (scale9EnableExist)
{
scale9Enable = DICTOOL->getBooleanValue_json(options, "scale9Enable");
2013-11-11 18:22:14 +08:00
}
imageView->setScale9Enabled(scale9Enable);
std::string tp_i = m_strFilePath;
2013-11-14 11:37:46 +08:00
const char* imageFileName_tp = nullptr;
2013-11-11 18:22:14 +08:00
if (imageFileName && (strcmp(imageFileName, "") != 0))
{
imageFileName_tp = tp_i.append(imageFileName).c_str();
}
bool useMergedTexture = DICTOOL->getBooleanValue_json(options, "useMergedTexture");
2013-11-11 18:22:14 +08:00
if (scale9Enable)
{
2013-09-13 22:20:20 +08:00
if (useMergedTexture)
{
2015-07-15 12:04:48 +08:00
imageView->loadTexture(imageFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
else
{
2013-11-11 18:22:14 +08:00
imageView->loadTexture(imageFileName_tp);
2013-09-13 22:20:20 +08:00
}
bool sw = DICTOOL->checkObjectExist_json(options, "scale9Width");
bool sh = DICTOOL->checkObjectExist_json(options, "scale9Height");
2013-11-11 18:22:14 +08:00
if (sw && sh)
{
float swf = DICTOOL->getFloatValue_json(options, "scale9Width");
float shf = DICTOOL->getFloatValue_json(options, "scale9Height");
imageView->setContentSize(Size(swf, shf));
2013-11-11 18:22:14 +08:00
}
float cx = DICTOOL->getFloatValue_json(options, "capInsetsX");
float cy = DICTOOL->getFloatValue_json(options, "capInsetsY");
float cw = DICTOOL->getFloatValue_json(options, "capInsetsWidth");
float ch = DICTOOL->getFloatValue_json(options, "capInsetsHeight");
2013-11-11 18:22:14 +08:00
imageView->setCapInsets(Rect(cx, cy, cw, ch));
2013-09-13 22:20:20 +08:00
}
else
{
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
2013-09-13 22:20:20 +08:00
{
2015-07-15 12:04:48 +08:00
imageView->loadTexture(imageFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
else
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
imageView->loadTexture(imageFileName_tp);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
}
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
2013-09-13 22:20:20 +08:00
void WidgetPropertiesReader0250::setPropsForLabelFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-11-11 18:22:14 +08:00
{
setPropsForWidgetFromJsonDictionary(widget, options);
cocos2d::ui::Text* label = static_cast<cocos2d::ui::Text*>(widget);
bool touchScaleChangeAble = DICTOOL->getBooleanValue_json(options, "touchScaleEnable");
2013-11-11 18:22:14 +08:00
label->setTouchScaleChangeEnabled(touchScaleChangeAble);
const char* text = DICTOOL->getStringValue_json(options, "text");
2014-05-14 15:26:14 +08:00
label->setString(text);
bool fs = DICTOOL->checkObjectExist_json(options, "fontSize");
2013-11-11 18:22:14 +08:00
if (fs)
{
label->setFontSize(DICTOOL->getIntValue_json(options, "fontSize"));
2013-11-11 18:22:14 +08:00
}
bool fn = DICTOOL->checkObjectExist_json(options, "fontName");
2013-11-11 18:22:14 +08:00
if (fn)
{
const char * szTemp = DICTOOL->getStringValue_json(options, "fontName");
if (szTemp && *szTemp)
label->setFontName(szTemp);
else
label->setFontName(std::string(""));
2013-11-11 18:22:14 +08:00
}
2014-01-14 14:37:31 +08:00
bool aw = DICTOOL->checkObjectExist_json(options, "areaWidth");
bool ah = DICTOOL->checkObjectExist_json(options, "areaHeight");
if (aw && ah)
2013-11-11 18:22:14 +08:00
{
2014-01-14 14:37:31 +08:00
Size size = Size(DICTOOL->getFloatValue_json(options, "areaWidth"),DICTOOL->getFloatValue_json(options,"areaHeight"));
label->setTextAreaSize(size);
2013-11-11 18:22:14 +08:00
}
bool ha = DICTOOL->checkObjectExist_json(options, "hAlignment");
2013-11-11 18:22:14 +08:00
if (ha)
{
label->setTextHorizontalAlignment((TextHAlignment)DICTOOL->getIntValue_json(options, "hAlignment"));
2013-11-11 18:22:14 +08:00
}
bool va = DICTOOL->checkObjectExist_json(options, "vAlignment");
2013-11-11 18:22:14 +08:00
if (va)
{
label->setTextVerticalAlignment((TextVAlignment)DICTOOL->getIntValue_json(options, "vAlignment"));
2013-11-11 18:22:14 +08:00
}
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
void WidgetPropertiesReader0250::setPropsForLabelAtlasFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-11-11 18:22:14 +08:00
{
setPropsForWidgetFromJsonDictionary(widget, options);
cocos2d::ui::TextAtlas* labelAtlas = static_cast<cocos2d::ui::TextAtlas*>(widget);
bool sv = DICTOOL->checkObjectExist_json(options, "stringValue");
bool cmf = DICTOOL->checkObjectExist_json(options, "charMapFile");
bool iw = DICTOOL->checkObjectExist_json(options, "itemWidth");
bool ih = DICTOOL->checkObjectExist_json(options, "itemHeight");
bool scm = DICTOOL->checkObjectExist_json(options, "startCharMap");
if (sv && cmf && iw && ih && scm && (strcmp(DICTOOL->getStringValue_json(options, "charMapFile"), "") != 0))
2013-11-11 18:22:14 +08:00
{
std::string tp_c = m_strFilePath;
const char* cmft = DICTOOL->getStringValue_json(options, "charMapFile");
const char* cmf_tp = tp_c.append(cmft).c_str();
2013-09-13 22:20:20 +08:00
labelAtlas->setProperty(DICTOOL->getStringValue_json(options, "stringValue"),cmf_tp,DICTOOL->getIntValue_json(options, "itemWidth"),DICTOOL->getIntValue_json(options,"itemHeight"),DICTOOL->getStringValue_json(options, "startCharMap"));
labelAtlas->setProperty(DICTOOL->getStringValue_json(options, "stringValue"),cmf_tp,DICTOOL->getIntValue_json(options, "itemWidth") / CC_CONTENT_SCALE_FACTOR() ,DICTOOL->getIntValue_json(options,"itemHeight") / CC_CONTENT_SCALE_FACTOR(), DICTOOL->getStringValue_json(options, "startCharMap"));
2013-11-11 18:22:14 +08:00
}
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
void WidgetPropertiesReader0250::setPropsForLayoutFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-11-11 18:22:14 +08:00
{
setPropsForWidgetFromJsonDictionary(widget, options);
2013-12-25 22:13:19 +08:00
Layout* containerWidget = static_cast<Layout*>(widget);
if (!dynamic_cast<cocos2d::ui::ScrollView*>(containerWidget)
&& !dynamic_cast<cocos2d::ui::ListView*>(containerWidget))
2013-11-11 18:22:14 +08:00
{
containerWidget->setClippingEnabled(DICTOOL->getBooleanValue_json(options, "clipAble"));
2013-11-11 18:22:14 +08:00
}
2013-12-23 15:02:52 +08:00
Layout* panel = (Layout*)widget;
bool backGroundScale9Enable = DICTOOL->getBooleanValue_json(options, "backGroundScale9Enable");
2013-11-11 18:22:14 +08:00
panel->setBackGroundImageScale9Enabled(backGroundScale9Enable);
int cr = DICTOOL->getIntValue_json(options, "bgColorR");
int cg = DICTOOL->getIntValue_json(options, "bgColorG");
int cb = DICTOOL->getIntValue_json(options, "bgColorB");
2013-11-11 18:22:14 +08:00
int scr = DICTOOL->getIntValue_json(options, "bgStartColorR");
int scg = DICTOOL->getIntValue_json(options, "bgStartColorG");
int scb = DICTOOL->getIntValue_json(options, "bgStartColorB");
2013-11-11 18:22:14 +08:00
int ecr = DICTOOL->getIntValue_json(options, "bgEndColorR");
int ecg = DICTOOL->getIntValue_json(options, "bgEndColorG");
int ecb = DICTOOL->getIntValue_json(options, "bgEndColorB");
2013-11-11 18:22:14 +08:00
float bgcv1 = DICTOOL->getFloatValue_json(options, "vectorX");
float bgcv2 = DICTOOL->getFloatValue_json(options, "vectorY");
Squashed commit of the following: commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2
2014-05-15 01:07:09 +08:00
panel->setBackGroundColorVector(Vec2(bgcv1, bgcv2));
2013-11-11 18:22:14 +08:00
int co = DICTOOL->getIntValue_json(options, "bgColorOpacity");
2013-11-11 18:22:14 +08:00
int colorType = DICTOOL->getIntValue_json(options, "colorType");
panel->setBackGroundColorType(Layout::BackGroundColorType(colorType));
2013-11-11 18:22:14 +08:00
panel->setBackGroundColor(Color3B(scr, scg, scb),Color3B(ecr, ecg, ecb));
panel->setBackGroundColor(Color3B(cr, cg, cb));
panel->setBackGroundColorOpacity(co);
std::string tp_b = m_strFilePath;
const char* imageFileName = DICTOOL->getStringValue_json(options, "backGroundImage");
2013-11-14 11:37:46 +08:00
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
bool useMergedTexture = DICTOOL->getBooleanValue_json(options, "useMergedTexture");
2013-11-11 18:22:14 +08:00
if (backGroundScale9Enable)
{
float cx = DICTOOL->getFloatValue_json(options, "capInsetsX");
float cy = DICTOOL->getFloatValue_json(options, "capInsetsY");
float cw = DICTOOL->getFloatValue_json(options, "capInsetsWidth");
float ch = DICTOOL->getFloatValue_json(options, "capInsetsHeight");
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
2013-09-13 22:20:20 +08:00
{
2015-07-15 12:04:48 +08:00
panel->setBackGroundImage(imageFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
else
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
panel->setBackGroundImage(imageFileName_tp);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
panel->setBackGroundImageCapInsets(Rect(cx, cy, cw, ch));
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
else
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
2013-09-13 22:20:20 +08:00
{
2015-07-15 12:04:48 +08:00
panel->setBackGroundImage(imageFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
else
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
panel->setBackGroundImage(imageFileName_tp);
2013-09-13 22:20:20 +08:00
}
2013-11-11 18:22:14 +08:00
}
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
void WidgetPropertiesReader0250::setPropsForScrollViewFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-11-11 18:22:14 +08:00
{
setPropsForLayoutFromJsonDictionary(widget, options);
cocos2d::ui::ScrollView* scrollView = static_cast<cocos2d::ui::ScrollView*>(widget);
float innerWidth = DICTOOL->getFloatValue_json(options, "innerWidth");
float innerHeight = DICTOOL->getFloatValue_json(options, "innerHeight");
2013-11-11 18:22:14 +08:00
scrollView->setInnerContainerSize(Size(innerWidth, innerHeight));
int direction = DICTOOL->getFloatValue_json(options, "direction");
2014-05-12 11:08:10 +08:00
scrollView->setDirection((ScrollView::Direction)direction);
scrollView->setBounceEnabled(DICTOOL->getBooleanValue_json(options, "bounceEnable"));
2013-11-11 18:22:14 +08:00
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
void WidgetPropertiesReader0250::setPropsForSliderFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-11-11 18:22:14 +08:00
{
setPropsForWidgetFromJsonDictionary(widget, options);
cocos2d::ui::Slider* slider = static_cast<cocos2d::ui::Slider*>(widget);
2013-11-11 18:22:14 +08:00
bool barTextureScale9Enable = DICTOOL->getBooleanValue_json(options, "barTextureScale9Enable");
2013-11-11 18:22:14 +08:00
slider->setScale9Enabled(barTextureScale9Enable);
bool bt = DICTOOL->checkObjectExist_json(options, "barFileName");
float barLength = DICTOOL->getFloatValue_json(options, "length");
bool useMergedTexture = DICTOOL->getBooleanValue_json(options, "useMergedTexture");
2013-11-11 18:22:14 +08:00
if (bt)
{
if (barTextureScale9Enable)
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
std::string tp_b = m_strFilePath;
const char* imageFileName = DICTOOL->getStringValue_json(options, "barFileName");
2013-11-14 11:37:46 +08:00
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
2013-09-13 22:20:20 +08:00
if (useMergedTexture)
{
2015-07-15 12:04:48 +08:00
slider->loadBarTexture(imageFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
else
{
2013-11-11 18:22:14 +08:00
slider->loadBarTexture(imageFileName_tp);
2013-09-13 22:20:20 +08:00
}
slider->setContentSize(Size(barLength, slider->getContentSize().height));
2013-09-13 22:20:20 +08:00
}
else
{
2013-11-11 18:22:14 +08:00
std::string tp_b = m_strFilePath;
const char* imageFileName = DICTOOL->getStringValue_json(options, "barFileName");
2013-11-14 11:37:46 +08:00
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
2013-09-13 22:20:20 +08:00
if (useMergedTexture)
{
2015-07-15 12:04:48 +08:00
slider->loadBarTexture(imageFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
else
{
2013-11-11 18:22:14 +08:00
slider->loadBarTexture(imageFileName_tp);
2013-09-13 22:20:20 +08:00
}
}
2013-11-11 18:22:14 +08:00
}
std::string tp_n = m_strFilePath;
std::string tp_p = m_strFilePath;
std::string tp_d = m_strFilePath;
const char* normalFileName = DICTOOL->getStringValue_json(options, "ballNormal");
const char* pressedFileName = DICTOOL->getStringValue_json(options, "ballPressed");
const char* disabledFileName = DICTOOL->getStringValue_json(options, "ballDisabled");
2013-11-11 18:22:14 +08:00
2013-11-14 11:37:46 +08:00
const char* normalFileName_tp = (normalFileName && (strcmp(normalFileName, "") != 0))?tp_n.append(normalFileName).c_str():nullptr;
const char* pressedFileName_tp = (pressedFileName && (strcmp(pressedFileName, "") != 0))?tp_p.append(pressedFileName).c_str():nullptr;
const char* disabledFileName_tp = (disabledFileName && (strcmp(disabledFileName, "") != 0))?tp_d.append(disabledFileName).c_str():nullptr;
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
{
2015-07-15 12:04:48 +08:00
slider->loadSlidBallTextures(normalFileName,pressedFileName,disabledFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
else
{
2013-11-11 18:22:14 +08:00
slider->loadSlidBallTextures(normalFileName_tp,pressedFileName_tp,disabledFileName_tp);
2013-09-13 22:20:20 +08:00
}
slider->setPercent(DICTOOL->getIntValue_json(options, "percent"));
2013-11-11 18:22:14 +08:00
std::string tp_b = m_strFilePath;
const char* imageFileName = DICTOOL->getStringValue_json(options, "progressBarFileName");
2013-11-14 11:37:46 +08:00
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
{
2015-07-15 12:04:48 +08:00
slider->loadProgressBarTexture(imageFileName, Widget::TextureResType::PLIST);
2013-11-11 18:22:14 +08:00
}
else
{
slider->loadProgressBarTexture(imageFileName_tp);
}
setColorPropsForWidgetFromJsonDictionary(widget,options);
2013-09-13 22:20:20 +08:00
}
void WidgetPropertiesReader0250::setPropsForTextFieldFromJsonDictionary(Widget*widget,const rapidjson::Value& options)
2013-09-13 22:20:20 +08:00
{
setPropsForWidgetFromJsonDictionary(widget, options);
cocos2d::ui::TextField* textField = static_cast<cocos2d::ui::TextField*>(widget);
bool ph = DICTOOL->checkObjectExist_json(options, "placeHolder");
2013-11-11 18:22:14 +08:00
if (ph)
{
textField->setPlaceHolder(DICTOOL->getStringValue_json(options, "placeHolder"));
2013-11-11 18:22:14 +08:00
}
2014-09-12 17:06:13 +08:00
textField->setString(DICTOOL->getStringValue_json(options, "text"));
bool fs = DICTOOL->checkObjectExist_json(options, "fontSize");
2013-09-13 22:20:20 +08:00
if (fs)
{
textField->setFontSize(DICTOOL->getIntValue_json(options, "fontSize"));
2013-09-13 22:20:20 +08:00
}
bool fn = DICTOOL->checkObjectExist_json(options, "fontName");
2013-09-13 22:20:20 +08:00
if (fn)
{
const char * szTemp = DICTOOL->getStringValue_json(options, "fontName");
if (szTemp && *szTemp)
textField->setFontName(szTemp);
else
textField->setFontName(std::string(""));
2013-11-11 18:22:14 +08:00
}
bool tsw = DICTOOL->checkObjectExist_json(options, "touchSizeWidth");
bool tsh = DICTOOL->checkObjectExist_json(options, "touchSizeHeight");
2013-11-11 18:22:14 +08:00
if (tsw && tsh)
{
textField->setTouchSize(Size(DICTOOL->getFloatValue_json(options, "touchSizeWidth"), DICTOOL->getFloatValue_json(options,"touchSizeHeight")));
2013-11-11 18:22:14 +08:00
}
float dw = DICTOOL->getFloatValue_json(options, "width");
float dh = DICTOOL->getFloatValue_json(options, "height");
2013-11-11 18:22:14 +08:00
if (dw > 0.0f || dh > 0.0f)
{
//textField->setSize(Size(dw, dh));
}
bool maxLengthEnable = DICTOOL->getBooleanValue_json(options, "maxLengthEnable");
2013-11-11 18:22:14 +08:00
textField->setMaxLengthEnabled(maxLengthEnable);
if (maxLengthEnable)
{
int maxLength = DICTOOL->getIntValue_json(options, "maxLength");
2013-11-11 18:22:14 +08:00
textField->setMaxLength(maxLength);
}
bool passwordEnable = DICTOOL->getBooleanValue_json(options, "passwordEnable");
2013-11-11 18:22:14 +08:00
textField->setPasswordEnabled(passwordEnable);
if (passwordEnable)
{
textField->setPasswordStyleText(DICTOOL->getStringValue_json(options, "passwordStyleText"));
2013-09-13 22:20:20 +08:00
}
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
void WidgetPropertiesReader0250::setPropsForLoadingBarFromJsonDictionary(Widget *widget, const rapidjson::Value&options)
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
setPropsForWidgetFromJsonDictionary(widget, options);
cocos2d::ui::LoadingBar* loadingBar = static_cast<cocos2d::ui::LoadingBar*>(widget);
bool useMergedTexture = DICTOOL->getBooleanValue_json(options, "useMergedTexture");
2013-11-11 18:22:14 +08:00
std::string tp_b = m_strFilePath;
const char*imageFileName = DICTOOL->getStringValue_json(options, "texture");
2013-11-14 11:37:46 +08:00
const char* imageFileName_tp = (imageFileName && (strcmp(imageFileName, "") != 0))?tp_b.append(imageFileName).c_str():nullptr;
2013-11-11 18:22:14 +08:00
if (useMergedTexture)
{
2015-07-15 12:04:48 +08:00
loadingBar->loadTexture(imageFileName,Widget::TextureResType::PLIST);
2013-09-13 22:20:20 +08:00
}
else
{
2013-11-11 18:22:14 +08:00
loadingBar->loadTexture(imageFileName_tp);
2013-09-13 22:20:20 +08:00
}
loadingBar->setDirection(LoadingBar::Direction(DICTOOL->getIntValue_json(options, "direction")));
loadingBar->setPercent(DICTOOL->getIntValue_json(options, "percent"));
2013-11-11 18:22:14 +08:00
setColorPropsForWidgetFromJsonDictionary(widget,options);
2013-09-13 22:20:20 +08:00
}
void WidgetPropertiesReader0250::setPropsForLabelBMFontFromJsonDictionary(Widget *widget, const rapidjson::Value&options)
2013-09-13 22:20:20 +08:00
{
2013-11-11 18:22:14 +08:00
2013-09-13 22:20:20 +08:00
setPropsForWidgetFromJsonDictionary(widget, options);
2013-11-11 18:22:14 +08:00
cocos2d::ui::TextBMFont* labelBMFont = static_cast<cocos2d::ui::TextBMFont*>(widget);
2013-11-11 18:22:14 +08:00
std::string tp_c = m_strFilePath;
const char* cmft = DICTOOL->getStringValue_json(options, "fileName");
const char* cmf_tp = tp_c.append(cmft).c_str();
2013-11-11 18:22:14 +08:00
labelBMFont->setFntFile(cmf_tp);
const char* text = DICTOOL->getStringValue_json(options, "text");
2014-05-14 16:02:31 +08:00
labelBMFont->setString(text);
2013-11-11 18:22:14 +08:00
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
2014-03-04 16:51:35 +08:00
void WidgetPropertiesReader0250::setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol* /*reader*/, Widget* /*widget*/, const rapidjson::Value& /*options*/)
2014-03-04 16:51:35 +08:00
{
}
void WidgetPropertiesReader0250::setPropsForAllCustomWidgetFromJsonDictionary(const std::string& /*classType*/,
cocos2d::ui::Widget* /*widget*/,
const rapidjson::Value& /*customOptions*/)
2014-03-04 16:51:35 +08:00
{
}
2013-11-11 18:22:14 +08:00
Widget* WidgetPropertiesReader0250::createWidgetFromBinary(CocoLoader* /*cocoLoader*/,
stExpCocoNode* /*pCocoNode*/,
const char* /*fileName*/)
{
return nullptr;
}
Widget* WidgetPropertiesReader0250::widgetFromBinary(CocoLoader* /*cocoLoader*/,
stExpCocoNode* /*pCocoNode*/)
{
return nullptr;
}
void WidgetPropertiesReader0250::setPropsForAllWidgetFromBinary(WidgetReaderProtocol* /*reader*/,
cocos2d::ui::Widget* /*widget*/,
CocoLoader* /*cocoLoader*/,
stExpCocoNode* /*pCocoNode*/)
{}
2013-11-11 18:22:14 +08:00
/*0.3.0.0~1.0.0.0*/
Widget* WidgetPropertiesReader0300::createWidget(const rapidjson::Value& data, const char* fullPath, const char* fileName)
2013-11-11 18:22:14 +08:00
{
m_strFilePath = fullPath;
int texturesCount = DICTOOL->getArrayCount_json(data, "textures");
2013-11-11 18:22:14 +08:00
for (int i=0; i<texturesCount; i++)
2013-09-13 22:20:20 +08:00
{
const char* file = DICTOOL->getStringValueFromArray_json(data, "textures", i);
2013-11-11 18:22:14 +08:00
std::string tp = fullPath;
tp.append(file);
2016-02-04 10:52:14 +08:00
SpriteFrameCache::getInstance()->addSpriteFramesWithFile(tp);
2013-09-13 22:20:20 +08:00
}
float fileDesignWidth = DICTOOL->getFloatValue_json(data, "designWidth");
float fileDesignHeight = DICTOOL->getFloatValue_json(data, "designHeight");
2013-11-11 18:22:14 +08:00
if (fileDesignWidth <= 0 || fileDesignHeight <= 0) {
CCLOGERROR("Read design size error!\n");
2013-11-11 18:22:14 +08:00
Size winSize = Director::getInstance()->getWinSize();
GUIReader::getInstance()->storeFileDesignSize(fileName, winSize);
2013-11-11 18:22:14 +08:00
}
else
{
GUIReader::getInstance()->storeFileDesignSize(fileName, Size(fileDesignWidth, fileDesignHeight));
2013-11-11 18:22:14 +08:00
}
const rapidjson::Value& widgetTree = DICTOOL->getSubDictionary_json(data, "widgetTree");
2013-12-23 15:02:52 +08:00
Widget* widget = widgetFromJsonDictionary(widgetTree);
2013-11-11 18:22:14 +08:00
/* *********temp********* */
if (widget->getContentSize().equals(Size::ZERO))
{
2013-12-23 15:02:52 +08:00
Layout* rootWidget = dynamic_cast<Layout*>(widget);
rootWidget->setContentSize(Size(fileDesignWidth, fileDesignHeight));
2013-11-11 18:22:14 +08:00
}
/* ********************** */
// widget->setFileDesignSize(Size(fileDesignWidth, fileDesignHeight));
const rapidjson::Value& actions = DICTOOL->getSubDictionary_json(data, "animation");
2013-11-11 18:22:14 +08:00
/* *********temp********* */
// ActionManager::getInstance()->releaseActions();
2013-11-11 18:22:14 +08:00
/* ********************** */
// CCLOG("file name == [%s]",fileName);
Ref* rootWidget = (Ref*) widget;
ActionManagerEx::getInstance()->initWithDictionary(fileName,actions,rootWidget);
2013-11-11 18:22:14 +08:00
return widget;
2013-09-13 22:20:20 +08:00
}
2014-03-04 16:51:35 +08:00
2014-06-23 10:02:09 +08:00
cocos2d::ui::Widget* WidgetPropertiesReader0300::createWidgetFromBinary(CocoLoader* cocoLoader,stExpCocoNode* cocoNode, const char* fileName)
2013-09-13 22:20:20 +08:00
{
2014-03-04 16:51:35 +08:00
2014-07-01 16:31:17 +08:00
stExpCocoNode *tpChildArray = cocoNode->GetChildArray(cocoLoader);
float fileDesignWidth = 0.0f;
float fileDesignHeight = 0.0f;
Widget* widget = nullptr;
2014-06-23 10:02:09 +08:00
for (int i = 0; i < cocoNode->GetChildNum(); ++i) {
std::string key = tpChildArray[i].GetName(cocoLoader);
2014-06-11 14:56:12 +08:00
if (key == "textures") {
int texturesCount = tpChildArray[i].GetChildNum();
for (int j=0; j<texturesCount; j++)
{
std::string file;
2014-07-01 16:31:17 +08:00
stExpCocoNode *textureCountsArray = tpChildArray[i].GetChildArray(cocoLoader);
file = textureCountsArray[j].GetValue(cocoLoader);
2014-06-11 14:56:12 +08:00
SpriteFrameCache::getInstance()->addSpriteFramesWithFile(file);
}
}else if (key == "designWidth"){
2014-07-14 20:45:24 +08:00
fileDesignWidth = utils::atof(tpChildArray[i].GetValue(cocoLoader));
2014-06-11 14:56:12 +08:00
}else if (key == "designHeight"){
2014-07-14 20:45:24 +08:00
fileDesignHeight = utils::atof(tpChildArray[i].GetValue(cocoLoader));
2014-06-11 14:56:12 +08:00
}else if (key == "widgetTree"){
if (fileDesignWidth <= 0 || fileDesignHeight <= 0) {
CCLOGERROR("Read design size error!\n");
Size winSize = Director::getInstance()->getWinSize();
GUIReader::getInstance()->storeFileDesignSize(fileName, winSize);
}
else
{
GUIReader::getInstance()->storeFileDesignSize(fileName, Size(fileDesignWidth, fileDesignHeight));
}
stExpCocoNode *widgetTreeNode = &tpChildArray[i];
2014-06-23 10:02:09 +08:00
rapidjson::Type tType = tpChildArray[i].GetType(cocoLoader);
2014-06-11 14:56:12 +08:00
if (rapidjson::kObjectType == tType)
{
2014-06-23 10:02:09 +08:00
widget = widgetFromBinary(cocoLoader, widgetTreeNode);
2014-06-11 14:56:12 +08:00
}
if (widget->getContentSize().equals(Size::ZERO))
{
Layout* rootWidget = dynamic_cast<Layout*>(widget);
rootWidget->setContentSize(Size(fileDesignWidth, fileDesignHeight));
2014-06-11 14:56:12 +08:00
}
}
2013-11-11 18:22:14 +08:00
}
/* ********************** */
2014-06-18 15:55:01 +08:00
/* ********************** */
2014-07-01 16:31:17 +08:00
stExpCocoNode *optionChildNode = cocoNode->GetChildArray(cocoLoader);
2014-06-23 10:02:09 +08:00
for (int k = 0; k < cocoNode->GetChildNum(); ++k) {
std::string key = optionChildNode[k].GetName(cocoLoader);
2014-06-18 15:55:01 +08:00
if (key == "animation") {
Ref* rootWidget = (Ref*) widget;
2014-06-23 10:02:09 +08:00
ActionManagerEx::getInstance()->initWithBinary(fileName,rootWidget,cocoLoader, &optionChildNode[k]);
2014-06-18 15:55:01 +08:00
break;
}
}
return widget;
}
2014-06-23 10:02:09 +08:00
Widget* WidgetPropertiesReader0300::widgetFromBinary(CocoLoader* cocoLoader, stExpCocoNode* cocoNode)
{
Widget* widget = nullptr;
2014-07-01 16:31:17 +08:00
stExpCocoNode *stChildArray = cocoNode->GetChildArray(cocoLoader);
2014-06-18 16:19:24 +08:00
stExpCocoNode *optionsNode = nullptr;
stExpCocoNode *childrenNode = nullptr;
2014-06-23 10:02:09 +08:00
int elementCount = cocoNode->GetChildNum();
std::string classname;
2014-06-18 16:19:24 +08:00
for (int i = 0; i < elementCount; ++i) {
2014-06-23 10:02:09 +08:00
std::string key = stChildArray[i].GetName(cocoLoader);
2014-07-01 16:31:17 +08:00
std::string value = stChildArray[i].GetValue(cocoLoader);
2014-06-18 16:19:24 +08:00
if (key == "classname" )
{
if (!value.empty())
{
classname = value;
widget = this->createGUI(classname);
}
else
{
CCLOG("Warning!!! classname not found!");
}
}else if(key == "children"){
childrenNode = &stChildArray[i];
}else if(key == "options"){
optionsNode = &stChildArray[i];
}
2013-11-11 18:22:14 +08:00
}
std::string readerName = this->getWidgetReaderClassName(classname);
2014-06-04 14:27:14 +08:00
WidgetReaderProtocol* reader = this->createWidgetReaderProtocol(readerName);
2014-03-04 16:51:35 +08:00
if (reader)
2013-11-11 18:22:14 +08:00
{
2014-03-04 16:51:35 +08:00
// widget parse with widget reader
2014-06-23 10:02:09 +08:00
setPropsForAllWidgetFromBinary(reader, widget, cocoLoader,optionsNode);
2013-11-11 18:22:14 +08:00
}
2014-03-04 16:51:35 +08:00
else
2013-11-11 18:22:14 +08:00
{
// 1st., custom widget parse properties of parent widget with parent widget reader
readerName = this->getWidgetReaderClassName(widget);
reader = this->createWidgetReaderProtocol(readerName);
2014-06-05 11:43:43 +08:00
2014-06-18 16:19:24 +08:00
if (reader && widget) {
2014-06-23 10:02:09 +08:00
setPropsForAllWidgetFromBinary(reader, widget, cocoLoader, optionsNode);
2014-06-18 16:19:24 +08:00
// 2nd., custom widget parse with custom reader
//2nd. parse custom property
const char* customProperty = nullptr;
2014-07-01 16:31:17 +08:00
stExpCocoNode *optionChildNode = optionsNode->GetChildArray(cocoLoader);
2014-06-18 16:19:24 +08:00
for (int k = 0; k < optionsNode->GetChildNum(); ++k) {
2014-06-23 10:02:09 +08:00
std::string key = optionChildNode[k].GetName(cocoLoader);
2014-06-18 16:19:24 +08:00
if (key == "customProperty") {
2014-07-01 16:31:17 +08:00
customProperty = optionChildNode[k].GetValue(cocoLoader);
2014-06-18 16:19:24 +08:00
break;
}
}
rapidjson::Document customJsonDict;
customJsonDict.Parse<0>(customProperty);
if (customJsonDict.HasParseError())
{
2015-05-25 11:43:03 +08:00
CCLOG("GetParseError %d\n", customJsonDict.GetParseError());
2014-06-18 16:19:24 +08:00
}
setPropsForAllCustomWidgetFromJsonDictionary(classname, widget, customJsonDict);
}else{
CCLOG("Widget or WidgetReader doesn't exists!!! Please check your csb file.");
}
}
//parse children
2014-06-18 16:19:24 +08:00
if (nullptr != childrenNode) {
2014-06-23 10:02:09 +08:00
rapidjson::Type tType22 = childrenNode->GetType(cocoLoader);
2014-06-11 09:35:24 +08:00
if (tType22 == rapidjson::kArrayType) {
2014-06-18 16:19:24 +08:00
int childrenCount = childrenNode->GetChildNum();
2014-07-01 16:31:17 +08:00
stExpCocoNode* innerChildArray = childrenNode->GetChildArray(cocoLoader);
2014-06-11 09:35:24 +08:00
for (int i=0; i < childrenCount; ++i) {
2014-06-23 10:02:09 +08:00
rapidjson::Type tType = innerChildArray[i].GetType(cocoLoader);
2014-06-11 09:35:24 +08:00
if (tType == rapidjson::kObjectType) {
2014-06-23 10:02:09 +08:00
Widget *child = widgetFromBinary(cocoLoader, &innerChildArray[i]);
2014-06-11 09:35:24 +08:00
if (child)
{
2014-06-11 09:35:24 +08:00
PageView* pageView = dynamic_cast<PageView*>(widget);
if (pageView)
{
2014-06-11 09:35:24 +08:00
pageView->addPage(static_cast<Layout*>(child));
}
else
{
2014-06-11 09:35:24 +08:00
ListView* listView = dynamic_cast<ListView*>(widget);
if (listView)
{
2014-06-11 09:35:24 +08:00
listView->pushBackCustomItem(child);
}
else
{
if (nullptr == dynamic_cast<Layout*>(widget))
{
2014-06-11 09:35:24 +08:00
if (child->getPositionType() == ui::Widget::PositionType::PERCENT)
{
child->setPositionPercent(Vec2(child->getPositionPercent().x + widget->getAnchorPoint().x,
child->getPositionPercent().y + widget->getAnchorPoint().y));
}
child->setPosition(Vec2(child->getPositionX() + widget->getAnchorPointInPoints().x,
child->getPositionY() + widget->getAnchorPointInPoints().y));
}
2014-06-11 09:35:24 +08:00
widget->addChild(child);
}
}
}
2014-06-11 09:35:24 +08:00
}
}
}
}
return widget;
}
void WidgetPropertiesReader0300::setPropsForAllWidgetFromBinary(WidgetReaderProtocol* reader,
cocos2d::ui::Widget* widget,
2014-06-23 10:02:09 +08:00
CocoLoader* cocoLoader,
stExpCocoNode* cocoNode)
{
2014-06-23 10:02:09 +08:00
reader->setPropsFromBinary(widget, cocoLoader, cocoNode);
}
void WidgetPropertiesReader0300::setPropsForAllCustomWidgetFromBinary(const std::string& /*classType*/,
cocos2d::ui::Widget* /*widget*/,
CocoLoader* /*cocoLoader*/,
stExpCocoNode* /*pCocoNode*/) {
//TODO: custom property
}
2014-06-05 11:43:43 +08:00
Widget* WidgetPropertiesReader0300::widgetFromJsonDictionary(const rapidjson::Value& data)
{
const char* classname = DICTOOL->getStringValue_json(data, "classname");
const rapidjson::Value& uiOptions = DICTOOL->getSubDictionary_json(data, "options");
Widget* widget = this->createGUI(classname);
// CCLOG("classname = %s", classname);
std::string readerName = this->getWidgetReaderClassName(classname);
WidgetReaderProtocol* reader = this->createWidgetReaderProtocol(readerName);
if (reader)
{
// widget parse with widget reader
setPropsForAllWidgetFromJsonDictionary(reader, widget, uiOptions);
}
else
{
readerName = this->getWidgetReaderClassName(widget);
2014-06-04 14:27:14 +08:00
reader = dynamic_cast<WidgetReaderProtocol*>(ObjectFactory::getInstance()->createObject(readerName));
2014-06-18 16:19:24 +08:00
if (reader && widget) {
setPropsForAllWidgetFromJsonDictionary(reader, widget, uiOptions);
// 2nd., custom widget parse with custom reader
const char* customProperty = DICTOOL->getStringValue_json(uiOptions, "customProperty");
rapidjson::Document customJsonDict;
customJsonDict.Parse<0>(customProperty);
if (customJsonDict.HasParseError())
{
2015-05-25 11:43:03 +08:00
CCLOG("GetParseError %d\n", customJsonDict.GetParseError());
2014-06-18 16:19:24 +08:00
}
setPropsForAllCustomWidgetFromJsonDictionary(classname, widget, customJsonDict);
}else{
2014-07-07 18:22:16 +08:00
CCLOG("Widget or WidgetReader doesn't exists!!! Please check your json file.");
2014-03-04 16:51:35 +08:00
}
2014-06-18 16:19:24 +08:00
2013-11-11 18:22:14 +08:00
}
int childrenCount = DICTOOL->getArrayCount_json(data, "children");
2014-03-04 16:51:35 +08:00
for (int i = 0; i < childrenCount; i++)
2013-11-11 18:22:14 +08:00
{
const rapidjson::Value& subData = DICTOOL->getDictionaryFromArray_json(data, "children", i);
2014-03-04 16:51:35 +08:00
cocos2d::ui::Widget* child = widgetFromJsonDictionary(subData);
2013-11-11 18:22:14 +08:00
if (child)
{
2013-12-26 21:02:47 +08:00
PageView* pageView = dynamic_cast<PageView*>(widget);
if (pageView)
2013-12-26 17:53:22 +08:00
{
2013-12-26 21:02:47 +08:00
pageView->addPage(static_cast<Layout*>(child));
2013-12-26 17:53:22 +08:00
}
else
{
2013-12-26 21:02:47 +08:00
ListView* listView = dynamic_cast<ListView*>(widget);
if (listView)
{
listView->pushBackCustomItem(child);
}
else
{
if (nullptr == dynamic_cast<Layout*>(widget))
2014-04-17 14:08:25 +08:00
{
if (child->getPositionType() == ui::Widget::PositionType::PERCENT)
2014-04-23 15:02:35 +08:00
{
Squashed commit of the following: commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2
2014-05-15 01:07:09 +08:00
child->setPositionPercent(Vec2(child->getPositionPercent().x + widget->getAnchorPoint().x, child->getPositionPercent().y + widget->getAnchorPoint().y));
2014-04-23 15:02:35 +08:00
}
Squashed commit of the following: commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed May 14 10:03:44 2014 -0700 math renames `Vector2` -> `Vec2` `Vector3` -> `Vec3` `Vector4` -> `Vec4` `Matrix` -> `Mat4` commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:24:28 2014 -0700 raw version of rename Vector3 commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:07:14 2014 -0700 rename Vector2 after merge commit ab2ed58c129dbc30a4c0970ed94568c5d271657b Merge: 1978d2d 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:05:30 2014 -0700 Merge branch 'v3' into v3_renameMathClassName Conflicts: tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp commit 1978d2d174877172ccddc083020a1bbf43ad3b39 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 08:51:45 2014 -0700 rename vector2 in tests/cpp-empty-test folder commit d4e0ff13dcce62724d2fece656543f26aa28e467 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:58:23 2014 -0700 rename vector2 in tests/cpp-tests cpp files commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:52:57 2014 -0700 rename vector2 in tests/cpp-tests head files commit 6daef564400d4e28c4ce20859a68e0f583fed125 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:49:48 2014 -0700 rename vector2 in extension folder commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:47:22 2014 -0700 rename vector2 in cocos/2d cpp files commit e1f3105aae06d595661a3030f519f7cc13aefbed Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:44:39 2014 -0700 rename vector2 in cocos/2d head files commit 6708d890bfe486109120c3cd4b9fe5c078b7108f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:59 2014 -0700 rename vector2 in cocos/base folder commit d3978fa5447c31ea2f3ece5469b7e746dfba4248 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:43 2014 -0700 rename vector2 in cocos/deprecated folder commit 4bff45139363d6b9706edbbcf9f322d48b4fd019 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:40:26 2014 -0700 rename vector2 in cocos/editor-support folder commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:36:48 2014 -0700 rename vector2 in cocos/ui folder commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:39 2014 -0700 rename vector2 in cocos/renderer folder commit 0bd2710dd8714cecb993880bc37affd9ecb05c27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:32:15 2014 -0700 rename vector2 in cocos/physics folder commit b7f0581c4587348bdbc1478d5374c2325735f21d Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:25:01 2014 -0700 rename vector2 in cocos/math folder commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 00:16:55 2014 -0700 rename Vector2 to Vec2 deprecate typedef Vector2
2014-05-15 01:07:09 +08:00
child->setPosition(Vec2(child->getPositionX() + widget->getAnchorPointInPoints().x, child->getPositionY() + widget->getAnchorPointInPoints().y));
2014-04-17 14:08:25 +08:00
}
2013-12-26 21:02:47 +08:00
widget->addChild(child);
}
2013-12-26 17:53:22 +08:00
}
2013-11-11 18:22:14 +08:00
}
}
return widget;
}
2013-12-26 17:53:22 +08:00
2014-03-04 16:51:35 +08:00
void WidgetPropertiesReader0300::setPropsForAllWidgetFromJsonDictionary(WidgetReaderProtocol *reader, Widget *widget, const rapidjson::Value &options)
{
reader->setPropsFromJsonDictionary(widget, options);
}
void WidgetPropertiesReader0300::setPropsForAllCustomWidgetFromJsonDictionary(const std::string &classType,
cocos2d::ui::Widget *widget,
const rapidjson::Value &customOptions)
{
GUIReader* guiReader = GUIReader::getInstance();
std::map<std::string, Ref*> *object_map = guiReader->getParseObjectMap();
Ref* object = (*object_map)[classType];
2014-03-04 16:51:35 +08:00
std::map<std::string, SEL_ParseEvent> *selector_map = guiReader->getParseCallBackMap();
SEL_ParseEvent selector = (*selector_map)[classType];
2014-03-04 16:51:35 +08:00
if (object && selector)
{
(object->*selector)(classType, widget, customOptions);
}
}
}