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

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
Prev Previous commit
Next Next commit
set properties's bug
  • Loading branch information
@githubmin
githubmin committed Sep 5, 2014
commit e3441f32802da36320a7284c6bec5b6730b22451
14 changes: 13 additions & 1 deletion spritebuilder/CCNodeLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,19 @@ void NodeLoader::parseProperties(Node * pNode, Node * pParent, CCBReader * ccbRe
// Skip properties that doesn't have a value to override
CCSet* extraPropsNames = (CCSet*)pNode->getUserObject();

setProp &= extraPropsNames->containsObject(CCString::create(propertyName));
bool foundProperty = false;
__SetIterator it;
for( it = extraPropsNames->begin(); it != extraPropsNames->end(); ++it) {
__String *propName = (__String*)*it;
if (strcmp(propertyName.c_str(), propName->getCString()) == 0) {
foundProperty = true;
break;
}
}

setProp &= foundProperty;

// setProp &= extraPropsNames->containsObject(CCString::create(propertyName));
}
}
else if (isExtraProp && pNode == ccbReader->getAnimationManager()->getRootNode())
Expand Down