AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 18:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Changes to diagnose font render buffer issues

Browse Source
This commit is contained in:
Jack Andersen
2015-12-01 15:32:15 -10:00
parent 11dfa963b5
commit 35edc47c91
19 changed files with 371 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
specter/lib/TextView.cpp
View File

@@ -1,5 +1,5 @@
#include "Specter/TextView.hpp"
#include "Specter/ViewSystem.hpp"
#include "Specter/ViewResources.hpp"
#include "utf8proc.h"
#include <freetype/internal/internal.h>
@@ -9,7 +9,7 @@ namespace Specter
{
static LogVisor::LogModule Log("Specter::TextView");
void TextView::System::init(boo::GLDataFactory* factory, FontCache* fcache)
void TextView::Resources::init(boo::GLDataFactory* factory, FontCache* fcache)
{
m_fcache = fcache;
@@ -259,7 +259,7 @@ void TextView::System::init(boo::MetalDataFactory* factory, FontCache* fcache)
#endif
TextView::TextView(ViewSystem& system, View& parentView, const FontAtlas& font, size_t capacity)
TextView::TextView(ViewResources& system, View& parentView, const FontAtlas& font, size_t capacity)
: View(system, parentView),
m_capacity(capacity),
m_fontAtlas(font)
@@ -270,11 +270,11 @@ TextView::TextView(ViewSystem& system, View& parentView, const FontAtlas& font,
boo::IShaderPipeline* shader;
if (font.subpixel())
shader = system.m_textSystem.m_subpixel;
shader = system.m_textRes.m_subpixel;
else
shader = system.m_textSystem.m_regular;
shader = system.m_textRes.m_regular;
if (!system.m_textSystem.m_vtxFmt)
if (!system.m_textRes.m_vtxFmt)
{
boo::VertexElementDescriptor vdescs[] =
{
@@ -302,7 +302,7 @@ TextView::TextView(ViewSystem& system, View& parentView, const FontAtlas& font,
else
{
boo::ITexture* texs[] = {m_fontAtlas.texture()};
m_shaderBinding = system.m_factory->newShaderDataBinding(shader, system.m_textSystem.m_vtxFmt,
m_shaderBinding = system.m_factory->newShaderDataBinding(shader, system.m_textRes.m_vtxFmt,
nullptr, m_glyphBuf, nullptr, 1,
(boo::IGraphicsBuffer**)&m_viewVertBlockBuf,
1, texs);
@@ -312,8 +312,8 @@ TextView::TextView(ViewSystem& system, View& parentView, const FontAtlas& font,
commitResources(system);
}
TextView::TextView(ViewSystem& system, View& parentView, FontTag font, size_t capacity)
: TextView(system, parentView, system.m_textSystem.m_fcache->lookupAtlas(font), capacity) {}
TextView::TextView(ViewResources& system, View& parentView, FontTag font, size_t capacity)
: TextView(system, parentView, system.m_textRes.m_fcache->lookupAtlas(font), capacity) {}
TextView::RenderGlyph::RenderGlyph(int& adv, const FontAtlas::Glyph& glyph, const Zeus::CColor& defaultColor)
{