mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

LowLevelGraphicsContext: Replace glyph drawing functions with single drawGlyphs()

Browse source
This commit is contained in:
reuk 2024-03-26 13:13:55 +00:00
parent 03b1e918fe
commit 1560f87111
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
11 changed files with 170 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/juce_graphics/native/juce_CoreGraphicsContext_mac.h
View file

@ -121,7 +121,9 @@ public:
void drawLine (const Line<float>&) override;
void setFont (const Font&) override;
const Font& getFont() override;
void drawGlyph (int glyphNumber, const AffineTransform& transform) override;
void drawGlyphs (Span<const uint16_t>,
Span<const Point<float>>,
const AffineTransform&) override;
private:
//==============================================================================

55
modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm
View file

@ -659,17 +659,6 @@ void CoreGraphicsContext::setFont (const Font& newFont)
{
state->font = newFont;
state->fontRef = nullptr;
const auto hbFont = state->font.getNativeDetails().font;
state->fontRef.reset (hb_coretext_font_get_ct_font (hbFont.get()));
CFRetain (state->fontRef.get());
const auto slant = hb_font_get_synthetic_slant (hbFont.get());
state->textMatrix = CGAffineTransformMake (state->font.getHorizontalScale(), 0, slant * state->font.getHorizontalScale(), 1.0f, 0, 0);
CGContextSetTextMatrix (context.get(), state->textMatrix);
state->inverseTextMatrix = CGAffineTransformInvert (state->textMatrix);
}
}
@ -678,28 +667,48 @@ const Font& CoreGraphicsContext::getFont()
return state->font;
}
void CoreGraphicsContext::drawGlyph (int glyphNumber, const AffineTransform& transform)
void CoreGraphicsContext::drawGlyphs (Span<const uint16_t> glyphs,
Span<const Point<float>> positions,
const AffineTransform& transform)
{
if (state->fontRef != nullptr && state->fillType.isColour())
jassert (glyphs.size() == positions.size());
if (state->fillType.isColour())
{
const CGGlyph glyphs[] { (CGGlyph) glyphNumber };
const auto scale = state->font.getHorizontalScale();
if (state->fontRef == nullptr)
{
const auto hbFont = state->font.getNativeDetails().font;
state->fontRef.reset (hb_coretext_font_get_ct_font (hbFont.get()));
CFRetain (state->fontRef.get());
const auto slant = hb_font_get_synthetic_slant (hbFont.get());
state->textMatrix = CGAffineTransformMake (scale, 0, slant * scale, 1.0f, 0, 0);
CGContextSetTextMatrix (context.get(), state->textMatrix);
state->inverseTextMatrix = CGAffineTransformInvert (state->textMatrix);
}
ScopedCGContextState scopedState (context.get());
flip();
applyTransform (AffineTransform::scale (1.0f, -1.0f).followedBy (transform));
const CGPoint positions[] { { 0.0f, 0.0f } };
CTFontDrawGlyphs (state->fontRef.get(), glyphs, positions, std::size (glyphs), context.get());
std::vector<CGPoint> pos (glyphs.size());
std::transform (positions.begin(), positions.end(), pos.begin(), [scale] (const auto& p) { return CGPointMake (p.x / scale, -p.y); });
CTFontDrawGlyphs (state->fontRef.get(), glyphs.data(), pos.data(), glyphs.size(), context.get());
}
else
{
Path p;
auto& f = state->font;
f.getTypefacePtr()->getOutlineForGlyph (f.getMetricsKind(), glyphNumber, p);
const auto scale = f.getHeight();
fillPath (p, AffineTransform::scale (scale * f.getHorizontalScale(), scale).followedBy (transform));
for (const auto [index, glyph] : enumerate (glyphs, size_t{}))
{
Path p;
auto& f = state->font;
f.getTypefacePtr()->getOutlineForGlyph (f.getMetricsKind(), glyph, p);
const auto scale = f.getHeight();
fillPath (p, AffineTransform::scale (scale * f.getHorizontalScale(), scale).translated (positions[index]).followedBy (transform));
}
}
}

16
modules/juce_graphics/native/juce_RenderingHelpers.h
View file

@ -2596,7 +2596,18 @@ public:
void setFont (const Font& newFont) override { stack->font = newFont; }
const Font& getFont() override { return stack->font; }
void drawGlyph (int i, const AffineTransform& t) override
void drawGlyphs (Span<const uint16_t> glyphs,
Span<const Point<float>> positions,
const AffineTransform& t) override
{
jassert (glyphs.size() == positions.size());
for (const auto [index, glyph] : enumerate (glyphs))
drawGlyph (glyph, AffineTransform::translation (positions[(size_t) index]).followedBy (t));
}
protected:
void drawGlyph (uint16_t i, const AffineTransform& t)
{
if (stack->clip == nullptr)
return;
@ -2660,8 +2671,7 @@ public:
}
}
protected:
StackBasedLowLevelGraphicsContext (SavedStateType* initialState) : stack (initialState) {}
explicit StackBasedLowLevelGraphicsContext (SavedStateType* initialState) : stack (initialState) {}
StackBasedLowLevelGraphicsContext() = default;
RenderingHelpers::SavedStateStack<SavedStateType> stack;