UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge d5948a3f30b58e2d1903fb0d0fd8731a7ab08023 into 99ebb13edf532a307dc3df101a8aa43beb2b2666

Browse Source
This commit is contained in:
chemodansama 2026-03-24 11:25:24 +09:00 committed by GitHub
commit f1d9e8d4ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRendererCocos2dX.cpp
View File

@ -685,23 +685,38 @@ namespace spine {
} }
Bone *SkeletonRendererCocos2dX::findBone(const std::string &boneName) const { Bone *SkeletonRendererCocos2dX::findBone(const std::string &boneName) const {
return _skeleton->findBone(boneName.c_str()); return findBone(boneName.empty() ? nullptr : boneName.c_str());
}
Bone *SkeletonRendererCocos2dX::findBone(const char *boneName) const {
const String spineBoneName{ boneName, true, false };
return _skeleton->findBone(spineBoneName);
} }
Slot *SkeletonRendererCocos2dX::findSlot(const std::string &slotName) const { Slot *SkeletonRendererCocos2dX::findSlot(const std::string &slotName) const {
return _skeleton->findSlot(slotName.c_str()); return findSlot(slotName.empty() ? nullptr : slotName.c_str());
}
Slot *SkeletonRendererCocos2dX::findSlot(const char *slotName) const {
const String spineSlotName{ slotName, true, false };
return _skeleton->findSlot(spineSlotName);
} }
void SkeletonRendererCocos2dX::setSkin(const std::string &skinName) { void SkeletonRendererCocos2dX::setSkin(const std::string &skinName) {
_skeleton->setSkin(skinName.empty() ? 0 : skinName.c_str()); _skeleton->setSkin(skinName.empty() ? nullptr : skinName.c_str());
} }
void SkeletonRendererCocos2dX::setSkin(const char *skinName) { void SkeletonRendererCocos2dX::setSkin(const char *skinName) {
const String spineSkinName{ skinName, true, false };
_skeleton->setSkin(skinName); _skeleton->setSkin(skinName);
} }
Attachment *SkeletonRendererCocos2dX::getAttachment(const std::string &slotName, const std::string &attachmentName) const { Attachment *SkeletonRendererCocos2dX::getAttachment(const std::string &slotName, const std::string &attachmentName) const {
return _skeleton->getAttachment(slotName.c_str(), attachmentName.c_str()); return getAttachment(slotName.c_str(), attachmentName.c_str());
} }
Attachment *SkeletonRendererCocos2dX::getAttachment(const char *slotName, const char *attachmentName) const {
const String spineSlotName{ slotName, true, false };
const String spineAttachmentName{ attachmentName, true, false };
return _skeleton->getAttachment(spineSlotName, spineAttachmentName);
}
bool SkeletonRendererCocos2dX::setAttachment(const std::string &slotName, const std::string &attachmentName) { bool SkeletonRendererCocos2dX::setAttachment(const std::string &slotName, const std::string &attachmentName) {
bool result = _skeleton->getAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()) ? true : false; bool result = _skeleton->getAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()) ? true : false;
_skeleton->setAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()); _skeleton->setAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str());

3
spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRendererCocos2dX.h
View File

@ -79,8 +79,10 @@ namespace spine {
/* Returns 0 if the bone was not found. */ /* Returns 0 if the bone was not found. */
Bone *findBone(const std::string &boneName) const; Bone *findBone(const std::string &boneName) const;
Bone *findBone(const char *boneName) const;
/* Returns 0 if the slot was not found. */ /* Returns 0 if the slot was not found. */
Slot *findSlot(const std::string &slotName) const; Slot *findSlot(const std::string &slotName) const;
Slot *findSlot(const char *slotName) const;
/* Sets the skin used to look up attachments not found in the SkeletonData defaultSkin. Attachments from the new skin are /* Sets the skin used to look up attachments not found in the SkeletonData defaultSkin. Attachments from the new skin are
* attached if the corresponding attachment from the old skin was attached. * attached if the corresponding attachment from the old skin was attached.
@ -91,6 +93,7 @@ namespace spine {
/* Returns 0 if the slot or attachment was not found. */ /* Returns 0 if the slot or attachment was not found. */
Attachment *getAttachment(const std::string &slotName, const std::string &attachmentName) const; Attachment *getAttachment(const std::string &slotName, const std::string &attachmentName) const;
Attachment *getAttachment(const char *slotName, const char *attachmentName) const;
/* Returns false if the slot or attachment was not found. /* Returns false if the slot or attachment was not found.
* @param attachmentName May be empty string ("") for no attachment. */ * @param attachmentName May be empty string ("") for no attachment. */
bool setAttachment(const std::string &slotName, const std::string &attachmentName); bool setAttachment(const std::string &slotName, const std::string &attachmentName);