From dad9b052ce3365556309913fc8564303f4f82040 Mon Sep 17 00:00:00 2001 From: owen <1053210246@qq.com> Date: Thu, 27 Jun 2019 20:43:57 +0800 Subject: [PATCH] refine code --- .../SkeletonRenderer.cpp | 4 -- native/cocos/renderer/scene/RenderFlow.cpp | 40 ++++++++++++++----- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp index 0d09b2f00a..4426b8e20b 100644 --- a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp +++ b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp @@ -447,10 +447,6 @@ void SkeletonRenderer::update (float deltaTime) { continue; } - if (!slot->getAttachment()) { - continue; - } - Triangles triangles; TwoColorTriangles trianglesTwoColor; diff --git a/native/cocos/renderer/scene/RenderFlow.cpp b/native/cocos/renderer/scene/RenderFlow.cpp index f5e33d0d86..6ac57f881e 100644 --- a/native/cocos/renderer/scene/RenderFlow.cpp +++ b/native/cocos/renderer/scene/RenderFlow.cpp @@ -249,18 +249,40 @@ void RenderFlow::calculateWorldMatrix() for(std::size_t index = 0, count = levelInfos.size(); index < count; index++) { auto& info = levelInfos[index]; - auto selfDirty = *info.dirty & WORLD_TRANSFORM; - if (info.parentDirty != nullptr && ((*info.parentDirty & WORLD_TRANSFORM_CHANGED) || selfDirty)) + auto selfWorldDirty = *info.dirty & WORLD_TRANSFORM; + auto selfOpacityDirty = *info.dirty & OPACITY; + + if (info.parentDirty) { - cocos2d::Mat4::multiply(*info.parentWorldMat, *info.localMat, info.worldMat); - *info.dirty |= WORLD_TRANSFORM_CHANGED; - *info.dirty &= ~WORLD_TRANSFORM; + if ((*info.parentDirty & WORLD_TRANSFORM_CHANGED) || selfWorldDirty) + { + cocos2d::Mat4::multiply(*info.parentWorldMat, *info.localMat, info.worldMat); + *info.dirty |= WORLD_TRANSFORM_CHANGED; + *info.dirty &= ~WORLD_TRANSFORM; + } + + if ((*info.parentDirty & OPACITY_CHANGED) || selfOpacityDirty) + { + *info.realOpacity = *info.opacity * *info.parentRealOpacity / 255.0f; + *info.dirty |= OPACITY_CHANGED; + *info.dirty &= ~OPACITY; + } } - else if (selfDirty) + else { - *info.worldMat = *info.localMat; - *info.dirty |= WORLD_TRANSFORM_CHANGED; - *info.dirty &= ~WORLD_TRANSFORM; + if (selfWorldDirty) + { + *info.worldMat = *info.localMat; + *info.dirty |= WORLD_TRANSFORM_CHANGED; + *info.dirty &= ~WORLD_TRANSFORM; + } + + if (selfOpacityDirty) + { + *info.realOpacity = *info.opacity; + *info.dirty |= OPACITY_CHANGED; + *info.dirty &= ~OPACITY; + } } } }