Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 19:01:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5941 from ctrlaltdavid/particles-fix

Browse source 
Fix particle radius, color, and alpha starts/finishes
This commit is contained in:
Brad Hefta-Gaub 2015-10-02 11:40:47 -07:00
commit dce4d94f30
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/entities/src/EntityItemProperties.cpp
View file

@ -1573,14 +1573,17 @@ void EntityItemProperties::markAllChanged() {
_accelerationSpreadChanged = true; _accelerationSpreadChanged = true;
_particleRadiusChanged = true; _particleRadiusChanged = true;
_radiusSpreadChanged = true; _radiusSpreadChanged = true;
_radiusStartChanged = true;
_radiusFinishChanged = true;
_colorSpreadChanged = true; _colorSpreadChanged = true;
_colorStartChanged = true;
_colorFinishChanged = true;
_alphaSpreadChanged = true; _alphaSpreadChanged = true;
_alphaStartChanged = true;
_alphaFinishChanged = true; // Only mark the following as changed if their values are specified in the properties when the particle is created. If their
// values are specified then they are marked as changed in getChangedProperties().
//_radiusStartChanged = true;
//_radiusFinishChanged = true;
//_colorStartChanged = true;
//_colorFinishChanged = true;
//_alphaStartChanged = true;
//_alphaFinishChanged = true;
_marketplaceIDChanged = true; _marketplaceIDChanged = true;

4
libraries/entities/src/ParticleEffectEntityItem.h
View file

@ -177,12 +177,12 @@ public:
float getParticleRadius() const { return _particleRadius; } float getParticleRadius() const { return _particleRadius; }
static const float DEFAULT_RADIUS_START; static const float DEFAULT_RADIUS_START;
bool _isRadiusStartInitialized; bool _isRadiusStartInitialized = false;
void setRadiusStart(float radiusStart) { _radiusStart = radiusStart; _isRadiusStartInitialized = true; } void setRadiusStart(float radiusStart) { _radiusStart = radiusStart; _isRadiusStartInitialized = true; }
float getRadiusStart() const { return _isRadiusStartInitialized ? _radiusStart : _particleRadius; } float getRadiusStart() const { return _isRadiusStartInitialized ? _radiusStart : _particleRadius; }
static const float DEFAULT_RADIUS_FINISH; static const float DEFAULT_RADIUS_FINISH;
bool _isRadiusFinishInitialized; bool _isRadiusFinishInitialized = false;
void setRadiusFinish(float radiusFinish) { _radiusFinish = radiusFinish; _isRadiusFinishInitialized = true; } void setRadiusFinish(float radiusFinish) { _radiusFinish = radiusFinish; _isRadiusFinishInitialized = true; }
float getRadiusFinish() const { return _isRadiusFinishInitialized ? _radiusFinish : _particleRadius; } float getRadiusFinish() const { return _isRadiusFinishInitialized ? _radiusFinish : _particleRadius; }