From f36aae4275a6b89dd5c8509a686a63a2f627a302 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Fri, 18 Aug 2017 23:26:17 +0900 Subject: [PATCH] doc: Pass W3C validator --- _docs/example.tmpl.html | 4 +- _docs/examplecontent.tmpl.html | 2 + _docs/index.tmpl.html | 14 ++++--- docs/examples/2048.content.html | 2 + docs/examples/2048.html | 4 +- docs/examples/alphablending.content.html | 2 + docs/examples/alphablending.html | 6 ++- docs/examples/audio.content.html | 2 + docs/examples/audio.html | 34 ++++++--------- docs/examples/blocks.content.html | 2 + docs/examples/blocks.html | 6 ++- docs/examples/font.content.html | 2 + docs/examples/font.html | 6 ++- docs/examples/gamepad.content.html | 2 + docs/examples/gamepad.html | 6 ++- docs/examples/hsv.content.html | 2 + docs/examples/hsv.html | 6 ++- docs/examples/hue.content.html | 2 + docs/examples/hue.html | 6 ++- docs/examples/infinitescroll.content.html | 2 + docs/examples/infinitescroll.html | 6 ++- docs/examples/keyboard.content.html | 2 + docs/examples/keyboard.html | 6 ++- docs/examples/life.content.html | 2 + docs/examples/life.html | 6 ++- docs/examples/masking.content.html | 2 + docs/examples/masking.html | 6 ++- docs/examples/mosaic.content.html | 2 + docs/examples/mosaic.html | 6 ++- docs/examples/noise.content.html | 2 + docs/examples/noise.html | 6 ++- docs/examples/paint.content.html | 2 + docs/examples/paint.html | 6 ++- docs/examples/perspective.content.html | 2 + docs/examples/perspective.html | 6 ++- docs/examples/piano.content.html | 2 + docs/examples/piano.html | 6 ++- docs/examples/rotate.content.html | 2 + docs/examples/rotate.html | 6 ++- docs/examples/sprites.content.html | 2 + docs/examples/sprites.html | 6 ++- docs/index.html | 50 ++++++++++++----------- docs/stylesheets/ebiten.css | 4 ++ 43 files changed, 165 insertions(+), 87 deletions(-) diff --git a/_docs/example.tmpl.html b/_docs/example.tmpl.html index 42bb6a1cd..d14a2317d 100644 --- a/_docs/example.tmpl.html +++ b/_docs/example.tmpl.html @@ -1,8 +1,10 @@ + Ebiten example - {{.Example.Name}} + @@ -23,7 +25,7 @@ {{with .Example}}

Ebiten example - {{.Name}}

- 
{{.Source}}
+ 
{{.Source}}
{{end}} diff --git a/_docs/examplecontent.tmpl.html b/_docs/examplecontent.tmpl.html index 7bb94e105..24e2540cf 100644 --- a/_docs/examplecontent.tmpl.html +++ b/_docs/examplecontent.tmpl.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/_docs/index.tmpl.html b/_docs/index.tmpl.html index bb41e953a..54027e718 100644 --- a/_docs/index.tmpl.html +++ b/_docs/index.tmpl.html @@ -1,9 +1,11 @@ + Ebiten - A simple 2D game library in Go + @@ -59,16 +61,16 @@
{{range .Examples -}}
- Ebiten example: {{.Name}} + Ebiten example: {{.Name}}
{{- end}}

The Gopher photographs by Chris Nokleberg are licensed under the Creative Commons 3.0 Attributions License.

-

Execute the examples

- 
go get github.com/hajimehoshi/ebiten/...
+  
Execute the examples

+  
go get github.com/hajimehoshi/ebiten/...
 cd $GOPATH/src/github.com/hajimehoshi/ebiten/examples
-go run -tags=example rotate/main.go
+go run -tags=example rotate/main.go

Note that you need to add -tags=example to run examples.

Getting Started

@@ -78,7 +80,7 @@ First create a new directory (mkdir hello_world), and change into it (cd hello_world). Type the following code into the main.go file:

