diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 9a7edec88f..48fd2a3bdc 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -854,7 +854,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * default is Earth's gravity value. * @property {vec3} accelerationSpread=0,0,0 - The spread in accelerations that each particle is given. If * emitAccelerations == {x: 0, y: -9.8, z: 0} and accelerationSpread == - * {x: 0, y: 1, z: 0}, each particle will have an acceleration in the range, {x: 0, y: -10.8, z: 0} + * {x: 0, y: 1, z: 0}, each particle will have an acceleration in the range {x: 0, y: -10.8, z: 0} * – {x: 0, y: -8.8, z: 0}. * @property {Vec3} dimensions - The dimensions of the particle effect, i.e., a bounding box containing all the particles * during their lifetimes, assuming that emitterShouldTrail is false. Read-only. @@ -890,19 +890,24 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * particleRadius value is used. * @property {number} radiusFinish=0.025 - The radius of each particle at the end of its life. If not explicitly set, the * particleRadius value is used. - * @property {number} radiusSpread=0 - Currently not used. + * @property {number} radiusSpread=0 - The spread in radius that each particle is given. If particleRadius == 0.5 + * and radiusSpread == 0.25, each particle will have a radius in the range 0.250.75. * @property {Color} color=255,255,255 - The color of each particle at the middle of its life. * @property {Color} colorStart=255,255,255 - The color of each particle at the start of its life. If not explicitly set, the * color value is used. * @property {Color} colorFinish=255,255,255 - The color of each particle at the end of its life. If not explicitly set, the * color value is used. - * @property {Color} colorSpread=0,0,0 - Currently not used. + * @property {Color} colorSpread=0,0,0 - The spread in color that each particle is given. If + * color == {red: 100, green: 100, blue: 100} and colorSpread == + * {red: 10, green: 25, blue: 50}, each particle will have an acceleration in the range {red: 90, green: 75, blue: 50} + * – {red: 110, green: 125, blue: 150}. * @property {number} alpha=1 - The alpha of each particle at the middle of its life. * @property {number} alphaStart=1 - The alpha of each particle at the start of its life. If not explicitly set, the * alpha value is used. * @property {number} alphaFinish=1 - The alpha of each particle at the end of its life. If not explicitly set, the * alpha value is used. - * @property {number} alphaSpread=0 - Currently not used. + * @property {number} alphaSpread=0 - The spread in alpha that each particle is given. If alpha == 0.5 + * and alphaSpread == 0.25, each particle will have an alpha in the range 0.250.75. * * @property {ShapeType} shapeType="none" - Currently not used. Read-only. * diff --git a/libraries/entities/src/ParticleEffectEntityItem.h b/libraries/entities/src/ParticleEffectEntityItem.h index cd8a19bee5..ecbd76193a 100644 --- a/libraries/entities/src/ParticleEffectEntityItem.h +++ b/libraries/entities/src/ParticleEffectEntityItem.h @@ -21,10 +21,10 @@ namespace particle { static const float SCRIPT_MAXIMUM_PI = 3.1416f; // Round up so that reasonable property values work static const float UNINITIALIZED = NAN; static const vec3 DEFAULT_COLOR = { 255, 255, 255 }; - static const xColor DEFAULT_XCOLOR = { (unsigned int)DEFAULT_COLOR.r, (unsigned int)DEFAULT_COLOR.g, (unsigned int)DEFAULT_COLOR.b }; + static const xColor DEFAULT_XCOLOR = { static_cast(DEFAULT_COLOR.r), static_cast(DEFAULT_COLOR.g), static_cast(DEFAULT_COLOR.b) }; static const vec3 DEFAULT_COLOR_UNINITIALIZED = { UNINITIALIZED, UNINITIALIZED, UNINITIALIZED }; static const vec3 DEFAULT_COLOR_SPREAD = { 0, 0, 0 }; - static const xColor DEFAULT_XCOLOR_SPREAD = { (unsigned int)DEFAULT_COLOR_SPREAD.r, (unsigned int)DEFAULT_COLOR_SPREAD.g, (unsigned int)DEFAULT_COLOR_SPREAD.b }; + static const xColor DEFAULT_XCOLOR_SPREAD = { static_cast(DEFAULT_COLOR_SPREAD.r), static_cast(DEFAULT_COLOR_SPREAD.g), static_cast(DEFAULT_COLOR_SPREAD.b) }; static const float DEFAULT_ALPHA = 1.0f; static const float DEFAULT_ALPHA_SPREAD = 0.0f; static const float DEFAULT_ALPHA_START = UNINITIALIZED;