From 6ec86fa3448b42c2f66563a78cfb6d96b1297233 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Thu, 2 Jul 2020 15:31:42 +0300 Subject: [PATCH] vfmt: reformat examples/sokol/particles *.v files --- examples/sokol/particles/main.v | 4 +- examples/sokol/particles/particle/color.v | 5 +- examples/sokol/particles/particle/particle.v | 54 +++++-------- examples/sokol/particles/particle/system.v | 48 +++++------- examples/sokol/particles/particle/vec2/vec2.v | 78 ++++++++----------- 5 files changed, 74 insertions(+), 115 deletions(-) diff --git a/examples/sokol/particles/main.v b/examples/sokol/particles/main.v index 6a721fca9b..fed2e1a77f 100644 --- a/examples/sokol/particles/main.v +++ b/examples/sokol/particles/main.v @@ -48,7 +48,7 @@ fn (mut a App) cleanup() { fn (a App) run() { title := 'V Particle Example' - desc := C.sapp_desc { + desc := C.sapp_desc{ width: a.width height: a.height user_data: &a @@ -67,7 +67,7 @@ fn (a App) draw() { } fn init(user_data voidptr) { - desc := C.sg_desc { + desc := C.sg_desc{ mtl_device: sapp.metal_get_device() mtl_renderpass_descriptor_cb: sapp.metal_get_renderpass_descriptor mtl_drawable_cb: sapp.metal_get_drawable diff --git a/examples/sokol/particles/particle/color.v b/examples/sokol/particles/particle/color.v index 813958a3e3..535e48ad70 100644 --- a/examples/sokol/particles/particle/color.v +++ b/examples/sokol/particles/particle/color.v @@ -1,11 +1,8 @@ // Copyright(C) 2019 Lars Pontoppidan. All rights reserved. // Use of this source code is governed by an MIT license file distributed with this software package - module particle -/* -* Color -*/ +// * Color pub struct Color { mut: r byte diff --git a/examples/sokol/particles/particle/particle.v b/examples/sokol/particles/particle/particle.v index 66564a308a..63dc6fcc0c 100644 --- a/examples/sokol/particles/particle/particle.v +++ b/examples/sokol/particles/particle/particle.v @@ -1,6 +1,5 @@ // Copyright(C) 2019 Lars Pontoppidan. All rights reserved. // Use of this source code is governed by an MIT license file distributed with this software package - module particle import vec2 @@ -8,21 +7,16 @@ import sokol.sgl const ( default_life_time = 1000 - default_v_color = Color{93, 136, 193, 255 } + default_v_color = Color{93, 136, 193, 255} ) -/* -* Module public -*/ +// * Module public pub fn new(location vec2.Vec2) &Particle { - - p := &Particle { - location: location, - velocity: vec2.Vec2{0,0} - acceleration: vec2.Vec2{0,0} - + p := &Particle{ + location: location + velocity: vec2.Vec2{0, 0} + acceleration: vec2.Vec2{0, 0} color: default_v_color - life_time: default_life_time life_time_init: default_life_time } @@ -33,20 +27,15 @@ fn remap(v, min, max, new_min, new_max f64) f64 { return (((v - min) * (new_max - new_min)) / (max - min)) + new_min } -/* -* Particle -*/ +// * Particle pub struct Particle { - mut: - location vec2.Vec2 - velocity vec2.Vec2 - acceleration vec2.Vec2 - - color Color - - life_time f64 - life_time_init f64 + location vec2.Vec2 + velocity vec2.Vec2 + acceleration vec2.Vec2 + color Color + life_time f64 + life_time_init f64 } pub fn (mut p Particle) update(dt f64) { @@ -54,16 +43,13 @@ pub fn (mut p Particle) update(dt f64) { acc.multiply_f64(dt) p.velocity = p.velocity.add(acc) p.location = p.location.add(p.velocity) - lt := p.life_time - (1000 * dt) if lt > 0 { p.life_time = lt - - p.color.r = p.color.r - 1 //byte(remap(p.life_time,0.0,p.life_time_init,0,p.color.r)) - p.color.g = p.color.g - 1 //byte(remap(p.life_time,0.0,p.life_time_init,0,p.color.g)) - p.color.b = p.color.b - 1 //byte(remap(p.life_time,0.0,p.life_time_init,0,p.color.b)) - - //p.color.a = byte(remap(p.life_time,0.0,p.life_time_init,0,255)) + p.color.r = p.color.r - 1 // byte(remap(p.life_time,0.0,p.life_time_init,0,p.color.r)) + p.color.g = p.color.g - 1 // byte(remap(p.life_time,0.0,p.life_time_init,0,p.color.g)) + p.color.b = p.color.b - 1 // byte(remap(p.life_time,0.0,p.life_time_init,0,p.color.b)) + // p.color.a = byte(remap(p.life_time,0.0,p.life_time_init,0,255)) } else { p.life_time = 0 } @@ -75,9 +61,7 @@ pub fn (p Particle) is_dead() bool { pub fn (p Particle) draw() { l := p.location - sgl.c4b(p.color.r, p.color.g, p.color.b, p.color.a) - lx := f32(l.x) ly := f32(l.y) sgl.v2f(lx, ly) @@ -90,10 +74,8 @@ pub fn (mut p Particle) reset() { p.location.zero() p.acceleration.zero() p.velocity.zero() - - //p.color = Color{93, 136, 193, 255} + // p.color = Color{93, 136, 193, 255} p.color = default_v_color - p.life_time = default_life_time p.life_time_init = p.life_time } diff --git a/examples/sokol/particles/particle/system.v b/examples/sokol/particles/particle/system.v index 2f419dc285..82d616b00d 100644 --- a/examples/sokol/particles/particle/system.v +++ b/examples/sokol/particles/particle/system.v @@ -1,38 +1,35 @@ // Copyright(C) 2019 Lars Pontoppidan. All rights reserved. // Use of this source code is governed by an MIT license file distributed with this software package - module particle + import vec2 import rand import sokol.sgl pub struct SystemConfig { - pool int + pool int } pub struct System { - width int - height int + width int + height int mut: - pool []&Particle - bin []&Particle + pool []&Particle + bin []&Particle } pub fn (mut s System) init(sc SystemConfig) { for i := 0; i < sc.pool; i++ { - p := particle.new( vec2.Vec2{f32(s.width)*0.5, f32(s.height)*0.5} ) + p := new(vec2.Vec2{f32(s.width) * 0.5, f32(s.height) * 0.5}) s.pool << p } } pub fn (mut s System) update(dt f64) { - mut p := &Particle(0) for i := 0; i < s.pool.len; i++ { p = s.pool[i] - p.update(dt) - if p.is_dead() { s.bin << p s.pool.delete(i) @@ -59,26 +56,20 @@ pub fn (mut s System) reset() { } } -pub fn (mut s System) explode(x f32, y f32) { - +pub fn (mut s System) explode(x, y f32) { mut reserve := 500 - - center := vec2.Vec2{x,y} - + center := vec2.Vec2{x, y} mut p := &Particle(0) for i := 0; i < s.bin.len && reserve > 0; i++ { p = s.bin[i] - p.reset() - p.location.from(center) - p.acceleration = vec2.Vec2{rand.f32_in_range(-0.5,0.5),rand.f32_in_range(-0.5,0.5)} - p.velocity = vec2.Vec2{rand.f32_in_range(-0.5,0.5),rand.f32_in_range(-0.5,0.5)} - p.life_time = rand.f64_in_range(500,2000) - + p.acceleration = vec2.Vec2{rand.f32_in_range(-0.5, 0.5), rand.f32_in_range(-0.5, + 0.5)} + p.velocity = vec2.Vec2{rand.f32_in_range(-0.5, 0.5), rand.f32_in_range(-0.5, 0.5)} + p.life_time = rand.f64_in_range(500, 2000) s.pool << p s.bin.delete(i) - reserve-- } } @@ -86,24 +77,23 @@ pub fn (mut s System) explode(x f32, y f32) { pub fn (mut s System) free() { for p in s.pool { if p == 0 { - print(ptr_str(p)+' ouch') + print(ptr_str(p) + ' ouch') continue } - unsafe{ + unsafe { free(p) } } s.pool.clear() for p in s.bin { if p == 0 { - print(ptr_str(p)+' ouch') + print(ptr_str(p) + ' ouch') continue } - - unsafe{ - //println('Freeing from bin') + unsafe { + // println('Freeing from bin') free(p) } } s.bin.clear() -} \ No newline at end of file +} diff --git a/examples/sokol/particles/particle/vec2/vec2.v b/examples/sokol/particles/particle/vec2/vec2.v index 2fdfa7a88d..4af580f1b9 100644 --- a/examples/sokol/particles/particle/vec2/vec2.v +++ b/examples/sokol/particles/particle/vec2/vec2.v @@ -1,99 +1,89 @@ // Copyright(C) 2019 Lars Pontoppidan. All rights reserved. // Use of this source code is governed by an MIT license file distributed with this software package - module vec2 pub struct Vec2 { pub mut: - x f64 - y f64 + x f64 + y f64 } pub fn (mut v Vec2) zero() { - v.x = 0.0 - v.y = 0.0 + v.x = 0.0 + v.y = 0.0 } pub fn (mut v Vec2) from(src Vec2) { - v.x = src.x - v.y = src.y + v.x = src.x + v.y = src.y } -/* - * Addition - */ - +// * Addition // + operator overload. Adds two vectors -pub fn (v1 Vec2) + (v2 Vec2) Vec2 { - return Vec2{v1.x + v2.x, v1.y + v2.y} +pub fn (v1 Vec2) +(v2 Vec2) Vec2 { + return Vec2{v1.x + v2.x, v1.y + v2.y} } pub fn (v Vec2) add(vector Vec2) Vec2 { - return Vec2{ v.x + vector.x, v.y + vector.y } + return Vec2{v.x + vector.x, v.y + vector.y} } pub fn (v Vec2) add_f64(scalar f64) Vec2 { - return Vec2{ v.x + scalar, v.y + scalar } + return Vec2{v.x + scalar, v.y + scalar} } pub fn (mut v Vec2) plus(vector Vec2) { - v.x += vector.x - v.y += vector.y + v.x += vector.x + v.y += vector.y } pub fn (mut v Vec2) plus_f64(scalar f64) { - v.x += scalar - v.y += scalar + v.x += scalar + v.y += scalar } - -/* - * Subtraction - */ -pub fn (v1 Vec2) - (v2 Vec2) Vec2 { - return Vec2{v1.x - v2.x, v1.y - v2.y} +// * Subtraction +pub fn (v1 Vec2) -(v2 Vec2) Vec2 { + return Vec2{v1.x - v2.x, v1.y - v2.y} } pub fn (v Vec2) sub(vector Vec2) Vec2 { - return Vec2{ v.x - vector.x, v.y - vector.y } + return Vec2{v.x - vector.x, v.y - vector.y} } pub fn (v Vec2) sub_f64(scalar f64) Vec2 { - return Vec2{ v.x - scalar, v.y - scalar } + return Vec2{v.x - scalar, v.y - scalar} } pub fn (mut v Vec2) subtract(vector Vec2) { - v.x -= vector.x - v.y -= vector.y + v.x -= vector.x + v.y -= vector.y } pub fn (mut v Vec2) subtract_f64(scalar f64) { - v.x -= scalar - v.y -= scalar + v.x -= scalar + v.y -= scalar } -/* - * Multiplication - */ -pub fn (v1 Vec2) * (v2 Vec2) Vec2 { - return Vec2{v1.x * v2.x, v1.y * v2.y} +// * Multiplication +pub fn (v1 Vec2) *(v2 Vec2) Vec2 { + return Vec2{v1.x * v2.x, v1.y * v2.y} } - pub fn (v Vec2) mul(vector Vec2) Vec2 { - return Vec2{ v.x * vector.x, v.y * vector.y } + return Vec2{v.x * vector.x, v.y * vector.y} } pub fn (v Vec2) mul_f64(scalar f64) Vec2 { - return Vec2{ v.x * scalar, v.y * scalar } + return Vec2{v.x * scalar, v.y * scalar} } pub fn (mut v Vec2) multiply(vector Vec2) { - v.x *= vector.x - v.y *= vector.y + v.x *= vector.x + v.y *= vector.y } pub fn (mut v Vec2) multiply_f64(scalar f64) { - v.x *= scalar - v.y *= scalar -} \ No newline at end of file + v.x *= scalar + v.y *= scalar +}