- 
package main
+  
package main
 
 import (
         "github.com/hajimehoshi/ebiten"
@@ -93,7 +95,7 @@ func update(screen *ebiten.Image) error {
 func main() {
         ebiten.Run(update, 320, 240, 2, "Hello world!")
 }
-
+

Run the go run command to start the game. There you have it, your first Ebiten game!

diff --git a/docs/examples/2048.content.html b/docs/examples/2048.content.html index 127cb9fa7..2dec50646 100644 --- a/docs/examples/2048.content.html +++ b/docs/examples/2048.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/2048.html b/docs/examples/2048.html index ca8671bfe..ed87221d5 100644 --- a/docs/examples/2048.html +++ b/docs/examples/2048.html @@ -1,8 +1,10 @@ + Ebiten example - 2048 + @@ -23,7 +25,7 @@

Ebiten example - 2048

- 
// Please read examples/2048/main.go and examples/2048/2048/*.go
+ 
// Please read examples/2048/main.go and examples/2048/2048/*.go
diff --git a/docs/examples/alphablending.content.html b/docs/examples/alphablending.content.html index b227ac95c..ed3e00e27 100644 --- a/docs/examples/alphablending.content.html +++ b/docs/examples/alphablending.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/alphablending.html b/docs/examples/alphablending.html index 554c99175..f0b65195d 100644 --- a/docs/examples/alphablending.html +++ b/docs/examples/alphablending.html @@ -1,8 +1,10 @@ + Ebiten example - alphablending + @@ -23,7 +25,7 @@

Ebiten example - alphablending

- 
// +build example
+  
// +build example
 
 package main
 
@@ -82,7 +84,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/audio.content.html b/docs/examples/audio.content.html index ed3b1f4b6..91a9977a6 100644 --- a/docs/examples/audio.content.html +++ b/docs/examples/audio.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/audio.html b/docs/examples/audio.html index dff80b30a..77dcaa635 100644 --- a/docs/examples/audio.html +++ b/docs/examples/audio.html @@ -1,8 +1,10 @@ + Ebiten example - audio + @@ -23,7 +25,7 @@

Ebiten example - audio

- 
// +build example
+  
// +build example
 
 // This is an example to implement an audio player.
 // See examples/wav for a simpler example to play a sound file.
@@ -54,18 +56,10 @@ const (
 )
 
 var (
-        playerBarImage     *ebiten.Image
-        playerCurrentImage *ebiten.Image
+        playerBarColor     = color.RGBA{0x80, 0x80, 0x80, 0xff}
+        playerCurrentColor = color.RGBA{0xff, 0xff, 0xff, 0xff}
 )
 
-func init() {
-        playerBarImage, _ = ebiten.NewImage(300, 4, ebiten.FilterNearest)
-        playerBarImage.Fill(&color.RGBA{0x80, 0x80, 0x80, 0xff})
-
-        playerCurrentImage, _ = ebiten.NewImage(4, 10, ebiten.FilterNearest)
-        playerCurrentImage.Fill(&color.RGBA{0xff, 0xff, 0xff, 0xff})
-}
-
 type Input struct {
         mouseButtonStates map[ebiten.MouseButton]int
         keyStates         map[ebiten.Key]int
@@ -114,7 +108,7 @@ var (
 )
 
 func playerBarRect() (x, y, w, h int) {
-        w, h = playerBarImage.Size()
+        w, h = 300, 4
         x = (screenWidth - w) / 2
         y = screenHeight - h - 16
         return
@@ -256,10 +250,10 @@ func (p *Player) close() error {
 }
 
 func (p *Player) draw(screen *ebiten.Image) {
-        op := &ebiten.DrawImageOptions{}
+        // Bar
         x, y, w, h := playerBarRect()
-        op.GeoM.Translate(float64(x), float64(y))
-        screen.DrawImage(playerBarImage, op)
+        ebitenutil.DrawRect(screen, float64(x), float64(y), float64(w), float64(h), playerBarColor)
+
         currentTimeStr := "00:00"
 
         // Current Time
@@ -268,13 +262,11 @@ func (p *Player) draw(screen *ebiten.Image) {
         s := (c / time.Second) % 60
         currentTimeStr = fmt.Sprintf("%02d:%02d", m, s)
 
-        // Bar
-        cw, ch := playerCurrentImage.Size()
+        // Cursor
+        cw, ch := 4, 10
         cx := int(time.Duration(w)*c/p.total) + x - cw/2
         cy := y - (ch-h)/2
-        op = &ebiten.DrawImageOptions{}
-        op.GeoM.Translate(float64(cx), float64(cy))
-        screen.DrawImage(playerCurrentImage, op)
+        ebitenutil.DrawRect(screen, float64(cx), float64(cy), float64(cw), float64(ch), playerCurrentColor)
 
         msg := fmt.Sprintf(`FPS: %0.2f
 Press S to toggle Play/Pause
@@ -315,7 +307,7 @@ func main() {
                 }
         }
 }
-
+ diff --git a/docs/examples/blocks.content.html b/docs/examples/blocks.content.html index 8f9ac8fe7..0b8f7e340 100644 --- a/docs/examples/blocks.content.html +++ b/docs/examples/blocks.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/blocks.html b/docs/examples/blocks.html index fa97ac401..fa17dcee6 100644 --- a/docs/examples/blocks.html +++ b/docs/examples/blocks.html @@ -1,8 +1,10 @@ + Ebiten example - blocks + @@ -23,8 +25,8 @@

Ebiten example - blocks

- 
// Please read examples/blocks/main.go and examples/blocks/blocks/*.go
-// NOTE: If Gamepad API is available in your browswer, you can use gamepads. Try it out!
+ 
// Please read examples/blocks/main.go and examples/blocks/blocks/*.go
+// NOTE: If Gamepad API is available in your browswer, you can use gamepads. Try it out!
diff --git a/docs/examples/font.content.html b/docs/examples/font.content.html index 1d14f7c5d..de8f1f126 100644 --- a/docs/examples/font.content.html +++ b/docs/examples/font.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/font.html b/docs/examples/font.html index 914f8a0e4..a3c0a215a 100644 --- a/docs/examples/font.html +++ b/docs/examples/font.html @@ -1,8 +1,10 @@ + Ebiten example - font + @@ -23,7 +25,7 @@

Ebiten example - font

- 
// +build example
+  
// +build example
 
 package main
 
@@ -174,7 +176,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/gamepad.content.html b/docs/examples/gamepad.content.html index 08bbfaa96..0ce2d12be 100644 --- a/docs/examples/gamepad.content.html +++ b/docs/examples/gamepad.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/gamepad.html b/docs/examples/gamepad.html index 2e869f284..e963eedbb 100644 --- a/docs/examples/gamepad.html +++ b/docs/examples/gamepad.html @@ -1,8 +1,10 @@ + Ebiten example - gamepad + @@ -23,7 +25,7 @@

Ebiten example - gamepad

- 
// +build example
+  
// +build example
 
 package main
 
@@ -79,7 +81,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/hsv.content.html b/docs/examples/hsv.content.html index 49acf6650..0077ac588 100644 --- a/docs/examples/hsv.content.html +++ b/docs/examples/hsv.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/hsv.html b/docs/examples/hsv.html index bef8e3299..30ea7136e 100644 --- a/docs/examples/hsv.html +++ b/docs/examples/hsv.html @@ -1,8 +1,10 @@ + Ebiten example - hsv + @@ -23,7 +25,7 @@

Ebiten example - hsv

- 
// +build example
+  
// +build example
 
 package main
 
@@ -114,7 +116,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/hue.content.html b/docs/examples/hue.content.html index 9329f3086..640f5b6c1 100644 --- a/docs/examples/hue.content.html +++ b/docs/examples/hue.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/hue.html b/docs/examples/hue.html index 0036fcde5..d12330350 100644 --- a/docs/examples/hue.html +++ b/docs/examples/hue.html @@ -1,8 +1,10 @@ + Ebiten example - hue + @@ -23,7 +25,7 @@

Ebiten example - hue

- 
// +build example
+  
// +build example
 
 package main
 
@@ -69,7 +71,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/infinitescroll.content.html b/docs/examples/infinitescroll.content.html index 008eadf62..cb0fad42a 100644 --- a/docs/examples/infinitescroll.content.html +++ b/docs/examples/infinitescroll.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/infinitescroll.html b/docs/examples/infinitescroll.html index 089d349f6..4edae05d9 100644 --- a/docs/examples/infinitescroll.html +++ b/docs/examples/infinitescroll.html @@ -1,8 +1,10 @@ + Ebiten example - infinitescroll + @@ -23,7 +25,7 @@

Ebiten example - infinitescroll

- 
// +build example
+  
// +build example
 
 package main
 
@@ -132,7 +134,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/keyboard.content.html b/docs/examples/keyboard.content.html index d9719b45e..c5e018d8d 100644 --- a/docs/examples/keyboard.content.html +++ b/docs/examples/keyboard.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/keyboard.html b/docs/examples/keyboard.html index ddcb5609e..e3a828bc0 100644 --- a/docs/examples/keyboard.html +++ b/docs/examples/keyboard.html @@ -1,8 +1,10 @@ + Ebiten example - keyboard + @@ -23,7 +25,7 @@

Ebiten example - keyboard

- 
// +build example
+  
// +build example
 
 package main
 
@@ -134,7 +136,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/life.content.html b/docs/examples/life.content.html index 903f5b612..0d2a96da0 100644 --- a/docs/examples/life.content.html +++ b/docs/examples/life.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/life.html b/docs/examples/life.html index 0b1e97ea1..b492ea919 100644 --- a/docs/examples/life.html +++ b/docs/examples/life.html @@ -1,8 +1,10 @@ + Ebiten example - life + @@ -23,7 +25,7 @@

Ebiten example - life

- 
// +build example
+  
// +build example
 
 package main
 
@@ -184,7 +186,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/masking.content.html b/docs/examples/masking.content.html index 85e592e69..7f075d09e 100644 --- a/docs/examples/masking.content.html +++ b/docs/examples/masking.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/masking.html b/docs/examples/masking.html index 91a2aa7d0..df90072cb 100644 --- a/docs/examples/masking.html +++ b/docs/examples/masking.html @@ -1,8 +1,10 @@ + Ebiten example - masking + @@ -23,7 +25,7 @@

Ebiten example - masking

- 
// +build example
+  
// +build example
 
 package main
 
@@ -136,7 +138,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/mosaic.content.html b/docs/examples/mosaic.content.html index c1e427f9d..22d8eb062 100644 --- a/docs/examples/mosaic.content.html +++ b/docs/examples/mosaic.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/mosaic.html b/docs/examples/mosaic.html index c7e2ef435..5ea31ad90 100644 --- a/docs/examples/mosaic.html +++ b/docs/examples/mosaic.html @@ -1,8 +1,10 @@ + Ebiten example - mosaic + @@ -23,7 +25,7 @@

Ebiten example - mosaic

- 
// +build example
+  
// +build example
 
 package main
 
@@ -72,7 +74,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/noise.content.html b/docs/examples/noise.content.html index af439b853..802ac1be7 100644 --- a/docs/examples/noise.content.html +++ b/docs/examples/noise.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/noise.html b/docs/examples/noise.html index abb1095f3..bdd998bff 100644 --- a/docs/examples/noise.html +++ b/docs/examples/noise.html @@ -1,8 +1,10 @@ + Ebiten example - noise + @@ -23,7 +25,7 @@

Ebiten example - noise

- 
// +build example
+  
// +build example
 
 package main
 
@@ -83,7 +85,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/paint.content.html b/docs/examples/paint.content.html index 4865c9e22..0ec46961e 100644 --- a/docs/examples/paint.content.html +++ b/docs/examples/paint.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/paint.html b/docs/examples/paint.html index bf3200f31..c6e9dcdb4 100644 --- a/docs/examples/paint.html +++ b/docs/examples/paint.html @@ -1,8 +1,10 @@ + Ebiten example - paint + @@ -23,7 +25,7 @@

Ebiten example - paint

- 
// +build example
+  
// +build example
 
 package main
 
@@ -108,7 +110,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/perspective.content.html b/docs/examples/perspective.content.html index 1ada5ea0a..26463789f 100644 --- a/docs/examples/perspective.content.html +++ b/docs/examples/perspective.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/perspective.html b/docs/examples/perspective.html index 6428b49a2..bcb98c60a 100644 --- a/docs/examples/perspective.html +++ b/docs/examples/perspective.html @@ -1,8 +1,10 @@ + Ebiten example - perspective + @@ -23,7 +25,7 @@

Ebiten example - perspective

- 
// +build example
+  
// +build example
 
 package main
 
@@ -77,7 +79,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/piano.content.html b/docs/examples/piano.content.html index 2845eccb2..7bf73d540 100644 --- a/docs/examples/piano.content.html +++ b/docs/examples/piano.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/piano.html b/docs/examples/piano.html index 2a13271b1..a1126a52b 100644 --- a/docs/examples/piano.html +++ b/docs/examples/piano.html @@ -1,8 +1,10 @@ + Ebiten example - piano + @@ -23,7 +25,7 @@

Ebiten example - piano

- 
// +build example
+  
// +build example
 
 package main
 
@@ -212,7 +214,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/rotate.content.html b/docs/examples/rotate.content.html index e5397fb53..e3971c0a8 100644 --- a/docs/examples/rotate.content.html +++ b/docs/examples/rotate.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/rotate.html b/docs/examples/rotate.html index 5df190a91..72c96f5c1 100644 --- a/docs/examples/rotate.html +++ b/docs/examples/rotate.html @@ -1,8 +1,10 @@ + Ebiten example - rotate + @@ -23,7 +25,7 @@

Ebiten example - rotate

- 
// +build example
+  
// +build example
 
 package main
 
@@ -70,7 +72,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/examples/sprites.content.html b/docs/examples/sprites.content.html index 155de2fe8..cbefd1a20 100644 --- a/docs/examples/sprites.content.html +++ b/docs/examples/sprites.content.html @@ -1,4 +1,5 @@ + +(Example)

Now Loading...

diff --git a/docs/examples/sprites.html b/docs/examples/sprites.html index 78f3301b9..02d7ec6ce 100644 --- a/docs/examples/sprites.html +++ b/docs/examples/sprites.html @@ -1,8 +1,10 @@ + Ebiten example - sprites + @@ -23,7 +25,7 @@

Ebiten example - sprites

- 
// +build example
+  
// +build example
 
 package main
 
@@ -165,7 +167,7 @@ func main() {
                 log.Fatal(err)
         }
 }
-
+ diff --git a/docs/index.html b/docs/index.html index e604ee2f6..31c9be731 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,9 +1,11 @@ + Ebiten - A simple 2D game library in Go + @@ -58,51 +60,51 @@

Examples

- Ebiten example: alphablending + Ebiten example: alphablending
- Ebiten example: audio + Ebiten example: audio
- Ebiten example: font + Ebiten example: font
- Ebiten example: hsv + Ebiten example: hsv
- Ebiten example: hue + Ebiten example: hue
- Ebiten example: gamepad + Ebiten example: gamepad
- Ebiten example: infinitescroll + Ebiten example: infinitescroll
- Ebiten example: keyboard + Ebiten example: keyboard
- Ebiten example: life + Ebiten example: life
- Ebiten example: masking + Ebiten example: masking
- Ebiten example: mosaic + Ebiten example: mosaic
- Ebiten example: noise + Ebiten example: noise
- Ebiten example: paint + Ebiten example: paint
- Ebiten example: perspective + Ebiten example: perspective
- Ebiten example: piano + Ebiten example: piano
- Ebiten example: rotate + Ebiten example: rotate
- Ebiten example: sprites + Ebiten example: sprites
- Ebiten example: 2048 + Ebiten example: 2048
- Ebiten example: blocks + Ebiten example: blocks

The Gopher photographs by Chris Nokleberg are licensed under the Creative Commons 3.0 Attributions License.

-

Execute the examples

- 
go get github.com/hajimehoshi/ebiten/...
+  
Execute the examples

+  
go get github.com/hajimehoshi/ebiten/...
 cd $GOPATH/src/github.com/hajimehoshi/ebiten/examples
-go run -tags=example rotate/main.go
+go run -tags=example rotate/main.go

Note that you need to add -tags=example to run examples.

Getting Started

@@ -112,7 +114,7 @@ First create a new directory (mkdir hello_world), and change into it (cd hello_world). Type the following code into the main.go file:

- 
package main
+  
package main
 
 import (
         "github.com/hajimehoshi/ebiten"
@@ -127,7 +129,7 @@ func update(screen *ebiten.Image) error {
 func main() {
         ebiten.Run(update, 320, 240, 2, "Hello world!")
 }
-
+

Run the go run command to start the game. There you have it, your first Ebiten game!

diff --git a/docs/stylesheets/ebiten.css b/docs/stylesheets/ebiten.css index d593a937a..f8305e112 100644 --- a/docs/stylesheets/ebiten.css +++ b/docs/stylesheets/ebiten.css @@ -28,6 +28,10 @@ img.example { padding: 0; } +pre.card-body { + margin-bottom: 0; +} + nav { background-color: #657378; color: #fff;