AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-13 16:06:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix an insane number of things with hsh refactoring

Browse Source
This commit is contained in:
Luke Street
2020-10-07 20:03:07 -04:00
parent 3c9816af12
commit 036e769210
41 changed files with 255 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/GuiSys/CGuiWidget.hpp
View File

@@ -8,6 +8,9 @@
#include "Runtime/IOStreams.hpp"
#include "Runtime/GuiSys/CGuiObject.hpp"
// FIXME move extent/rect/etc to builtin_types
#include "hsh/hsh.h"
#include "zeus/CColor.hpp"
#include "zeus/CTransform.hpp"
#include "zeus/CVector3f.hpp"

2
Runtime/GuiSys/CRasterFont.hpp
View File

@@ -148,7 +148,7 @@ public:
const char16_t* str, int len) const;
const CGlyph* GetGlyph(char16_t chr) const { return InternalGetGlyph(chr); }
void GetSize(const CDrawStringOptions& opts, int& width, int& height, const char16_t* str, int len) const;
hsh::texture2d GetTexture() {
hsh::texture2d_array GetTexture() {
return x80_texture->GetFontTexture(x2c_mode);
}

4
Runtime/GuiSys/CTextRenderBuffer.cpp
View File

@@ -57,7 +57,9 @@ void CTextRenderBuffer::CommitResources() {
m_uniBuf2 = hsh::create_dynamic_uniform_buffer<CTextSupportShader::Uniform>();
}
for (BooFontCharacters& chs : m_fontCharacters) {
CTextSupportShader::BuildCharacterShaderBinding(*this, chs, m_drawFlags);
if (!chs.m_charData.empty()) {
CTextSupportShader::BuildCharacterShaderBinding(*this, chs, m_drawFlags);
}
}
for (BooImage& img : m_images) {
CTextSupportShader::BuildImageShaderBinding(*this, img, m_drawFlags);

2
Runtime/GuiSys/CTextRenderBuffer.hpp
View File

@@ -9,6 +9,8 @@
#include "Runtime/GuiSys/CFontImageDef.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include "hsh/hsh.h"
#include "zeus/CColor.hpp"
#include "zeus/CMatrix4f.hpp"
#include "zeus/CVector2f.hpp"