i don't know
This commit is contained in:
parent
9fe90a769c
commit
ebcfbff5ff
@ -53,6 +53,5 @@ void ButtonNode::update()
|
|||||||
m_callback->exec();
|
m_callback->exec();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
getEngine().getScene()->updateShaders();
|
|
||||||
GUINode::update();
|
GUINode::update();
|
||||||
}
|
}
|
||||||
|
@ -5,14 +5,19 @@
|
|||||||
#include "SparrowRenderer/mesh.h"
|
#include "SparrowRenderer/mesh.h"
|
||||||
#include "SparrowRenderer/phongmaterial.h"
|
#include "SparrowRenderer/phongmaterial.h"
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
LabelNode::LabelNode():
|
LabelNode::LabelNode():
|
||||||
m_string(""),
|
m_string(""),
|
||||||
m_color(glm::vec3(1,1,1))
|
m_color(glm::vec3(1,1,1))
|
||||||
{
|
{
|
||||||
Font* font = RESOURCE_GET(Font,"shellfont");
|
Font* font = RESOURCE_GET(Font,"shellfont");
|
||||||
m_text = font->getTextNode(m_string,m_color,32);
|
m_text = font->getTextNode(m_string,m_color,32);
|
||||||
|
if(m_text){
|
||||||
|
m_text->setDepth(15);
|
||||||
addChild(m_text);
|
addChild(m_text);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void LabelNode::setText(std::string s)
|
void LabelNode::setText(std::string s)
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
ScrollBarNode::ScrollBarNode(glm::vec2 dimension, glm::vec3 bar_color):
|
ScrollBarNode::ScrollBarNode(glm::vec2 dimension, glm::vec3 bar_color):
|
||||||
m_dimension(dimension),
|
m_dimension(dimension),
|
||||||
m_bar_position(glm::vec2(0)),
|
m_bar_position(glm::vec2(0)),
|
||||||
m_bar_dimension(m_dimension),
|
m_bar_dimension(dimension),
|
||||||
m_bar_color(bar_color),
|
m_bar_color(bar_color),
|
||||||
m_bar_color_updated(false),
|
m_bar_color_updated(false),
|
||||||
m_bar_resized(false),
|
m_bar_resized(false),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user