🚀 优化字体加载

This commit is contained in:
源文雨
2023-02-10 14:59:27 +08:00
parent ca89f01f7d
commit 2e51c9e9c3
11 changed files with 70 additions and 71 deletions

View File

@@ -1416,11 +1416,11 @@ func alwaysDoGif(cc *context, value ...string) (string, error) {
}
canvas := gg.NewContext(500, 600)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
err = canvas.LoadFontFace(text.BoldFontFile, 40)
err = canvas.ParseFontFace(data, 40)
if err != nil {
return "", err
}
@@ -1438,7 +1438,7 @@ func alwaysDoGif(cc *context, value ...string) (string, error) {
canvas := gg.NewContext(500, 600)
canvas.DrawImage(f.Image(), 0, 0)
canvas.SetColor(color.Black)
_ = canvas.LoadFontFace(text.BoldFontFile, 40)
// _ = canvas.ParseFontFace(data, 40)
canvas.DrawString(arg, 280-l, 560)
canvas.DrawImage(imgfactory.Size(f.Image(), 90, 90).Image(), 280, 505)
canvas.DrawString("吗", 370, 560)

View File

@@ -277,11 +277,11 @@ func anyasuki(cc *context, args ...string) (string, error) {
canvas.DrawImage(imgfactory.Size(face, 347, 267).Image(), 82, 53)
canvas.DrawImage(back, 0, 0)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 30); err != nil {
if err = canvas.ParseFontFace(data, 30); err != nil {
return "", err
}
if args[0] == "" {
@@ -323,11 +323,11 @@ func alwaysLike(cc *context, args ...string) (string, error) {
canvas.DrawImage(back, 0, 0)
canvas.DrawImage(imgfactory.Size(face, 380, 380).Image(), 44, 74)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 56); err != nil {
if err = canvas.ParseFontFace(data, 56); err != nil {
return "", err
}
if args[0] == "" {
@@ -437,11 +437,11 @@ func universal(cc *context, args ...string) (string, error) {
canvas := gg.NewContext(500, 550)
canvas.DrawImage(imgfactory.Size(face, 500, 500).Image(), 0, 0)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 40); err != nil {
if err = canvas.ParseFontFace(data, 40); err != nil {
return "", err
}
if args[0] == "" {
@@ -488,11 +488,11 @@ func interview(cc *context, args ...string) (string, error) {
canvas.DrawImage(huaji, 376, 50)
canvas.DrawImage(microphone, 300, 50)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 40); err != nil {
if err = canvas.ParseFontFace(data, 40); err != nil {
return "", err
}
if args[0] == "" {
@@ -646,11 +646,11 @@ func playGame(cc *context, args ...string) (string, error) {
canvas.DrawImage(imgfactory.Rotate(face, 10, 225, 160).Image(), 161, 117)
canvas.DrawImage(back, 0, 0)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 40); err != nil {
if err = canvas.ParseFontFace(data, 40); err != nil {
return "", err
}
if args[0] == "" {
@@ -776,11 +776,11 @@ func safeSense(cc *context, args ...string) (string, error) {
canvas.DrawImage(back, 0, 0)
canvas.DrawImage(imgfactory.Size(face, 215, 343).Image(), 215, 135)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 30); err != nil {
if err = canvas.ParseFontFace(data, 30); err != nil {
return "", err
}
if args[0] == "" {
@@ -938,11 +938,11 @@ func makeFriend(cc *context, args ...string) (string, error) {
canvas.DrawImage(imgfactory.Rotate(face, 9, 55, 55).Image(), 836, 722)
canvas.DrawImage(back, 0, 0)
canvas.SetColor(color.White)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 20); err != nil {
if err = canvas.ParseFontFace(data, 20); err != nil {
return "", err
}
if args[0] == "" {
@@ -1017,11 +1017,11 @@ func coupon(cc *context, args ...string) (string, error) {
canvas.Rotate(gg.Radians(-22))
canvas.DrawImage(imgfactory.Size(face, 60, 60).Image(), 100, 163)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 30); err != nil {
if err = canvas.ParseFontFace(data, 30); err != nil {
return "", err
}
if args[0] == "" {
@@ -1176,11 +1176,11 @@ func youer(cc *context, args ...string) (string, error) {
canvas.DrawImage(back, 0, 0)
canvas.DrawImage(imgfactory.Size(tou, 350, 350).Image(), 55, 165)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 56); err != nil {
if err = canvas.ParseFontFace(data, 56); err != nil {
return "", err
}
if args[0] == "" {
@@ -1223,11 +1223,11 @@ func xiaotianshi(cc *context, args ...string) (string, error) {
canvas.DrawImage(back, 0, 0)
canvas.DrawImage(imgfactory.Size(face, 480, 480).Image(), 20, 80)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 35); err != nil {
if err = canvas.ParseFontFace(data, 35); err != nil {
return "", err
}
if args[0] == "" {
@@ -1327,11 +1327,11 @@ func van(cc *context, args ...string) (string, error) {
canvas.DrawImage(back, 0, 0)
canvas.DrawImage(imgfactory.Size(face, 480, 480).Image(), 20, 80)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 35); err != nil {
if err = canvas.ParseFontFace(data, 35); err != nil {
return "", err
}
if args[0] == "" {
@@ -1488,11 +1488,11 @@ func mengbi(cc *context, args ...string) (string, error) {
canvas.DrawImage(imgfactory.Size(face, 100, 100).Image(), 392, 460)
canvas.DrawImage(imgfactory.Size(face, 100, 100).Image(), 606, 443)
canvas.SetColor(color.Black)
_, err = file.GetLazyData(text.BoldFontFile, control.Md5File, true)
data, err := file.GetLazyData(text.BoldFontFile, control.Md5File, true)
if err != nil {
return "", err
}
if err = canvas.LoadFontFace(text.BoldFontFile, 80); err != nil {
if err = canvas.ParseFontFace(data, 80); err != nil {
return "", err
}
if args[0] == "" {