diff --git a/core/Node/Node.cpp b/core/Node/Node.cpp index f29c6107..8fd05b19 100644 --- a/core/Node/Node.cpp +++ b/core/Node/Node.cpp @@ -93,11 +93,11 @@ void e2d::Node::Visit() UpdateTransform(); extrapolate_ = this->GetProperty(); - auto renderTarget = Renderer::GetInstance()->GetRenderTarget(); + auto render_target = Renderer::GetInstance()->GetRenderTarget(); if (clip_enabled_) { - renderTarget->SetTransform(final_matrix_); - renderTarget->PushAxisAlignedClip( + render_target->SetTransform(final_matrix_); + render_target->PushAxisAlignedClip( D2D1::RectF(0, 0, size_.width, size_.height), D2D1_ANTIALIAS_MODE_PER_PRIMITIVE ); @@ -108,7 +108,7 @@ void e2d::Node::Visit() auto drawableNode = dynamic_cast(this); if (drawableNode) { - renderTarget->SetTransform(final_matrix_); + render_target->SetTransform(final_matrix_); drawableNode->Draw(); } } @@ -135,7 +135,7 @@ void e2d::Node::Visit() auto drawableNode = dynamic_cast(this); if (drawableNode) { - renderTarget->SetTransform(final_matrix_); + render_target->SetTransform(final_matrix_); drawableNode->Draw(); } @@ -146,7 +146,7 @@ void e2d::Node::Visit() if (clip_enabled_) { - renderTarget->PopAxisAlignedClip(); + render_target->PopAxisAlignedClip(); } } diff --git a/core/Transition/Transition.cpp b/core/Transition/Transition.cpp index 625ba7c6..0635d981 100644 --- a/core/Transition/Transition.cpp +++ b/core/Transition/Transition.cpp @@ -84,7 +84,7 @@ void e2d::Transition::Update() void e2d::Transition::Draw() { - auto renderTarget = Renderer::GetInstance()->GetRenderTarget(); + auto render_target = Renderer::GetInstance()->GetRenderTarget(); auto size = Window::GetInstance()->GetSize(); if (out_scene_) @@ -96,14 +96,14 @@ void e2d::Transition::Draw() std::min(rootPos.x + size.width, size.width), std::min(rootPos.y + size.height, size.height) ); - renderTarget->SetTransform(D2D1::Matrix3x2F::Identity()); - renderTarget->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); - renderTarget->PushLayer(out_layer_param_, out_layer_); + render_target->SetTransform(D2D1::Matrix3x2F::Identity()); + render_target->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); + render_target->PushLayer(out_layer_param_, out_layer_); out_scene_->Visit(); - renderTarget->PopLayer(); - renderTarget->PopAxisAlignedClip(); + render_target->PopLayer(); + render_target->PopAxisAlignedClip(); } if (in_scene_) @@ -115,14 +115,14 @@ void e2d::Transition::Draw() std::min(rootPos.x + size.width, size.width), std::min(rootPos.y + size.height, size.height) ); - renderTarget->SetTransform(D2D1::Matrix3x2F::Identity()); - renderTarget->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); - renderTarget->PushLayer(in_layer_param_, in_layer_); + render_target->SetTransform(D2D1::Matrix3x2F::Identity()); + render_target->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); + render_target->PushLayer(in_layer_param_, in_layer_); in_scene_->Visit(); - renderTarget->PopLayer(); - renderTarget->PopAxisAlignedClip(); + render_target->PopLayer(); + render_target->PopAxisAlignedClip(); } }