Permalink
Browse files

Get rid of SizeMultiplier - redundant and not relevant to simulation

  • Loading branch information...
lmontoute committed Feb 5, 2019
1 parent b309e00 commit 4a4352c75557dea9693297a07f3d90c47095b3eb
Showing with 7,909 additions and 21,483 deletions.
  1. +3 −13 Editor/Blocks/Solver/InitializeSolver.cs
  2. +7,906 −21,470 Editor/Templates/Fluid Particle System.vfx
@@ -57,12 +57,6 @@ protected override IEnumerable<VFXPropertyWithValue> inputProperties
fluid = new List<VFXNamedExpression>();
foreach (var expression in GetExpressionsFromSlots(initializeBlock))
{
// Only add for this step
if (expression.name == $"{nameof(InputProperties.SizeMultiplier)}")
{
if (block == initializeBlock) yield return expression;
continue;
}
if (expression.name == $"{nameof(InputProperties.Fluid)}_{nameof(Fluid.SmoothingDistance)}")
{
// We use solverData_KernelSize instead
@@ -248,7 +242,6 @@ public class InputProperties
{
public Fluid Fluid;
public Vector Gravity;
[Min(0.0f)] public float SizeMultiplier = 1.0f;
}
#pragma warning restore 649

@@ -289,18 +282,15 @@ public override string source
force = 0;
// Set mass
mass = solverData_Fluid_ParticleMass;
// Set size";
mass = solverData_Fluid_ParticleMass;";
if (AutomaticSize)
{
str += $@"
// Set size
size = solverData_KernelSize.x * FLUVIO_AUTO_PARTICLE_SIZE_FACTOR;";
}

str += $@"
size *= SizeMultiplier;";

if (hasLifetime)
{
str += $@"
Oops, something went wrong.

0 comments on commit 4a4352c

Please sign in to comment.