Illusion/O2048
1
0
Fork 0
mirror of https://github.com/IllusionMan1212/O2048.git synced 2026-10-24 10:12:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

game: completely avoid leaking mem when spawning particles by using a static array

Browse Source
This commit is contained in:
Illusion
2024-01-27 04:17:24 +02:00
parent 292f0058d5
commit 911508b583
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game.odin
-1
View File
@@ -400,7 +400,6 @@ reset_game :: proc() {
game.board[y][x].value = 0 game.board[y][x].value = 0
game.board[y][x].new_value = 0 game.board[y][x].new_value = 0
game.board[y][x].merged = false game.board[y][x].merged = false
delete(game.board[y][x].emitter.particles)
game.board[y][x].emitter = ParticleEmitter{} game.board[y][x].emitter = ParticleEmitter{}
} }
} }
particle.odin
+9 -14
View File
@@ -5,6 +5,9 @@ import "core:time"
import "zephr" import "zephr"
@private
MAX_PARTICLES :: 500
Particle :: struct { Particle :: struct {
pos: zephr.Vec2, pos: zephr.Vec2,
vel: zephr.Vec2, vel: zephr.Vec2,
@@ -15,7 +18,7 @@ Particle :: struct {
ParticleEmitter :: struct { ParticleEmitter :: struct {
pos: zephr.Vec2, pos: zephr.Vec2,
particles: [dynamic]Particle, particles: [MAX_PARTICLES]Particle,
duration: time.Duration, duration: time.Duration,
spawn_rate: u32, spawn_rate: u32,
} }
@@ -27,7 +30,7 @@ last_emitted_particle_idx: int = 0
particle_time: time.Duration = 0 particle_time: time.Duration = 0
@private @private
update_particles :: proc(delta_t: time.Duration, particles: ^[dynamic]Particle, start_pos: zephr.Vec2) { update_particles :: proc(delta_t: time.Duration, particles: ^[MAX_PARTICLES]Particle, start_pos: zephr.Vec2) {
delta_t_f := cast(f32)time.duration_seconds(delta_t) delta_t_f := cast(f32)time.duration_seconds(delta_t)
for p in particles { for p in particles {
@@ -46,9 +49,9 @@ update_particles :: proc(delta_t: time.Duration, particles: ^[dynamic]Particle,
} }
@private @private
find_first_dead_particle :: proc(particles: [dynamic]Particle) -> int { find_first_dead_particle :: proc(particles: [MAX_PARTICLES]Particle) -> int {
// search from last emitted particle, should return almost immediately // search from last emitted particle, should return almost immediately
for i in last_emitted_particle_idx..<cap(particles) { for i in last_emitted_particle_idx..<MAX_PARTICLES {
if particles[i].life <= 0 { if particles[i].life <= 0 {
last_emitted_particle_idx = i last_emitted_particle_idx = i
return i return i
@@ -82,13 +85,13 @@ update_emitter :: proc(delta_t: time.Duration, emitter: ^ParticleEmitter) {
offset := cast(f32)rand.int_max(100) - 50 offset := cast(f32)rand.int_max(100) - 50
rand_velocity := zephr.Vec2{rand.float32_range(-500.0, 500.0) * random / 20, -rand.float32_range(-500.0, 500.0) * random / 20} rand_velocity := zephr.Vec2{rand.float32_range(-500.0, 500.0) * random / 20, -rand.float32_range(-500.0, 500.0) * random / 20}
found_dead_particle_idx := find_first_dead_particle(emitter.particles) found_dead_particle_idx := find_first_dead_particle(emitter.particles)
assign_at(&emitter.particles, found_dead_particle_idx, Particle{ emitter.particles[found_dead_particle_idx] = Particle{
pos = emitter.pos, pos = emitter.pos,
vel = rand_velocity, vel = rand_velocity,
color = zephr.COLOR_WHITE, color = zephr.COLOR_WHITE,
size = 1, size = 1,
life = time.Millisecond * 500, life = time.Millisecond * 500,
}) }
} }
particle_time -= time.Millisecond * 16 particle_time -= time.Millisecond * 16
} }
@@ -98,14 +101,6 @@ update_emitter :: proc(delta_t: time.Duration, emitter: ^ParticleEmitter) {
} }
emitter_start :: proc(emitter: ^ParticleEmitter, capacity: int, pos: zephr.Vec2, duration: time.Duration, spawn_rate: u32 = 3) { emitter_start :: proc(emitter: ^ParticleEmitter, capacity: int, pos: zephr.Vec2, duration: time.Duration, spawn_rate: u32 = 3) {
// Should happen in an init function but this works too so idc
// Valgrind says we leak here but I don't think so because we "delete()" the memory
// when calling "reset_game()"
if emitter.particles != nil {
delete(emitter.particles)
}
emitter.particles = make([dynamic]Particle, capacity)
emitter.pos = pos emitter.pos = pos
emitter.duration = duration emitter.duration = duration
emitter.spawn_rate = spawn_rate emitter.spawn_rate = spawn_rate