lesson 8

SBomber/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1286560408718923769" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1277994465197165617" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1286562333461475541" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1277996664550349269" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

SBomber/include/DestroyableGroundObject.h

@@ -12,6 +12,8 @@ public:
 
     virtual inline uint16_t GetScore() const = 0;
 
+    virtual DestroyableGroundObject* clone() const = 0;
+
 protected:
 
-};
+};

SBomber/include/House.h

@@ -3,16 +3,32 @@
 #include "DestroyableGroundObject.h"
 #include <cstdint>
 
-class House : public DestroyableGroundObject {
+class House: public DestroyableGroundObject
+{
 public:
-  bool isInside(double x1, double x2) const override;
+    House() {}
 
-  inline uint16_t GetScore() const override {
+    House(const House &h)
-    return score;
+    {
-  }
+        x = h.x;
+        y = h.y;
+        width = h.width;
+    }
 
-  void Draw() const override;
+    bool isInside(double x1, double x2) const override;
+
+    inline uint16_t GetScore() const override
+    {
+        return score;
+    }
+
+    void Draw() const override;
+
+    House* clone() const
+    {
+        return new House(*this);
+    }
 
 private:
-  const uint16_t score = 40;
+    const uint16_t score = 40;
 };

SBomber/include/MyTools.h

@@ -3,16 +3,75 @@
 #include <string>
 #include <cstring>
 
-namespace MyTools {
+#include <iostream>
+#include <vector>
 
-void OpenLogFile(const std::string& FN);
+namespace MyTools
+{
 
-void CloseLogFile();
+//    void OpenLogFile(const std::string &FN);
+//    void CloseLogFile();
+//    void WriteToLog(const std::string &str);
+//    void WriteToLog(const std::string &str, int n);
+//    void WriteToLog(const std::string &str, double d);
 
-void WriteToLog(const std::string& str);
+    class Logger
+    {
+    public:
+        virtual void OpenLogFile(const std::string &FN) = 0;
+        virtual void CloseLogFile() = 0;
+        virtual void WriteToLog(const std::string &str) = 0;
+        virtual void WriteToLog(const std::string &str, int n) = 0;
+        virtual void WriteToLog(const std::string &str, double d) = 0;
+        virtual ~Logger() {}
+    };
 
-void WriteToLog(const std::string& str, int n);
+    class FileLoggerSingleton: public Logger
+    {
+    public:
+        static FileLoggerSingleton& getInstance()
+        {
+            static FileLoggerSingleton _instance;
+            return _instance;
+        }
 
-void WriteToLog(const std::string& str, double d);
+        void OpenLogFile(const std::string &FN) override;
+        void CloseLogFile() override;
+        void WriteToLog(const std::string &str) override;
+        void WriteToLog(const std::string &str, int n) override;
+        void WriteToLog(const std::string &str, double d) override;
+    private:
+        FileLoggerSingleton() {}
+        FileLoggerSingleton(const FileLoggerSingleton&) = delete;
+        FileLoggerSingleton& operator=(const FileLoggerSingleton&) = delete;
+        FileLoggerSingleton& operator=(FileLoggerSingleton&&) = delete;
+    };
 
-}; // namespace MyTools
+    class LoggerSingleton: public Logger
+    {
+    public:
+        static LoggerSingleton& getInstance()
+        {
+            static LoggerSingleton _instance;
+            return _instance;
+        }
+
+        void OpenLogFile(const std::string &FN) override;
+        void CloseLogFile() override;
+        void WriteToLog(const std::string &str) override;
+        void WriteToLog(const std::string &str, int n) override;
+        void WriteToLog(const std::string &str, double d) override;
+        ~LoggerSingleton();
+
+    private:
+        LoggerSingleton() {}
+        LoggerSingleton(const LoggerSingleton&) = delete;
+        LoggerSingleton& operator=(const LoggerSingleton&) = delete;
+        LoggerSingleton& operator=(LoggerSingleton&&) = delete;
+        FileLoggerSingleton& LoadLoggerSingletone();
+
+        FileLoggerSingleton *_logger = NULL;
+        std::vector<double> times;
+    };
+
+} // namespace MyTools

SBomber/include/SBomber.h

@@ -42,6 +42,8 @@ private:
 
     void DropBomb();
 
+    void AnimateScrolling();
+
     std::vector<DynamicObject*> vecDynamicObj;
     std::vector<GameObject*> vecStaticObj;
     
@@ -50,4 +52,4 @@ private:
     uint64_t startTime, finishTime, passedTime;
     uint16_t bombsNumber, deltaTime, fps;
     int16_t score;
-};
+};

