mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-29 00:05:40 +00:00
Merge branch 'development' into imageAsset_refactor_rev3
This commit is contained in:
commit
0da0903599
4189 changed files with 29881 additions and 635347 deletions
|
|
@ -75,7 +75,7 @@ void afxParticlePoolData::initPersistFields()
|
|||
"...");
|
||||
addField("baseColor", TypeColorF, Offset(base_color, afxParticlePoolData),
|
||||
"...");
|
||||
addField("blendWeight", TypeF32, Offset(blend_weight, afxParticlePoolData),
|
||||
addFieldV("blendWeight", TypeRangedF32, Offset(blend_weight, afxParticlePoolData), &CommonValidators::PositiveFloat,
|
||||
"...");
|
||||
|
||||
Parent::initPersistFields();
|
||||
|
|
|
|||
|
|
@ -151,13 +151,13 @@ void afxPathData::initPersistFields()
|
|||
"...");
|
||||
addField("loop", TypeString, Offset(loop_string, afxPathData),
|
||||
"...");
|
||||
addField("mult", TypeF32, Offset(mult, afxPathData),
|
||||
addFieldV("mult", TypeRangedF32, Offset(mult, afxPathData), &CommonValidators::F32Range,
|
||||
"...");
|
||||
addField("delay", TypeF32, Offset(delay, afxPathData),
|
||||
addFieldV("delay", TypeRangedF32, Offset(delay, afxPathData), &CommonValidators::PositiveFloat,
|
||||
"...");
|
||||
addField("lifetime", TypeF32, Offset(lifetime, afxPathData),
|
||||
addFieldV("lifetime", TypeRangedF32, Offset(lifetime, afxPathData), &CommonValidators::PositiveFloat,
|
||||
"...");
|
||||
addField("timeOffset", TypeF32, Offset(time_offset, afxPathData),
|
||||
addFieldV("timeOffset", TypeRangedF32, Offset(time_offset, afxPathData), &CommonValidators::F32Range,
|
||||
"...");
|
||||
addField("reverse", TypeBool, Offset(reverse, afxPathData),
|
||||
"...");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue