From 9075931c517ac3402c1d944d709e71cccac8fd5d Mon Sep 17 00:00:00 2001 From: Onek8 Date: Tue, 13 May 2025 17:58:05 +0000 Subject: [PATCH] moisesjpelaez - Add particles random size --- leenkx/Sources/iron/object/ParticleSystem.hx | 34 ++++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/leenkx/Sources/iron/object/ParticleSystem.hx b/leenkx/Sources/iron/object/ParticleSystem.hx index 245c525..6e55a36 100644 --- a/leenkx/Sources/iron/object/ParticleSystem.hx +++ b/leenkx/Sources/iron/object/ParticleSystem.hx @@ -51,6 +51,7 @@ class ParticleSystem { seed = pref.seed; particles = []; ready = false; + Data.getParticle(sceneName, pref.particle, function(b: ParticleData) { data = b; r = data.raw; @@ -70,7 +71,13 @@ class ParticleSystem { lifetime = r.lifetime / frameRate; animtime = (r.frame_end - r.frame_start) / frameRate; spawnRate = ((r.frame_end - r.frame_start) / r.count) / frameRate; - for (i in 0...r.count) particles.push(new Particle(i)); + + for (i in 0...r.count) { + var particle = new Particle(i); + particle.sr = 1 - Math.random() * r.size_random; + particles.push(particle); + } + ready = true; }); } @@ -108,7 +115,7 @@ class ParticleSystem { } // Animate - time += Time.realDelta * speed; + time += Time.delta * speed; lap = Std.int(time / animtime); lapTime = time - lap * animtime; count = Std.int(lapTime / spawnRate); @@ -143,7 +150,7 @@ class ParticleSystem { } function setupGeomGpu(object: MeshObject, owner: MeshObject) { - var instancedData = new Float32Array(particles.length * 3); + var instancedData = new Float32Array(particles.length * 6); var i = 0; var normFactor = 1 / 32767; // pa.values are not normalized @@ -162,6 +169,10 @@ class ParticleSystem { instancedData.set(i, pa.values[j * pa.size ] * normFactor * scaleFactor.x); i++; instancedData.set(i, pa.values[j * pa.size + 1] * normFactor * scaleFactor.y); i++; instancedData.set(i, pa.values[j * pa.size + 2] * normFactor * scaleFactor.z); i++; + + instancedData.set(i, p.sr); i++; + instancedData.set(i, p.sr); i++; + instancedData.set(i, p.sr); i++; } case 1: // Face @@ -185,6 +196,10 @@ class ParticleSystem { instancedData.set(i, pos.x * normFactor * scaleFactor.x); i++; instancedData.set(i, pos.y * normFactor * scaleFactor.y); i++; instancedData.set(i, pos.z * normFactor * scaleFactor.z); i++; + + instancedData.set(i, p.sr); i++; + instancedData.set(i, p.sr); i++; + instancedData.set(i, p.sr); i++; } case 2: // Volume @@ -195,9 +210,13 @@ class ParticleSystem { instancedData.set(i, (Math.random() * 2.0 - 1.0) * scaleFactorVolume.x); i++; instancedData.set(i, (Math.random() * 2.0 - 1.0) * scaleFactorVolume.y); i++; instancedData.set(i, (Math.random() * 2.0 - 1.0) * scaleFactorVolume.z); i++; + + instancedData.set(i, p.sr); i++; + instancedData.set(i, p.sr); i++; + instancedData.set(i, p.sr); i++; } } - object.data.geom.setupInstanced(instancedData, 1, Usage.StaticUsage); + object.data.geom.setupInstanced(instancedData, 3, Usage.StaticUsage); } function fhash(n: Int): Float { @@ -236,9 +255,10 @@ class ParticleSystem { class Particle { public var i: Int; - public var x = 0.0; - public var y = 0.0; - public var z = 0.0; + public var px = 0.0; + public var py = 0.0; + public var pz = 0.0; + public var sr = 1.0; // Size random public var cameraDistance: Float; public function new(i: Int) {