JCS-Prod/ProtoTank
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Move render stuff to draw function

Browse Source
This commit is contained in:
JackCarterSmith 2024-09-19 19:29:53 +02:00
parent 451302d67e
commit 19957bbc52
Signed by: JackCarterSmith
GPG Key ID: 832E52F4E23F8F24
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Engine/Graphics/UI.cpp
View File

@ -39,21 +39,32 @@ CockpitUI::CockpitUI() : UI() {
} }
void CockpitUI::Update() { void CockpitUI::Update() {
}
void CockpitUI::Draw(std::shared_ptr<sf::RenderWindow> context) {
sf::BlendMode sBM = sf::BlendNone; sf::BlendMode sBM = sf::BlendNone;
sf::RenderStates sRS(sBM); sf::RenderStates sRS(sBM);
// Clear the UI screen
mUIRender.clear(sf::Color::Transparent); mUIRender.clear(sf::Color::Transparent);
// Draw the static board
sf::Sprite staticBoardSprite(mBoardTexture); sf::Sprite staticBoardSprite(mBoardTexture);
mUIRender.draw(staticBoardSprite, sRS); mUIRender.draw(staticBoardSprite, sRS);
// Draw the radar display
sf::CircleShape radar(95, 8); sf::CircleShape radar(95, 8);
radar.setRotation(22.5f); radar.setRotation(22.5f);
radar.setPosition(sf::Vector2f(838,378)); radar.setPosition(sf::Vector2f(838,378));
radar.setFillColor(sf::Color::Yellow); radar.setFillColor(sf::Color::Yellow);
mUIRender.draw(radar, sRS); mUIRender.draw(radar, sRS);
// Do the final texture render
mUIRender.display(); mUIRender.display();
// OnScreen rendering
DrawUIOnRenderWindow(context);
} }

2
Engine/Graphics/UI.hpp
View File

@ -33,7 +33,7 @@ public:
CockpitUI& operator= (CockpitUI const&) = delete; CockpitUI& operator= (CockpitUI const&) = delete;
void Update() override; void Update() override;
//void Draw(std::shared_ptr<sf::RenderWindow>) override; void Draw(std::shared_ptr<sf::RenderWindow>) override;
private: private:
sf::Texture mBoardTexture; sf::Texture mBoardTexture;

5
Game.cpp
View File

@ -59,8 +59,8 @@ GAME_STATUS Game::Tick(SysTimer& time) {
// Debug performance computations // Debug performance computations
if (mDbgUI != nullptr && mPerfsTimer != nullptr) { if (mDbgUI != nullptr && mPerfsTimer != nullptr) {
msTicksMonitoring.push_back((mDelta - mPrevdelta) / (1000000/TARGET_FPS)); msTicksMonitoring.push_back((mDelta - mPrevdelta) / (1000000.f / TARGET_FPS));
if (mPerfsTimer->GetDeltaTime() >= 1000) { // Re-evaluate CPU usage every seconds (for FP'S') if (mPerfsTimer->GetDeltaTime() >= 1000) { // Every 1s
double cpuUsage = 100 * std::accumulate(msTicksMonitoring.begin(), msTicksMonitoring.end(), (double)(0)) / msTicksMonitoring.size(); double cpuUsage = 100 * std::accumulate(msTicksMonitoring.begin(), msTicksMonitoring.end(), (double)(0)) / msTicksMonitoring.size();
mDbgUI->UpdateDebugData(cpuUsage, ((mDelta - mPrevdelta) / 1000), mFrameCnt, (PerfsGetVirtMem() / 1000), (PerfsGetPhysMem() / 1000)); mDbgUI->UpdateDebugData(cpuUsage, ((mDelta - mPrevdelta) / 1000), mFrameCnt, (PerfsGetVirtMem() / 1000), (PerfsGetPhysMem() / 1000));
@ -101,6 +101,7 @@ GAME_STATUS Game::Tick(SysTimer& time) {
} }
void Game::Update() { void Game::Update() {
// Game logic calls should go here...
mWorldUI->Update(); mWorldUI->Update();
mCockpitUI->Update(); mCockpitUI->Update();
} }