From de3ad2b04f2db2d02c76025d0dbe0e947097260a Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Wed, 15 Jan 2020 22:17:40 +0100
Subject: [PATCH] fix vweb tutorial project; clean up gg functions a bit

---
 tutorials/code/blog/blog.v |  5 ++++-
 vlib/builtin/string.v      |  6 +++---
 vlib/gg/gg.v               | 27 ++++++++++++++++++---------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/tutorials/code/blog/blog.v b/tutorials/code/blog/blog.v
index df99c2138c..6f7476ca39 100644
--- a/tutorials/code/blog/blog.v
+++ b/tutorials/code/blog/blog.v
@@ -7,7 +7,7 @@ import (
 	json
 )
 
-struct App {
+pub struct App {
 mut:
 	vweb vweb.Context
 	db pg.DB
@@ -46,6 +46,9 @@ pub fn (app mut App) new() {
 	$vweb.html()
 }
 
+pub fn (app mut App) reset() {
+}
+
 pub fn (app mut App) new_article() {
 	title := app.vweb.form['title']
 	text := app.vweb.form['text']
diff --git a/vlib/builtin/string.v b/vlib/builtin/string.v
index 3fddf841e7..7512fe27a0 100644
--- a/vlib/builtin/string.v
+++ b/vlib/builtin/string.v
@@ -470,7 +470,7 @@ pub fn (s string) split_into_lines() []string {
 }
 
 // 'hello'.left(2) => 'he'
-fn (s string) left(n int) string {
+pub fn (s string) left(n int) string {
 	if n >= s.len {
 		return s
 	}
@@ -478,7 +478,7 @@ fn (s string) left(n int) string {
 }
 
 // 'hello'.right(2) => 'llo'
-fn (s string) right(n int) string {
+pub fn (s string) right(n int) string {
 	if n >= s.len {
 		return ''
 	}
@@ -491,7 +491,7 @@ fn (s string) substr2(start, _end int, end_max bool) string {
 	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 {
 		panic('substr($start, $end) out of bounds (len=$s.len)')
 	}
diff --git a/vlib/gg/gg.v b/vlib/gg/gg.v
index 68ebfc91a8..2cfa940a2e 100644
--- a/vlib/gg/gg.v
+++ b/vlib/gg/gg.v
@@ -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)
 }
 
+pub fn (ctx &GG) draw_circle(x, y, radius int, c gx.Color) {
+}
+
 /*
 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) {
 }
 
+pub fn (ctx &GG) create_image(file string) u32 {
+	return create_image(file)
+}
+
 pub fn create_image(file string) u32 {
 	//println('gg create image "$file"')
 	if file.contains('twitch') {
@@ -386,7 +393,7 @@ pub fn create_image_from_memory(buf byteptr) u32 {
 	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)
 	C.glDeleteBuffers(1, &ctx.vao)
 	C.glDeleteBuffers(1, &ctx.vbo)
@@ -401,23 +408,25 @@ pub fn (ctx &GG) draw_line_c(x, y, x2, y2 f32, color gx.Color) {
 	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) {
 	c.draw_line(x, y, x, y + height)
 }
+*/
 
 
 //ctx.gg.draw_line(center + prev_x, center+prev_y, center + x*10.0, center+y)
 
 // fn (ctx &GG) draw_image(x, y, w, h f32, img stbi.Image) {
 pub fn (ctx &GG) draw_image(x, y, w, h f32, tex_id u32) {
-    
+
 	// NB: HACK to ensure same state ... TODO: remove next line
 	ctx.draw_empty_rect(0,0,0,0, gx.white)
-    
+
 	last_array_buffer := 0
 	last_texture := 0
 	C.glGetIntegerv(C.GL_ARRAY_BUFFER_BINDING, &last_array_buffer)
@@ -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) {
-	c.draw_line_c(x, y, x + w, y, color)
-	c.draw_line_c(x, y, x, y + h, color)
-	c.draw_line_c(x, y + h, x + w, y + h, color)
-	c.draw_line_c(x + w, y, x + w, y + h, color)
+	c.draw_line(x, y, x + w, y, color)
+	c.draw_line(x, y, x, y + h, color)
+	c.draw_line(x, y + h, x + w, y + h, color)
+	c.draw_line(x + w, y, x + w, y + h, color)
 }