diff --git a/core/modules/Game.cpp b/core/modules/Game.cpp index 17f03d75..ce28c4ef 100644 --- a/core/modules/Game.cpp +++ b/core/modules/Game.cpp @@ -146,7 +146,7 @@ void e2d::Game::EnterScene(Scene * scene, Transition * transition) transition_ = transition; transition_->Retain(); - transition_->Init(curr_scene_, next_scene_) + transition_->Init(curr_scene_, next_scene_); } } diff --git a/core/transitions/BoxTransition.cpp b/core/transitions/BoxTransition.cpp index f4b6bb22..65a1cb02 100644 --- a/core/transitions/BoxTransition.cpp +++ b/core/transitions/BoxTransition.cpp @@ -7,14 +7,11 @@ e2d::BoxTransition::BoxTransition(float duration) { } -bool e2d::BoxTransition::Init(Scene * prev, Scene * next) +void e2d::BoxTransition::Init(Scene * prev, Scene * next) { - if (Transition::Init(prev, next)) - { - in_layer_param_.opacity = 0; - return true; - } - return false; + Transition::Init(prev, next); + + in_layer_param_.opacity = 0; } void e2d::BoxTransition::Update() diff --git a/core/transitions/EmergeTransition.cpp b/core/transitions/EmergeTransition.cpp index fb0f4cca..15b0d996 100644 --- a/core/transitions/EmergeTransition.cpp +++ b/core/transitions/EmergeTransition.cpp @@ -6,15 +6,12 @@ e2d::EmergeTransition::EmergeTransition(float duration) { } -bool e2d::EmergeTransition::Init(Scene * prev, Scene * next) +void e2d::EmergeTransition::Init(Scene * prev, Scene * next) { - if (Transition::Init(prev, next)) - { - out_layer_param_.opacity = 1; - in_layer_param_.opacity = 0; - return true; - } - return false; + Transition::Init(prev, next); + + out_layer_param_.opacity = 1; + in_layer_param_.opacity = 0; } void e2d::EmergeTransition::Update() diff --git a/core/transitions/FadeTransition.cpp b/core/transitions/FadeTransition.cpp index 698d4c59..942fd091 100644 --- a/core/transitions/FadeTransition.cpp +++ b/core/transitions/FadeTransition.cpp @@ -6,15 +6,12 @@ e2d::FadeTransition::FadeTransition(float duration) { } -bool e2d::FadeTransition::Init(Scene * prev, Scene * next) +void e2d::FadeTransition::Init(Scene * prev, Scene * next) { - if (Transition::Init(prev, next)) - { - out_layer_param_.opacity = 1; - in_layer_param_.opacity = 0; - return true; - } - return false; + Transition::Init(prev, next); + + out_layer_param_.opacity = 1; + in_layer_param_.opacity = 0; } void e2d::FadeTransition::Update() diff --git a/core/transitions/MoveTransition.cpp b/core/transitions/MoveTransition.cpp index 64e6f1dd..8135f857 100644 --- a/core/transitions/MoveTransition.cpp +++ b/core/transitions/MoveTransition.cpp @@ -8,37 +8,34 @@ e2d::MoveTransition::MoveTransition(float duration, Direction direction) { } -bool e2d::MoveTransition::Init(Scene * prev, Scene * next) +void e2d::MoveTransition::Init(Scene * prev, Scene * next) { - if (Transition::Init(prev, next)) + Transition::Init(prev, next); + + auto size = Window::GetInstance()->GetSize(); + if (direction_ == Direction::Up) { - auto size = Window::GetInstance()->GetSize(); - if (direction_ == Direction::Up) - { - pos_delta_ = Point(0, -size.height); - start_pos_ = Point(0, size.height); - } - else if (direction_ == Direction::Down) - { - pos_delta_ = Point(0, size.height); - start_pos_ = Point(0, -size.height); - } - else if (direction_ == Direction::Left) - { - pos_delta_ = Point(-size.width, 0); - start_pos_ = Point(size.width, 0); - } - else if (direction_ == Direction::Right) - { - pos_delta_ = Point(size.width, 0); - start_pos_ = Point(-size.width, 0); - } - - if (out_scene_ && out_scene_->GetRoot()) out_scene_->GetRoot()->SetPos(0, 0); - if (in_scene_->GetRoot()) in_scene_->GetRoot()->SetPos(start_pos_); - return true; + pos_delta_ = Point(0, -size.height); + start_pos_ = Point(0, size.height); } - return false; + else if (direction_ == Direction::Down) + { + pos_delta_ = Point(0, size.height); + start_pos_ = Point(0, -size.height); + } + else if (direction_ == Direction::Left) + { + pos_delta_ = Point(-size.width, 0); + start_pos_ = Point(size.width, 0); + } + else if (direction_ == Direction::Right) + { + pos_delta_ = Point(size.width, 0); + start_pos_ = Point(-size.width, 0); + } + + if (out_scene_ && out_scene_->GetRoot()) out_scene_->GetRoot()->SetPos(0, 0); + if (in_scene_->GetRoot()) in_scene_->GetRoot()->SetPos(start_pos_); } void e2d::MoveTransition::Update() diff --git a/core/transitions/Transition.cpp b/core/transitions/Transition.cpp index 335c7f45..26efef54 100644 --- a/core/transitions/Transition.cpp +++ b/core/transitions/Transition.cpp @@ -7,7 +7,7 @@ e2d::Transition::Transition(float duration) , started_() , delta_(0) , out_scene_(nullptr) - , in_scene_(scene) + , in_scene_(nullptr) , out_layer_(nullptr) , in_layer_(nullptr) , out_layer_param_() @@ -65,8 +65,6 @@ void e2d::Transition::Init(Scene * prev, Scene * next) renderer->GetSolidBrush(), D2D1_LAYER_OPTIONS_NONE ); - - return true; } void e2d::Transition::Update()