alexander
/
geekbrains_gof
1
0
Fork 0
Code Issues Pull Requests 3 Projects Releases Wiki Activity

lesson_8 #3

Open
alexander wants to merge 3 commits from lesson_8 into master
pull from: lesson_8
merge into: alexander:master
Conversation 0 Commits 3 Files Changed 12 +607 -320341
12 changed files with 607 additions and 320341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SBomber/.settings/language.settings.xml
View File

@ -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>

2
SBomber/include/DestroyableGroundObject.h
View File

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

20
SBomber/include/House.h
View File

@ -3,16 +3,32 @@
#include "DestroyableGroundObject.h"
#include <cstdint>
class House : public DestroyableGroundObject {
class House: public DestroyableGroundObject
{
public:
House() {}
House(const House &h)
{
x = h.x;
y = h.y;
width = h.width;
}
bool isInside(double x1, double x2) const override;
inline uint16_t GetScore() 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;
};

73
SBomber/include/MyTools.h
View File

@ -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

2
SBomber/include/SBomber.h
View File

@ -42,6 +42,8 @@ private:
void DropBomb();
void AnimateScrolling();
std::vector<DynamicObject*> vecDynamicObj;
std::vector<GameObject*> vecStaticObj;

13
SBomber/include/Tank.h
View File

@ -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;

46
SBomber/include/Timer.h Normal file
View File

@ -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;
};

320028
SBomber/log.txt
View File

File diff suppressed because it is too large Load Diff

6
SBomber/main.cpp
View File

@ -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());
MyTools::CloseLogFile();
game.AnimateScrolling();
MyTools::LoggerSingleton::getInstance().CloseLogFile();
return 0;
}

90
SBomber/src/MyTools.cpp
View File

