From d5d577c7335642369a0f18e4f7bde92d0bb93821 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Wed, 14 Mar 2018 12:19:05 +0900 Subject: [PATCH] examples/blocks: Use embedded resources (#552) --- examples/blocks/blocks/gamescene.go | 7 +++++-- examples/blocks/blocks/piece.go | 8 +++++--- examples/blocks/blocks/titlescene.go | 8 +++++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/examples/blocks/blocks/gamescene.go b/examples/blocks/blocks/gamescene.go index d24209aaf..4c9e5753d 100644 --- a/examples/blocks/blocks/gamescene.go +++ b/examples/blocks/blocks/gamescene.go @@ -15,6 +15,8 @@ package blocks import ( + "bytes" + "image" "image/color" _ "image/jpeg" _ "image/png" @@ -24,6 +26,7 @@ import ( "github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/examples/resources/images" "github.com/hajimehoshi/ebiten/inpututil" ) @@ -69,11 +72,11 @@ func linesTextBoxPosition() (x, y int) { func init() { // Background - var err error - imageGameBG, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterDefault) + img, _, err := image.Decode(bytes.NewReader(images.Gophers_jpg)) if err != nil { panic(err) } + imageGameBG, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault) // Windows imageWindows, _ = ebiten.NewImage(ScreenWidth, ScreenHeight, ebiten.FilterDefault) diff --git a/examples/blocks/blocks/piece.go b/examples/blocks/blocks/piece.go index 5d1dd5d2c..126955dc7 100644 --- a/examples/blocks/blocks/piece.go +++ b/examples/blocks/blocks/piece.go @@ -15,21 +15,23 @@ package blocks import ( + "bytes" "image" _ "image/png" "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + rblocks "github.com/hajimehoshi/ebiten/examples/resources/images/blocks" ) var imageBlocks *ebiten.Image func init() { - var err error - imageBlocks, _, err = ebitenutil.NewImageFromFile("_resources/images/blocks/blocks.png", ebiten.FilterDefault) + img, _, err := image.Decode(bytes.NewReader(rblocks.Blocks_png)) if err != nil { panic(err) } + imageBlocks, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault) + } type Angle int diff --git a/examples/blocks/blocks/titlescene.go b/examples/blocks/blocks/titlescene.go index d1d94b3a4..05ae1e72a 100644 --- a/examples/blocks/blocks/titlescene.go +++ b/examples/blocks/blocks/titlescene.go @@ -15,22 +15,24 @@ package blocks import ( + "bytes" + "image" "image/color" _ "image/png" "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + rblocks "github.com/hajimehoshi/ebiten/examples/resources/images/blocks" "github.com/hajimehoshi/ebiten/inpututil" ) var imageBackground *ebiten.Image func init() { - var err error - imageBackground, _, err = ebitenutil.NewImageFromFile("_resources/images/blocks/background.png", ebiten.FilterDefault) + img, _, err := image.Decode(bytes.NewReader(rblocks.Background_png)) if err != nil { panic(err) } + imageBackground, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault) } type TitleScene struct {