Revert "examples/text: Use golang.org/x/image/font/opentype"

This reverts commit 013a42ddb8.

Reason: #1377
This commit is contained in:
Hajime Hoshi 2020-10-03 20:24:05 +09:00
parent c1be079ae9
commit 42fe708263

View File

@ -22,8 +22,8 @@ import (
"math/rand" "math/rand"
"time" "time"
"github.com/golang/freetype/truetype"
"golang.org/x/image/font" "golang.org/x/image/font"
"golang.org/x/image/font/opentype"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil" "github.com/hajimehoshi/ebiten/ebitenutil"
@ -45,28 +45,22 @@ var (
) )
func init() { func init() {
tt, err := opentype.Parse(fonts.MPlus1pRegular_ttf) tt, err := truetype.Parse(fonts.MPlus1pRegular_ttf)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
const dpi = 72 const dpi = 72
mplusNormalFont, err = opentype.NewFace(tt, &opentype.FaceOptions{ mplusNormalFont = truetype.NewFace(tt, &truetype.Options{
Size: 24, Size: 24,
DPI: dpi, DPI: dpi,
Hinting: font.HintingFull, Hinting: font.HintingFull,
}) })
if err != nil { mplusBigFont = truetype.NewFace(tt, &truetype.Options{
log.Fatal(err)
}
mplusBigFont, err = opentype.NewFace(tt, &opentype.FaceOptions{
Size: 32, Size: 32,
DPI: dpi, DPI: dpi,
Hinting: font.HintingFull, Hinting: font.HintingFull,
}) })
if err != nil {
log.Fatal(err)
}
} }
func init() { func init() {