From ebcfbff5ff00105a2c13b46130afa6d33e8d23b2 Mon Sep 17 00:00:00 2001 From: Lendemor Date: Thu, 23 Feb 2017 10:46:13 +0100 Subject: [PATCH] i don't know --- src/scene/gui/buttonnode.cpp | 1 - src/scene/gui/labelnode.cpp | 7 ++++++- src/scene/gui/scrollbarnode.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/scene/gui/buttonnode.cpp b/src/scene/gui/buttonnode.cpp index 68a083a..94e2520 100644 --- a/src/scene/gui/buttonnode.cpp +++ b/src/scene/gui/buttonnode.cpp @@ -53,6 +53,5 @@ void ButtonNode::update() m_callback->exec(); } } - getEngine().getScene()->updateShaders(); GUINode::update(); } diff --git a/src/scene/gui/labelnode.cpp b/src/scene/gui/labelnode.cpp index 857b41d..ea9ad5d 100644 --- a/src/scene/gui/labelnode.cpp +++ b/src/scene/gui/labelnode.cpp @@ -5,13 +5,18 @@ #include "SparrowRenderer/mesh.h" #include "SparrowRenderer/phongmaterial.h" +#include + LabelNode::LabelNode(): m_string(""), m_color(glm::vec3(1,1,1)) { Font* font = RESOURCE_GET(Font,"shellfont"); m_text = font->getTextNode(m_string,m_color,32); - addChild(m_text); + if(m_text){ + m_text->setDepth(15); + addChild(m_text); + } } void LabelNode::setText(std::string s) diff --git a/src/scene/gui/scrollbarnode.cpp b/src/scene/gui/scrollbarnode.cpp index 2b736a5..982499a 100644 --- a/src/scene/gui/scrollbarnode.cpp +++ b/src/scene/gui/scrollbarnode.cpp @@ -11,7 +11,7 @@ ScrollBarNode::ScrollBarNode(glm::vec2 dimension, glm::vec3 bar_color): m_dimension(dimension), m_bar_position(glm::vec2(0)), - m_bar_dimension(m_dimension), + m_bar_dimension(dimension), m_bar_color(bar_color), m_bar_color_updated(false), m_bar_resized(false),