From 2d68b8e2ccb63fc625ae4000c82ddf76e17e9fba Mon Sep 17 00:00:00 2001 From: Nomango <569629550@qq.com> Date: Fri, 7 Sep 2018 00:33:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=98=E9=87=8F=E5=90=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/transitions/Transition.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/transitions/Transition.cpp b/core/transitions/Transition.cpp index 6ee62b9a..b155702b 100644 --- a/core/transitions/Transition.cpp +++ b/core/transitions/Transition.cpp @@ -89,15 +89,15 @@ void e2d::Transition::Draw() if (out_scene_ && out_scene_->GetRoot()) { - auto rootPos = out_scene_->GetRoot()->GetPos(); - auto clipRect = D2D1::RectF( - std::max(rootPos.x, 0.f), - std::max(rootPos.y, 0.f), - std::min(rootPos.x + size.width, size.width), - std::min(rootPos.y + size.height, size.height) + auto root_pos = out_scene_->GetRoot()->GetPos(); + auto clip_rect = D2D1::RectF( + std::max(root_pos.x, 0.f), + std::max(root_pos.y, 0.f), + std::min(root_pos.x + size.width, size.width), + std::min(root_pos.y + size.height, size.height) ); render_target->SetTransform(D2D1::Matrix3x2F::Identity()); - render_target->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); + render_target->PushAxisAlignedClip(clip_rect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); render_target->PushLayer(out_layer_param_, out_layer_); out_scene_->Draw(); @@ -108,15 +108,15 @@ void e2d::Transition::Draw() if (in_scene_ && in_scene_->GetRoot()) { - Point rootPos = in_scene_->GetRoot()->GetPos(); - auto clipRect = D2D1::RectF( - std::max(rootPos.x, 0.f), - std::max(rootPos.y, 0.f), - std::min(rootPos.x + size.width, size.width), - std::min(rootPos.y + size.height, size.height) + Point root_pos = in_scene_->GetRoot()->GetPos(); + auto clip_rect = D2D1::RectF( + std::max(root_pos.x, 0.f), + std::max(root_pos.y, 0.f), + std::min(root_pos.x + size.width, size.width), + std::min(root_pos.y + size.height, size.height) ); render_target->SetTransform(D2D1::Matrix3x2F::Identity()); - render_target->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); + render_target->PushAxisAlignedClip(clip_rect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); render_target->PushLayer(in_layer_param_, in_layer_); in_scene_->Draw();