mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 19:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename ImageDrawOption -> ImageDrawOptions

Browse Source
This commit is contained in:
Hajime Hoshi 2014-12-24 23:38:04 +09:00
parent 742c7ad854
commit 90665944b9
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/blocks/blocks/font.go
View File

@ -60,7 +60,7 @@ func drawText(rt *ebiten.Image, images *Images, str string, ox, oy, scale int, c
b := float64(c2.B) / max b := float64(c2.B) / max
a := float64(c2.A) / max a := float64(c2.A) / max
clr := ebiten.ScaleColor(r, g, b, a) clr := ebiten.ScaleColor(r, g, b, a)
rt.DrawImage(fontImageId, &ebiten.ImageDrawOption{ rt.DrawImage(fontImageId, &ebiten.ImageDrawOptions{
DstParts: dsts, DstParts: dsts,
SrcParts: srcs, SrcParts: srcs,
GeometryMatrix: &geo, GeometryMatrix: &geo,

2
example/blocks/blocks/gamescene.go
View File

@ -115,7 +115,7 @@ func (s *GameScene) Draw(r *ebiten.Image, images *Images) {
geo := ebiten.ScaleGeometry(float64(fieldWidth)/float64(w), float64(fieldHeight)/float64(h)) geo := ebiten.ScaleGeometry(float64(fieldWidth)/float64(w), float64(fieldHeight)/float64(h))
geo.Concat(ebiten.TranslateGeometry(20, 20)) // TODO: magic number? geo.Concat(ebiten.TranslateGeometry(20, 20)) // TODO: magic number?
clr := ebiten.ScaleColor(0.0, 0.0, 0.0, 0.5) clr := ebiten.ScaleColor(0.0, 0.0, 0.0, 0.5)
r.DrawImage(field, &ebiten.ImageDrawOption{ r.DrawImage(field, &ebiten.ImageDrawOptions{
GeometryMatrix: &geo, GeometryMatrix: &geo,
ColorMatrix: &clr, ColorMatrix: &clr,
}) })

2
example/blocks/blocks/scenemanager.go
View File

@ -75,7 +75,7 @@ func (s *SceneManager) Draw(r *ebiten.Image, images *Images) {
alpha := float64(s.transitionCount) / float64(transitionMaxCount) alpha := float64(s.transitionCount) / float64(transitionMaxCount)
clr := ebiten.ScaleColor(1, 1, 1, alpha) clr := ebiten.ScaleColor(1, 1, 1, alpha)
op := &ebiten.ImageDrawOption{ op := &ebiten.ImageDrawOptions{
ColorMatrix: &clr, ColorMatrix: &clr,
} }
r.DrawImage(to, op) r.DrawImage(to, op)

4
example/mosaic/main.go
View File

@ -35,12 +35,12 @@ var (
func update(screen *ebiten.Image) error { func update(screen *ebiten.Image) error {
geo := ebiten.ScaleGeometry(1.0/mosaicRatio, 1.0/mosaicRatio) geo := ebiten.ScaleGeometry(1.0/mosaicRatio, 1.0/mosaicRatio)
gophersRenderTarget.DrawImage(gophersImage, &ebiten.ImageDrawOption{ gophersRenderTarget.DrawImage(gophersImage, &ebiten.ImageDrawOptions{
GeometryMatrix: &geo, GeometryMatrix: &geo,
}) })
geo = ebiten.ScaleGeometry(mosaicRatio, mosaicRatio) geo = ebiten.ScaleGeometry(mosaicRatio, mosaicRatio)
screen.DrawImage(gophersRenderTarget, &ebiten.ImageDrawOption{ screen.DrawImage(gophersRenderTarget, &ebiten.ImageDrawOptions{
GeometryMatrix: &geo, GeometryMatrix: &geo,
}) })
return nil return nil

2
example/perspective/main.go
View File

@ -43,7 +43,7 @@ func update(screen *ebiten.Image) error {
maxWidth := float64(w) + float64(h)*0.75 maxWidth := float64(w) + float64(h)*0.75
geo := ebiten.TranslateGeometry(-maxWidth/2, -float64(h)/2) geo := ebiten.TranslateGeometry(-maxWidth/2, -float64(h)/2)
geo.Concat(ebiten.TranslateGeometry(screenWidth/2, screenHeight/2)) geo.Concat(ebiten.TranslateGeometry(screenWidth/2, screenHeight/2))
screen.DrawImage(gophersImage, &ebiten.ImageDrawOption{ screen.DrawImage(gophersImage, &ebiten.ImageDrawOptions{
DstParts: dsts, DstParts: dsts,
SrcParts: srcs, SrcParts: srcs,
GeometryMatrix: &geo, GeometryMatrix: &geo,

2
example/rotate/main.go
View File

@ -56,7 +56,7 @@ func update(screen *ebiten.Image) error {
geo.Concat(ebiten.ScaleGeometry(scaleX, scaleY)) geo.Concat(ebiten.ScaleGeometry(scaleX, scaleY))
geo.Concat(ebiten.RotateGeometry(float64(count%720) * 2 * math.Pi / 720)) geo.Concat(ebiten.RotateGeometry(float64(count%720) * 2 * math.Pi / 720))
geo.Concat(ebiten.TranslateGeometry(screenWidth/2, screenHeight/2)) geo.Concat(ebiten.TranslateGeometry(screenWidth/2, screenHeight/2))
if err := screen.DrawImage(gophersImage, &ebiten.ImageDrawOption{ if err := screen.DrawImage(gophersImage, &ebiten.ImageDrawOptions{
GeometryMatrix: &geo, GeometryMatrix: &geo,
}); err != nil { }); err != nil {
return err return err

2
graphicscontext.go
View File

@ -68,7 +68,7 @@ func (c *graphicsContext) postUpdate() error {
scale := float64(c.screenScale) scale := float64(c.screenScale)
geo := ScaleGeometry(scale, scale) geo := ScaleGeometry(scale, scale)
clr := ColorMatrixI() clr := ColorMatrixI()
option := &ImageDrawOption{ option := &ImageDrawOptions{
GeometryMatrix: &geo, GeometryMatrix: &geo,
ColorMatrix: &clr, ColorMatrix: &clr,
} }

14
image.go
View File

@ -52,9 +52,9 @@ func (i *innerImage) Fill(clr color.Color) error {
return nil return nil
} }
func (i *innerImage) drawImage(img *innerImage, option *ImageDrawOption) error { func (i *innerImage) drawImage(img *innerImage, option *ImageDrawOptions) error {
if option == nil { if option == nil {
option = &ImageDrawOption{} option = &ImageDrawOptions{}
} }
dsts := option.DstParts dsts := option.DstParts
srcs := option.SrcParts srcs := option.SrcParts
@ -159,11 +159,11 @@ func (i *Image) Fill(clr color.Color) (err error) {
// After determining parts to draw, this applies the geometry matrix geo and the color matrix color. // After determining parts to draw, this applies the geometry matrix geo and the color matrix color.
// //
// If you want to draw a whole image simply, use DrawWholeImage. // If you want to draw a whole image simply, use DrawWholeImage.
func (i *Image) DrawImage(image *Image, option *ImageDrawOption) (err error) { func (i *Image) DrawImage(image *Image, option *ImageDrawOptions) (err error) {
return i.drawImage(image.inner, option) return i.drawImage(image.inner, option)
} }
func (i *Image) drawImage(image *innerImage, option *ImageDrawOption) (err error) { func (i *Image) drawImage(image *innerImage, option *ImageDrawOptions) (err error) {
i.pixels = nil i.pixels = nil
i.syncer.Sync(func() { i.syncer.Sync(func() {
err = i.inner.drawImage(image, option) err = i.inner.drawImage(image, option)
@ -202,16 +202,16 @@ func (i *Image) At(x, y int) color.Color {
return color.RGBA{r, g, b, a} return color.RGBA{r, g, b, a}
} }
type ImageDrawOption struct { type ImageDrawOptions struct {
DstParts []image.Rectangle DstParts []image.Rectangle
SrcParts []image.Rectangle SrcParts []image.Rectangle
GeometryMatrix *GeometryMatrix GeometryMatrix *GeometryMatrix
ColorMatrix *ColorMatrix ColorMatrix *ColorMatrix
} }
func At(x, y int) *ImageDrawOption { func At(x, y int) *ImageDrawOptions {
geo := TranslateGeometry(float64(x), float64(y)) geo := TranslateGeometry(float64(x), float64(y))
return &ImageDrawOption{ return &ImageDrawOptions{
GeometryMatrix: &geo, GeometryMatrix: &geo,
} }
} }