Merge branch 'add_a_performance_overlay_ui_element'
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include "Scene/Material.hpp"
|
||||
#include "Scene/Vertex.hpp"
|
||||
#include "Scene/SimpleDrawable.hpp"
|
||||
#include "Scene/UI/PerformanceInfo.hpp"
|
||||
#include "Input/InputManager.hpp"
|
||||
#include "Host/GraphicsAppManager.hpp"
|
||||
#include "Math/Math.hpp"
|
||||
@@ -42,6 +43,9 @@ namespace OpenVulkano
|
||||
std::vector<Node> nodesPool;
|
||||
Vector3f_SIMD position = {0, 0, -10};
|
||||
|
||||
OpenVulkano::Scene::UI::SimpleUi m_ui;
|
||||
std::shared_ptr<OpenVulkano::Scene::UI::PerformanceInfo> m_perfInfo;
|
||||
|
||||
public:
|
||||
void Init() override
|
||||
{
|
||||
@@ -78,6 +82,10 @@ namespace OpenVulkano
|
||||
|
||||
camController.Init(&cam);
|
||||
camController.SetDefaultKeybindings();
|
||||
|
||||
std::shared_ptr<OpenVulkano::Scene::UI::PerformanceInfo> m_perfInfo = std::make_shared<OpenVulkano::Scene::UI::PerformanceInfo>();
|
||||
m_ui.AddElement(m_perfInfo);
|
||||
GetGraphicsAppManager()->GetRenderer()->SetActiveUi(&m_ui);
|
||||
}
|
||||
|
||||
void Tick() override
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "Scene/Camera.hpp"
|
||||
#include "Scene/SimpleAnimationController.hpp"
|
||||
#include "Scene/SequenceAnimationController.hpp"
|
||||
#include "Scene/UI/PerformanceInfo.hpp"
|
||||
#include "Input/InputManager.hpp"
|
||||
#include "Host/GraphicsAppManager.hpp"
|
||||
#include "Base/EngineConfiguration.hpp"
|
||||
@@ -44,6 +45,9 @@ namespace OpenVulkano
|
||||
Scene::SimpleAnimationController m_simpleAnimationController;
|
||||
Scene::SequenceAnimationController m_sequenceAnimationController;
|
||||
|
||||
Scene::UI::SimpleUi m_ui;
|
||||
std::shared_ptr<Scene::UI::PerformanceInfo> m_perfInfo;
|
||||
|
||||
SceneElement m_whiteBox;
|
||||
SceneElement m_redBox;
|
||||
|
||||
@@ -161,6 +165,10 @@ namespace OpenVulkano
|
||||
|
||||
CreatePyramid(&m_pyramid, Math::Vector4f(0.9, 0.9, 0.6, 1.0));
|
||||
m_pyramid.m_node.worldMat = Math::Utils::translate(Math::Vector3f(13, 0, 0));
|
||||
|
||||
std::shared_ptr<Scene::UI::PerformanceInfo> m_perfInfo = std::make_shared<Scene::UI::PerformanceInfo>();
|
||||
m_ui.AddElement(m_perfInfo);
|
||||
GetGraphicsAppManager()->GetRenderer()->SetActiveUi(&m_ui);
|
||||
}
|
||||
|
||||
void OnSimpleAnimationCompleted(Scene::SimpleAnimationController *anim)
|
||||
|
||||
Reference in New Issue
Block a user