From 8aa72d95763c58a2fd162ec8731b0d4b5f198447 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sun, 4 Feb 2018 23:52:19 +0900
Subject: [PATCH] docs: Update

---
 docs/examples/audio.html | 56 +++++-----------------------------------
 docs/examples/piano.html | 16 ++----------
 2 files changed, 9 insertions(+), 63 deletions(-)

diff --git a/docs/examples/audio.html b/docs/examples/audio.html
index f9d38cebd..7fc663fc2 100644
--- a/docs/examples/audio.html
+++ b/docs/examples/audio.html
@@ -46,6 +46,7 @@ import (
         &#34;github.com/hajimehoshi/ebiten/audio/mp3&#34;
         &#34;github.com/hajimehoshi/ebiten/audio/wav&#34;
         &#34;github.com/hajimehoshi/ebiten/ebitenutil&#34;
+        &#34;github.com/hajimehoshi/ebiten/inpututil&#34;
 )
 
 const (
@@ -62,46 +63,8 @@ var (
         playerCurrentColor = color.RGBA{0xff, 0xff, 0xff, 0xff}
 )
 
-// Input manages the current input state to detect keys &#39;just pressed&#39;.
-//
-// Note: &#39;just pressed&#39; is a very common idiom.
-// There is a plan to create a new package for input utility.
-// See https://github.com/hajimehoshi/ebiten/issues/415.
-type Input struct {
-        mouseButtonStates map[ebiten.MouseButton]int
-        keyStates         map[ebiten.Key]int
-}
-
-func (i *Input) update() {
-        for _, key := range []ebiten.Key{ebiten.KeyP, ebiten.KeyS, ebiten.KeyX, ebiten.KeyZ, ebiten.KeyB} {
-                if !ebiten.IsKeyPressed(key) {
-                        i.keyStates[key] = 0
-                } else {
-                        i.keyStates[key]&#43;&#43;
-                }
-        }
-        if !ebiten.IsMouseButtonPressed(ebiten.MouseButtonLeft) {
-                i.mouseButtonStates[ebiten.MouseButtonLeft] = 0
-        } else {
-                i.mouseButtonStates[ebiten.MouseButtonLeft]&#43;&#43;
-        }
-}
-
-func (i *Input) isKeyJustPressed(key ebiten.Key) bool {
-        return i.keyStates[key] == 1
-}
-
-func (i *Input) isKeyPressed(key ebiten.Key) bool {
-        return i.keyStates[key] &gt; 0
-}
-
-func (i *Input) isMouseButtonJustPressed(mouseButton ebiten.MouseButton) bool {
-        return i.mouseButtonStates[mouseButton] == 1
-}
-
 // Player represents the current audio state.
 type Player struct {
-        input        *Input
         audioContext *audio.Context
         audioPlayer  *audio.Player
         current      time.Duration
@@ -137,10 +100,6 @@ func NewPlayer(audioContext *audio.Context) (*Player, error) {
                 return nil, err
         }
         player := &amp;Player{
-                input: &amp;Input{
-                        mouseButtonStates: map[ebiten.MouseButton]int{},
-                        keyStates:         map[ebiten.Key]int{},
-                },
                 audioContext: audioContext,
                 audioPlayer:  p,
                 total:        time.Second * time.Duration(s.Length()) / bytesPerSample / sampleRate,
@@ -168,7 +127,6 @@ func NewPlayer(audioContext *audio.Context) (*Player, error) {
 }
 
 func (p *Player) update() error {
-        p.input.update()
         select {
         case p.seBytes = &lt;-p.seCh:
                 close(p.seCh)
@@ -184,7 +142,7 @@ func (p *Player) update() error {
         p.playSEIfNeeded()
         p.updateVolumeIfNeeded()
 
-        if p.input.isKeyJustPressed(ebiten.KeyB) {
+        if inpututil.IsKeyJustPressed(ebiten.KeyB) {
                 b := ebiten.IsRunnableInBackground()
                 ebiten.SetRunnableInBackground(!b)
         }
@@ -197,7 +155,7 @@ func (p *Player) playSEIfNeeded() {
                 return
         }
 
-        if !p.input.isKeyJustPressed(ebiten.KeyP) {
+        if !inpututil.IsKeyJustPressed(ebiten.KeyP) {
                 return
         }
         sePlayer, _ := audio.NewPlayerFromBytes(p.audioContext, p.seBytes)
@@ -205,10 +163,10 @@ func (p *Player) playSEIfNeeded() {
 }
 
 func (p *Player) updateVolumeIfNeeded() {
-        if p.input.isKeyPressed(ebiten.KeyZ) {
+        if ebiten.IsKeyPressed(ebiten.KeyZ) {
                 p.volume128--
         }
-        if p.input.isKeyPressed(ebiten.KeyX) {
+        if ebiten.IsKeyPressed(ebiten.KeyX) {
                 p.volume128&#43;&#43;
         }
         if p.volume128 &lt; 0 {
@@ -221,7 +179,7 @@ func (p *Player) updateVolumeIfNeeded() {
 }
 
 func (p *Player) switchPlayStateIfNeeded() {
-        if !p.input.isKeyJustPressed(ebiten.KeyS) {
+        if !inpututil.IsKeyJustPressed(ebiten.KeyS) {
                 return
         }
         if p.audioPlayer.IsPlaying() {
@@ -232,7 +190,7 @@ func (p *Player) switchPlayStateIfNeeded() {
 }
 
 func (p *Player) seekBarIfNeeded() {
-        if !p.input.isMouseButtonJustPressed(ebiten.MouseButtonLeft) {
+        if !inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft) {
                 return
         }
 
diff --git a/docs/examples/piano.html b/docs/examples/piano.html
index 83674efe6..bcc7ba809 100644
--- a/docs/examples/piano.html
+++ b/docs/examples/piano.html
@@ -44,6 +44,7 @@ import (
         &#34;github.com/hajimehoshi/ebiten&#34;
         &#34;github.com/hajimehoshi/ebiten/audio&#34;
         &#34;github.com/hajimehoshi/ebiten/ebitenutil&#34;
+        &#34;github.com/hajimehoshi/ebiten/inpututil&#34;
         &#34;github.com/hajimehoshi/ebiten/text&#34;
 )
 
@@ -224,20 +225,8 @@ var (
                 ebiten.KeyO,
                 ebiten.KeyL,
         }
-        keyStates = map[ebiten.Key]int{}
 )
 
-// updateInput updates the input state.
-func updateInput() {
-        for _, key := range keys {
-                if !ebiten.IsKeyPressed(key) {
-                        keyStates[key] = 0
-                        continue
-                }
-                keyStates[key]&#43;&#43;
-        }
-}
-
 func update(screen *ebiten.Image) error {
         // The piano data is still being initialized.
         // Get the progress if available.
@@ -250,9 +239,8 @@ func update(screen *ebiten.Image) error {
         }
 
         if pianoNoteSamplesInited {
-                updateInput()
                 for i, key := range keys {
-                        if keyStates[key] != 1 {
+                        if !inpututil.IsKeyJustPressed(key) {
                                 continue
                         }
                         playNote(baseFreq * math.Exp2(float64(i-1)/12.0))