vfmt: reformat examples/sokol/particles *.v files
parent
05e11f6336
commit
6ec86fa344
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
@ -11,18 +10,13 @@ const (
|
|||
default_v_color = Color{93, 136, 193, 255}
|
||||
)
|
||||
|
||||
/*
|
||||
* Module public
|
||||
*/
|
||||
// * Module public
|
||||
pub fn new(location vec2.Vec2) &Particle {
|
||||
|
||||
p := &Particle{
|
||||
location: location,
|
||||
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,18 +27,13 @@ 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
|
||||
}
|
||||
|
@ -54,15 +43,12 @@ 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))
|
||||
} 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 = default_v_color
|
||||
|
||||
p.life_time = default_life_time
|
||||
p.life_time_init = p.life_time
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// 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
|
||||
|
@ -20,19 +20,16 @@ mut:
|
|||
|
||||
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}
|
||||
|
||||
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.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--
|
||||
}
|
||||
}
|
||||
|
@ -99,7 +90,6 @@ pub fn (mut s System) free() {
|
|||
print(ptr_str(p) + ' ouch')
|
||||
continue
|
||||
}
|
||||
|
||||
unsafe {
|
||||
// println('Freeing from bin')
|
||||
free(p)
|
||||
|
|
|
@ -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 vec2
|
||||
|
||||
pub struct Vec2 {
|
||||
|
@ -19,10 +18,7 @@ pub fn (mut v Vec2) from(src Vec2) {
|
|||
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}
|
||||
|
@ -46,10 +42,7 @@ pub fn (mut v Vec2) plus_f64(scalar f64) {
|
|||
v.y += scalar
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Subtraction
|
||||
*/
|
||||
// * Subtraction
|
||||
pub fn (v1 Vec2) -(v2 Vec2) Vec2 {
|
||||
return Vec2{v1.x - v2.x, v1.y - v2.y}
|
||||
}
|
||||
|
@ -72,14 +65,11 @@ pub fn (mut v Vec2) subtract_f64(scalar f64) {
|
|||
v.y -= scalar
|
||||
}
|
||||
|
||||
/*
|
||||
* Multiplication
|
||||
*/
|
||||
// * 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}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue