orosmatthew/particles
1
0
Fork 0
Code Releases 1 Activity

Tweaks

Browse Source
This commit is contained in:
orosmatthew
2021-12-29 15:08:26 -05:00
parent 430e05e921
commit 7e968df4a6
17 changed files with 188 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ParticleSimulation/Particle.cs
View File

@@ -7,7 +7,7 @@ namespace Particles.ParticleSimulation
private float _health = 1f;
public Vector2 Position = new Vector2();
public bool ScreenWrappedLast = true;
public bool WasTeleportedLast = true;
public Vector2 Velocity = new Vector2();
public Particle(int id, ParticleType type)
@@ -33,5 +33,10 @@ namespace Particles.ParticleSimulation
{
AverageSpeed = 0.99f * AverageSpeed + 0.01f * speed;
}
public void ResetAverageSpeed()
{
AverageSpeed = 1f;
}
}
}

118
ParticleSimulation/ParticleSimulation.cs
View File

@@ -1,27 +1,39 @@
using System.Collections.Generic;
using System.Threading.Tasks;
#define MULTITHREADED
using System.Collections.Generic;
using System.Linq;
using Godot;
#if MULTITHREADED
using System.Threading.Tasks;
#endif
namespace Particles.ParticleSimulation
{
public class ParticleSimulation
{
// size of simulation space
public Vector2 SpaceSize;
// dictionary of particles with particle Id being the key
private readonly Dictionary<int, Particle> _particles = new Dictionary<int, Particle>();
private readonly List<ParticleType> _particleTypes = new List<ParticleType>();
private readonly List<Task> _tasks = new List<Task>();
// task list if multi-threaded
#if MULTITHREADED
private readonly List<Task> _tasks = new List<Task>();
#endif
// updated on every simulation update
public List<int> LastParticlesAdded { get; private set; } = new List<int>();
// ReSharper disable once CollectionNeverUpdated.Global
public List<int> LastParticlesRemoved { get; private set; } = new List<int>();
// counts up for each particle added
private int _idCount;
private const int MaxParticles = 1100;
private const int MaxParticleTypes = 12;
private const int MaxParticleTypes = 10;
private const float HealthDelta = 0.005f;
private const float NegativeHealthMultiplier = 2f;
private const float PositiveHealthMultiplier = 4f;
@@ -32,35 +44,41 @@ namespace Particles.ParticleSimulation
{
for (var i = 0; i < MaxParticleTypes; i++)
CreateRandomParticleType();
//for (var i = 0; i < MaxParticles; i++)
// CreateRandomParticle();
}
public void Update()
{
LastParticlesRemoved.Clear();
LastParticlesAdded.Clear();
_tasks.Clear();
// update all particles
#if MULTITHREADED
_tasks.Clear();
foreach (var id in _particles.Keys)
_tasks.Add(Task.Factory.StartNew(UpdateParticle, id));
Task.WaitAll(_tasks.ToArray());
#else
foreach (var id in _particles.Keys)
_tasks.Add(Task.Factory.StartNew(UpdateParticle, id));
Task.WaitAll(_tasks.ToArray());
var deletedParticle = false;
foreach (var p in _particles)
UpdateParticle(id);
#endif
// used to ensure only one particle is moved per update
var movedParticle = false;
foreach (var particle in _particles.Select(p => p.Value))
{
var particle = p.Value;
particle.ScreenWrappedLast = false;
if (deletedParticle == false && particle.Health == 0f)
particle.WasTeleportedLast = false;
if (movedParticle == false && particle.Health == 0f)
{
if (GD.Randf() < 0.2f)
if (GD.Randf() < 0.1f)
{
particle.Position = GetRandomParticlePosition();
particle.ScreenWrappedLast = true;
//LastParticlesRemoved.Add(p.Key);
deletedParticle = true;
particle.WasTeleportedLast = true;
particle.Health = 1f;
movedParticle = true;
continue;
}
}
var position = particle.Position;
particle.Velocity = particle.Velocity.Clamped(5f);
position += particle.Velocity;
@@ -68,52 +86,48 @@ namespace Particles.ParticleSimulation
if (position.x > SpaceSize.x)
{
position.x -= SpaceSize.x;
particle.ScreenWrappedLast = true;
particle.WasTeleportedLast = true;
}
else if (position.x < 0)
{
position.x += SpaceSize.x;
particle.ScreenWrappedLast = true;
particle.WasTeleportedLast = true;
}
if (position.y > SpaceSize.y)
{
position.y -= SpaceSize.y;
particle.ScreenWrappedLast = true;
particle.WasTeleportedLast = true;
}
else if (position.y < 0)
{
position.y += SpaceSize.y;
particle.ScreenWrappedLast = true;
particle.WasTeleportedLast = true;
}
particle.AddAverageSpeedValue(particle.Position.DistanceTo(position));
/*
if (particle.AverageSpeed < 0.3f)
particle.AddAverageSpeedValue(particle.Velocity.Length());
if (particle.AverageSpeed < 0.5f)
particle.Health -= HealthDelta * NegativeHealthMultiplier;
else
particle.Health += HealthDelta;
*/
if (deletedParticle == false && particle.Health == 0f)
particle.Health += HealthDelta * PositiveHealthMultiplier;
if (movedParticle == false && particle.Health == 0f)
{
if (GD.Randf() < 0.2f)
if (GD.Randf() < 0.1f)
{
//LastParticlesRemoved.Add(p.Key);
particle.Position = GetRandomParticlePosition();
particle.ScreenWrappedLast = true;
deletedParticle = true;
particle.ResetAverageSpeed();
particle.WasTeleportedLast = true;
particle.Health = 1f;
movedParticle = true;
continue;
}
}
*/
particle.Position = position;
}
foreach (var id in LastParticlesRemoved)
{
_particles.Remove(id);
}
// ReSharper disable once InvertIf
if (_particles.Count < MaxParticles)
{
@@ -132,6 +146,13 @@ namespace Particles.ParticleSimulation
}
}
// ReSharper disable once UnusedMember.Local
private void RemoveParticle(int id)
{
_particles.Remove(id);
LastParticlesRemoved.Add(id);
}
private void CreateRandomParticleType()
{
var type = new ParticleType()
@@ -192,7 +213,7 @@ namespace Particles.ParticleSimulation
return _particles[id];
}
private Task UpdateParticle(object i)
private void UpdateParticle(object i)
{
var id = (int)i;
var particle1 = _particles[id];
@@ -206,15 +227,17 @@ namespace Particles.ParticleSimulation
var distanceSquared = particle1.Position.DistanceSquaredTo(position);
if (distanceSquared > (55f * 55f))
continue;
var direction = particle1.Position.DirectionTo(position);
if (distanceSquared < (35f * 35f))
closeCount++;
// collision force
float distance;
Vector2 direction;
if (distanceSquared < (ParticleCollisionRadius * ParticleCollisionRadius))
{
direction = particle1.Position.DirectionTo(position);
distance = particle1.Position.DistanceTo(position);
var collisionForce = 1f / (0.35f + Mathf.Pow(Mathf.E, -1.15f * (distance - 12f))) - 1f / 0.35f;
particle1.Velocity += direction * collisionForce;
@@ -225,6 +248,7 @@ namespace Particles.ParticleSimulation
if (props.Force != 0f && distanceSquared >= props.MinRadius * props.MinRadius &&
distanceSquared <= props.MaxRadius * props.MaxRadius)
{
direction = particle1.Position.DirectionTo(position);
distance = particle1.Position.DistanceTo(position);
var mid = (props.MinRadius + props.MaxRadius) / 2f;
float particleForce;
@@ -256,12 +280,10 @@ namespace Particles.ParticleSimulation
}
}
if (closeCount > 50)
if (closeCount > 70)
particle1.Health -= HealthDelta * NegativeHealthMultiplier;
else
particle1.Health += HealthDelta * PositiveHealthMultiplier;
return Task.CompletedTask;
}
}
}