classic-games/tennis-game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: random direction of the ball at the beginning of the match/after a restart (#4)

Browse Source 
Reviewed-on: #4
This commit is contained in:
Dawid Wysokiński 2023-12-02 07:48:46 +00:00
parent 1f7a8aed38
commit 88ecbf6362
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/ball.go
View File

@ -3,6 +3,8 @@ package internal
import (
"image"
"image/color"
"math/rand"
"time"
"github.com/hajimehoshi/ebiten/v2"
"github.com/hajimehoshi/ebiten/v2/vector"
@ -20,23 +22,25 @@ type ball struct {
const (
ballBaseRadius = 5
ballBaseSpeedX = 1
ballBaseSpeedY = 1
ballBaseSpeedX = 1.5
ballBaseSpeedY = 1.5
)
func newBall(screenWidth, screenHeight int) *ball {
fScreenWidth := float32(screenWidth)
fScreenHeight := float32(screenHeight)
r := ballBaseRadius * fScreenHeight / BaseHeight
x := fScreenWidth/2.0 - r
y := fScreenHeight/2.0 - r
return &ball{
x: x,
y: y,
initX: x,
initY: y,
speedX: ballBaseSpeedX * fScreenWidth / BaseWidth,
speedY: ballBaseSpeedY * fScreenHeight / BaseHeight,
speedX: randSpeedDirection() * ballBaseSpeedX * fScreenWidth / BaseWidth,
speedY: randSpeedDirection() * ballBaseSpeedY * fScreenHeight / BaseHeight,
r: r,
}
}
@ -99,6 +103,8 @@ func (b *ball) nextSpeed(bounds image.Rectangle, obstacles ...image.Rectangle) (
func (b *ball) reset() {
b.x = b.initX
b.y = b.initY
b.speedX *= randSpeedDirection()
b.speedY *= randSpeedDirection()
}
func (b *ball) resize(x, y float32) {
@ -114,3 +120,14 @@ func (b *ball) resize(x, y float32) {
func (b *ball) bounds() image.Rectangle {
return image.Rect(int(b.x-b.r), int(b.y-b.r), int(b.x+b.r), int(b.y+b.r))
}
func randSpeedDirection() float32 {
//nolint:gosec
r := rand.New(rand.NewSource(time.Now().Unix()))
if r.Intn(101) >= 50 {
return -1
}
return 1
}