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

Formatting

Browse Source
This commit is contained in:
unknown 2019-07-03 12:56:51 +02:00
parent 90f2968865
commit c71736792b
2 changed files with 914 additions and 914 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
spine-cocos2dx/src/spine/SkeletonRenderer.cpp
View File

@ -66,31 +66,31 @@ namespace spine {
#endif #endif
SkeletonRenderer* SkeletonRenderer::createWithSkeleton(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData) { SkeletonRenderer* SkeletonRenderer::createWithSkeleton(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData) {
SkeletonRenderer* node = new SkeletonRenderer(skeleton, ownsSkeleton, ownsSkeletonData); SkeletonRenderer* node = new SkeletonRenderer(skeleton, ownsSkeleton, ownsSkeletonData);
node->autorelease(); node->autorelease();
return node; return node;
} }
SkeletonRenderer* SkeletonRenderer::createWithData (SkeletonData* skeletonData, bool ownsSkeletonData) { SkeletonRenderer* SkeletonRenderer::createWithData (SkeletonData* skeletonData, bool ownsSkeletonData) {
SkeletonRenderer* node = new SkeletonRenderer(skeletonData, ownsSkeletonData); SkeletonRenderer* node = new SkeletonRenderer(skeletonData, ownsSkeletonData);
node->autorelease(); node->autorelease();
return node; return node;
} }
SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) { SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
SkeletonRenderer* node = new SkeletonRenderer(skeletonDataFile, atlas, scale); SkeletonRenderer* node = new SkeletonRenderer(skeletonDataFile, atlas, scale);
node->autorelease(); node->autorelease();
return node; return node;
} }
SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) { SkeletonRenderer* SkeletonRenderer::createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
SkeletonRenderer* node = new SkeletonRenderer(skeletonDataFile, atlasFile, scale); SkeletonRenderer* node = new SkeletonRenderer(skeletonDataFile, atlasFile, scale);
node->autorelease(); node->autorelease();
return node; return node;
} }
void SkeletonRenderer::initialize () { void SkeletonRenderer::initialize () {
_clipper = new (__FILE__, __LINE__) SkeletonClipping(); _clipper = new (__FILE__, __LINE__) SkeletonClipping();
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
@ -100,9 +100,9 @@ void SkeletonRenderer::initialize () {
_skeleton->setToSetupPose(); _skeleton->setToSetupPose();
_skeleton->updateWorldTransform(); _skeleton->updateWorldTransform();
} }
void SkeletonRenderer::setupGLProgramState (bool twoColorTintEnabled) { void SkeletonRenderer::setupGLProgramState (bool twoColorTintEnabled) {
if (twoColorTintEnabled) { if (twoColorTintEnabled) {
setGLProgramState(SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState()); setGLProgramState(SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState());
return; return;
@ -129,60 +129,60 @@ void SkeletonRenderer::setupGLProgramState (bool twoColorTintEnabled) {
} }
} }
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP, texture)); setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP, texture));
} }
void SkeletonRenderer::setSkeletonData (SkeletonData *skeletonData, bool ownsSkeletonData) { void SkeletonRenderer::setSkeletonData (SkeletonData *skeletonData, bool ownsSkeletonData) {
_skeleton = new (__FILE__, __LINE__) Skeleton(skeletonData); _skeleton = new (__FILE__, __LINE__) Skeleton(skeletonData);
_ownsSkeletonData = ownsSkeletonData; _ownsSkeletonData = ownsSkeletonData;
} }
SkeletonRenderer::SkeletonRenderer () SkeletonRenderer::SkeletonRenderer ()
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) { : _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
} }
SkeletonRenderer::SkeletonRenderer(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData, bool ownsAtlas) SkeletonRenderer::SkeletonRenderer(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData, bool ownsAtlas)
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) { : _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
initWithSkeleton(skeleton, ownsSkeleton, ownsSkeletonData, ownsAtlas); initWithSkeleton(skeleton, ownsSkeleton, ownsSkeletonData, ownsAtlas);
} }
SkeletonRenderer::SkeletonRenderer (SkeletonData *skeletonData, bool ownsSkeletonData) SkeletonRenderer::SkeletonRenderer (SkeletonData *skeletonData, bool ownsSkeletonData)
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) { : _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
initWithData(skeletonData, ownsSkeletonData); initWithData(skeletonData, ownsSkeletonData);
} }
SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, Atlas* atlas, float scale) SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, Atlas* atlas, float scale)
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) { : _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
initWithJsonFile(skeletonDataFile, atlas, scale); initWithJsonFile(skeletonDataFile, atlas, scale);
} }
SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) SkeletonRenderer::SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale)
: _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) { : _atlas(nullptr), _attachmentLoader(nullptr), _debugSlots(false), _debugBones(false), _debugMeshes(false), _debugBoundingRect(false), _timeScale(1), _effect(nullptr), _startSlotIndex(0), _endSlotIndex(std::numeric_limits<int>::max()) {
initWithJsonFile(skeletonDataFile, atlasFile, scale); initWithJsonFile(skeletonDataFile, atlasFile, scale);
} }
SkeletonRenderer::~SkeletonRenderer () { SkeletonRenderer::~SkeletonRenderer () {
if (_ownsSkeletonData) delete _skeleton->getData(); if (_ownsSkeletonData) delete _skeleton->getData();
if (_ownsSkeleton) delete _skeleton; if (_ownsSkeleton) delete _skeleton;
if (_ownsAtlas) delete _atlas; if (_ownsAtlas) delete _atlas;
delete _attachmentLoader; delete _attachmentLoader;
delete _clipper; delete _clipper;
} }
void SkeletonRenderer::initWithSkeleton(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData, bool ownsAtlas) { void SkeletonRenderer::initWithSkeleton(Skeleton* skeleton, bool ownsSkeleton, bool ownsSkeletonData, bool ownsAtlas) {
_skeleton = skeleton; _skeleton = skeleton;
_ownsSkeleton = ownsSkeleton; _ownsSkeleton = ownsSkeleton;
_ownsSkeletonData = ownsSkeletonData; _ownsSkeletonData = ownsSkeletonData;
_ownsAtlas = ownsAtlas; _ownsAtlas = ownsAtlas;
initialize(); initialize();
} }
void SkeletonRenderer::initWithData (SkeletonData* skeletonData, bool ownsSkeletonData) { void SkeletonRenderer::initWithData (SkeletonData* skeletonData, bool ownsSkeletonData) {
_ownsSkeleton = true; _ownsSkeleton = true;
setSkeletonData(skeletonData, ownsSkeletonData); setSkeletonData(skeletonData, ownsSkeletonData);
initialize(); initialize();
} }
void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) { void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
_atlas = atlas; _atlas = atlas;
_attachmentLoader = new (__FILE__, __LINE__) Cocos2dAtlasAttachmentLoader(_atlas); _attachmentLoader = new (__FILE__, __LINE__) Cocos2dAtlasAttachmentLoader(_atlas);
@ -195,9 +195,9 @@ void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, At
setSkeletonData(skeletonData, true); setSkeletonData(skeletonData, true);
initialize(); initialize();
} }
void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) { void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
_atlas = new (__FILE__, __LINE__) Atlas(atlasFile.c_str(), &textureLoader, true); _atlas = new (__FILE__, __LINE__) Atlas(atlasFile.c_str(), &textureLoader, true);
CCASSERT(_atlas, "Error reading atlas file."); CCASSERT(_atlas, "Error reading atlas file.");
@ -213,9 +213,9 @@ void SkeletonRenderer::initWithJsonFile (const std::string& skeletonDataFile, co
setSkeletonData(skeletonData, true); setSkeletonData(skeletonData, true);
initialize(); initialize();
} }
void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) { void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, Atlas* atlas, float scale) {
_atlas = atlas; _atlas = atlas;
_attachmentLoader = new (__FILE__, __LINE__) Cocos2dAtlasAttachmentLoader(_atlas); _attachmentLoader = new (__FILE__, __LINE__) Cocos2dAtlasAttachmentLoader(_atlas);
@ -227,9 +227,9 @@ void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile,
setSkeletonData(skeletonData, true); setSkeletonData(skeletonData, true);
initialize(); initialize();
} }
void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) { void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale) {
_atlas = new (__FILE__, __LINE__) Atlas(atlasFile.c_str(), &textureLoader, true); _atlas = new (__FILE__, __LINE__) Atlas(atlasFile.c_str(), &textureLoader, true);
CCASSERT(_atlas, "Error reading atlas file."); CCASSERT(_atlas, "Error reading atlas file.");
@ -244,15 +244,15 @@ void SkeletonRenderer::initWithBinaryFile (const std::string& skeletonDataFile,
setSkeletonData(skeletonData, true); setSkeletonData(skeletonData, true);
initialize(); initialize();
} }
void SkeletonRenderer::update (float deltaTime) { void SkeletonRenderer::update (float deltaTime) {
Node::update(deltaTime); Node::update(deltaTime);
if (_ownsSkeleton) _skeleton->update(deltaTime * _timeScale); if (_ownsSkeleton) _skeleton->update(deltaTime * _timeScale);
} }
void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t transformFlags) { void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t transformFlags) {
_isAutoCulled = false; _isAutoCulled = false;
// Early exit if the skeleton is invisible // Early exit if the skeleton is invisible
if (getDisplayedOpacity() == 0 || _skeleton->getColor().a == 0){ if (getDisplayedOpacity() == 0 || _skeleton->getColor().a == 0){
@ -618,20 +618,20 @@ void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t
} }
VLA_FREE(worldCoords); VLA_FREE(worldCoords);
} }
bool SkeletonRenderer::isAutoCulled () const { bool SkeletonRenderer::isAutoCulled () const {
return _isAutoCulled; return _isAutoCulled;
} }
void SkeletonRenderer::drawDebug (Renderer* renderer, const Mat4 &transform, uint32_t transformFlags) { void SkeletonRenderer::drawDebug (Renderer* renderer, const Mat4 &transform, uint32_t transformFlags) {
#if !defined(USE_MATRIX_STACK_PROJECTION_ONLY) #if !defined(USE_MATRIX_STACK_PROJECTION_ONLY)
Director* director = Director::getInstance(); Director* director = Director::getInstance();
director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform);
#endif #endif
DrawNode* drawNode = DrawNode::create(); DrawNode* drawNode = DrawNode::create();
@ -721,148 +721,148 @@ void SkeletonRenderer::drawDebug (Renderer* renderer, const Mat4 &transform, uin
} }
drawNode->draw(renderer, transform, transformFlags); drawNode->draw(renderer, transform, transformFlags);
#if !defined(USE_MATRIX_STACK_PROJECTION_ONLY) #if !defined(USE_MATRIX_STACK_PROJECTION_ONLY)
director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
#endif #endif
} }
cocos2d::Rect SkeletonRenderer::getBoundingBox () const { cocos2d::Rect SkeletonRenderer::getBoundingBox () const {
return _boundingRect; return _boundingRect;
} }
// --- Convenience methods for Skeleton_* functions. // --- Convenience methods for Skeleton_* functions.
void SkeletonRenderer::updateWorldTransform() { void SkeletonRenderer::updateWorldTransform() {
_skeleton->updateWorldTransform(); _skeleton->updateWorldTransform();
} }
void SkeletonRenderer::setToSetupPose () { void SkeletonRenderer::setToSetupPose () {
_skeleton->setToSetupPose(); _skeleton->setToSetupPose();
} }
void SkeletonRenderer::setBonesToSetupPose () { void SkeletonRenderer::setBonesToSetupPose () {
_skeleton->setBonesToSetupPose(); _skeleton->setBonesToSetupPose();
} }
void SkeletonRenderer::setSlotsToSetupPose () { void SkeletonRenderer::setSlotsToSetupPose () {
_skeleton->setSlotsToSetupPose(); _skeleton->setSlotsToSetupPose();
} }
Bone* SkeletonRenderer::findBone (const std::string& boneName) const { Bone* SkeletonRenderer::findBone (const std::string& boneName) const {
return _skeleton->findBone(boneName.c_str()); return _skeleton->findBone(boneName.c_str());
} }
Slot* SkeletonRenderer::findSlot (const std::string& slotName) const { Slot* SkeletonRenderer::findSlot (const std::string& slotName) const {
return _skeleton->findSlot( slotName.c_str()); return _skeleton->findSlot( slotName.c_str());
} }
void SkeletonRenderer::setSkin (const std::string& skinName) { void SkeletonRenderer::setSkin (const std::string& skinName) {
_skeleton->setSkin(skinName.empty() ? 0 : skinName.c_str()); _skeleton->setSkin(skinName.empty() ? 0 : skinName.c_str());
} }
void SkeletonRenderer::setSkin (const char* skinName) { void SkeletonRenderer::setSkin (const char* skinName) {
_skeleton->setSkin(skinName); _skeleton->setSkin(skinName);
} }
Attachment* SkeletonRenderer::getAttachment (const std::string& slotName, const std::string& attachmentName) const { Attachment* SkeletonRenderer::getAttachment (const std::string& slotName, const std::string& attachmentName) const {
return _skeleton->getAttachment(slotName.c_str(), attachmentName.c_str()); return _skeleton->getAttachment(slotName.c_str(), attachmentName.c_str());
} }
bool SkeletonRenderer::setAttachment (const std::string& slotName, const std::string& attachmentName) { bool SkeletonRenderer::setAttachment (const std::string& slotName, const std::string& attachmentName) {
return _skeleton->getAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()) ? true : false; return _skeleton->getAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()) ? true : false;
} }
bool SkeletonRenderer::setAttachment (const std::string& slotName, const char* attachmentName) { bool SkeletonRenderer::setAttachment (const std::string& slotName, const char* attachmentName) {
return _skeleton->getAttachment(slotName.c_str(), attachmentName) ? true : false; return _skeleton->getAttachment(slotName.c_str(), attachmentName) ? true : false;
} }
void SkeletonRenderer::setTwoColorTint(bool enabled) { void SkeletonRenderer::setTwoColorTint(bool enabled) {
setupGLProgramState(enabled); setupGLProgramState(enabled);
} }
bool SkeletonRenderer::isTwoColorTint() { bool SkeletonRenderer::isTwoColorTint() {
return getGLProgramState() == SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState(); return getGLProgramState() == SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState();
} }
void SkeletonRenderer::setVertexEffect(VertexEffect *effect) { void SkeletonRenderer::setVertexEffect(VertexEffect *effect) {
this->_effect = effect; this->_effect = effect;
} }
void SkeletonRenderer::setSlotsRange(int startSlotIndex, int endSlotIndex) { void SkeletonRenderer::setSlotsRange(int startSlotIndex, int endSlotIndex) {
_startSlotIndex = startSlotIndex == -1 ? 0 : startSlotIndex; _startSlotIndex = startSlotIndex == -1 ? 0 : startSlotIndex;
_endSlotIndex = endSlotIndex == -1 ? std::numeric_limits<int>::max() : endSlotIndex; _endSlotIndex = endSlotIndex == -1 ? std::numeric_limits<int>::max() : endSlotIndex;
} }
Skeleton* SkeletonRenderer::getSkeleton () const { Skeleton* SkeletonRenderer::getSkeleton () const {
return _skeleton; return _skeleton;
} }
void SkeletonRenderer::setTimeScale (float scale) { void SkeletonRenderer::setTimeScale (float scale) {
_timeScale = scale; _timeScale = scale;
} }
float SkeletonRenderer::getTimeScale () const { float SkeletonRenderer::getTimeScale () const {
return _timeScale; return _timeScale;
} }
void SkeletonRenderer::setDebugSlotsEnabled (bool enabled) { void SkeletonRenderer::setDebugSlotsEnabled (bool enabled) {
_debugSlots = enabled; _debugSlots = enabled;
} }
bool SkeletonRenderer::getDebugSlotsEnabled () const { bool SkeletonRenderer::getDebugSlotsEnabled () const {
return _debugSlots; return _debugSlots;
} }
void SkeletonRenderer::setDebugBonesEnabled (bool enabled) { void SkeletonRenderer::setDebugBonesEnabled (bool enabled) {
_debugBones = enabled; _debugBones = enabled;
} }
bool SkeletonRenderer::getDebugBonesEnabled () const { bool SkeletonRenderer::getDebugBonesEnabled () const {
return _debugBones; return _debugBones;
} }
void SkeletonRenderer::setDebugMeshesEnabled (bool enabled) { void SkeletonRenderer::setDebugMeshesEnabled (bool enabled) {
_debugMeshes = enabled; _debugMeshes = enabled;
} }
bool SkeletonRenderer::getDebugMeshesEnabled () const { bool SkeletonRenderer::getDebugMeshesEnabled () const {
return _debugMeshes; return _debugMeshes;
} }
void SkeletonRenderer::setDebugBoundingRectEnabled(bool enabled) { void SkeletonRenderer::setDebugBoundingRectEnabled(bool enabled) {
_debugBoundingRect = enabled; _debugBoundingRect = enabled;
} }
bool SkeletonRenderer::getDebugBoundingRectEnabled() const { bool SkeletonRenderer::getDebugBoundingRectEnabled() const {
return _debugBoundingRect; return _debugBoundingRect;
} }
void SkeletonRenderer::onEnter () { void SkeletonRenderer::onEnter () {
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) return; if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) return;
#endif #endif
Node::onEnter(); Node::onEnter();
scheduleUpdate(); scheduleUpdate();
} }
void SkeletonRenderer::onExit () { void SkeletonRenderer::onExit () {
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit)) return; if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit)) return;
#endif #endif
Node::onExit(); Node::onExit();
unscheduleUpdate(); unscheduleUpdate();
} }
// --- CCBlendProtocol // --- CCBlendProtocol
const BlendFunc& SkeletonRenderer::getBlendFunc () const { const BlendFunc& SkeletonRenderer::getBlendFunc () const {
return _blendFunc; return _blendFunc;
} }
void SkeletonRenderer::setBlendFunc (const BlendFunc &blendFunc) { void SkeletonRenderer::setBlendFunc (const BlendFunc &blendFunc) {
_blendFunc = blendFunc; _blendFunc = blendFunc;
} }
void SkeletonRenderer::setOpacityModifyRGB (bool value) { void SkeletonRenderer::setOpacityModifyRGB (bool value) {
_premultipliedAlpha = value; _premultipliedAlpha = value;
} }
bool SkeletonRenderer::isOpacityModifyRGB () const { bool SkeletonRenderer::isOpacityModifyRGB () const {
return _premultipliedAlpha; return _premultipliedAlpha;
} }
namespace { namespace {
cocos2d::Rect computeBoundingRect(const float* coords, int vertexCount) cocos2d::Rect computeBoundingRect(const float* coords, int vertexCount)
{ {
assert(coords); assert(coords);
@ -928,9 +928,9 @@ namespace {
void transformWorldVertices(float* dstCoord, int coordCount, Skeleton& skeleton, int startSlotIndex, int endSlotIndex) void transformWorldVertices(float* dstCoord, int coordCount, Skeleton& skeleton, int startSlotIndex, int endSlotIndex)
{ {
float* dstPtr = dstCoord; float* dstPtr = dstCoord;
#ifndef NDEBUG #ifndef NDEBUG
float* const dstEnd = dstCoord + coordCount; float* const dstEnd = dstCoord + coordCount;
#endif #endif
for (size_t i = 0; i < skeleton.getSlots().size(); ++i) for (size_t i = 0; i < skeleton.getSlots().size(); ++i)
{ {
/*const*/ Slot& slot = *skeleton.getDrawOrder()[i]; // match the draw order of SkeletonRenderer::Draw /*const*/ Slot& slot = *skeleton.getDrawOrder()[i]; // match the draw order of SkeletonRenderer::Draw
@ -1074,6 +1074,6 @@ namespace {
{ {
return { (GLubyte)(color.r * 255.f), (GLubyte)(color.g * 255.f), (GLubyte)(color.b * 255.f), (GLubyte)(color.a * 255.f) }; return { (GLubyte)(color.r * 255.f), (GLubyte)(color.g * 255.f), (GLubyte)(color.b * 255.f), (GLubyte)(color.a * 255.f) };
} }
} }
} }

2
spine-cocos2dx/src/spine/SkeletonRenderer.h
View File

@ -84,7 +84,7 @@ namespace spine {
Slot* findSlot (const std::string& slotName) const; Slot* findSlot (const std::string& 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. Returns false if the skin was not found. * attached if the corresponding attachment from the old skin was attached.
* @param skin May be empty string ("") for no skin.*/ * @param skin May be empty string ("") for no skin.*/
void setSkin (const std::string& skinName); void setSkin (const std::string& skinName);
/** @param skin May be 0 for no skin.*/ /** @param skin May be 0 for no skin.*/