Skip to content

Commit

Permalink
ebiten: Remove the filter argument from NewImage and NewImageFromImage
Browse files Browse the repository at this point in the history
hajimehoshi committed Oct 4, 2020
1 parent 0892ffa commit fe97e7b
Showing 61 changed files with 217 additions and 235 deletions.
2 changes: 1 addition & 1 deletion ebitenutil/debugprint.go
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ var (

func init() {
img := assets.CreateTextImage()
debugPrintTextImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
debugPrintTextImage, _ = ebiten.NewImageFromImage(img)
}

// DebugPrint draws the string str on the image on left top corner.
4 changes: 2 additions & 2 deletions ebitenutil/loadimage.go
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ import (
// Note that this doesn't work on mobiles.
//
// For productions, instead of using NewImageFromFile, it is safer to embed your resources, e.g., with github.com/rakyll/statik .
func NewImageFromFile(path string, filter ebiten.Filter) (*ebiten.Image, image.Image, error) {
func NewImageFromFile(path string) (*ebiten.Image, image.Image, error) {
file, err := OpenFile(path)
if err != nil {
return nil, nil, err
@@ -45,7 +45,7 @@ func NewImageFromFile(path string, filter ebiten.Filter) (*ebiten.Image, image.I
if err != nil {
return nil, nil, err
}
img2, err := ebiten.NewImageFromImage(img, filter)
img2, err := ebiten.NewImageFromImage(img)
if err != nil {
return nil, nil, err
}
2 changes: 1 addition & 1 deletion ebitenutil/shapes.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ var (
)

func init() {
emptyImage, _ = ebiten.NewImage(1, 1, ebiten.FilterDefault)
emptyImage, _ = ebiten.NewImage(1, 1)
_ = emptyImage.Fill(color.White)
}

4 changes: 1 addition & 3 deletions ebitenutil/url.go
Original file line number Diff line number Diff line change
@@ -25,8 +25,6 @@ import (
//
// Image decoders must be imported when using NewImageFromURL. For example,
// if you want to load a PNG image, you'd need to add `_ "image/png"` to the import section.
//
// FilterDefault is used at NewImgeFromImage internally.
func NewImageFromURL(url string) (*ebiten.Image, error) {
res, err := http.Get(url)
if err != nil {
@@ -39,6 +37,6 @@ func NewImageFromURL(url string) (*ebiten.Image, error) {
return nil, err
}

eimg, _ := ebiten.NewImageFromImage(img, ebiten.FilterDefault)
eimg, _ := ebiten.NewImageFromImage(img)
return eimg, nil
}
2 changes: 1 addition & 1 deletion examples/2048/2048/game.go
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ func (g *Game) Update() error {
func (g *Game) Draw(screen *ebiten.Image) {
if g.boardImage == nil {
w, h := g.board.Size()
g.boardImage, _ = ebiten.NewImage(w, h, ebiten.FilterDefault)
g.boardImage, _ = ebiten.NewImage(w, h)
}
screen.Fill(backgroundColor)
g.board.Draw(g.boardImage)
2 changes: 1 addition & 1 deletion examples/2048/2048/tile.go
Original file line number Diff line number Diff line change
@@ -355,7 +355,7 @@ var (
)

func init() {
tileImage, _ = ebiten.NewImage(tileSize, tileSize, ebiten.FilterDefault)
tileImage, _ = ebiten.NewImage(tileSize, tileSize)
tileImage.Fill(color.White)
}

2 changes: 1 addition & 1 deletion examples/additive/main.go
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
ebitenImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
ebitenImage, _ = ebiten.NewImageFromImage(img)

ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
ebiten.SetWindowTitle("Additive Blending (Ebiten Demo)")
2 changes: 1 addition & 1 deletion examples/address/main.go
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ func init() {
if err != nil {
log.Fatal(err)
}
ebitenImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
ebitenImage, _ = ebiten.NewImageFromImage(img)
}

func drawRect(screen *ebiten.Image, img *ebiten.Image, x, y, width, height float32, address ebiten.Address, msg string) {
10 changes: 5 additions & 5 deletions examples/airship/main.go
Original file line number Diff line number Diff line change
@@ -61,14 +61,14 @@ func init() {
if err != nil {
log.Fatal(err)
}
gophersImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
gophersImage, _ = ebiten.NewImageFromImage(img)

groundImage, _ = ebiten.NewImage(screenWidth*2, screenHeight*2/3+50, ebiten.FilterDefault)
perspectiveGroundImage, _ = ebiten.NewImage(screenWidth*2, screenHeight, ebiten.FilterDefault)
groundImage, _ = ebiten.NewImage(screenWidth*2, screenHeight*2/3+50)
perspectiveGroundImage, _ = ebiten.NewImage(screenWidth*2, screenHeight)

const repeat = 5
w, h := gophersImage.Size()
repeatedGophersImage, _ = ebiten.NewImage(w*repeat, h*repeat, ebiten.FilterDefault)
repeatedGophersImage, _ = ebiten.NewImage(w*repeat, h*repeat)
for j := 0; j < repeat; j++ {
for i := 0; i < repeat; i++ {
op := &ebiten.DrawImageOptions{}
@@ -92,7 +92,7 @@ func init() {
fogRGBA.SetRGBA(i, j, clr)
}
}
fogImage, _ = ebiten.NewImageFromImage(fogRGBA, ebiten.FilterDefault)
fogImage, _ = ebiten.NewImageFromImage(fogRGBA)
}

// player represents the current airship's position.
2 changes: 1 addition & 1 deletion examples/alphablending/main.go
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
ebitenImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
ebitenImage, _ = ebiten.NewImageFromImage(img)

ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
ebiten.SetWindowTitle("Alpha Blending (Ebiten Demo)")
2 changes: 1 addition & 1 deletion examples/animation/main.go
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
runnerImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
runnerImage, _ = ebiten.NewImageFromImage(img)

ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
ebiten.SetWindowTitle("Animation (Ebiten Demo)")
2 changes: 1 addition & 1 deletion examples/audiopanning/main.go
Original file line number Diff line number Diff line change
@@ -140,7 +140,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
img, _ = ebiten.NewImageFromImage(rawimg, ebiten.FilterDefault)
img, _ = ebiten.NewImageFromImage(rawimg)

ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
ebiten.SetWindowTitle("Audio Panning Loop (Ebiten Demo)")
6 changes: 3 additions & 3 deletions examples/blocks/blocks/gamescene.go
Original file line number Diff line number Diff line change
@@ -76,10 +76,10 @@ func init() {
if err != nil {
panic(err)
}
imageGameBG, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
imageGameBG, _ = ebiten.NewImageFromImage(img)

// Windows
imageWindows, _ = ebiten.NewImage(ScreenWidth, ScreenHeight, ebiten.FilterDefault)
imageWindows, _ = ebiten.NewImage(ScreenWidth, ScreenHeight)

// Windows: Field
x, y := fieldWindowPosition()
@@ -104,7 +104,7 @@ func init() {
drawTextBox(imageWindows, "LINES", x, y, textBoxWidth())

// Gameover
imageGameover, _ = ebiten.NewImage(ScreenWidth, ScreenHeight, ebiten.FilterDefault)
imageGameover, _ = ebiten.NewImage(ScreenWidth, ScreenHeight)
imageGameover.Fill(color.NRGBA{0x00, 0x00, 0x00, 0x80})
y = (ScreenHeight - blockHeight) / 2
drawTextWithShadowCenter(imageGameover, "GAME OVER\n\nPRESS SPACE", 0, y, 1, color.White, ScreenWidth)
2 changes: 1 addition & 1 deletion examples/blocks/blocks/piece.go
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ func init() {
if err != nil {
panic(err)
}
imageBlocks, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
imageBlocks, _ = ebiten.NewImageFromImage(img)

}

4 changes: 2 additions & 2 deletions examples/blocks/blocks/scenemanager.go
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ var (
)

func init() {
transitionFrom, _ = ebiten.NewImage(ScreenWidth, ScreenHeight, ebiten.FilterDefault)
transitionTo, _ = ebiten.NewImage(ScreenWidth, ScreenHeight, ebiten.FilterDefault)
transitionFrom, _ = ebiten.NewImage(ScreenWidth, ScreenHeight)
transitionTo, _ = ebiten.NewImage(ScreenWidth, ScreenHeight)
}

type Scene interface {
2 changes: 1 addition & 1 deletion examples/blocks/blocks/titlescene.go
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ func init() {
if err != nil {
panic(err)
}
imageBackground, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
imageBackground, _ = ebiten.NewImageFromImage(img)
}

type TitleScene struct {
2 changes: 1 addition & 1 deletion examples/blur/main.go
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
gophersImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
gophersImage, _ = ebiten.NewImageFromImage(img)

ebiten.SetWindowSize(screenWidth, screenHeight)
ebiten.SetWindowTitle("Blur (Ebiten Demo)")
4 changes: 2 additions & 2 deletions examples/camera/main.go
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ func init() {
if err != nil {
log.Fatal(err)
}
tilesImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
tilesImage, _ = ebiten.NewImageFromImage(img)
}

type Camera struct {
@@ -261,7 +261,7 @@ func main() {
},
camera: Camera{ViewPort: f64.Vec2{screenWidth, screenHeight}},
}
g.world, _ = ebiten.NewImage(worldWidth, worldHeight, ebiten.FilterDefault)
g.world, _ = ebiten.NewImage(worldWidth, worldHeight)

ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
ebiten.SetWindowTitle("Tiles (Ebiten Demo)")
2 changes: 1 addition & 1 deletion examples/chipmunk/main.go
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ var (
)

func init() {
dot, _ = ebiten.NewImage(1, 1, ebiten.FilterDefault)
dot, _ = ebiten.NewImage(1, 1)
dot.Fill(color.White)
}

4 changes: 2 additions & 2 deletions examples/contextlost/main.go
Original file line number Diff line number Diff line change
@@ -144,11 +144,11 @@ func main() {
if err != nil {
log.Fatal(err)
}
gophersImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
gophersImage, _ = ebiten.NewImageFromImage(img)

// Extend the shared backend GL texture on purpose.
for i := 0; i < 20; i++ {
eimg, _ := ebiten.NewImageFromImage(img, ebiten.FilterDefault)
eimg, _ := ebiten.NewImageFromImage(img)
extraImages = append(extraImages, eimg)
}

2 changes: 1 addition & 1 deletion examples/drag/main.go
Original file line number Diff line number Diff line change
@@ -203,7 +203,7 @@ func init() {
if err != nil {
log.Fatal(err)
}
ebitenImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
ebitenImage, _ = ebiten.NewImageFromImage(img)
}

func NewGame() *Game {
2 changes: 1 addition & 1 deletion examples/filter/main.go
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ func main() {
// Specifying filter on NewImage[FromImage] is just for backward compatibility.
// Now specifying filter at DrawImageOptions is recommended.
// Specify FilterDefault here, that means to prefer filter specified at DrawImageOptions.
ebitenImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
ebitenImage, _ = ebiten.NewImageFromImage(img)

ebiten.SetWindowSize(screenWidth, screenHeight)
ebiten.SetWindowTitle("Filter (Ebiten Demo)")
4 changes: 2 additions & 2 deletions examples/flappy/main.go
Original file line number Diff line number Diff line change
@@ -82,13 +82,13 @@ func init() {
if err != nil {
log.Fatal(err)
}
gopherImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
gopherImage, _ = ebiten.NewImageFromImage(img)

img, _, err = image.Decode(bytes.NewReader(resources.Tiles_png))
if err != nil {
log.Fatal(err)
}
tilesImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
tilesImage, _ = ebiten.NewImageFromImage(img)
}

func init() {
2 changes: 1 addition & 1 deletion examples/flood/main.go
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
ebitenImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
ebitenImage, _ = ebiten.NewImageFromImage(img)

ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
ebiten.SetWindowTitle("Flood fill with solid colors (Ebiten Demo)")
2 changes: 1 addition & 1 deletion examples/fullscreen/main.go
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ func init() {
if err != nil {
log.Fatal(err)
}
gophersImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
gophersImage, _ = ebiten.NewImageFromImage(img)
}

func initFont() {
2 changes: 1 addition & 1 deletion examples/hsv/main.go
Original file line number Diff line number Diff line change
@@ -149,7 +149,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
gophersImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
gophersImage, _ = ebiten.NewImageFromImage(img)

ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
ebiten.SetWindowTitle("HSV (Ebiten Demo)")
2 changes: 1 addition & 1 deletion examples/hue/main.go
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
gophersImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
gophersImage, _ = ebiten.NewImageFromImage(img)

ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
ebiten.SetWindowTitle("Hue (Ebiten Demo)")
2 changes: 1 addition & 1 deletion examples/infinitescroll/main.go
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ func init() {
if err != nil {
log.Fatal(err)
}
bgImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
bgImage, _ = ebiten.NewImageFromImage(img)
}

type viewport struct {
4 changes: 2 additions & 2 deletions examples/keyboard/keyboard/gen.go
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ func keyDisplayNameToKey(name string) ebiten.Key {
func drawKey(t *ebiten.Image, name string, x, y, width int) {
const height = 16
width--
img, _ := ebiten.NewImage(width, height, ebiten.FilterDefault)
img, _ := ebiten.NewImage(width, height)
p := make([]byte, width*height*4)
for j := 0; j < height; j++ {
for i := 0; i < width; i++ {
@@ -196,7 +196,7 @@ func drawKey(t *ebiten.Image, name string, x, y, width int) {

func outputKeyboardImage() (map[ebiten.Key]image.Rectangle, error) {
keyMap := map[ebiten.Key]image.Rectangle{}
img, _ := ebiten.NewImage(320, 240, ebiten.FilterDefault)
img, _ := ebiten.NewImage(320, 240)
x, y := 0, 0
for j, line := range keyboardKeys {
x = 0
2 changes: 1 addition & 1 deletion examples/keyboard/main.go
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ func init() {
log.Fatal(err)
}

keyboardImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
keyboardImage, _ = ebiten.NewImageFromImage(img)
}

type Game struct {
2 changes: 1 addition & 1 deletion examples/mandelbrot/main.go
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ func updateOffscreen(centerX, centerY, size float64) {
}

func init() {
offscreen, _ = ebiten.NewImage(screenWidth, screenHeight, ebiten.FilterDefault)
offscreen, _ = ebiten.NewImage(screenWidth, screenHeight)
offscreenPix = make([]byte, screenWidth*screenHeight*4)
for i := range palette {
palette[i] = byte(math.Sqrt(float64(i)/float64(len(palette))) * 0x80)
6 changes: 3 additions & 3 deletions examples/mascot/main.go
Original file line number Diff line number Diff line change
@@ -55,19 +55,19 @@ func init() {
if err != nil {
log.Fatal(err)
}
gopher1, _ = ebiten.NewImageFromImage(img1, ebiten.FilterDefault)
gopher1, _ = ebiten.NewImageFromImage(img1)

img2, _, err := image.Decode(bytes.NewReader(rmascot.Out02_png))
if err != nil {
log.Fatal(err)
}
gopher2, _ = ebiten.NewImageFromImage(img2, ebiten.FilterDefault)
gopher2, _ = ebiten.NewImageFromImage(img2)

img3, _, err := image.Decode(bytes.NewReader(rmascot.Out03_png))
if err != nil {
log.Fatal(err)
}
gopher3, _ = ebiten.NewImageFromImage(img3, ebiten.FilterDefault)
gopher3, _ = ebiten.NewImageFromImage(img3)
}

func init() {
Loading
Oops, something went wrong.

0 comments on commit fe97e7b

Please sign in to comment.