Skip to content

GuiText: Fix color preset. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
V10lator wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GuiText: Fix color preset. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/gui/GuiText.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class GuiText : public GuiElement {
static int32_t presetMaxWidth;
static float presetInternalRenderingScale;
static int32_t presetAlignment;
static GX2ColorF32 presetColor;
static glm::vec4 presetColor;

//!Clear the dynamic text
void clearDynamicText();
Expand Down
16 changes: 6 additions & 10 deletions source/gui/GuiText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ int32_t GuiText::presetSize = 28;
float GuiText::presetInternalRenderingScale = 2.0f; //Lets render the font at the doubled size. This make it even smoother!
int32_t GuiText::presetMaxWidth = 0xFFFF;
int32_t GuiText::presetAlignment = ALIGN_CENTER | ALIGN_MIDDLE;
GX2ColorF32 GuiText::presetColor = (GX2ColorF32) {
1.0f, 1.0f, 1.0f, 1.0f
};
glm::vec4 GuiText::presetColor = glm::vec4(1.0f);

#define TEXT_SCROLL_DELAY 6
#define TEXT_SCROLL_INITIAL_DELAY 10
Expand All @@ -39,8 +37,8 @@ GuiText::GuiText() {
text = NULL;
size = presetSize;
currentSize = size;
color = glm::vec4(presetColor.r, presetColor.g, presetColor.b, presetColor.a);
alpha = presetColor.a;
color = presetColor;
alpha = presetColor[3];
alignment = presetAlignment;
maxWidth = presetMaxWidth;
wrapMode = 0;
Expand Down Expand Up @@ -126,8 +124,8 @@ GuiText::GuiText(const char * t) {
text = NULL;
size = presetSize;
currentSize = size;
color = glm::vec4(presetColor.r, presetColor.g, presetColor.b, presetColor.a);
alpha = presetColor.a;
color = presetColor;
alpha = presetColor[3];
alignment = presetAlignment;
maxWidth = presetMaxWidth;
wrapMode = 0;
Expand Down Expand Up @@ -235,9 +233,7 @@ void GuiText::clearDynamicText() {

void GuiText::setPresets(int32_t sz, const glm::vec4 & c, int32_t w, int32_t a) {
presetSize = sz;
presetColor = (GX2ColorF32) {
(float)c.r / 255.0f, (float)c.g / 255.0f, (float)c.b / 255.0f, (float)c.a / 255.0f
};
presetColor = c;
presetMaxWidth = w;
presetAlignment = a;
}
Expand Down