added sound

Author: Kaiser

README.md

@@ -1,20 +1,26 @@
 # Gong! - The Go Pong
 
-Retro style Pong game based upon ebiten game framework.
+Retro styled classic [Pong](https://en.wikipedia.org/wiki/Pong) clone based upon [ebiten](https://ebiten.org/) game framework.
 
 With go installed, just type
 
 ```bash
-go install github.com/jenska/gong
+git clone http://github.com/jenska/gong
+cd gong
+go run main.go
 ```
 
 to start
 
-![Screenshot](screenshot.png)
+![Screenshot](assets/screenshot.png)
+
+## Thanks to
+
+[OpenGameArt.Org](https://opengameart.org/)
 
 ## Soon to come
 
 - ~~update package structure~~
+- ~~stereo sounds~~
 - AI support (beat the computer opponent, computer vs computer becomes more interessting)
-- stereo sounds
 - WebAssembly support

assets/lost.wav

@@ -29,17 +29,19 @@ func (b *ball) reset() {
 }
 
 func (b *ball) update(g *Gong) {
-	b.visible = g.state == play || g.state == interrupt
 	if g.state == play {
 		b.x += b.xVelocity
 		b.y += b.yVelocity
 
 		if b.y-ballRadius > windowHeight {
+			playSound(ping)
 			b.yVelocity = -b.yVelocity
 			b.y = windowHeight - ballRadius
 		} else if b.y+ballRadius < 0 {
+			playSound(ping)
 			b.yVelocity = -b.yVelocity
 			b.y = ballRadius
 		}
 	}
+	b.visible = g.state == play || g.state == interrupt
 }

assets/menu_select.wav

@@ -2,6 +2,7 @@ package game
 
 import (
 	"image/color"
+	"math"
 	"os"
 	"time"
 
@@ -52,6 +53,9 @@ var (
 
 // NewGong creates a new gong object
 func NewGong() *Gong {
+	ebiten.SetWindowSize(windowWidth, windowHeight)
+	ebiten.SetWindowTitle("Gong! - The Go Pong")
+	ebiten.SetCursorMode(ebiten.CursorModeHidden)
 	g := &Gong{}
 	g.reset()
 	return g
@@ -66,48 +70,61 @@ func (g *Gong) reset() {
 		newHUD(),
 	}
 	g.state = start
-
 }
 
 // Layout sets the screen layout
 func (g *Gong) Layout(outsideWidth, outsideHeight int) (int, int) {
 	return windowWidth, windowHeight
 }
 
+func isMenuSelected(key ebiten.Key) bool {
+	if inpututil.IsKeyJustPressed(key) {
+		playSound(menuSelect)
+		return true
+	}
+	return false
+}
+
 // Update game state and sprites
 func (g *Gong) Update(screen *ebiten.Image) error {
 	if inpututil.IsKeyJustPressed(ebiten.KeyEscape) {
 		os.Exit(0)
 	}
 	switch g.state {
 	case start:
-		if inpututil.IsKeyJustPressed(ebiten.KeyH) {
+		if isMenuSelected(ebiten.KeyH) {
 			g.state = controls
-		} else if inpututil.IsKeyJustPressed(ebiten.KeyA) {
-			g.isComputer1 = true
+		} else if isMenuSelected(ebiten.KeyA) {
+			g.isComputer1, g.isComputer2 = true, false
 			g.state = play
-		} else if inpututil.IsKeyJustPressed(ebiten.KeyV) {
+		} else if isMenuSelected(ebiten.KeyV) {
 			g.state = play
-		} else if inpututil.IsKeyJustPressed(ebiten.KeyB) {
+		} else if isMenuSelected(ebiten.KeyB) {
 			g.isComputer1, g.isComputer2 = true, true
 			g.state = play
+		} else if isMenuSelected(ebiten.KeyF) {
+			ebiten.SetFullscreen(!ebiten.IsFullscreen())
+		} else if isMenuSelected(ebiten.KeyW) {
+			sl.volume = math.Min(1.0, sl.volume+0.1)
+		} else if isMenuSelected(ebiten.KeyS) {
+			sl.volume = math.Max(0.0, sl.volume-0.1)
 		}
 	case controls:
-		if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
+		if isMenuSelected(ebiten.KeySpace) {
 			g.state = start
 		}
 	case pause:
-		if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
+		if isMenuSelected(ebiten.KeySpace) {
 			g.state = play
-		} else if inpututil.IsKeyJustPressed(ebiten.KeyR) {
+		} else if isMenuSelected(ebiten.KeyR) {
 			g.reset()
 		}
 	case play:
-		if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
+		if isMenuSelected(ebiten.KeySpace) {
 			g.state = pause
 		}
 	case gameOver:
-		if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
+		if isMenuSelected(ebiten.KeySpace) {
 			g.reset()
 		}
 	case interrupt:
@@ -125,6 +142,7 @@ func (g *Gong) Update(screen *ebiten.Image) error {
 // Draw updates the game screen elements drawn
 func (g *Gong) Draw(screen *ebiten.Image) {
 	screen.Fill(screenColor)
+
 	for _, object := range g.objects {
 		object.draw(screen)
 	}

assets/ping.wav

@@ -14,8 +14,9 @@ import (
 )
 
 const (
-	fontSize      = 30
-	smallFontSize = fontSize / 2
+	fontSize       = 30
+	smallFontSize  = fontSize / 2
+	ghostTextShift = 10
 )
 
 type hud struct {
@@ -77,12 +78,16 @@ func (h *hud) update(g *Gong) {
 	case start:
 		h.hints = []string{
 			"",
-			"      GONG!      ",
+			"GONG!",
 			"",
-			"H -> HELP         ",
-			"V -> TWO PLAYERS  ",
-			"A -> AI VS PLAYER ",
-			"B -> AI VS AI     "}
+			"V   -> TWO PLAYERS ",
+			"A   -> AI VS PLAYER",
+			"B   -> AI VS AI    ",
+			"",
+			"F   -> Fullscreen  ",
+			fmt.Sprintf("W/S -> Volume %3d%% ", int(sl.volume*100)),
+			"H   -> HELP        ",
+			"ESC -> Exit        "}
 	case controls:
 		h.hints = []string{
 			"",
@@ -92,9 +97,7 @@ func (h *hud) update(g *Gong) {
 			"",
 			"PLAYER 2:  ",
 			"ARROW UP   ",
-			"ARROW DOWN ",
-			"",
-			"ESC -> EXIT"}
+			"ARROW DOWN "}
 		h.message = "SPACE -> main menu"
 	case pause:
 		h.hints = []string{
@@ -105,7 +108,6 @@ func (h *hud) update(g *Gong) {
 	case play, interrupt:
 		h.message = "SPACE -> PAUSE"
 		h.scores = fmt.Sprintf("%s: %d <-> %s: %d", player1, g.score1, player2, g.score2)
-
 	case gameOver:
 		winner := player1
 		if g.score2 > g.score1 {
@@ -127,6 +129,6 @@ func (h *hud) draw(screen *ebiten.Image) {
 
 func drawText(y int, str string, font font.Face, size int, screen *ebiten.Image) {
 	x := (windowWidth - len(str)*size) / 2
-	text.Draw(screen, str, font, x+10, y, ghostColor)
+	text.Draw(screen, str, font, x+ghostTextShift, y, ghostColor)
 	text.Draw(screen, str, font, x, y, objectColor)
 }