Working GUI Button

This commit is contained in:
2015-09-23 16:51:20 +02:00
parent 8e00b76036
commit b83de44715
4 changed files with 128 additions and 21 deletions
+21 -6
View File
@@ -53,7 +53,7 @@
#include "Physics/ESetImpulse.h"
#include "GUI/Frame.h"
#include "GUI/TextureFrame.h"
#include "GUI/Button.h"
namespace dd
{
@@ -74,11 +74,23 @@ public:
m_FrameStack->Width = 1920;
m_FrameStack->Height = 1080;
{
auto button = new GUI::TextureFrame(m_FrameStack, "SuperButt");
button->SetTexture("Textures/Test/TestBrick_Diffuse.png");
auto button = new GUI::Button(m_FrameStack, "SuperButt");
button->TextureReleased = "Textures/Test/TestBrick_Specular.png";
button->TexturePressed = "Textures/Test/TestBrick_Normal.png";
button->TextureHover = "Textures/Test/TestBrick_Diffuse.png";
button->X = 50;
button->Y = 75;
button->Width = 100;
button->Height = 25;
}
{
auto button = new GUI::TextureFrame(m_FrameStack, "BALLZ");
button->SetTexture("Textures/Ball.png");
button->X = 50;
button->Y = 75;
button->Width = 100;
button->Height = 100;
}
m_InputManager = std::make_shared<InputManager>(m_Renderer->Window(), m_EventBroker);
@@ -250,13 +262,16 @@ public:
double dt = currentTime - m_LastTime;
m_LastTime = currentTime;
ResourceManager::Update();
// Update input
m_InputManager->Update(dt);
// Swap event queues to get fresh input data in the read queue
m_EventBroker->Swap();
ResourceManager::Update();
m_World->Update(dt);
m_EventBroker->Process<GUI::Frame>();
m_FrameStack->UpdateLayered(dt);
//
// if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_R)) {