mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-12-27 04:08:53 +01:00
text/v2: avoid creating an option struct when the given option is nil
This commit is contained in:
parent
2b9e307ec2
commit
c9a3ef28eb
@ -101,15 +101,17 @@ type LayoutOptions struct {
|
|||||||
// If the vertical alignment is center, the rendering region's middle Y comes to the origin.
|
// If the vertical alignment is center, the rendering region's middle Y comes to the origin.
|
||||||
// If the vertical alignment is bottom, the rendering region's bottom Y comes to the origin.
|
// If the vertical alignment is bottom, the rendering region's bottom Y comes to the origin.
|
||||||
func Draw(dst *ebiten.Image, text string, face Face, options *DrawOptions) {
|
func Draw(dst *ebiten.Image, text string, face Face, options *DrawOptions) {
|
||||||
if options == nil {
|
var layoutOp LayoutOptions
|
||||||
options = &DrawOptions{}
|
var drawOp ebiten.DrawImageOptions
|
||||||
|
|
||||||
|
if options != nil {
|
||||||
|
layoutOp = options.LayoutOptions
|
||||||
|
drawOp = options.DrawImageOptions
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy the options to avoid modifying the original options (#2954).
|
|
||||||
drawOp := options.DrawImageOptions
|
|
||||||
geoM := drawOp.GeoM
|
geoM := drawOp.GeoM
|
||||||
|
|
||||||
for _, g := range AppendGlyphs(nil, text, face, &options.LayoutOptions) {
|
for _, g := range AppendGlyphs(nil, text, face, &layoutOp) {
|
||||||
if g.Image == nil {
|
if g.Image == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user