@ -9,42 +9,110 @@
#include <time.h>
#include <stdio.h>
#include <numeric>
#include "Timer.h"
namespace MyTools {
namespace MyTools
{
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() {
if (logOut.is_open()) {
void FileLoggerSingleton::CloseLogFile()
{
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);
char *buf = ctime(&time);
return std::string(buf);
}
void WriteToLog(const std::string &str) {
if (logOut.is_open()) {
void FileLoggerSingleton::WriteToLog(const std::string &str)
{
if (logOut.is_open())
{
logOut << GetCurDateTime() << " - " << str << std::endl;
}
}
void WriteToLog(const std::string &str, int n) {
if (logOut.is_open()) {
void FileLoggerSingleton::WriteToLog(const std::string &str, int n)
{
if (logOut.is_open())
{
logOut << GetCurDateTime() << " - " << str << n << std::endl;
}
}
void WriteToLog(const std::string &str, double d) {
if (logOut.is_open()) {
void FileLoggerSingleton::WriteToLog(const std::string &str, double d)
{
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

230
SBomber/src/SBomber.cpp
View File

@ -1,4 +1,3 @@
#include "MyTools.h"
#include "SBomber.h"
#include "Bomb.h"
@ -10,10 +9,11 @@
#include <chrono>
#include <thread>
SBomber::SBomber()
: exitFlag(false), startTime(0), finishTime(0), deltaTime(0), passedTime(0),
fps(0), bombsNumber(10), score(0) {
MyTools::WriteToLog(std::string(__func__) + " was invoked");
extern int _kbhit();
SBomber::SBomber() : exitFlag(false), startTime(0), finishTime(0), deltaTime(0), passedTime(0), fps(0), bombsNumber(10), score(0)
{
MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
Plane *p = new Plane;
p->SetDirection(1, 0.1);
@ -64,49 +64,65 @@ SBomber::SBomber()
*/
}
SBomber::~SBomber() {
for (size_t i = 0; i < vecDynamicObj.size(); i++) {
if (vecDynamicObj[i] != nullptr) {
SBomber::~SBomber()
{
for (size_t i = 0; i < vecDynamicObj.size(); i++)
{
if (vecDynamicObj[i] != nullptr)
{
delete vecDynamicObj[i];
}
}
for (size_t i = 0; i < vecStaticObj.size(); i++) {
if (vecStaticObj[i] != nullptr) {
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");
void SBomber::MoveObjects()
{
MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
for (size_t i = 0; i < vecDynamicObj.size(); i++) {
if (vecDynamicObj[i] != nullptr) {
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");
void SBomber::CheckObjects()
{
MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
CheckPlaneAndLevelGUI();
CheckBombsAndGround();
};
}
;
void SBomber::CheckPlaneAndLevelGUI() {
if (FindPlane()->GetX() > FindLevelGUI()->GetFinishX()) {
void SBomber::CheckPlaneAndLevelGUI()
{
if (FindPlane()->GetX() > FindLevelGUI()->GetFinishX())
{
exitFlag = true;
}
}
void SBomber::CheckBombsAndGround() {
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) {
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]);
@ -114,54 +130,66 @@ void SBomber::CheckBombsAndGround() {
}
}
void SBomber::CheckDestoyableObjects(Bomb* pBomb) {
std::vector<DestroyableGroundObject*> vecDestoyableObjects =
FindDestoyableGroundObjects();
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++) {
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)) {
if (vecDestoyableObjects[i]->isInside(x1, x2))
{
score += vecDestoyableObjects[i]->GetScore();
DeleteStaticObj(vecDestoyableObjects[i]);
}
}
}
void SBomber::DeleteDynamicObj(DynamicObject* pObj) {
void SBomber::DeleteDynamicObj(DynamicObject *pObj)
{
auto it = vecDynamicObj.begin();
for (; it != vecDynamicObj.end(); it++) {
if (*it == pObj) {
for (; it != vecDynamicObj.end(); it++)
{
if (*it == pObj)
{
vecDynamicObj.erase(it);
break;
}
}
}
void SBomber::DeleteStaticObj(GameObject* pObj) {
void SBomber::DeleteStaticObj(GameObject *pObj)
{
auto it = vecStaticObj.begin();
for (; it != vecStaticObj.end(); it++) {
if (*it == pObj) {
for (; it != vecStaticObj.end(); it++)
{
if (*it == pObj)
{
vecStaticObj.erase(it);
break;
}
}
}
std::vector<DestroyableGroundObject*> SBomber::FindDestoyableGroundObjects() const {
std::vector<DestroyableGroundObject*> SBomber::FindDestoyableGroundObjects() const
{
std::vector<DestroyableGroundObject*> vec;
Tank *pTank;
House *pHouse;
for (size_t i = 0; i < vecStaticObj.size(); i++) {
for (size_t i = 0; i < vecStaticObj.size(); i++)
{
pTank = dynamic_cast<Tank*>(vecStaticObj[i]);
if (pTank != nullptr) {
if (pTank != nullptr)
{
vec.push_back(pTank);
continue;
}
pHouse = dynamic_cast<House*>(vecStaticObj[i]);
if (pHouse != nullptr) {
if (pHouse != nullptr)
{
vec.push_back(pHouse);
continue;
}
@ -170,12 +198,15 @@ std::vector<DestroyableGroundObject*> SBomber::FindDestoyableGroundObjects() con
return vec;
}
Ground* SBomber::FindGround() const {
Ground* SBomber::FindGround() const
{
Ground *pGround;
for (size_t i = 0; i < vecStaticObj.size(); i++) {
for (size_t i = 0; i < vecStaticObj.size(); i++)
{
pGround = dynamic_cast<Ground*>(vecStaticObj[i]);
if (pGround != nullptr) {
if (pGround != nullptr)
{
return pGround;
}
}
@ -183,12 +214,15 @@ Ground* SBomber::FindGround() const {
return nullptr;
}
std::vector<Bomb*> SBomber::FindAllBombs() const {
std::vector<Bomb*> SBomber::FindAllBombs() const
{
std::vector<Bomb*> vecBombs;
for (size_t i = 0; i < vecDynamicObj.size(); i++) {
for (size_t i = 0; i < vecDynamicObj.size(); i++)
{
Bomb *pBomb = dynamic_cast<Bomb*>(vecDynamicObj[i]);
if (pBomb != nullptr) {
if (pBomb != nullptr)
{
vecBombs.push_back(pBomb);
}
}
@ -196,10 +230,13 @@ std::vector<Bomb*> SBomber::FindAllBombs() const {
return vecBombs;
}
Plane* SBomber::FindPlane() const {
for (size_t i = 0; i < vecDynamicObj.size(); i++) {
Plane* SBomber::FindPlane() const
{
for (size_t i = 0; i < vecDynamicObj.size(); i++)
{
Plane *p = dynamic_cast<Plane*>(vecDynamicObj[i]);
if (p != nullptr) {
if (p != nullptr)
{
return p;
}
}
@ -207,10 +244,13 @@ Plane* SBomber::FindPlane() const {
return nullptr;
}
LevelGUI* SBomber::FindLevelGUI() const {
for (size_t i = 0; i < vecStaticObj.size(); i++) {
LevelGUI* SBomber::FindLevelGUI() const
{
for (size_t i = 0; i < vecStaticObj.size(); i++)
{
LevelGUI *p = dynamic_cast<LevelGUI*>(vecStaticObj[i]);
if (p != nullptr) {
if (p != nullptr)
{
return p;
}
}
@ -218,16 +258,19 @@ LevelGUI* SBomber::FindLevelGUI() const {
return nullptr;
}
void SBomber::ProcessKBHit() {
void SBomber::ProcessKBHit()
{
int c = getchar();
if (c == 224) {
if (c == 224)
{
c = getchar();
}
MyTools::WriteToLog(std::string(__func__) + " was invoked. key = ", c);
MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked. key = ", c);
switch (c) {
switch (c)
{
case 27: // esc
exitFlag = true;
@ -249,22 +292,43 @@ void SBomber::ProcessKBHit() {
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::WriteToLog(std::string(__func__) + " was invoked");
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) {
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) {
for (size_t i = 0; i < vecStaticObj.size(); i++)
{
if (vecStaticObj[i] != nullptr)
{
vecStaticObj[i]->Draw();
}
}
@ -275,24 +339,26 @@ void SBomber::DrawFrame() {
FindLevelGUI()->SetParam(passedTime, fps, bombsNumber, score);
}
void SBomber::TimeStart() {
MyTools::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::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();
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::WriteToLog(std::string(__func__) + " deltaTime = ", (int)deltaTime);
MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " deltaTime = ", (int) deltaTime);
}
void SBomber::DropBomb() {
if (bombsNumber > 0) {
MyTools::WriteToLog(std::string(__func__) + " was invoked");
void SBomber::DropBomb()
{
if (bombsNumber > 0)
{
MyTools::LoggerSingleton::getInstance().WriteToLog(std::string(__func__) + " was invoked");
Plane *pPlane = FindPlane();
double x = pPlane->GetX() + 4;
@ -309,3 +375,25 @@ void SBomber::DropBomb() {
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();
}

8
SBomber/src/ScreenSingleton.cpp
View File

@ -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();