Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复局部变量命名问题

This commit is contained in:
Nomango 2018-09-05 00:09:23 +08:00
parent 11e9d1ce9b
commit 860e0fe08e
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/Node/Node.cpp
View File

@ -93,11 +93,11 @@ void e2d::Node::Visit()
UpdateTransform(); UpdateTransform();
extrapolate_ = this->GetProperty(); extrapolate_ = this->GetProperty();
auto renderTarget = Renderer::GetInstance()->GetRenderTarget(); auto render_target = Renderer::GetInstance()->GetRenderTarget();
if (clip_enabled_) if (clip_enabled_)
{ {
renderTarget->SetTransform(final_matrix_); render_target->SetTransform(final_matrix_);
renderTarget->PushAxisAlignedClip( render_target->PushAxisAlignedClip(
D2D1::RectF(0, 0, size_.width, size_.height), D2D1::RectF(0, 0, size_.width, size_.height),
D2D1_ANTIALIAS_MODE_PER_PRIMITIVE D2D1_ANTIALIAS_MODE_PER_PRIMITIVE
); );
@ -108,7 +108,7 @@ void e2d::Node::Visit()
auto drawableNode = dynamic_cast<Drawable*>(this); auto drawableNode = dynamic_cast<Drawable*>(this);
if (drawableNode) if (drawableNode)
{ {
renderTarget->SetTransform(final_matrix_); render_target->SetTransform(final_matrix_);
drawableNode->Draw(); drawableNode->Draw();
} }
} }
@ -135,7 +135,7 @@ void e2d::Node::Visit()
auto drawableNode = dynamic_cast<Drawable*>(this); auto drawableNode = dynamic_cast<Drawable*>(this);
if (drawableNode) if (drawableNode)
{ {
renderTarget->SetTransform(final_matrix_); render_target->SetTransform(final_matrix_);
drawableNode->Draw(); drawableNode->Draw();
} }
@ -146,7 +146,7 @@ void e2d::Node::Visit()
if (clip_enabled_) if (clip_enabled_)
{ {
renderTarget->PopAxisAlignedClip(); render_target->PopAxisAlignedClip();
} }
} }

22
core/Transition/Transition.cpp
View File

@ -84,7 +84,7 @@ void e2d::Transition::Update()
void e2d::Transition::Draw() void e2d::Transition::Draw()
{ {
auto renderTarget = Renderer::GetInstance()->GetRenderTarget(); auto render_target = Renderer::GetInstance()->GetRenderTarget();
auto size = Window::GetInstance()->GetSize(); auto size = Window::GetInstance()->GetSize();
if (out_scene_) if (out_scene_)
@ -96,14 +96,14 @@ void e2d::Transition::Draw()
std::min(rootPos.x + size.width, size.width), std::min(rootPos.x + size.width, size.width),
std::min(rootPos.y + size.height, size.height) std::min(rootPos.y + size.height, size.height)
); );
renderTarget->SetTransform(D2D1::Matrix3x2F::Identity()); render_target->SetTransform(D2D1::Matrix3x2F::Identity());
renderTarget->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); render_target->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
renderTarget->PushLayer(out_layer_param_, out_layer_); render_target->PushLayer(out_layer_param_, out_layer_);
out_scene_->Visit(); out_scene_->Visit();
renderTarget->PopLayer(); render_target->PopLayer();
renderTarget->PopAxisAlignedClip(); render_target->PopAxisAlignedClip();
} }
if (in_scene_) if (in_scene_)
@ -115,14 +115,14 @@ void e2d::Transition::Draw()
std::min(rootPos.x + size.width, size.width), std::min(rootPos.x + size.width, size.width),
std::min(rootPos.y + size.height, size.height) std::min(rootPos.y + size.height, size.height)
); );
renderTarget->SetTransform(D2D1::Matrix3x2F::Identity()); render_target->SetTransform(D2D1::Matrix3x2F::Identity());
renderTarget->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE); render_target->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
renderTarget->PushLayer(in_layer_param_, in_layer_); render_target->PushLayer(in_layer_param_, in_layer_);
in_scene_->Visit(); in_scene_->Visit();
renderTarget->PopLayer(); render_target->PopLayer();
renderTarget->PopAxisAlignedClip(); render_target->PopAxisAlignedClip();
} }
} }