YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Next phase ready

Browse Source
This commit is contained in:
Dominic Masters
2023-06-11 09:08:14 -07:00
parent 7e20d6e8c5
commit 836ecb265b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dawn/scene/components/ui/UILabelNew.cpp
View File

@@ -19,7 +19,7 @@ void UILabelNew::rebufferQuads(std::vector<struct UILabelText> texts) {
auto oldTexts = this->texts; auto oldTexts = this->texts;
textureMap.clear(); textureMap.clear();
glm::vec2 position(32, 32); glm::vec2 position(0, 0);
struct FontShaderBufferData fontData; struct FontShaderBufferData fontData;
int32_t quadIndex = 0; int32_t quadIndex = 0;
int32_t partIndex = 0; int32_t partIndex = 0;
@@ -45,6 +45,9 @@ void UILabelNew::rebufferQuads(std::vector<struct UILabelText> texts) {
assertTrue(nextTexture < FONT_SHADER_TEXTURE_MAX); assertTrue(nextTexture < FONT_SHADER_TEXTURE_MAX);
textureMap[itText->texture] = nextTexture++; textureMap[itText->texture] = nextTexture++;
} }
// Set initial line height
position.y = mathMax<float_t>(itText->size, position.y);
++itText; ++itText;
} }
@@ -186,9 +189,8 @@ std::vector<struct ShaderPassItem> UILabelNew::getUIRenderPasses() {
break; break;
default: default:
break; assertUnreachable();
} }
assertTrue(param >= 0 && param < FONT_SHADER_TEXTURE_MAX);
item.textureValues[param] = it->second; item.textureValues[param] = it->second;
++it; ++it;
} }