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

Merge pull request #12737 from chengstory/FixReaderBug 

Fix cocos reader bug.
This commit is contained in:
pandamicro 2015-07-09 10:33:45 +08:00
parent 0c2bb9f691 0862d313b2
commit 893d39c543
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp
View File

@ -238,15 +238,12 @@ namespace cocostudio
setPropsWithFlatBuffers(tmx, (Table*)gameMapOptions); setPropsWithFlatBuffers(tmx, (Table*)gameMapOptions);
} }
} }
//else else
//{ {
// Node* node = Node::create(); Node* node = Node::create();
// setPropsWithFlatBuffers(node, (Table*)gameMapOptions); setPropsWithFlatBuffers(node, (Table*)gameMapOptions);
// auto label = Label::create(); return node;
// label->setString(__String::createWithFormat("%s missed", errorFilePath.c_str())->getCString()); }
// node->addChild(label);
// return node;
//}
return tmx; return tmx;
} }

19
cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp
View File

@ -153,11 +153,11 @@ namespace cocostudio
void ParticleReader::setPropsWithFlatBuffers(cocos2d::Node *node, void ParticleReader::setPropsWithFlatBuffers(cocos2d::Node *node,
const flatbuffers::Table *particleOptions) const flatbuffers::Table *particleOptions)
{ {
auto particle = static_cast<ParticleSystemQuad*>(node); auto particle = dynamic_cast<ParticleSystemQuad*>(node);
auto options = (ParticleSystemOptions*)particleOptions; auto options = (ParticleSystemOptions*)particleOptions;
auto f_blendFunc = options->blendFunc(); auto f_blendFunc = options->blendFunc();
if (f_blendFunc) if (particle && f_blendFunc)
{ {
cocos2d::BlendFunc blendFunc = cocos2d::BlendFunc::ALPHA_PREMULTIPLIED; cocos2d::BlendFunc blendFunc = cocos2d::BlendFunc::ALPHA_PREMULTIPLIED;
blendFunc.src = f_blendFunc->src(); blendFunc.src = f_blendFunc->src();
@ -208,15 +208,12 @@ namespace cocostudio
particle->setPositionType(ParticleSystem::PositionType::GROUPED); particle->setPositionType(ParticleSystem::PositionType::GROUPED);
} }
} }
//else else
//{ {
// Node* node = Node::create(); Node* node = Node::create();
// setPropsWithFlatBuffers(node, (Table*)particleOptions); setPropsWithFlatBuffers(node, (Table*)particleOptions);
// auto label = Label::create(); return node;
// label->setString(__String::createWithFormat("%s missed", errorFilePath.c_str())->getCString()); }
// node->addChild(label);
// return node;
//}
return particle; return particle;
} }