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

improve lasers

This commit is contained in:
andyque 2014-06-11 15:16:08 +08:00
parent f50263402a
commit 5515c43bb2
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/CCSGUIReader.cpp
View File

@ -1298,7 +1298,7 @@ Widget* WidgetPropertiesReader0300::widgetFromBinary(CocoLoader* pCocoLoader, s
widget = this->createGUI(classname); widget = this->createGUI(classname);
} }
CCLOG("classname = %s", classname.c_str()); // CCLOG("classname = %s", classname.c_str());
std::string readerName = this->getWidgetReaderClassName(classname); std::string readerName = this->getWidgetReaderClassName(classname);
WidgetReaderProtocol* reader = this->createWidgetReaderProtocol(readerName); WidgetReaderProtocol* reader = this->createWidgetReaderProtocol(readerName);

2
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
View File

@ -53,7 +53,7 @@ namespace cocostudio
for (int i = 0; i < pCocoNode->GetChildNum(); ++i) { for (int i = 0; i < pCocoNode->GetChildNum(); ++i) {
std::string key = stChildArray[i].GetName(pCocoLoader); std::string key = stChildArray[i].GetName(pCocoLoader);
std::string value = stChildArray[i].GetValue(); std::string value = stChildArray[i].GetValue();
CCLOG("Button: key = %s, value = %s", key.c_str(), value.c_str()); // CCLOG("Button: key = %s, value = %s", key.c_str(), value.c_str());
if (key == "ignoreSize") { if (key == "ignoreSize") {
widget->ignoreContentAdaptWithSize(valueToBool(value)); widget->ignoreContentAdaptWithSize(valueToBool(value));

4
cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp
View File

@ -54,7 +54,7 @@ namespace cocostudio
for (int i = 0; i < pCocoNode->GetChildNum(); ++i) { for (int i = 0; i < pCocoNode->GetChildNum(); ++i) {
std::string key = stChildArray[i].GetName(pCocoLoader); std::string key = stChildArray[i].GetName(pCocoLoader);
std::string value = stChildArray[i].GetValue(); std::string value = stChildArray[i].GetValue();
CCLOG("Layout: key = %s, value = %s", key.c_str(), value.c_str()); // CCLOG("Layout: key = %s, value = %s", key.c_str(), value.c_str());
if (key == "ignoreSize") { if (key == "ignoreSize") {
widget->ignoreContentAdaptWithSize(valueToBool(value)); widget->ignoreContentAdaptWithSize(valueToBool(value));
}else if(key == "sizeType"){ }else if(key == "sizeType"){
@ -220,7 +220,7 @@ namespace cocostudio
Widget::TextureResType imageFileNameType = (Widget::TextureResType)valueToInt(resType); Widget::TextureResType imageFileNameType = (Widget::TextureResType)valueToInt(resType);
std::string backgroundValue = this->getResourcePath(pCocoLoader, &stChildArray[i], imageFileNameType); std::string backgroundValue = this->getResourcePath(pCocoLoader, &stChildArray[i], imageFileNameType);
CCLOG("Layout : image =%s", backgroundValue.c_str()); // CCLOG("Layout : image =%s", backgroundValue.c_str());
panel->setBackGroundImage(backgroundValue, imageFileNameType); panel->setBackGroundImage(backgroundValue, imageFileNameType);
} }

2
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
View File

@ -44,7 +44,7 @@ namespace cocostudio
for (int i = 0; i < pCocoNode->GetChildNum(); ++i) { for (int i = 0; i < pCocoNode->GetChildNum(); ++i) {
std::string key = stChildArray[i].GetName(pCocoLoader); std::string key = stChildArray[i].GetName(pCocoLoader);
std::string value = stChildArray[i].GetValue(); std::string value = stChildArray[i].GetValue();
CCLOG("Text: key = %s, value = %s", key.c_str(), value.c_str()); // CCLOG("Text: key = %s, value = %s", key.c_str(), value.c_str());
if (key == "ignoreSize") { if (key == "ignoreSize") {
widget->ignoreContentAdaptWithSize(valueToBool(value)); widget->ignoreContentAdaptWithSize(valueToBool(value));

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp
View File

@ -10,7 +10,7 @@ bool UIImageViewTest_Editor::init()
if (UIScene_Editor::init()) if (UIScene_Editor::init())
{ {
// _layout = static_cast<Layout*>(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json")); // _layout = static_cast<Layout*>(cocostudio::GUIReader::getInstance()->widgetFromJsonFile("cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json"));
_layout = static_cast<Layout*>(cocostudio::GUIReader::getInstance()->widgetFromBinaryFile("cocosui/UIEditorTest/UIImageView_Editor/ui_imageview_editor_1.ubi")); _layout = static_cast<Layout*>(cocostudio::GUIReader::getInstance()->widgetFromBinaryFile("cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.csb"));
_touchGroup->addChild(_layout); _touchGroup->addChild(_layout);
Size screenSize = CCDirector::getInstance()->getWinSize(); Size screenSize = CCDirector::getInstance()->getWinSize();