Font::getGlyphByGlyphIndex(GlyphIndex) #1278

Author: Reputeless

Siv3D/include/Siv3D/Font.hpp

@@ -423,6 +423,12 @@ namespace s3d
 		[[nodiscard]]
 		Glyph getGlyph(StringView ch) const;
 
+		/// @brief 指定した文字の描画用のグリフを返します。
+		/// @param glyphIndex 文字のグリフインデックス
+		/// @return 描画用グリフ
+		[[nodiscard]]
+		Glyph getGlyphByGlyphIndex(GlyphIndex glyphIndex) const;
+
 		/// @brief 指定した文字列の描画用のグリフ配列を返します。
 		/// @param s 文字列
 		/// @param ligature リガチャ（合字）を有効にするか

Siv3D/src/Siv3D/Font/CFont.cpp

@@ -372,6 +372,16 @@ namespace s3d
 		return glyph;
 	}
 
+	Glyph CFont::getGlyphByGlyphIndex(const Font::IDType handleID, const GlyphIndex glyphIndex)
+	{
+		const auto& font = m_fonts[handleID];
+		Glyph glyph{ font->getGlyphInfoByGlyphIndex(glyphIndex) };
+		glyph.codePoint = 0; // 逆引きは不可能（1 つのグリフが複数のコードポイントを持つ場合があるため）
+		glyph.texture = font->getGlyphCache().getTextureRegion(*font, glyph.glyphIndex);
+		glyph.buffer = font->getGlyphCache().getBufferThickness(glyph.glyphIndex);
+		return glyph;
+	}
+
 	Array<Glyph> CFont::getGlyphs(const Font::IDType handleID, const StringView s, const Ligature ligature)
 	{
 		const auto& font = m_fonts[handleID];

Siv3D/src/Siv3D/Font/CFont.hpp

@@ -111,6 +111,8 @@ namespace s3d
 
 		Glyph getGlyph(Font::IDType handleID, StringView ch) override;
 
+		Glyph getGlyphByGlyphIndex(Font::IDType handleID, GlyphIndex glyphIndex) override;
+
 		Array<Glyph> getGlyphs(Font::IDType handleID, StringView s, Ligature ligature) override;
 
 		Array<double> getXAdvances(Font::IDType handleID, StringView s, const Array<GlyphCluster>& clusters, double fontSize) override;

Siv3D/src/Siv3D/Font/CFont_Headless.cpp

@@ -286,6 +286,14 @@ namespace s3d
 		return glyph;
 	}
 
+	Glyph CFont_Headless::getGlyphByGlyphIndex(const Font::IDType handleID, const GlyphIndex glyphIndex)
+	{
+		const auto& font = m_fonts[handleID];
+		Glyph glyph{ font->getGlyphInfoByGlyphIndex(glyphIndex) };
+		glyph.codePoint = 0; // 逆引きは不可能（1 つのグリフが複数のコードポイントを持つ場合があるため）
+		return glyph;
+	}
+
 	Array<Glyph> CFont_Headless::getGlyphs(const Font::IDType handleID, const StringView s, const Ligature ligature)
 	{
 		const auto& font = m_fonts[handleID];

Siv3D/src/Siv3D/Font/CFont_Headless.hpp

@@ -91,6 +91,8 @@ namespace s3d
 
 		Glyph getGlyph(Font::IDType handleID, StringView ch) override;
 
+		Glyph getGlyphByGlyphIndex(Font::IDType handleID, GlyphIndex glyphIndex) override;
+
 		Array<Glyph> getGlyphs(Font::IDType handleID, StringView s, Ligature ligature) override;
 
 		Array<double> getXAdvances(Font::IDType handleID, StringView s, const Array<GlyphCluster>& clusters, double fontSize) override;

Siv3D/src/Siv3D/Font/IFont.hpp

@@ -87,6 +87,8 @@ namespace s3d
 		virtual const Texture& getTexture(Font::IDType handleID) = 0;
 
 		virtual Glyph getGlyph(Font::IDType handleID, StringView ch) = 0;
+		
+		virtual Glyph getGlyphByGlyphIndex(Font::IDType handleID, GlyphIndex glyphIndex) = 0;
 
 		virtual Array<Glyph> getGlyphs(Font::IDType handleID, StringView s, Ligature ligature) = 0;
 

Siv3D/src/Siv3D/Font/SivFont.cpp

@@ -413,6 +413,11 @@ namespace s3d
 		return SIV3D_ENGINE(Font)->getGlyph(m_handle->id(), ch);
 	}
 
+	Glyph Font::getGlyphByGlyphIndex(GlyphIndex glyphIndex) const
+	{
+		return SIV3D_ENGINE(Font)->getGlyphByGlyphIndex(m_handle->id(), glyphIndex);
+	}
+
 	Array<Glyph> Font::getGlyphs(const StringView s, const Ligature ligature) const
 	{
 		return SIV3D_ENGINE(Font)->getGlyphs(m_handle->id(), s, ligature);