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

fix vweb tutorial project; clean up gg functions a bit

Browse Source
This commit is contained in:
Alexander Medvednikov 2020-01-15 22:17:40 +01:00
parent 4f8848f658
commit de3ad2b04f
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tutorials/code/blog/blog.v
View File

@ -7,7 +7,7 @@ import (
json json
) )
struct App { pub struct App {
mut: mut:
vweb vweb.Context vweb vweb.Context
db pg.DB db pg.DB
@ -46,6 +46,9 @@ pub fn (app mut App) new() {
$vweb.html() $vweb.html()
} }
pub fn (app mut App) reset() {
}
pub fn (app mut App) new_article() { pub fn (app mut App) new_article() {
title := app.vweb.form['title'] title := app.vweb.form['title']
text := app.vweb.form['text'] text := app.vweb.form['text']

6
vlib/builtin/string.v
View File

@ -470,7 +470,7 @@ pub fn (s string) split_into_lines() []string {
} }
// 'hello'.left(2) => 'he' // 'hello'.left(2) => 'he'
fn (s string) left(n int) string { pub fn (s string) left(n int) string {
if n >= s.len { if n >= s.len {
return s return s
} }
@ -478,7 +478,7 @@ fn (s string) left(n int) string {
} }
// 'hello'.right(2) => 'llo' // 'hello'.right(2) => 'llo'
fn (s string) right(n int) string { pub fn (s string) right(n int) string {
if n >= s.len { if n >= s.len {
return '' return ''
} }
@ -491,7 +491,7 @@ fn (s string) substr2(start, _end int, end_max bool) string {
return s.substr(start, end) return s.substr(start, end)
} }
fn (s string) substr(start, end int) string { pub fn (s string) substr(start, end int) string {
if start > end || start > s.len || end > s.len || start < 0 || end < 0 { if start > end || start > s.len || end > s.len || start < 0 || end < 0 {
panic('substr($start, $end) out of bounds (len=$s.len)') panic('substr($start, $end) out of bounds (len=$s.len)')
} }

23
vlib/gg/gg.v
View File

@ -212,6 +212,9 @@ pub fn (ctx &GG) draw_rect(x, y, w, h f32, c gx.Color) {
ctx.draw_rect2(x, y, w, h, c) ctx.draw_rect2(x, y, w, h, c)
} }
pub fn (ctx &GG) draw_circle(x, y, radius int, c gx.Color) {
}
/* /*
fn (ctx mut GG) init_rect_vao() { fn (ctx mut GG) init_rect_vao() {
@ -357,6 +360,10 @@ fn (c GG) font_size(size int) {
fn (c GG) text_align(a int) { fn (c GG) text_align(a int) {
} }
pub fn (ctx &GG) create_image(file string) u32 {
return create_image(file)
}
pub fn create_image(file string) u32 { pub fn create_image(file string) u32 {
//println('gg create image "$file"') //println('gg create image "$file"')
if file.contains('twitch') { if file.contains('twitch') {
@ -386,7 +393,7 @@ pub fn create_image_from_memory(buf byteptr) u32 {
return texture return texture
} }
pub fn (ctx &GG) draw_line_c(x, y, x2, y2 f32, color gx.Color) { pub fn (ctx &GG) draw_line(x, y, x2, y2 f32, color gx.Color) {
ctx.shader.set_int('has_texture', 0) ctx.shader.set_int('has_texture', 0)
C.glDeleteBuffers(1, &ctx.vao) C.glDeleteBuffers(1, &ctx.vao)
C.glDeleteBuffers(1, &ctx.vbo) C.glDeleteBuffers(1, &ctx.vbo)
@ -401,13 +408,15 @@ pub fn (ctx &GG) draw_line_c(x, y, x2, y2 f32, color gx.Color) {
gl.draw_arrays(C.GL_LINES, 0, 2) gl.draw_arrays(C.GL_LINES, 0, 2)
} }
pub fn (c &GG) draw_line(x, y, x2, y2 f32) { /*
c.draw_line_c(x, y, x2, y2, gx.Gray) pub fn (c &GG) draw_gray_line(x, y, x2, y2 f32) {
c.draw_line(x, y, x2, y2, gx.Gray)
} }
pub fn (c &GG) draw_vertical(x, y, height int) { pub fn (c &GG) draw_vertical(x, y, height int) {
c.draw_line(x, y, x, y + height) c.draw_line(x, y, x, y + height)
} }
*/
//ctx.gg.draw_line(center + prev_x, center+prev_y, center + x*10.0, center+y) //ctx.gg.draw_line(center + prev_x, center+prev_y, center + x*10.0, center+y)
@ -463,8 +472,8 @@ pub fn (ctx &GG) draw_image(x, y, w, h f32, tex_id u32) {
} }
pub fn (c &GG) draw_empty_rect(x, y, w, h f32, color gx.Color) { pub fn (c &GG) draw_empty_rect(x, y, w, h f32, color gx.Color) {
c.draw_line_c(x, y, x + w, y, color) c.draw_line(x, y, x + w, y, color)
c.draw_line_c(x, y, x, y + h, color) c.draw_line(x, y, x, y + h, color)
c.draw_line_c(x, y + h, x + w, y + h, color) c.draw_line(x, y + h, x + w, y + h, color)
c.draw_line_c(x + w, y, x + w, y + h, color) c.draw_line(x + w, y, x + w, y + h, color)
} }