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

修复变量名问题

This commit is contained in:
Nomango 2018-09-07 00:33:23 +08:00
parent 5f698fb475
commit 2d68b8e2cc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/transitions/Transition.cpp
View File

@ -89,15 +89,15 @@ void e2d::Transition::Draw()
if (out_scene_ && out_scene_->GetRoot()) if (out_scene_ && out_scene_->GetRoot())
{ {
auto rootPos = out_scene_->GetRoot()->GetPos(); auto root_pos = out_scene_->GetRoot()->GetPos();
auto clipRect = D2D1::RectF( auto clip_rect = D2D1::RectF(
std::max(rootPos.x, 0.f), std::max(root_pos.x, 0.f),
std::max(rootPos.y, 0.f), std::max(root_pos.y, 0.f),
std::min(rootPos.x + size.width, size.width), std::min(root_pos.x + size.width, size.width),
std::min(rootPos.y + size.height, size.height) std::min(root_pos.y + size.height, size.height)
); );
render_target->SetTransform(D2D1::Matrix3x2F::Identity()); 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_); render_target->PushLayer(out_layer_param_, out_layer_);
out_scene_->Draw(); out_scene_->Draw();
@ -108,15 +108,15 @@ void e2d::Transition::Draw()
if (in_scene_ && in_scene_->GetRoot()) if (in_scene_ && in_scene_->GetRoot())
{ {
Point rootPos = in_scene_->GetRoot()->GetPos(); Point root_pos = in_scene_->GetRoot()->GetPos();
auto clipRect = D2D1::RectF( auto clip_rect = D2D1::RectF(
std::max(rootPos.x, 0.f), std::max(root_pos.x, 0.f),
std::max(rootPos.y, 0.f), std::max(root_pos.y, 0.f),
std::min(rootPos.x + size.width, size.width), std::min(root_pos.x + size.width, size.width),
std::min(rootPos.y + size.height, size.height) std::min(root_pos.y + size.height, size.height)
); );
render_target->SetTransform(D2D1::Matrix3x2F::Identity()); 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_); render_target->PushLayer(in_layer_param_, in_layer_);
in_scene_->Draw(); in_scene_->Draw();