The-Homebrew-Cloud/libgui
2
0
Fork 0
mirror of https://github.com/wiiu-env/libgui.git synced 2024-12-25 07:41:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow 0 SSAA value

Browse Source 
Signed-off-by: Thomas Rohloff <v10lator@myway.de>
This commit is contained in:
Thomas Rohloff 2020-05-15 11:59:29 +02:00
parent fea73ae1d3
commit 1e9bdc6423
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gui/GuiText.h
View File

@ -121,7 +121,7 @@ protected:
static FreeTypeGX * presentFont; static FreeTypeGX * presentFont;
static int32_t presetSize; static int32_t presetSize;
static int32_t presetMaxWidth; static int32_t presetMaxWidth;
static int32_t presetInternalRenderingScale; static int32_t presetSSAA;
static int32_t presetAlignment; static int32_t presetAlignment;
static GX2ColorF32 presetColor; static GX2ColorF32 presetColor;
@ -152,7 +152,7 @@ protected:
float blurGlowIntensity; float blurGlowIntensity;
float blurAlpha; float blurAlpha;
glm::vec4 blurGlowColor; glm::vec4 blurGlowColor;
int32_t internalRenderingScale; int32_t internalSSAA;
}; };
#endif #endif

2
source/gui/GuiSelectBox.cpp
View File

@ -160,7 +160,7 @@ void GuiSelectBox::Init(std::map<std::string,std::string> values, int32_t valueI
valueButtons[i].valueButtonHighlightedImg = new GuiImage(valueHighlightedImageData); valueButtons[i].valueButtonHighlightedImg = new GuiImage(valueHighlightedImageData);
valueButtons[i].valueButton = new GuiButton(valueButtons[i].valueButtonImg->getWidth() * imgScale, valueButtons[i].valueButtonImg->getHeight() * imgScale); valueButtons[i].valueButton = new GuiButton(valueButtons[i].valueButtonImg->getWidth() * imgScale, valueButtons[i].valueButtonImg->getHeight() * imgScale);
valueButtons[i].valueButtonText = new GuiText(itr->first.c_str(),32,glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), 1); valueButtons[i].valueButtonText = new GuiText(itr->first.c_str(),32,glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), 0);
valueButtons[i].valueButtonText->setMaxWidth(valueButtons[i].valueButtonImg->getWidth() * imgScale - 20.0f, GuiText::WRAP); valueButtons[i].valueButtonText->setMaxWidth(valueButtons[i].valueButtonImg->getWidth() * imgScale - 20.0f, GuiText::WRAP);
valueButtons[i].valueButtonText->setPosition(0, 0); valueButtons[i].valueButtonText->setPosition(0, 0);

18
source/gui/GuiText.cpp
View File

@ -20,7 +20,7 @@
FreeTypeGX * GuiText::presentFont = NULL; FreeTypeGX * GuiText::presentFont = NULL;
int32_t GuiText::presetSize = 28; int32_t GuiText::presetSize = 28;
int32_t GuiText::presetInternalRenderingScale = 1; int32_t GuiText::presetSSAA = 0;
int32_t GuiText::presetMaxWidth = 0xFFFF; int32_t GuiText::presetMaxWidth = 0xFFFF;
int32_t GuiText::presetAlignment = ALIGN_CENTER | ALIGN_MIDDLE; int32_t GuiText::presetAlignment = ALIGN_CENTER | ALIGN_MIDDLE;
GX2ColorF32 GuiText::presetColor = (GX2ColorF32) { GX2ColorF32 GuiText::presetColor = (GX2ColorF32) {
@ -54,7 +54,7 @@ GuiText::GuiText() {
blurGlowIntensity = 0.0f; blurGlowIntensity = 0.0f;
blurAlpha = 0.0f; blurAlpha = 0.0f;
blurGlowColor = glm::vec4(0.0f); blurGlowColor = glm::vec4(0.0f);
internalRenderingScale = presetInternalRenderingScale; internalSSAA = presetSSAA;
} }
GuiText::GuiText(const char * t, int32_t s, const glm::vec4 & c, int32_t SSAA) { GuiText::GuiText(const char * t, int32_t s, const glm::vec4 & c, int32_t SSAA) {
@ -76,7 +76,7 @@ GuiText::GuiText(const char * t, int32_t s, const glm::vec4 & c, int32_t SSAA) {
blurGlowIntensity = 0.0f; blurGlowIntensity = 0.0f;
blurAlpha = 0.0f; blurAlpha = 0.0f;
blurGlowColor = glm::vec4(0.0f); blurGlowColor = glm::vec4(0.0f);
internalRenderingScale = SSAA; internalSSAA = SSAA;
if(t) { if(t) {
text = FreeTypeGX::charToWideChar(t); text = FreeTypeGX::charToWideChar(t);
@ -106,7 +106,7 @@ GuiText::GuiText(const wchar_t * t, int32_t s, const glm::vec4 & c, int32_t SSAA
blurGlowIntensity = 0.0f; blurGlowIntensity = 0.0f;
blurAlpha = 0.0f; blurAlpha = 0.0f;
blurGlowColor = glm::vec4(0.0f); blurGlowColor = glm::vec4(0.0f);
internalRenderingScale = SSAA; internalSSAA = SSAA;
if(t) { if(t) {
text = new (std::nothrow) wchar_t[wcslen(t)+1]; text = new (std::nothrow) wchar_t[wcslen(t)+1];
@ -141,7 +141,7 @@ GuiText::GuiText(const char * t) {
blurGlowIntensity = 0.0f; blurGlowIntensity = 0.0f;
blurAlpha = 0.0f; blurAlpha = 0.0f;
blurGlowColor = glm::vec4(0.0f); blurGlowColor = glm::vec4(0.0f);
internalRenderingScale = presetInternalRenderingScale; internalSSAA = presetSSAA;
if(t) { if(t) {
text = FreeTypeGX::charToWideChar(t); text = FreeTypeGX::charToWideChar(t);
@ -240,7 +240,7 @@ void GuiText::setPresets(int32_t sz, const glm::vec4 & c, int32_t w, int32_t a,
}; };
presetMaxWidth = w; presetMaxWidth = w;
presetAlignment = a; presetAlignment = a;
presetInternalRenderingScale = SSAA; presetSSAA = SSAA;
} }
void GuiText::setPresetFont(FreeTypeGX *f) { void GuiText::setPresetFont(FreeTypeGX *f) {
@ -248,7 +248,7 @@ void GuiText::setPresetFont(FreeTypeGX *f) {
} }
void GuiText::setSSAA(int32_t SSAA) { void GuiText::setSSAA(int32_t SSAA) {
internalRenderingScale = SSAA; internalSSAA = SSAA;
} }
void GuiText::setFontSize(int32_t s) { void GuiText::setFontSize(int32_t s) {
@ -496,10 +496,10 @@ void GuiText::draw(CVideo *pVideo) {
color[3] = getAlpha(); color[3] = getAlpha();
blurGlowColor[3] = blurAlpha * getAlpha(); blurGlowColor[3] = blurAlpha * getAlpha();
float finalRenderingScale = internalRenderingScale << 1; int32_t finalRenderingScale = internalSSAA == 0 ? 1 : internalSSAA << 1;
int32_t newSize = size * getScale() * finalRenderingScale;
int32_t normal_size = size * getScale(); int32_t normal_size = size * getScale();
int32_t newSize = normalSize * finalRenderingScale;
if(newSize != currentSize) { if(newSize != currentSize) {
currentSize = normal_size; currentSize = normal_size;