From a1dcc3bb9f687cbca0ac1d3508bc848048935dcd Mon Sep 17 00:00:00 2001 From: pancake Date: Sun, 30 Aug 2020 18:11:59 +0200 Subject: [PATCH] examples: make the graph example resizable, use cooler lines (#6267) --- examples/hot_reload/graph.v | 29 ++++++++++++++++++----------- thirdparty/sokol/util/sokol_gl.h | 4 ++-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/examples/hot_reload/graph.v b/examples/hot_reload/graph.v index b3834e02c7..7ae0d62b30 100644 --- a/examples/hot_reload/graph.v +++ b/examples/hot_reload/graph.v @@ -2,13 +2,13 @@ module main import gx import gg +import sokol.sapp import time import math const ( size = 700 scale = 50.0 - pi = math.pi ) struct Context { @@ -29,6 +29,7 @@ fn main() { window_title: 'Graph builder' create_window: true frame_fn: frame + resizable: true bg_color: gx.white font_path: gg.system_font_path() }) @@ -43,24 +44,30 @@ fn frame(mut ctx Context) { [live] fn (ctx &Context) draw() { - center := f32(size / 2) - ctx.gg.draw_line(0, center, size, center, gx.gray) // x axis - ctx.gg.draw_line(center, 0, center, size, gx.gray) // y axis + w := sapp.width() + h := sapp.height() + ctx.gg.draw_line(0, h/2, w, h/2, gx.gray) // x axis + ctx.gg.draw_line(w/2, 0, w/2, h, gx.gray) // y axis atime := f64(time.ticks() / 10) - stime := math.sin(2.0 * pi * f64(time.ticks() % 6000) / 6000) + stime := math.sin(2.0 * math.pi * f64(time.ticks() % 6000) / 6000) mut y := 0.0 + blue := gx.Color {r:100, g:100, b:200} + red := gx.Color {r:200, g:100, b:100} y = 1.0 - for x := -10.0; x <= 10.0; x += 0.02 { + max := f32(w)/scale + min := -max + for x := min; x <= max; x += 0.01 { // y = x*x + 2 - y = x * x + stime * stime + // y = x * x + stime * stime // y = stime - // y = stime * x - y = stime * 1.0 * math.sin(x + stime + atime / 50) * x + // y = stime * h + y = stime * 1.0 * math.sin((x) + stime + atime / 32) * ((h/256) + x) // y = (stime * x) * x + stime // y = (x + 3) * (x + 3) / stime + stime*2.5 // y = math.sqrt(30.0 - x * x) * stime // y -= (stime-0.5) + stime - ctx.gg.draw_rect(f32(center + x * scale), f32(center - y * scale), 1, 1, gx.blue) - ctx.gg.draw_rect(f32(center + x * scale), f32(center + y * scale), 1, 1, gx.red) + // ctx.gg.draw_rect(f32((w/2) + x * scale), f32((h/2) - y * scale), 2, 2, blue) + ctx.gg.draw_rect(f32((w/2) + x * scale), f32((h/2) - y * scale), 2, (f32(y) * scale), blue) + ctx.gg.draw_rect(f32((w/2) + x * scale), f32((h/2) + y * scale), 2, (f32(y) * scale) + 32, red) } } diff --git a/thirdparty/sokol/util/sokol_gl.h b/thirdparty/sokol/util/sokol_gl.h index e7b7b5537e..15a110a4e7 100755 --- a/thirdparty/sokol/util/sokol_gl.h +++ b/thirdparty/sokol/util/sokol_gl.h @@ -2011,8 +2011,8 @@ typedef struct { #define _SGL_INVALID_SLOT_INDEX (0) #define _SGL_MAX_STACK_DEPTH (64) #define _SGL_DEFAULT_PIPELINE_POOL_SIZE (64) -#define _SGL_DEFAULT_MAX_VERTICES (1<<16) -#define _SGL_DEFAULT_MAX_COMMANDS (1<<14) +#define _SGL_DEFAULT_MAX_VERTICES (1<<17) +#define _SGL_DEFAULT_MAX_COMMANDS (1<<15) #define _SGL_SLOT_SHIFT (16) #define _SGL_MAX_POOL_SIZE (1<<_SGL_SLOT_SHIFT) #define _SGL_SLOT_MASK (_SGL_MAX_POOL_SIZE-1)