Skip to content

Commit

Permalink
Use files in examples (hajimehoshi#243)
Browse files Browse the repository at this point in the history
hajimehoshi committed Jul 27, 2016
1 parent 4ad5c65 commit 5e1ed99
Showing 21 changed files with 35 additions and 339 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
4 changes: 2 additions & 2 deletions examples/additive/main.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"log"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/examples/common"
"github.com/hajimehoshi/ebiten/ebitenutil"
)

const (
@@ -50,7 +50,7 @@ func update(screen *ebiten.Image) error {

func main() {
var err error
ebitenImage, _, err = common.AssetImage("ebiten.png", ebiten.FilterNearest)
ebitenImage, _, err = ebitenutil.NewImageFromFile("_resources/images/ebiten.png", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
4 changes: 2 additions & 2 deletions examples/airship/main.go
Original file line number Diff line number Diff line change
@@ -18,12 +18,12 @@ import (
"fmt"
"image"
"image/color"
_ "image/jpeg"
"log"
"math"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil"
"github.com/hajimehoshi/ebiten/examples/common"
)

const (
@@ -223,7 +223,7 @@ func update(screen *ebiten.Image) error {

func main() {
var err error
gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest)
gophersImage, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
4 changes: 2 additions & 2 deletions examples/alphablending/main.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"log"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/examples/common"
"github.com/hajimehoshi/ebiten/ebitenutil"
)

const (
@@ -78,7 +78,7 @@ func update(screen *ebiten.Image) error {

func main() {
var err error
ebitenImage, _, err = common.AssetImage("ebiten.png", ebiten.FilterNearest)
ebitenImage, _, err = ebitenutil.NewImageFromFile("_resources/images/ebiten.png", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
3 changes: 2 additions & 1 deletion examples/blocks/blocks/gamescene.go
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ import (
"time"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil"
"github.com/hajimehoshi/ebiten/examples/common"
)

@@ -75,7 +76,7 @@ func init() {
}
imageEmpty.Fill(color.White)
// Background
imageGameBG, _, err = common.AssetImage("gophers.jpg", ebiten.FilterLinear)
imageGameBG, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterLinear)
if err != nil {
panic(err)
}
41 changes: 0 additions & 41 deletions examples/common/assets.go

This file was deleted.

13 changes: 12 additions & 1 deletion examples/common/font.go
Original file line number Diff line number Diff line change
@@ -19,9 +19,12 @@ import (
"image/color"
"image/draw"
"math"
"path/filepath"
"runtime"
"strings"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil"
)

var (
@@ -43,7 +46,15 @@ func (f *Font) TextWidth(str string) int {
}

func init() {
arcadeFontImage, img, err := AssetImage("arcadefont.png", ebiten.FilterNearest)
dir := ""
if runtime.GOARCH != "js" {
// Get the path of this file (font.go).
_, path, _, _ := runtime.Caller(0)
path = filepath.Dir(path)
dir = filepath.Join(path, "..")
}
arcadeFontPath := filepath.Join(dir, "_resources", "images", "arcadefont.png")
arcadeFontImage, img, err := ebitenutil.NewImageFromFile(arcadeFontPath, ebiten.FilterNearest)
if err != nil {
panic(err)
}
21 changes: 0 additions & 21 deletions examples/common/internal/assets/assets.go

This file was deleted.

252 changes: 0 additions & 252 deletions examples/common/internal/assets/bindata.go

This file was deleted.

3 changes: 1 addition & 2 deletions examples/hsv/main.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ import (

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil"
"github.com/hajimehoshi/ebiten/examples/common"
)

const (
@@ -95,7 +94,7 @@ Value: %0.2f [Z][X]`, hue, saturation, value)

func main() {
var err error
gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest)
gophersImage, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
4 changes: 2 additions & 2 deletions examples/hue/main.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"math"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/examples/common"
"github.com/hajimehoshi/ebiten/ebitenutil"
)

const (
@@ -47,7 +47,7 @@ func update(screen *ebiten.Image) error {

func main() {
var err error
gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest)
gophersImage, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
6 changes: 3 additions & 3 deletions examples/masking/main.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
"math"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/examples/common"
"github.com/hajimehoshi/ebiten/ebitenutil"
)

const (
@@ -108,11 +108,11 @@ func min(a, b int) int {

func main() {
var err error
gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest)
gophersImage, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
fiveyearsImage, _, err = common.AssetImage("fiveyears.jpg", ebiten.FilterNearest)
fiveyearsImage, _, err = ebitenutil.NewImageFromFile("_resources/images/fiveyears.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
4 changes: 2 additions & 2 deletions examples/mosaic/main.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"log"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/examples/common"
"github.com/hajimehoshi/ebiten/ebitenutil"
)

const (
@@ -46,7 +46,7 @@ func update(screen *ebiten.Image) error {

func main() {
var err error
gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest)
gophersImage, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
4 changes: 2 additions & 2 deletions examples/perspective/main.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"log"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/examples/common"
"github.com/hajimehoshi/ebiten/ebitenutil"
)

const (
@@ -66,7 +66,7 @@ func update(screen *ebiten.Image) error {

func main() {
var err error
gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest)
gophersImage, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
4 changes: 2 additions & 2 deletions examples/rotate/main.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"math"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/examples/common"
"github.com/hajimehoshi/ebiten/ebitenutil"
)

const (
@@ -48,7 +48,7 @@ func update(screen *ebiten.Image) error {

func main() {
var err error
gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest)
gophersImage, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
3 changes: 1 addition & 2 deletions examples/sprites/main.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ import (

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil"
"github.com/hajimehoshi/ebiten/examples/common"
)

const (
@@ -139,7 +138,7 @@ Press <- or -> to change the number of sprites`, ebiten.CurrentFPS(), sprites.Le

func main() {
var err error
ebitenImage, _, err = common.AssetImage("ebiten.png", ebiten.FilterNearest)
ebitenImage, _, err = ebitenutil.NewImageFromFile("_resources/images/ebiten.png", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}
4 changes: 2 additions & 2 deletions examples/windowsize/main.go
Original file line number Diff line number Diff line change
@@ -17,11 +17,11 @@ package main
import (
"fmt"
"image/color"
_ "image/jpeg"
"log"

"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/ebitenutil"
"github.com/hajimehoshi/ebiten/examples/common"
)

const (
@@ -104,7 +104,7 @@ FPS: %0.2f`, x, y, ebiten.CurrentFPS())

func main() {
var err error
gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest)
gophersImage, _, err = ebitenutil.NewImageFromFile("_resources/images/gophers.jpg", ebiten.FilterNearest)
if err != nil {
log.Fatal(err)
}

0 comments on commit 5e1ed99

Please sign in to comment.