Revert main.go as blocks.go

example/blocks.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"github.com/hajimehoshi/ebiten/example/blocks"
 	"github.com/hajimehoshi/ebiten/ui"
 	"github.com/hajimehoshi/ebiten/ui/glfw"
 	"log"
@@ -28,8 +29,8 @@ func main() {
 	}
 
 	u := new(glfw.UI)
-	game := NewGame()
-	if err := ui.Run(u, game, ScreenWidth, ScreenHeight, 2, "Blocks (Ebiten Demo)", 60); err != nil {
+	game := blocks.NewGame()
+	if err := ui.Run(u, game, blocks.ScreenWidth, blocks.ScreenHeight, 2, "Blocks (Ebiten Demo)", 60); err != nil {
 		log.Fatal(err)
 	}
 }

example/blocks/field.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/graphics"

example/blocks/font.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/graphics"
@@ -7,7 +7,7 @@ import (
 )
 
 func init() {
-	texturePaths["font"] = "../images/blocks/font.png"
+	texturePaths["font"] = "images/blocks/font.png"
 }
 
 const charWidth = 8

example/blocks/game.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/graphics"

example/blocks/gamescene.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/graphics"
@@ -10,7 +10,7 @@ import (
 )
 
 func init() {
-	texturePaths["empty"] = "../images/blocks/empty.png"
+	texturePaths["empty"] = "images/blocks/empty.png"
 }
 
 type GameScene struct {

example/blocks/input.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/input"

example/blocks/piece.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/graphics"
@@ -6,7 +6,7 @@ import (
 )
 
 func init() {
-	texturePaths["blocks"] = "../images/blocks/blocks.png"
+	texturePaths["blocks"] = "images/blocks/blocks.png"
 }
 
 type Angle int

example/blocks/scenemanager.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/graphics"

example/blocks/textures.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/graphics"

example/blocks/titlescene.go

@@ -1,4 +1,4 @@
-package main
+package blocks
 
 import (
 	"github.com/hajimehoshi/ebiten/graphics"
@@ -8,7 +8,7 @@ import (
 )
 
 func init() {
-	texturePaths["background"] = "../images/blocks/background.png"
+	texturePaths["background"] = "images/blocks/background.png"
 }
 
 type TitleScene struct {

readme.md

@@ -23,14 +23,14 @@ changed easily.
 
 ```
 :; cd $GOHOME/src/github.com/hajimehoshi/ebiten/example/blocks
-:; go run *.go
+:; go run blocks.go
 ```
 
 ### How to benchmark the example
 
 ```
 :; cd $GOHOME/src/github.com/hajimehoshi/ebiten/example/blocks
-:; go build -o=example *.go
+:; go build -o=example blocks.go
 :; ./example -cpuprofile=cpu.out
 :; go tool pprof ./example cpu.out
 ```

ui/glfw/canvas.go

@@ -60,9 +60,7 @@ func (c *canvas) run(width, height, scale int) {
 		c.window.MakeContextCurrent()
 		glfw.SwapInterval(1)
 		for {
-
-			f := <-c.funcs
-			f()
+			(<-c.funcs)()
 			c.funcsDone <- struct{}{}
 		}
 	}()