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

issue #4693: add getName(), setName() and getChildByName()

This commit is contained in:
minggo 2014-06-11 16:57:43 +08:00
parent 0ad57bdde7
commit 8a5bfb9840
8 changed files with 57 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cocos/2d/CCNode.cpp
View File

@ -29,6 +29,7 @@ THE SOFTWARE.
#include "2d/CCNode.h"
#include <algorithm>
#include <string>
#include "base/CCDirector.h"
#include "base/CCScheduler.h"
@ -122,6 +123,8 @@ Node::Node(void)
, _cascadeColorEnabled(false)
, _cascadeOpacityEnabled(false)
, _usingNormalizedPosition(false)
, _name("")
, _hashOfName(0)
{
// set default scheduler and actionManager
Director *director = Director::getInstance();
@ -624,6 +627,18 @@ void Node::setTag(int tag)
_tag = tag ;
}
std::string Node::getName() const
{
return _name;
}
void Node::setName(const std::string& name)
{
_name = name;
std::hash<std::string> h;
_hashOfName = h(name);
}
/// userData setter
void Node::setUserData(void *userData)
{
@ -750,6 +765,22 @@ Node* Node::getChildByTag(int tag) const
return nullptr;
}
Node* Node::getChildByName(const std::string& name) const
{
CCASSERT(name.size() != 0, "Invilide name");
std::hash<std::string> h;
size_t hash = h(name);
for (auto& child : _children)
{
// Different strings may have the same hash code, but can use it to compare first for speed
if(child->_hashOfName == hash && child->_name.compare(name) == 0)
return child;
}
return nullptr;
}
/* "add" logic MUST only be on this method
* If a class want's to extend the 'addChild' behavior it only needs
* to override this method

24
cocos/2d/CCNode.h
View File

@ -667,6 +667,16 @@ public:
* @return a Node object whose tag equals to the input parameter
*/
virtual Node * getChildByTag(int tag) const;
/**
* Gets a child from the container with its name
*
* @param name An identifier to find the child node.
*
* @return a Node object whose name equals to the input parameter
*
* @since v3.2
*/
virtual Node* getChildByName(const std::string& name) const;
/**
* Returns the array of the node's children
*
@ -780,6 +790,19 @@ public:
* @param tag A integer that identifies the node.
*/
virtual void setTag(int tag);
/** Returns a string that is used to identify the node.
* @return A string that identifies the node.
*
* @since v3.2
*/
virtual std::string getName() const;
/** Changes the name that is used to identify the node easily.
* @param name A string that identifies the node.
*
* @since v3.2
*/
virtual void setName(const std::string& name);
/**
@ -1443,6 +1466,7 @@ protected:
int _tag; ///< a tag. Can be any number you assigned just to identify this node
std::string _name; ///<a string label, an user defined string to identify this node
size_t _hashOfName; ///<hash value of _name, used for speed in getChildByName
void *_userData; ///< A user assingned void pointer, Can be point to any cpp object
Ref *_userObject; ///< A user assigned Object

4
cocos/editor-support/cocostudio/CCArmature.h
View File

@ -200,9 +200,6 @@ public:
virtual void setArmatureData(ArmatureData *armatureData) { _armatureData = armatureData; }
virtual ArmatureData *getArmatureData() const { return _armatureData; }
virtual void setName(const std::string &name) { _name = name; }
virtual const std::string &getName() const { return _name; }
virtual void setParentBone(Bone *parentBone);
virtual Bone *getParentBone() const;
@ -257,7 +254,6 @@ protected:
BatchNode *_batchNode;
std::string _name;
Bone *_parentBone;
float _version;

5
cocos/editor-support/cocostudio/CCBone.h
View File

@ -207,9 +207,6 @@ public:
virtual FrameData *getTweenData() const { return _tweenData; }
virtual void setName(const std::string &name) { _name = name; }
virtual const std::string getName() const { return _name; }
virtual BaseData *getWorldInfo() const { return _worldInfo; }
protected:
void applyParentTransform(Bone *parent);
@ -242,8 +239,6 @@ protected:
//! Used for making tween effect in every frame
FrameData *_tweenData;
std::string _name;
Bone *_parentBone; //! A weak reference to its parent
bool _boneTransformDirty; //! Whether or not transform dirty

2
cocos/ui/UIScrollView.cpp
View File

@ -268,7 +268,7 @@ Node* ScrollView::getChildByTag(int tag) const
return _innerContainer->getChildByTag(tag);
}
Widget* ScrollView::getChildByName(const std::string& name)const
Node* ScrollView::getChildByName(const std::string& name)const
{
return _innerContainer->getChildByName(name);
}

2
cocos/ui/UIScrollView.h
View File

@ -264,7 +264,7 @@ public:
virtual const Vector<Node*>& getChildren() const override;
virtual ssize_t getChildrenCount() const override;
virtual Node * getChildByTag(int tag) const override;
virtual Widget* getChildByName(const std::string& name)const override;
virtual Node* getChildByName(const std::string& name)const override;
//handle touch event
virtual bool onTouchBegan(Touch *touch, Event *unusedEvent) override;

31
cocos/ui/UIWidget.cpp
View File

@ -144,7 +144,6 @@ _touchMovePosition(Vec2::ZERO),
_touchEndPosition(Vec2::ZERO),
_touchEventListener(nullptr),
_touchEventSelector(nullptr),
_name("default"),
_actionTag(0),
_size(Size::ZERO),
_customSize(Size::ZERO),
@ -249,25 +248,6 @@ void Widget::setEnabled(bool enabled)
{
_enabled = enabled;
}
Widget* Widget::getChildByName(const std::string& name)const
{
for (auto& child : _children)
{
if (child)
{
Widget* widgetChild = dynamic_cast<Widget*>(child);
if (widgetChild)
{
if (widgetChild->getName() == name)
{
return widgetChild;
}
}
}
}
return nullptr;
}
void Widget::initRenderer()
{
@ -964,17 +944,6 @@ const Vec2& Widget::getTouchEndPosition()const
return _touchEndPosition;
}
void Widget::setName(const std::string& name)
{
_name = name;
}
const std::string& Widget::getName() const
{
return _name;
}
void Widget::setLayoutParameter(LayoutParameter *parameter)
{
if (!parameter)

26
cocos/ui/UIWidget.h
View File

@ -228,15 +228,6 @@ public:
CC_DEPRECATED_ATTRIBUTE float getTopInParent(){return this->getTopBoundary();}
float getTopBoundary() const;
/**
* Gets a child from the container with its name
*
* @param name An key to find the child widget.
*
* @return a Widget object whose name equals to the input parameter
*/
virtual Widget* getChildByName(const std::string& name) const;
virtual void visit(cocos2d::Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) override;
/**
@ -375,22 +366,6 @@ public:
CC_DEPRECATED_ATTRIBUTE const Vec2& getTouchEndPos()const{return this->getTouchEndPosition();}
const Vec2& getTouchEndPosition()const;
/**
* Changes the name that is used to identify the widget easily.
*
* @param A const std::string that indentifies the widget.
*/
void setName(const std::string& name);
/**
* Returns a name that is used to identify the widget easily.
*
* You can set tags to widget then identify them easily.
*
* @return A const std::string that identifies the widget.
*/
const std::string& getName() const;
/**
* Changes the size that is widget's size
*
@ -682,7 +657,6 @@ protected:
PositionType _positionType;
//use
std::string _name;
int _actionTag;
Size _size;