WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 12:09:36 +00:00
Code Issues Projects Releases Wiki Activity

Move font API to GpCommon

Browse Source
This commit is contained in:
elasota
2020-09-12 14:01:51 -04:00
parent f07137b52d
commit 987a1dea75
43 changed files with 189 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PortabilityLayer/TextPlacer.cpp
View File

@@ -1,8 +1,8 @@
#include "TextPlacer.h"
#include "PLPasStr.h"
#include "RenderedFontMetrics.h"
#include "RenderedGlyphMetrics.h"
#include "GpRenderedFontMetrics.h"
#include "GpRenderedGlyphMetrics.h"
#include "RenderedFont.h"
#include <assert.h>
@@ -63,7 +63,7 @@ namespace PortabilityLayer
if (character == '\r')
break;
const PortabilityLayer::RenderedGlyphMetrics *metrics = nullptr;
const GpRenderedGlyphMetrics *metrics = nullptr;
const void *glyphData = nullptr;
if (m_rfont->GetGlyph(m_chars[i], metrics, glyphData))
spanWidth += metrics->m_advanceX;
@@ -72,7 +72,7 @@ namespace PortabilityLayer
}
else
{
const PortabilityLayer::RenderedGlyphMetrics *metrics = nullptr;
const GpRenderedGlyphMetrics *metrics = nullptr;
const void *glyphData = nullptr;
if (!m_rfont->GetGlyph(m_chars[i], metrics, glyphData))
{
@@ -116,7 +116,7 @@ namespace PortabilityLayer
outCharacteristics.m_characterIndex = m_currentStartChar + m_emitOffset;
outCharacteristics.m_character = character;
const PortabilityLayer::RenderedGlyphMetrics *metrics;
const GpRenderedGlyphMetrics *metrics;
const void *data;
if (!m_rfont->GetGlyph(character, metrics, data))
{