diff --git a/sources/System/IntroAnimation/IntroAnimationSystem.cpp b/sources/System/IntroAnimation/IntroAnimationSystem.cpp index c5671987..887a11d8 100644 --- a/sources/System/IntroAnimation/IntroAnimationSystem.cpp +++ b/sources/System/IntroAnimation/IntroAnimationSystem.cpp @@ -49,7 +49,7 @@ namespace BBM topRectangle.getComponent().drawable->setColor(BLACK); else topRectangle.getComponent().drawable->setColor(WHITE); - if (component.frameCounter == 60) { + if (component.frameCounter >= 60) { component.currentStep = IntroAnimationComponent::animationSteps::topLeftgrowing; component.frameCounter = -1; topRectangle.getComponent().drawable->setColor(BLACK); @@ -58,10 +58,10 @@ namespace BBM break; case IntroAnimationComponent::animationSteps::topLeftgrowing: rectangle = dynamic_cast(leftRectangle.getComponent().drawable.get()); - rectangle->incrementHeight(4); + rectangle->incrementHeight(8); rectangle = dynamic_cast(topRectangle.getComponent().drawable.get()); - rectangle->incrementWidth(4); - if (rectangle->getWidth() == 256) { + rectangle->incrementWidth(8); + if (rectangle->getWidth() >= 256) { component.currentStep = IntroAnimationComponent::animationSteps::bottomRightGrowing; bottomRectangle.getComponent().position = Vector3f(1920 / 2 - 128, 1080 / 2 - 128 + 240, 0); rightRectangle.getComponent().position = Vector3f(1920 / 2 - 128 + 240, 1080 / 2 - 128, 0); @@ -69,16 +69,16 @@ namespace BBM break; case IntroAnimationComponent::animationSteps::bottomRightGrowing: rectangle = dynamic_cast(bottomRectangle.getComponent().drawable.get()); - rectangle->incrementWidth(4); + rectangle->incrementWidth(8); rectangle = dynamic_cast(rightRectangle.getComponent().drawable.get()); - rectangle->incrementHeight(4); - if (rectangle->getHeight() == 256) { + rectangle->incrementHeight(8); + if (rectangle->getHeight() >= 256) { component.currentStep = IntroAnimationComponent::animationSteps::lettersTyping; component.frameCounter = 0; } break; case IntroAnimationComponent::animationSteps::lettersTyping: - if ((component.frameCounter / 15) % 2) { + if ((component.frameCounter / 10) % 2) { letterCounter++; text = dynamic_cast(rayText.getComponent().drawable.get()); if (letterCounter == 2) {