|
@@ -171,6 +171,13 @@ ImplementEnumType( ParticleBlendStyle,
|
|
{ ParticleRenderInst::BlendPremultAlpha, "PREMULTALPHA", "Color blends with the colors of the imagemap rather than the alpha.\n" },
|
|
{ ParticleRenderInst::BlendPremultAlpha, "PREMULTALPHA", "Color blends with the colors of the imagemap rather than the alpha.\n" },
|
|
EndImplementEnumType;
|
|
EndImplementEnumType;
|
|
|
|
|
|
|
|
+IRangeValidator ejectPeriodIValidator(1, 2047);
|
|
|
|
+IRangeValidator periodVarianceIValidator(0, 2047);
|
|
|
|
+FRangeValidator ejectionFValidator(0.f, 655.35f);
|
|
|
|
+FRangeValidator velVarianceFValidator(0.f, 163.83f);
|
|
|
|
+FRangeValidator thetaFValidator(0.f, 180.f);
|
|
|
|
+FRangeValidator phiFValidator(0.f, 360.f);
|
|
|
|
+
|
|
//-----------------------------------------------------------------------------
|
|
//-----------------------------------------------------------------------------
|
|
// initPersistFields
|
|
// initPersistFields
|
|
//-----------------------------------------------------------------------------
|
|
//-----------------------------------------------------------------------------
|
|
@@ -178,31 +185,31 @@ void ParticleEmitterData::initPersistFields()
|
|
{
|
|
{
|
|
addGroup( "ParticleEmitterData" );
|
|
addGroup( "ParticleEmitterData" );
|
|
|
|
|
|
- addFieldV("ejectionPeriodMS", TYPEID< S32 >(), Offset(ejectionPeriodMS, ParticleEmitterData), new IRangeValidator(1, 2047),
|
|
|
|
|
|
+ addFieldV("ejectionPeriodMS", TYPEID< S32 >(), Offset(ejectionPeriodMS, ParticleEmitterData), &ejectPeriodIValidator,
|
|
"Time (in milliseconds) between each particle ejection." );
|
|
"Time (in milliseconds) between each particle ejection." );
|
|
|
|
|
|
- addFieldV("periodVarianceMS", TYPEID< S32 >(), Offset(periodVarianceMS, ParticleEmitterData), new IRangeValidator(0, 2047),
|
|
|
|
|
|
+ addFieldV("periodVarianceMS", TYPEID< S32 >(), Offset(periodVarianceMS, ParticleEmitterData), &periodVarianceIValidator,
|
|
"Variance in ejection period, from 1 - ejectionPeriodMS." );
|
|
"Variance in ejection period, from 1 - ejectionPeriodMS." );
|
|
|
|
|
|
- addFieldV( "ejectionVelocity", TYPEID< F32 >(), Offset(ejectionVelocity, ParticleEmitterData), new FRangeValidator(0, 655.35f),
|
|
|
|
|
|
+ addFieldV( "ejectionVelocity", TYPEID< F32 >(), Offset(ejectionVelocity, ParticleEmitterData), &ejectionFValidator,
|
|
"Particle ejection velocity." );
|
|
"Particle ejection velocity." );
|
|
|
|
|
|
- addFieldV( "velocityVariance", TYPEID< F32 >(), Offset(velocityVariance, ParticleEmitterData), new FRangeValidator(0, 163.83f),
|
|
|
|
|
|
+ addFieldV( "velocityVariance", TYPEID< F32 >(), Offset(velocityVariance, ParticleEmitterData), &velVarianceFValidator,
|
|
"Variance for ejection velocity, from 0 - ejectionVelocity." );
|
|
"Variance for ejection velocity, from 0 - ejectionVelocity." );
|
|
|
|
|
|
- addFieldV( "ejectionOffset", TYPEID< F32 >(), Offset(ejectionOffset, ParticleEmitterData), new FRangeValidator(0, 655.35f),
|
|
|
|
|
|
+ addFieldV( "ejectionOffset", TYPEID< F32 >(), Offset(ejectionOffset, ParticleEmitterData), &ejectionFValidator,
|
|
"Distance along ejection Z axis from which to eject particles." );
|
|
"Distance along ejection Z axis from which to eject particles." );
|
|
|
|
|
|
- addFieldV( "thetaMin", TYPEID< F32 >(), Offset(thetaMin, ParticleEmitterData), new FRangeValidator(0, 180.0f),
|
|
|
|
|
|
+ addFieldV( "thetaMin", TYPEID< F32 >(), Offset(thetaMin, ParticleEmitterData), &thetaFValidator,
|
|
"Minimum angle, from the horizontal plane, to eject from." );
|
|
"Minimum angle, from the horizontal plane, to eject from." );
|
|
|
|
|
|
- addFieldV( "thetaMax", TYPEID< F32 >(), Offset(thetaMax, ParticleEmitterData), new FRangeValidator(0, 180.0f),
|
|
|
|
|
|
+ addFieldV( "thetaMax", TYPEID< F32 >(), Offset(thetaMax, ParticleEmitterData), &thetaFValidator,
|
|
"Maximum angle, from the horizontal plane, to eject particles from." );
|
|
"Maximum angle, from the horizontal plane, to eject particles from." );
|
|
|
|
|
|
- addFieldV( "phiReferenceVel", TYPEID< F32 >(), Offset(phiReferenceVel, ParticleEmitterData), new FRangeValidator(0, 360.0f),
|
|
|
|
|
|
+ addFieldV( "phiReferenceVel", TYPEID< F32 >(), Offset(phiReferenceVel, ParticleEmitterData), &phiFValidator,
|
|
"Reference angle, from the vertical plane, to eject particles from." );
|
|
"Reference angle, from the vertical plane, to eject particles from." );
|
|
|
|
|
|
- addFieldV( "phiVariance", TYPEID< F32 >(), Offset(phiVariance, ParticleEmitterData), new FRangeValidator(0, 360.0f),
|
|
|
|
|
|
+ addFieldV( "phiVariance", TYPEID< F32 >(), Offset(phiVariance, ParticleEmitterData), &phiFValidator,
|
|
"Variance from the reference angle, from 0 - 360." );
|
|
"Variance from the reference angle, from 0 - 360." );
|
|
|
|
|
|
addField( "softnessDistance", TYPEID< F32 >(), Offset(softnessDistance, ParticleEmitterData),
|
|
addField( "softnessDistance", TYPEID< F32 >(), Offset(softnessDistance, ParticleEmitterData),
|