Skip to content

Spritebutton #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Spritebutton #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0679275
spriteFrame & custom props's bug
githubmin Jul 29, 2014
405a316
sprite button init
githubmin Aug 2, 2014
f9110a9
move threshold
githubmin Aug 2, 2014
10b31a3
add property name to replace tag at 3.2
githubmin Aug 3, 2014
f6f00b5
Merge branch 'master' into spritebutton
githubmin Aug 3, 2014
e3441f3
set properties's bug
githubmin Sep 5, 2014
3b0470e
Merge branch 'master' into spritebutton
githubmin Sep 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
spriteFrame & custom props's bug
  • Loading branch information
@githubmin
githubmin committed Jul 29, 2014
commit 0679275477e5e3da11dfd8af8f24a0b57eaed579
4 changes: 2 additions & 2 deletions spritebuilder/CCBAnimationManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ ActionInterval* CCBAnimationManager::getAction(CCBKeyframe *pKeyframe0, CCBKeyfr
return Sequence::createWithTwoActions(DelayTime::create(duration), Hide::create());
}
}
else if (propName == "displayFrame")
else if (propName == "displayFrame" || propName == "spriteFrame")
{
return Sequence::createWithTwoActions(DelayTime::create(duration),
CCBSetSpriteFrame::create(static_cast<SpriteFrame*>(pKeyframe1->getObject())));
Expand Down Expand Up @@ -503,7 +503,7 @@ void CCBAnimationManager::setAnimatedProperty(const std::string& propName, Node
unsigned char opacity = value.asFloat() * 255.0f;//value.asByte();
pNode->setOpacity(opacity);
}
else if (propName == "displayFrame")
else if (propName == "displayFrame" || propName == "spriteFrame")
{
static_cast<Sprite*>(pNode)->setSpriteFrame(static_cast<SpriteFrame*>(obj));
}
Expand Down
12 changes: 10 additions & 2 deletions spritebuilder/CCBReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,14 @@ float CCBReader::getPTMRatio() {
void CCBReader::setupSpriteBuilder(const char* resourcePath, float ptmRatio) {

_ptmRatio = ptmRatio;

std::vector<std::string> searchPath;
searchPath.push_back("Published-iOS");
FileUtils::getInstance()->setSearchPaths(searchPath);
// FileUtils::getInstance()->addSearchPath("Published-iOS")
char docPath[256] = {0};
sprintf(docPath, "%s/Published-iOS", FileUtils::getInstance()->getWritablePath().c_str());
FileUtils::getInstance()->addSearchPath(docPath, true);

FileUtils::getInstance()->addSearchResolutionsOrder(resourcePath);

FileUtils::getInstance()->loadFilenameLookupDictionaryFromFile("fileLookup.plist");
Expand Down Expand Up @@ -1409,8 +1413,9 @@ CCBKeyframe* CCBReader::readKeyframe(PropertyType type)
std::string spriteFile = readCachedString();
//std::string spriteSheet = readCachedString();

SpriteFrame* spriteFrame;
SpriteFrame* spriteFrame = SpriteFrameCache::getInstance()->getSpriteFrameByName(spriteFile);
//if (spriteSheet.length() == 0)
if (spriteFrame == nullptr)
{
spriteFile = _CCBRootPath + spriteFile;

Expand All @@ -1435,6 +1440,9 @@ CCBKeyframe* CCBReader::readKeyframe(PropertyType type)
spriteFrame = frameCache->getSpriteFrameByName(spriteFile.c_str());
}
*/

keyframe->setObject(spriteFrame);

} else {
CCASSERT(false, "Unknown keyframe type!");
}
Expand Down
4 changes: 2 additions & 2 deletions spritebuilder/CCNodeLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ void NodeLoader::parseProperties(Node * pNode, Node * pParent, CCBReader * ccbRe
}
else if (isExtraProp && pNode == ccbReader->getAnimationManager()->getRootNode())
{
__Array *extraPropsNames = static_cast<__Array*>(pNode->getUserObject());
CCSet *extraPropsNames = static_cast<CCSet*>(pNode->getUserObject());
if (! extraPropsNames)
{
extraPropsNames = Array::create();
extraPropsNames = CCSet::create();
pNode->setUserObject(extraPropsNames);
}

Expand Down