From a8bfa80d235e342c24f55aa24641bba88560df2f Mon Sep 17 00:00:00 2001 From: nihonium Date: Wed, 4 Jan 2023 14:56:03 +0300 Subject: [PATCH] seminar13 - arkanoid finally splitted --- seminar13_polymorphism/arkanoid/arkanoid.cpp | 4 ++-- seminar13_polymorphism/arkanoid/arkanoid.hpp | 5 +++-- seminar13_polymorphism/arkanoid/ball.cpp | 2 ++ seminar13_polymorphism/arkanoid/ball.hpp | 7 +++++-- seminar13_polymorphism/arkanoid/bonus.cpp | 4 ++-- seminar13_polymorphism/arkanoid/bonus.hpp | 6 ++++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/seminar13_polymorphism/arkanoid/arkanoid.cpp b/seminar13_polymorphism/arkanoid/arkanoid.cpp index 1e3c557..c7be89f 100644 --- a/seminar13_polymorphism/arkanoid/arkanoid.cpp +++ b/seminar13_polymorphism/arkanoid/arkanoid.cpp @@ -2,9 +2,9 @@ #include #include #include + #include "arkanoid.hpp" -#include "ball.hpp" -#include "paddle.hpp" +#include "bonus.hpp" const double pi = 3.14159265358979323846; diff --git a/seminar13_polymorphism/arkanoid/arkanoid.hpp b/seminar13_polymorphism/arkanoid/arkanoid.hpp index b753c1d..8ba2996 100644 --- a/seminar13_polymorphism/arkanoid/arkanoid.hpp +++ b/seminar13_polymorphism/arkanoid/arkanoid.hpp @@ -1,9 +1,10 @@ #pragma once #include + #include "ball.hpp" -//class Ball; #include "brick_grid.hpp" -#include "bonus.hpp" +#include "paddle.hpp" +class Bonus; class Arkanoid { diff --git a/seminar13_polymorphism/arkanoid/ball.cpp b/seminar13_polymorphism/arkanoid/ball.cpp index 2936661..a5d7f7f 100644 --- a/seminar13_polymorphism/arkanoid/ball.cpp +++ b/seminar13_polymorphism/arkanoid/ball.cpp @@ -1,5 +1,7 @@ #include #include "ball.hpp" +#include "brick_grid.hpp" +#include "paddle.hpp" // Вспомагательные функции для работы с векторами типа sf::Vector2f float operator*(const sf::Vector2f& first, const sf::Vector2f& second) diff --git a/seminar13_polymorphism/arkanoid/ball.hpp b/seminar13_polymorphism/arkanoid/ball.hpp index 813f4aa..2bca550 100644 --- a/seminar13_polymorphism/arkanoid/ball.hpp +++ b/seminar13_polymorphism/arkanoid/ball.hpp @@ -1,6 +1,9 @@ #pragma once -#include "brick_grid.hpp" -#include "paddle.hpp" +#include +#include + +class BrickGrid; +class Paddle; struct Ball { diff --git a/seminar13_polymorphism/arkanoid/bonus.cpp b/seminar13_polymorphism/arkanoid/bonus.cpp index 62e99fc..d6cc064 100644 --- a/seminar13_polymorphism/arkanoid/bonus.cpp +++ b/seminar13_polymorphism/arkanoid/bonus.cpp @@ -1,9 +1,9 @@ -#include -#include #include #include "bonus.hpp" #include "arkanoid.hpp" +#include "ball.hpp" +#include "paddle.hpp" const double pi = 3.14159265358979323846; diff --git a/seminar13_polymorphism/arkanoid/bonus.hpp b/seminar13_polymorphism/arkanoid/bonus.hpp index b10c606..221e4c5 100644 --- a/seminar13_polymorphism/arkanoid/bonus.hpp +++ b/seminar13_polymorphism/arkanoid/bonus.hpp @@ -1,6 +1,8 @@ #pragma once -#include "paddle.hpp" -#include "ball.hpp" +#include +#include +class Paddle; +class Ball; class Arkanoid; class Bonus