SBomber/include/Tank.h

@@ -7,6 +7,14 @@
 class Tank : public DestroyableGroundObject
 {
 public:
+    Tank() {}
+
+    Tank(const Tank &t)
+    {
+        x = t.x;
+        y = t.y;
+        width = t.width;
+    }
 
 	bool  isInside(double x1, double x2) const override;
 
@@ -14,6 +22,11 @@ public:
 
 	void Draw() const override;
 
+	Tank* clone() const
+	{
+	    return new Tank(*this);
+	}
+
 private:
 
 	const uint16_t score = 30;

SBomber/include/Timer.h

@@ -0,0 +1,46 @@
+/*
+ * Timer.h
+ *
+ *  Created on: 21 дек. 2021 г.
+ *      Author: alexander
+ */
+
+#pragma once
+
+#include <chrono>
+
+class Timer
+{
+public:
+    static Timer& getInstance()
+    {
+        static Timer _instance;
+        return _instance;
+    }
+
+    void start()
+    {
+        m_beg = clock_t::now();
+    }
+
+    double end() const
+    {
+        return elapsed() * 1000;
+    }
+
+private:
+    using clock_t = std::chrono::high_resolution_clock;
+    using second_t = std::chrono::duration<double, std::ratio<1> >;
+
+    std::chrono::time_point<clock_t> m_beg;
+
+    double elapsed() const
+    {
+        return std::chrono::duration_cast<second_t>(clock_t::now() - m_beg).count();
+    }
+
+    Timer() {}
+    Timer(const Timer&) = delete;
+    Timer& operator=(const Timer&) = delete;
+    Timer& operator=(Timer&&) = delete;
+};

SBomber/main.cpp

@@ -32,7 +32,7 @@ int _kbhit()
 
 int main(void)
 {
-    MyTools::OpenLogFile("log.txt");
+    MyTools::LoggerSingleton::getInstance().OpenLogFile("log.txt");
 
     SBomber game;
 
@@ -54,8 +54,8 @@ int main(void)
         game.TimeFinish();
 
     } while (!game.GetExitFlag());
-
+    game.AnimateScrolling();
-    MyTools::CloseLogFile();
+    MyTools::LoggerSingleton::getInstance().CloseLogFile();
 
     return 0;
 }

SBomber/src/MyTools.cpp

@@ -9,42 +9,110 @@
 #include <time.h>
 #include <stdio.h>
 
+#include <numeric>
+#include "Timer.h"
 
