mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

gg: use gg types for Events instead of sapp

Browse Source
This commit is contained in:
Alexander Medvednikov
2021-02-17 06:44:01 +01:00
parent 3341c17202
commit d4a05bebde
9 changed files with 247 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
examples/2048/2048.v
View File

@ -3,7 +3,6 @@ import gx
import math
import os
import rand
import sokol.sapp
import time
struct App {
@ -348,11 +347,10 @@ fn (mut b Board) is_game_over() bool {
// there are remaining zeros
return false
}
if (x > 0 && fidx == b.field[y][x - 1]) ||
(x < 4 - 1 && fidx == b.field[y][x + 1]) ||
(y > 0 && fidx == b.field[y - 1][x]) ||
(y < 4 - 1 && fidx == b.field[y + 1][x])
{
if (x > 0 && fidx == b.field[y][x - 1])
|| (x < 4 - 1 && fidx == b.field[y][x + 1])
|| (y > 0 && fidx == b.field[y - 1][x])
|| (y < 4 - 1 && fidx == b.field[y + 1][x]) {
// there are remaining merges
return false
}
@ -530,48 +528,52 @@ fn (mut app App) ai_move() {
fn (app &App) label_format(kind LabelKind) gx.TextCfg {
match kind {
.points { return {
color: if app.state in [.over, .victory] {
gx.white
} else {
app.theme.text_color
}
.points {
return {
color: if app.state in [.over, .victory] { gx.white } else { app.theme.text_color }
align: .left
size: app.ui.font_size / 2
} }
.moves { return {
color: if app.state in [.over, .victory] {
gx.white
} else {
app.theme.text_color
}
}
}
.moves {
return {
color: if app.state in [.over, .victory] { gx.white } else { app.theme.text_color }
align: .right
size: app.ui.font_size / 2
} }
.tile { return {
}
}
.tile {
return {
color: app.theme.text_color
align: .center
vertical_align: .middle
size: app.ui.font_size
} }
.victory { return {
}
}
.victory {
return {
color: app.theme.victory_color
align: .center
vertical_align: .middle
size: app.ui.font_size * 2
} }
.game_over { return {
}
}
.game_over {
return {
color: app.theme.game_over_color
align: .center
vertical_align: .middle
size: app.ui.font_size * 2
} }
.score_end { return {
}
}
.score_end {
return {
color: gx.white
align: .center
vertical_align: .middle
size: app.ui.font_size * 3 / 4
} }
}
}
}
}
@ -584,12 +586,13 @@ fn (mut app App) set_theme(idx int) {
}
fn (mut app App) resize() {
mut s := sapp.dpi_scale()
mut s := gg.dpi_scale()
if s == 0.0 {
s = 1.0
}
w := int(sapp.width() / s)
h := int(sapp.height() / s)
window_size := gg.window_size()
w := int(window_size.width / s)
h := int(window_size.height / s)
m := f32(min(w, h))
app.ui.dpi_scale = s
app.ui.window_width = w
@ -790,11 +793,7 @@ fn (mut app App) handle_swipe() {
[inline]
fn (mut app App) next_theme() {
app.set_theme(if app.theme_idx == themes.len - 1 {
0
} else {
app.theme_idx + 1
})
app.set_theme(if app.theme_idx == themes.len - 1 { 0 } else { app.theme_idx + 1 })
}
[inline]
@ -815,7 +814,7 @@ fn (mut app App) undo() {
}
}
fn (mut app App) on_key_down(key sapp.KeyCode) {
fn (mut app App) on_key_down(key gg.KeyCode) {
// these keys are independent from the game state:
match key {
.a { app.is_ai_mode = !app.is_ai_mode }
@ -843,7 +842,7 @@ fn (mut app App) on_key_down(key sapp.KeyCode) {
}
}
fn on_event(e &sapp.Event, mut app App) {
fn on_event(e &gg.Event, mut app App) {
match e.typ {
.key_down {
app.on_key_down(e.key_code)