tetris.v: minor User Interface improvements

pull/2514/head
Sergio Abreu García 2019-10-23 15:19:05 +02:00 committed by Alexander Medvednikov
parent 054dd237a4
commit 374133086d
1 changed files with 16 additions and 5 deletions

View File

@ -21,6 +21,7 @@ const (
WinHeight = BlockSize * FieldHeight
TimerPeriod = 250 // ms
TextSize = 12
LimitThickness = 3
)
const (
@ -80,6 +81,9 @@ const (
gx.rgb(170, 85, 0), // brown longest
gx.rgb(0, 170, 170), // unused ?
]
BackgroundColor = gx.White
UIColor = gx.Red
)
// TODO: type Tetro [TetroSize]struct{ x, y int }
@ -140,7 +144,7 @@ fn main() {
game.init_game()
game.gg.window.onkeydown(key_down)
go game.run() // Run the game loop in a new thread
gg.clear(gx.White)
gg.clear(BackgroundColor)
// Try to load font
game.ft = freetype.new_context(gg.Cfg{
width: WinWidth
@ -151,7 +155,7 @@ fn main() {
})
game.font_loaded = (game.ft != 0 )
for {
gg.clear(gx.White)
gg.clear(BackgroundColor)
game.draw_scene()
game.gg.render()
if game.gg.window.should_close() {
@ -319,23 +323,30 @@ fn (g &Game) draw_field() {
}
}
fn (g mut Game) draw_score() {
if g.font_loaded {
fn (g mut Game) draw_ui() {
if g.font_loaded {WinHeight / 2 + 2 * TextSize
g.ft.draw_text(1, 2, 'score: ' + g.score.str(), text_cfg)
if g.state == .gameover {
g.gg.draw_rect(0, WinHeight / 2 - TextSize, WinWidth,
5 * TextSize, UIColor)
g.ft.draw_text(1, WinHeight / 2 + 0 * TextSize, 'Game Over', text_cfg)
g.ft.draw_text(1, WinHeight / 2 + 2 * TextSize, 'SPACE to restart', text_cfg)
} else if g.state == .paused {
g.gg.draw_rect(0, WinHeight / 2 - TextSize, WinWidth,
5 * TextSize, UIColor)
g.ft.draw_text(1, WinHeight / 2 + 0 * TextSize, 'Game Paused', text_cfg)
g.ft.draw_text(1, WinHeight / 2 + 2 * TextSize, 'SPACE to resume', text_cfg)
}
}
g.gg.draw_rect(0, BlockSize, WinWidth, LimitThickness, UIColor)
}
fn (g mut Game) draw_scene() {
g.draw_tetro()
g.draw_field()
g.draw_score()
g.draw_ui()
}
fn parse_binary_tetro(t_ int) []Block {