-namespace MyTools {
+namespace MyTools
+{
 
-std::ofstream logOut;
+    std::ofstream logOut;
 
-void OpenLogFile(const std::string &FN) { logOut.open(FN, std::ios_base::out); }
+    void FileLoggerSingleton::OpenLogFile(const std::string &FN)
+    {
+        logOut.open(FN, std::ios_base::out);
+    }
 
-void CloseLogFile() {
+    void FileLoggerSingleton::CloseLogFile()
-  if (logOut.is_open()) {
+    {
-    logOut.close();
+        if (logOut.is_open())
-  }
+        {
-}
+            logOut.close();
+        }
+    }
 
-std::string GetCurDateTime() {
+    std::string GetCurDateTime()
-  auto cur = std::chrono::system_clock::now();
+    {
-  time_t time = std::chrono::system_clock::to_time_t(cur);
+        auto cur = std::chrono::system_clock::now();
-  char* buf = ctime(&time);
+        time_t time = std::chrono::system_clock::to_time_t(cur);
-  return std::string(buf);
+        char *buf = ctime(&time);
-}
+        return std::string(buf);
+    }
 
-void WriteToLog(const std::string &str) {
+    void FileLoggerSingleton::WriteToLog(const std::string &str)
-  if (logOut.is_open()) {
+    {
-    logOut << GetCurDateTime() << " - " << str << std::endl;
+        if (logOut.is_open())
-  }
+        {
-}
+            logOut << GetCurDateTime() << " - " << str << std::endl;
+        }
+    }
 
-void WriteToLog(const std::string &str, int n) {
+    void FileLoggerSingleton::WriteToLog(const std::string &str, int n)
-  if (logOut.is_open()) {
+    {
-    logOut << GetCurDateTime() << " - " << str << n << std::endl;
+        if (logOut.is_open())
-  }
+        {
-}
+            logOut << GetCurDateTime() << " - " << str << n << std::endl;
+        }
+    }
 
-void WriteToLog(const std::string &str, double d) {
+    void FileLoggerSingleton::WriteToLog(const std::string &str, double d)
-  if (logOut.is_open()) {
+    {
-    logOut << GetCurDateTime() << " - " << str << d << std::endl;
+        if (logOut.is_open())
-  }
+        {
-}
+            logOut << GetCurDateTime() << " - " << str << d << std::endl;
+        }
+    }
+
+    void LoggerSingleton::OpenLogFile(const std::string &FN)
+    {
+        Timer::getInstance().start();
+        LoadLoggerSingletone().OpenLogFile(FN);
+        times.push_back(Timer::getInstance().end());
+    }
+
+    void LoggerSingleton::CloseLogFile()
+    {
+        Timer::getInstance().start();
+        LoadLoggerSingletone().CloseLogFile();
+        times.push_back(Timer::getInstance().end());
+    }
+
+    void LoggerSingleton::WriteToLog(const std::string &str)
+    {
+        Timer::getInstance().start();
+        LoadLoggerSingletone().WriteToLog(str);
+        times.push_back(Timer::getInstance().end());
+    }
+
+    void LoggerSingleton::WriteToLog(const std::string &str, int n)
+    {
+        Timer::getInstance().start();
+        LoadLoggerSingletone().WriteToLog(str, n);
+        times.push_back(Timer::getInstance().end());
+    }
+
+    void LoggerSingleton::WriteToLog(const std::string &str, double d)
+    {
+        Timer::getInstance().start();
+        LoadLoggerSingletone().WriteToLog(str, d);
+        times.push_back(Timer::getInstance().end());
+    }
+
+    LoggerSingleton::~LoggerSingleton()
+    {
+        if (times.size())
+        {
+            std::cout << "Среднее время выполнения операций: " << std::accumulate(times.begin(), times.end(), 0.0) / times.size() << " секунд" << std::endl;
+        }
+    }
+
+    FileLoggerSingleton& LoggerSingleton::LoadLoggerSingletone()
+    {
+        if (!_logger)
+        {
+            _logger = &FileLoggerSingleton::getInstance();
+        }
+
+        return *_logger;
+    }
 
 } // namespace MyTools

SBomber/src/SBomber.cpp

@@ -1,4 +1,3 @@
-
 #include "MyTools.h"
 #include "SBomber.h"
 #include "Bomb.h"
@@ -10,302 +9,391 @@
 #include <chrono>
 #include <thread>
 
-SBomber::SBomber()
+extern int _kbhit();
-  : exitFlag(false), startTime(0), finishTime(0), deltaTime(0), passedTime(0),
-    fps(0), bombsNumber(10), score(0) {
-  MyTools::WriteToLog(std::string(__func__) + " was invoked");
 
-  Plane* p = new Plane;
+SBomber::SBomber() : exitFlag(false), startTime(0), finishTime(0), deltaTime(0), passedTime(0), fps(0), bombsNumber(10), score(0)
-  p->SetDirection(1, 0.1);
+{
-  p->SetSpeed(4);
+    MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
-  p->SetPos(5, 10);
-  vecDynamicObj.push_back(p);
 
-  LevelGUI* pGUI = new LevelGUI;
+    Plane *p = new Plane;
-  pGUI->SetParam(passedTime, fps, bombsNumber, score);
+    p->SetDirection(1, 0.1);
-  const uint16_t maxX = ScreenSingleton::getInstance().GetMaxX();
+    p->SetSpeed(4);
-  const uint16_t maxY = ScreenSingleton::getInstance().GetMaxY();
+    p->SetPos(5, 10);
-  const uint16_t offset = 3;
+    vecDynamicObj.push_back(p);
-  const uint16_t width = maxX - 7;
-  pGUI->SetPos(offset, offset);
-  pGUI->SetWidth(width);
-  pGUI->SetHeight(maxY - 4);
-  pGUI->SetFinishX(offset + width - 4);
-  vecStaticObj.push_back(pGUI);
 
-  Ground* pGr = new Ground;
+    LevelGUI *pGUI = new LevelGUI;
-  const uint16_t groundY = maxY - 5;
+    pGUI->SetParam(passedTime, fps, bombsNumber, score);
-  pGr->SetPos(offset + 1, groundY);
+    const uint16_t maxX = ScreenSingleton::getInstance().GetMaxX();
-  pGr->SetWidth(width - 2);
+    const uint16_t maxY = ScreenSingleton::getInstance().GetMaxY();
-  vecStaticObj.push_back(pGr);
+    const uint16_t offset = 3;
+    const uint16_t width = maxX - 7;
+    pGUI->SetPos(offset, offset);
+    pGUI->SetWidth(width);
+    pGUI->SetHeight(maxY - 4);
+    pGUI->SetFinishX(offset + width - 4);
+    vecStaticObj.push_back(pGUI);
 
-  Tank* pTank = new Tank;
+    Ground *pGr = new Ground;
-  pTank->SetWidth(13);
+    const uint16_t groundY = maxY - 5;
-  pTank->SetPos(30, groundY - 1);
+    pGr->SetPos(offset + 1, groundY);
-  vecStaticObj.push_back(pTank);
+    pGr->SetWidth(width - 2);
+    vecStaticObj.push_back(pGr);
 
-  pTank = new Tank;
+    Tank *pTank = new Tank;
-  pTank->SetWidth(13);
+    pTank->SetWidth(13);
-  pTank->SetPos(50, groundY - 1);
+    pTank->SetPos(30, groundY - 1);
-  vecStaticObj.push_back(pTank);
+    vecStaticObj.push_back(pTank);
 
-  House* pHouse = new House;
+    pTank = new Tank;
-  pHouse->SetWidth(13);
+    pTank->SetWidth(13);
-  pHouse->SetPos(80, groundY - 1);
+    pTank->SetPos(50, groundY - 1);
-  vecStaticObj.push_back(pHouse);
+    vecStaticObj.push_back(pTank);
 
-  /*
+    House *pHouse = new House;
-  Bomb* pBomb = new Bomb;
+    pHouse->SetWidth(13);
-  pBomb->SetDirection(0.3, 1);
+    pHouse->SetPos(80, groundY - 1);
-  pBomb->SetSpeed(2);
+    vecStaticObj.push_back(pHouse);
-  pBomb->SetPos(51, 5);
+
-  pBomb->SetSize(SMALL_CRATER_SIZE);
+    /*
-  vecDynamicObj.push_back(pBomb);
+     Bomb* pBomb = new Bomb;
-  */
+     pBomb->SetDirection(0.3, 1);
+     pBomb->SetSpeed(2);
+     pBomb->SetPos(51, 5);
+     pBomb->SetSize(SMALL_CRATER_SIZE);
+     vecDynamicObj.push_back(pBomb);
+     */
 }
 
-SBomber::~SBomber() {
+SBomber::~SBomber()
-  for (size_t i = 0; i < vecDynamicObj.size(); i++) {
+{
-    if (vecDynamicObj[i] != nullptr) {
+    for (size_t i = 0; i < vecDynamicObj.size(); i++)
-      delete vecDynamicObj[i];
+    {
-    }
+        if (vecDynamicObj[i] != nullptr)
-  }
+        {
-
+            delete vecDynamicObj[i];
-  for (size_t i = 0; i < vecStaticObj.size(); i++) {
+        }
-    if (vecStaticObj[i] != nullptr) {
-      delete vecStaticObj[i];
-    }
-  }
-}
-
-void SBomber::MoveObjects() {
-  MyTools::WriteToLog(std::string(__func__) + " was invoked");
-
-  for (size_t i = 0; i < vecDynamicObj.size(); i++) {
-    if (vecDynamicObj[i] != nullptr) {
-      vecDynamicObj[i]->Move(deltaTime);
-    }
-  }
-};
-
-void SBomber::CheckObjects() {
-  MyTools::WriteToLog(std::string(__func__) + " was invoked");
-
-  CheckPlaneAndLevelGUI();
-  CheckBombsAndGround();
-};
-
-void SBomber::CheckPlaneAndLevelGUI() {
-  if (FindPlane()->GetX() > FindLevelGUI()->GetFinishX()) {
-    exitFlag = true;
-  }
-}
-
-void SBomber::CheckBombsAndGround() {
-  std::vector<Bomb*> vecBombs = FindAllBombs();
-  Ground* pGround = FindGround();
-  const double y = pGround->GetY();
-  for (size_t i = 0; i < vecBombs.size(); i++) {
-    if (vecBombs[i]->GetY() >= y) {
-      pGround->AddCrater(vecBombs[i]->GetX());
-      CheckDestoyableObjects(vecBombs[i]);
-      DeleteDynamicObj(vecBombs[i]);
-    }
-  }
-}
-
-void SBomber::CheckDestoyableObjects(Bomb* pBomb) {
-  std::vector<DestroyableGroundObject*> vecDestoyableObjects =
-      FindDestoyableGroundObjects();
-  const double size = pBomb->GetWidth();
-  const double size_2 = size / 2;
-  for (size_t i = 0; i < vecDestoyableObjects.size(); i++) {
-    const double x1 = pBomb->GetX() - size_2;
-    const double x2 = x1 + size;
-    if (vecDestoyableObjects[i]->isInside(x1, x2)) {
-      score += vecDestoyableObjects[i]->GetScore();
-      DeleteStaticObj(vecDestoyableObjects[i]);
-    }
-  }
-}
-
-void SBomber::DeleteDynamicObj(DynamicObject* pObj) {
-  auto it = vecDynamicObj.begin();
-  for (; it != vecDynamicObj.end(); it++) {
-    if (*it == pObj) {
-      vecDynamicObj.erase(it);
-      break;
-    }
-  }
-}
-
-void SBomber::DeleteStaticObj(GameObject* pObj) {
-  auto it = vecStaticObj.begin();
-  for (; it != vecStaticObj.end(); it++) {
-    if (*it == pObj) {
-      vecStaticObj.erase(it);
-      break;
-    }
-  }
-}
-
-std::vector<DestroyableGroundObject*> SBomber::FindDestoyableGroundObjects() const {
-  std::vector<DestroyableGroundObject*> vec;
-  Tank* pTank;
-  House* pHouse;
-  for (size_t i = 0; i < vecStaticObj.size(); i++) {
-    pTank = dynamic_cast<Tank*>(vecStaticObj[i]);
-    if (pTank != nullptr) {
-      vec.push_back(pTank);
-      continue;
     }
 
-    pHouse = dynamic_cast<House*>(vecStaticObj[i]);
+    for (size_t i = 0; i < vecStaticObj.size(); i++)
-    if (pHouse != nullptr) {
+    {
-      vec.push_back(pHouse);
+        if (vecStaticObj[i] != nullptr)
-      continue;
+        {
+            delete vecStaticObj[i];
+        }
     }
-  }
-
-  return vec;
 }
 
-Ground* SBomber::FindGround() const {
+void SBomber::MoveObjects()
-  Ground* pGround;
+{
+    MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
 
-  for (size_t i = 0; i < vecStaticObj.size(); i++) {
+    for (size_t i = 0; i < vecDynamicObj.size(); i++)
-    pGround = dynamic_cast<Ground*>(vecStaticObj[i]);
+    {
-    if (pGround != nullptr) {
+        if (vecDynamicObj[i] != nullptr)
-      return pGround;
+        {
+            vecDynamicObj[i]->Move(deltaTime);
+        }
     }
-  }
-
-  return nullptr;
 }
+;
 
-std::vector<Bomb*> SBomber::FindAllBombs() const {
+void SBomber::CheckObjects()
-  std::vector<Bomb*> vecBombs;
+{
+    MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
 
-  for (size_t i = 0; i < vecDynamicObj.size(); i++) {
+    CheckPlaneAndLevelGUI();
-    Bomb* pBomb = dynamic_cast<Bomb*>(vecDynamicObj[i]);
+    CheckBombsAndGround();
-    if (pBomb != nullptr) {
+}
-      vecBombs.push_back(pBomb);
+;
+
+void SBomber::CheckPlaneAndLevelGUI()
+{
+    if (FindPlane()->GetX() > FindLevelGUI()->GetFinishX())
+    {
+        exitFlag = true;
     }
-  }
-
-  return vecBombs;
 }
 
-Plane* SBomber::FindPlane() const {
+void SBomber::CheckBombsAndGround()
-  for (size_t i = 0; i < vecDynamicObj.size(); i++) {
+{
-    Plane* p = dynamic_cast<Plane*>(vecDynamicObj[i]);
+    std::vector<Bomb*> vecBombs = FindAllBombs();
-    if (p != nullptr) {
+    Ground *pGround = FindGround();
-      return p;
+    const double y = pGround->GetY();
+    for (size_t i = 0; i < vecBombs.size(); i++)
+    {
+        if (vecBombs[i]->GetY() >= y)
+        {
+            pGround->AddCrater(vecBombs[i]->GetX());
+            CheckDestoyableObjects(vecBombs[i]);
+            DeleteDynamicObj(vecBombs[i]);
+        }
     }
-  }
-
-  return nullptr;
 }
 
-LevelGUI* SBomber::FindLevelGUI() const {
+void SBomber::CheckDestoyableObjects(Bomb *pBomb)
-  for (size_t i = 0; i < vecStaticObj.size(); i++) {
+{
-    LevelGUI* p = dynamic_cast<LevelGUI*>(vecStaticObj[i]);
+    std::vector<DestroyableGroundObject*> vecDestoyableObjects = FindDestoyableGroundObjects();
-    if (p != nullptr) {
+    const double size = pBomb->GetWidth();
-      return p;
+    const double size_2 = size / 2;
+    for (size_t i = 0; i < vecDestoyableObjects.size(); i++)
+    {
+        const double x1 = pBomb->GetX() - size_2;
+        const double x2 = x1 + size;
+        if (vecDestoyableObjects[i]->isInside(x1, x2))
+        {
+            score += vecDestoyableObjects[i]->GetScore();
+            DeleteStaticObj(vecDestoyableObjects[i]);
+        }
     }
-  }
-
-  return nullptr;
 }
 
-void SBomber::ProcessKBHit() {
+void SBomber::DeleteDynamicObj(DynamicObject *pObj)
-  int c = getchar();
+{
-
+    auto it = vecDynamicObj.begin();
-  if (c == 224) {
+    for (; it != vecDynamicObj.end(); it++)
-    c = getchar();
+    {
-  }
+        if (*it == pObj)
-
+        {
-  MyTools::WriteToLog(std::string(__func__) + " was invoked. key = ", c);
+            vecDynamicObj.erase(it);
-
+            break;
-  switch (c) {
+        }
-
-    case 27: // esc
-      exitFlag = true;
-      break;
-
-    case 72: // up
-      FindPlane()->ChangePlaneY(-0.25);
-      break;
-
-    case 80: // down
-      FindPlane()->ChangePlaneY(0.25);
-      break;
-
-    case 'b':
-      DropBomb();
-      break;
-
-    case 'B':
-      DropBomb();
-      break;
-
-    default:
-      break;
-  }
-}
-
-void SBomber::DrawFrame() {
-  MyTools::WriteToLog(std::string(__func__) + " was invoked");
-
-  for (size_t i = 0; i < vecDynamicObj.size(); i++) {
-    if (vecDynamicObj[i] != nullptr) {
-      vecDynamicObj[i]->Draw();
     }
-  }
+}
 
-  for (size_t i = 0; i < vecStaticObj.size(); i++) {
+void SBomber::DeleteStaticObj(GameObject *pObj)
-    if (vecStaticObj[i] != nullptr) {
+{
-      vecStaticObj[i]->Draw();
+    auto it = vecStaticObj.begin();
+    for (; it != vecStaticObj.end(); it++)
+    {
+        if (*it == pObj)
+        {
+            vecStaticObj.erase(it);
+            break;
+        }
     }
-  }
-
-  ScreenSingleton::getInstance().GotoXY(0, 0);
-  fps++;
-
-  FindLevelGUI()->SetParam(passedTime, fps, bombsNumber, score);
 }
 
-void SBomber::TimeStart() {
+std::vector<DestroyableGroundObject*> SBomber::FindDestoyableGroundObjects() const
-  MyTools::WriteToLog(std::string(__func__) + " was invoked");
+{
-  startTime = std::chrono::duration_cast<std::chrono::milliseconds>(
+    std::vector<DestroyableGroundObject*> vec;
-      std::chrono::high_resolution_clock::now().time_since_epoch()).count();
+    Tank *pTank;
+    House *pHouse;
+    for (size_t i = 0; i < vecStaticObj.size(); i++)
+    {
+        pTank = dynamic_cast<Tank*>(vecStaticObj[i]);
+        if (pTank != nullptr)
+        {
+            vec.push_back(pTank);
+            continue;
+        }
+
+        pHouse = dynamic_cast<House*>(vecStaticObj[i]);
+        if (pHouse != nullptr)
+        {
+            vec.push_back(pHouse);
+            continue;
+        }
+    }
+
+    return vec;
 }
 
-void SBomber::TimeFinish() {
+Ground* SBomber::FindGround() const
-  finishTime = std::chrono::duration_cast<std::chrono::milliseconds>(
+{
-      std::chrono::high_resolution_clock::now().time_since_epoch()).count();
+    Ground *pGround;
-  deltaTime = uint16_t(finishTime - startTime);
-  passedTime += deltaTime;
 
-  MyTools::WriteToLog(std::string(__func__) + " deltaTime = ", (int)deltaTime);
+    for (size_t i = 0; i < vecStaticObj.size(); i++)
+    {
+        pGround = dynamic_cast<Ground*>(vecStaticObj[i]);
+        if (pGround != nullptr)
+        {
+            return pGround;
+        }
+    }
+
+    return nullptr;
 }
 
-void SBomber::DropBomb() {
+std::vector<Bomb*> SBomber::FindAllBombs() const
-  if (bombsNumber > 0) {
+{
-    MyTools::WriteToLog(std::string(__func__) + " was invoked");
+    std::vector<Bomb*> vecBombs;
 
-    Plane* pPlane = FindPlane();
+    for (size_t i = 0; i < vecDynamicObj.size(); i++)
-    double x = pPlane->GetX() + 4;
+    {
-    double y = pPlane->GetY() + 2;
+        Bomb *pBomb = dynamic_cast<Bomb*>(vecDynamicObj[i]);
+        if (pBomb != nullptr)
+        {
+            vecBombs.push_back(pBomb);
+        }
+    }
 
-    Bomb* pBomb = new Bomb;
+    return vecBombs;
-    pBomb->SetDirection(0.3, 1);
-    pBomb->SetSpeed(2);
-    pBomb->SetPos(x, y);
-    pBomb->SetWidth(SMALL_CRATER_SIZE);
-
-    vecDynamicObj.push_back(pBomb);
-    bombsNumber--;
-    score -= Bomb::BombCost;
-  }
 }
+
+Plane* SBomber::FindPlane() const
+{
+    for (size_t i = 0; i < vecDynamicObj.size(); i++)
+    {
+        Plane *p = dynamic_cast<Plane*>(vecDynamicObj[i]);
+        if (p != nullptr)
+        {
+            return p;
+        }
+    }
+
+    return nullptr;
+}
+
+LevelGUI* SBomber::FindLevelGUI() const
+{
+    for (size_t i = 0; i < vecStaticObj.size(); i++)
+    {
+        LevelGUI *p = dynamic_cast<LevelGUI*>(vecStaticObj[i]);
+        if (p != nullptr)
+        {
+            return p;
+        }
+    }
+
+    return nullptr;
+}
+
+void SBomber::ProcessKBHit()
+{
+    int c = getchar();
+
+    if (c == 224)
+    {
+        c = getchar();
+    }
+
+    MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked. key = ", c);
+
+    switch (c)
+    {
+
+        case 27: // esc
+            exitFlag = true;
+            break;
+
+        case 72: // up
+            FindPlane()->ChangePlaneY(-0.25);
+            break;
+
+        case 80: // down
+            FindPlane()->ChangePlaneY(0.25);
+            break;
+
+        case 'b':
+            DropBomb();
+            break;
+
+        case 'B':
+            DropBomb();
+            break;
+
+        case 'd':
+        {
+            DestroyableGroundObject *clone = nullptr;
+
+            std::vector<DestroyableGroundObject*> vecDestoyableObjects = FindDestoyableGroundObjects();
+            for (size_t i = 0; i < vecDestoyableObjects.size(); i++)
+            {
+                if (!clone) clone = vecDestoyableObjects[i]->clone();
+                if (!vecDestoyableObjects[i]->isInside(clone->GetX(), clone->GetY()))
+                {
+                    vecStaticObj.push_back(clone);
+                }
+            }
+
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+void SBomber::DrawFrame()
+{
+    MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
+
+    for (size_t i = 0; i < vecDynamicObj.size(); i++)
+    {
+        if (vecDynamicObj[i] != nullptr)
+        {
+            vecDynamicObj[i]->Draw();
+        }
+    }
+
+    for (size_t i = 0; i < vecStaticObj.size(); i++)
+    {
+        if (vecStaticObj[i] != nullptr)
+        {
+            vecStaticObj[i]->Draw();
+        }
+    }
+
+    ScreenSingleton::getInstance().GotoXY(0, 0);
+    fps++;
+
+    FindLevelGUI()->SetParam(passedTime, fps, bombsNumber, score);
+}
+
+void SBomber::TimeStart()
+{
+    MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
+    startTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count();
+}
+
+void SBomber::TimeFinish()
+{
+    finishTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count();
+    deltaTime = uint16_t(finishTime - startTime);
+    passedTime += deltaTime;
+
+    MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " deltaTime = ", (int) deltaTime);
+}
+
+void SBomber::DropBomb()
+{
+    if (bombsNumber > 0)
+    {
+        MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
+
+        Plane *pPlane = FindPlane();
+        double x = pPlane->GetX() + 4;
+        double y = pPlane->GetY() + 2;
+
+        Bomb *pBomb = new Bomb;
+        pBomb->SetDirection(0.3, 1);
+        pBomb->SetSpeed(2);
+        pBomb->SetPos(x, y);
+        pBomb->SetWidth(SMALL_CRATER_SIZE);
+
+        vecDynamicObj.push_back(pBomb);
+        bombsNumber--;
+        score -= Bomb::BombCost;
+    }
+}
+
+void SBomber::AnimateScrolling()
+{
+    MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__FUNCTION__) + " was invoked");
+    const size_t windowHeight = 10; // Размер окна для скроллинга
+    const size_t startX = MyTools::GetMaxX() / 2 - ScrollWidth / 2;
+    const size_t startY = MyTools::GetMaxY() / 2 - windowHeight / 2;
+    double curPos = 0;
+    do {
+            TimeStart();
+            MyTools::ClrScr();
+
+            // вывод windowHeight строк из ppScroll используя смещение curPos
+        // ...
+            MyTools::GotoXY(0, 0);
+            TimeFinish();
+            curPos += deltaTime * 0.0015;
+
+    } while (!_kbhit() && int(curPos) <= (ScrollHeight - windowHeight));
+    MyTools::ClrScr();
+}
+

SBomber/src/ScreenSingleton.cpp

@@ -33,15 +33,15 @@ IScreen& getInternalInstance() {
 class ScreenSingletonProxy : public IScreen {
 public:
   virtual void ClrScr() override {
-    MyTools::WriteToLog("ClrScr invoke begin");
+    MyTools::LoggerSingleton::getInstance().WriteToLog("ClrScr invoke begin");
     getInternalInstance().ClrScr();
-    MyTools::WriteToLog("ClrScr invoke end");
+    MyTools::LoggerSingleton::getInstance().WriteToLog("ClrScr invoke end");
   }
   virtual void GotoXY(double x, double y) override {
 
-    MyTools::WriteToLog("GotoXY invoke begin");
+    MyTools::LoggerSingleton::getInstance().WriteToLog("GotoXY invoke begin");
     getInternalInstance().GotoXY(x, y);
-    MyTools::WriteToLog("GotoXY invoke end");
+    MyTools::LoggerSingleton::getInstance().WriteToLog("GotoXY invoke end");
   }
   virtual uint16_t GetMaxX() override {
     return getInternalInstance().GetMaxX();