mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

graphics: Move calculating source region from restorable package

Browse Source
This commit is contained in:
Hajime Hoshi 2018-03-02 12:20:44 +09:00
parent ecf4757809
commit d4112004b0
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
image.go
View File

@ -20,6 +20,7 @@ import (
"image/color" "image/color"
"runtime" "runtime"
"github.com/hajimehoshi/ebiten/internal/affine"
"github.com/hajimehoshi/ebiten/internal/graphics" "github.com/hajimehoshi/ebiten/internal/graphics"
"github.com/hajimehoshi/ebiten/internal/opengl" "github.com/hajimehoshi/ebiten/internal/opengl"
"github.com/hajimehoshi/ebiten/internal/restorable" "github.com/hajimehoshi/ebiten/internal/restorable"
@ -202,6 +203,24 @@ func (i *Image) DrawImage(img *Image, options *DrawImageOptions) error {
sy1 = r.Max.Y sy1 = r.Max.Y
} }
} }
geom := options.GeoM.impl
if sx0 < 0 || sy0 < 0 {
dx := 0.0
dy := 0.0
if sx0 < 0 {
dx = -float64(sx0)
sx0 = 0
}
if sy0 < 0 {
dy = -float64(sy0)
sy0 = 0
}
var g *affine.GeoM
g = g.Translate(dx, dy)
g = g.Concat(geom)
geom = g
}
mode := opengl.CompositeMode(options.CompositeMode) mode := opengl.CompositeMode(options.CompositeMode)
filter := graphics.FilterNearest filter := graphics.FilterNearest
@ -211,7 +230,7 @@ func (i *Image) DrawImage(img *Image, options *DrawImageOptions) error {
filter = graphics.Filter(img.filter) filter = graphics.Filter(img.filter)
} }
i.restorable.DrawImage(img.restorable, sx0, sy0, sx1, sy1, options.GeoM.impl, options.ColorM.impl, mode, filter) i.restorable.DrawImage(img.restorable, sx0, sy0, sx1, sy1, geom, options.ColorM.impl, mode, filter)
return nil return nil
} }

16
internal/restorable/vertices.go
View File

@ -54,22 +54,6 @@ func (i *Image) vertices(sx0, sy0, sx1, sy1 int, geo *affine.GeoM) []float32 {
// TODO: This function should be in graphics package? // TODO: This function should be in graphics package?
vs := theVerticesBackend.get() vs := theVerticesBackend.get()
if sx0 < 0 || sy0 < 0 {
dx := 0.0
dy := 0.0
if sx0 < 0 {
dx = -float64(sx0)
sx0 = 0
}
if sy0 < 0 {
dy = -float64(sy0)
sy0 = 0
}
var g *affine.GeoM
g = g.Translate(dx, dy)
g = g.Concat(geo)
geo = g
}
x0, y0 := 0.0, 0.0 x0, y0 := 0.0, 0.0
x1, y1 := float64(sx1-sx0), float64(sy1-sy0) x1, y1 := float64(sx1-sx0), float64(sy1-sy0)