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

Merge pull request #2529 from rohankuruvilla/cocosplayer 

fixed #2128: Bug fixes in CCBReader.
This commit is contained in:
James Chen 2013-05-07 18:55:38 -07:00
parent 70472d558d b7aa71dcfc
commit 36cc495dd9
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/CCBReader/CCBReader.cpp
View File

@ -635,7 +635,7 @@ CCNode * CCBReader::readNodeGraph(CCNode * pParent) {
embeddedNode->setScaleY(ccbFileNode->getScaleY()); embeddedNode->setScaleY(ccbFileNode->getScaleY());
embeddedNode->setTag(ccbFileNode->getTag()); embeddedNode->setTag(ccbFileNode->getTag());
embeddedNode->setVisible(true); embeddedNode->setVisible(true);
embeddedNode->ignoreAnchorPointForPosition(ccbFileNode->isIgnoreAnchorPointForPosition()); //embeddedNode->ignoreAnchorPointForPosition(ccbFileNode->isIgnoreAnchorPointForPosition());
mActionManager->moveAnimationsFromNode(ccbFileNode, embeddedNode); mActionManager->moveAnimationsFromNode(ccbFileNode, embeddedNode);

6
extensions/CCBReader/CCNodeLoader.cpp
View File

@ -566,8 +566,10 @@ CCSpriteFrame * CCNodeLoader::parsePropTypeSpriteFrame(CCNode * pNode, CCNode *
{ {
spriteFile = pCCBReader->getCCBRootPath() + spriteFile; spriteFile = pCCBReader->getCCBRootPath() + spriteFile;
CCTexture2D * texture = CCTextureCache::sharedTextureCache()->addImage(spriteFile.c_str()); CCTexture2D * texture = CCTextureCache::sharedTextureCache()->addImage(spriteFile.c_str());
CCRect bounds = CCRectMake(0, 0, texture->getContentSize().width, texture->getContentSize().height); if(texture != NULL) {
spriteFrame = CCSpriteFrame::createWithTexture(texture, bounds); CCRect bounds = CCRectMake(0, 0, texture->getContentSize().width, texture->getContentSize().height);
spriteFrame = CCSpriteFrame::createWithTexture(texture, bounds);
}
} }
else else
{ {

6
extensions/CCBReader/CCSpriteLoader.cpp
View File

@ -10,7 +10,11 @@ NS_CC_EXT_BEGIN
void CCSpriteLoader::onHandlePropTypeSpriteFrame(CCNode * pNode, CCNode * pParent, const char * pPropertyName, CCSpriteFrame * pCCSpriteFrame, CCBReader * pCCBReader) { void CCSpriteLoader::onHandlePropTypeSpriteFrame(CCNode * pNode, CCNode * pParent, const char * pPropertyName, CCSpriteFrame * pCCSpriteFrame, CCBReader * pCCBReader) {
if(strcmp(pPropertyName, PROPERTY_DISPLAYFRAME) == 0) { if(strcmp(pPropertyName, PROPERTY_DISPLAYFRAME) == 0) {
((CCSprite *)pNode)->setDisplayFrame(pCCSpriteFrame); if(pCCSpriteFrame != NULL) {
((CCSprite *)pNode)->setDisplayFrame(pCCSpriteFrame);
} else {
CCLOG("ERROR: SpriteFrame NULL");
}
} else { } else {
CCNodeLoader::onHandlePropTypeSpriteFrame(pNode, pParent, pPropertyName, pCCSpriteFrame, pCCBReader); CCNodeLoader::onHandlePropTypeSpriteFrame(pNode, pParent, pPropertyName, pCCSpriteFrame, pCCBReader);
} }