From 302de72b01482cd9ba4b7736ef75cf61eb211dbe Mon Sep 17 00:00:00 2001 From: owen <1053210246@qq.com> Date: Thu, 10 Oct 2019 19:43:35 +0800 Subject: [PATCH] fix Spine or DragonBones alpha value incorrect (#1871) --- .../CCArmatureCacheDisplay.cpp | 13 ++++++++----- .../SkeletonCacheAnimation.cpp | 15 +++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/native/cocos/editor-support/dragonbones-creator-support/CCArmatureCacheDisplay.cpp b/native/cocos/editor-support/dragonbones-creator-support/CCArmatureCacheDisplay.cpp index 79b25c7c98..8013bd4fab 100644 --- a/native/cocos/editor-support/dragonbones-creator-support/CCArmatureCacheDisplay.cpp +++ b/native/cocos/editor-support/dragonbones-creator-support/CCArmatureCacheDisplay.cpp @@ -152,6 +152,10 @@ void CCArmatureCacheDisplay::render(float dt) auto mgr = MiddlewareManager::getInstance(); if (!mgr->isRendering) return; + auto& segments = frameData->getSegments(); + auto& colors = frameData->getColors(); + if (segments.size() == 0 || colors.size() == 0) return; + _nodeColor.a = _nodeProxy->getRealOpacity() / (float)255; middleware::MeshBuffer* mb = mgr->getMeshBuffer(VF_XYUVC); @@ -161,15 +165,13 @@ void CCArmatureCacheDisplay::render(float dt) const auto& srcIB = frameData->ib; const cocos2d::Mat4& nodeWorldMat = _nodeProxy->getWorldMatrix(); - auto& segments = frameData->getSegments(); - auto& colors = frameData->getColors(); int colorOffset = 0; ArmatureCache::ColorData* nowColor = colors[colorOffset++]; auto maxVFOffset = nowColor->vertexFloatOffset; Color4B color; - float tempR = 0.0f, tempG = 0.0f, tempB = 0.0f; + float tempR = 0.0f, tempG = 0.0f, tempB = 0.0f, tempA = 0.0f; float multiplier = 1.0f; std::size_t srcVertexBytesOffset = 0; std::size_t srcIndexBytesOffset = 0; @@ -196,12 +198,13 @@ void CCArmatureCacheDisplay::render(float dt) auto handleColor = [&](ArmatureCache::ColorData* colorData) { - color.a = (GLubyte)(colorData->color.a * _nodeColor.a); - multiplier = _premultipliedAlpha ? color.a / 255 : 1; + tempA = colorData->color.a * _nodeColor.a; + multiplier = _premultipliedAlpha ? tempA / 255 : 1; tempR = _nodeColor.r * multiplier; tempG = _nodeColor.g * multiplier; tempB = _nodeColor.b * multiplier; + color.a = (GLubyte)tempA; color.r = (GLubyte)(colorData->color.r * tempR); color.g = (GLubyte)(colorData->color.g * tempG); color.b = (GLubyte)(colorData->color.b * tempB); diff --git a/native/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.cpp b/native/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.cpp index bcc6daa789..75c4ee23c6 100644 --- a/native/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.cpp +++ b/native/cocos/editor-support/spine-creator-support/SkeletonCacheAnimation.cpp @@ -154,6 +154,10 @@ namespace spine { SkeletonCache::FrameData* frameData = _animationData->getFrameData(_curFrameIndex); if (!frameData) return; + auto& segments = frameData->getSegments(); + auto& colors = frameData->getColors(); + if (segments.size() == 0 || colors.size() == 0) return; + auto mgr = MiddlewareManager::getInstance(); if (!mgr->isRendering) return; @@ -166,16 +170,14 @@ namespace spine { const auto& srcIB = frameData->ib; const cocos2d::Mat4& nodeWorldMat = _nodeProxy->getWorldMatrix(); - auto& segments = frameData->getSegments(); - auto& colors = frameData->getColors(); - + int colorOffset = 0; SkeletonCache::ColorData* nowColor = colors[colorOffset++]; auto maxVFOffset = nowColor->vertexFloatOffset; Color4B finalColor; Color4B darkColor; - float tempR = 0.0f, tempG = 0.0f, tempB = 0.0f; + float tempR = 0.0f, tempG = 0.0f, tempB = 0.0f, tempA = 0.0f; float multiplier = 1.0f; int srcVertexBytesOffset = 0; int vertexBytes = 0; @@ -201,12 +203,13 @@ namespace spine { } auto handleColor = [&](SkeletonCache::ColorData* colorData){ - finalColor.a = (GLubyte)(colorData->finalColor.a * _nodeColor.a); - multiplier = _premultipliedAlpha ? finalColor.a / 255 : 1; + tempA = colorData->finalColor.a * _nodeColor.a; + multiplier = _premultipliedAlpha ? tempA / 255 : 1; tempR = _nodeColor.r * multiplier; tempG = _nodeColor.g * multiplier; tempB = _nodeColor.b * multiplier; + finalColor.a = (GLubyte)tempA; finalColor.r = (GLubyte)(colorData->finalColor.r * tempR); finalColor.g = (GLubyte)(colorData->finalColor.g * tempG); finalColor.b = (GLubyte)(colorData->finalColor.b * tempB);