Atlante45
|
1da68e0214
|
Fix particle bug by having lifetimes increase
|
2015-10-16 18:11:22 -07:00 |
|
Andrew Meadows
|
fa17b77d70
|
move DIRTY_FLAGS out of EntityItem namespace
|
2015-10-15 09:34:09 -07:00 |
|
Brad Hefta-Gaub
|
25481e0a25
|
Merge pull request #6038 from Atlante45/asset-drop
Asset file drop
|
2015-10-10 09:32:58 -07:00 |
|
Atlante45
|
bcd148cb87
|
Construct entity properties at definition
|
2015-10-09 12:23:19 -07:00 |
|
David Rowe
|
09e5b30c16
|
Only emit particles if isEmitting is true
|
2015-10-09 11:21:59 -07:00 |
|
Brad Hefta-Gaub
|
bb10d8a7d5
|
more work on rationalizing particle properties
|
2015-10-07 20:08:30 -07:00 |
|
David Rowe
|
131b4ed004
|
Merge branch 'master' into 20699
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
libraries/entities/src/ParticleEffectEntityItem.cpp
|
2015-10-07 15:08:07 -07:00 |
|
Brad Hefta-Gaub
|
57cc7adbfe
|
standardize somethingChanged - CR feedback
|
2015-10-07 12:27:12 -07:00 |
|
David Rowe
|
4624649b1b
|
Sanitize particle properties, fix crashes
|
2015-10-07 08:57:55 -07:00 |
|
Eric Levin
|
c72c87b59c
|
Revert "QA for 20699 - Sanitize particle property values when set"
|
2015-10-05 13:35:58 -07:00 |
|
ZappoMan
|
6f86b0f550
|
particle fixes
|
2015-10-04 15:23:17 -07:00 |
|
David Rowe
|
53e85e8566
|
Tidying
|
2015-10-03 09:59:33 -07:00 |
|
David Rowe
|
510065fe5c
|
Fix particle property maxParticles not being able to be set properly
|
2015-10-03 09:16:07 -07:00 |
|
David Rowe
|
67a497cda3
|
Sanitize particle properties and their use
Excluding animationSetings because it's unused and will be removed.
|
2015-10-02 17:37:59 -07:00 |
|
Brad Hefta-Gaub
|
eb9078bda5
|
cleanup
|
2015-10-02 17:27:45 -07:00 |
|
Brad Hefta-Gaub
|
02536a5ab9
|
remove animationSettings from particles, add isEmitting
|
2015-10-02 14:17:01 -07:00 |
|
Brad Hefta-Gaub
|
e6fb587a8c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
|
2015-10-02 13:04:14 -07:00 |
|
Brad Hefta-Gaub
|
aca25bd76e
|
connect up AnimationPropertyGroup to AnimationLoop
|
2015-10-01 11:05:16 -07:00 |
|
Brad Hefta-Gaub
|
7c14f9ab93
|
Merge branch 'animationGroupSettings' of https://github.com/ZappoMan/hifi into animationGroupSettings
|
2015-09-30 21:46:28 -07:00 |
|
Brad Hefta-Gaub
|
6aa9ef9910
|
first cut at migrating animation settings into a property group
|
2015-09-30 20:51:25 -07:00 |
|
David Rowe
|
c56ac24602
|
Improve particle property interpolation
Use Bezier interpolation instead of cubic so that values don't overshoot.
|
2015-09-30 11:37:22 -07:00 |
|
David Rowe
|
d233d3f81b
|
Fix particle emitter corner cases
|
2015-09-24 19:17:02 -07:00 |
|
David Rowe
|
629128c17f
|
Fix particle emit directions for point emitter
|
2015-09-24 19:16:28 -07:00 |
|
David Rowe
|
3d44fdfdf5
|
Fix warnings
|
2015-09-23 21:18:23 -07:00 |
|
David Rowe
|
2b902238e7
|
Code tidying
|
2015-09-23 10:33:31 -07:00 |
|
David Rowe
|
812ab9b7c6
|
Merge branch 'master' into 20681
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
|
2015-09-18 16:44:04 -07:00 |
|
David Rowe
|
ec146069b1
|
Reuse old property enum slots
|
2015-09-18 13:06:18 -07:00 |
|
David Rowe
|
8634b59914
|
Make able to emit from within portion of ellipsoid volume
|
2015-09-17 23:49:57 -07:00 |
|
David Rowe
|
9e2b5b75b6
|
Make able to emit in specified range of directions
Controlled by polar and azimuth start and finish angles, around point or
from specified part of spheroid surface.
|
2015-09-17 22:40:49 -07:00 |
|
David Rowe
|
f647dcf147
|
Change emitter radiuses to dimensions to match sphere properties
|
2015-09-17 21:06:40 -07:00 |
|
Brad Hefta-Gaub
|
4e2cb00ec3
|
first cut at only returning type specific properties in getEntityProperties
|
2015-09-17 17:33:53 -07:00 |
|
David Rowe
|
12e2cf3ce9
|
Emit in all directions from a point or the surface of a spheroid
|
2015-09-17 17:14:35 -07:00 |
|
David Rowe
|
c992107363
|
Add particle properties ready to use for emitting from a spheroid
|
2015-09-16 18:07:18 -07:00 |
|
Brad Hefta-Gaub
|
e1cb041576
|
first cut at adding desiredProperties to getProperties
|
2015-09-16 15:00:42 -07:00 |
|
David Rowe
|
d51cab3e3d
|
Replace particle velocity with speed and orientation
|
2015-09-16 14:51:08 -07:00 |
|
Seth Alves
|
49ee251238
|
quiet compiler
|
2015-09-12 09:59:25 -07:00 |
|
David Rowe
|
4d4b35ba5e
|
Fix #include
|
2015-09-10 09:47:49 -07:00 |
|
David Rowe
|
fa959c4554
|
Move cubic interpolation method to shared library
|
2015-09-10 08:53:16 -07:00 |
|
David Rowe
|
99c1e06201
|
Code tidying
|
2015-09-08 13:25:15 -07:00 |
|
David Rowe
|
cdd5e68815
|
Add colorStart and colorFinish entity particle properties
|
2015-09-08 11:28:53 -07:00 |
|
David Rowe
|
cb9468c311
|
Add colorSpread entity particle property
|
2015-09-07 16:27:42 -07:00 |
|
David Rowe
|
47b27a3280
|
Add alphaStart and alphaFinish entity particle properties
|
2015-09-05 16:30:01 -07:00 |
|
David Rowe
|
042384b5b0
|
Tidy and finish alpha and alphaSpread
|
2015-09-05 14:51:48 -07:00 |
|
David Rowe
|
1b3d125cb3
|
Add alphaSpread entity particle property
|
2015-09-05 14:39:10 -07:00 |
|
David Rowe
|
8b296f53e6
|
Short-circuit radius values and interpolation when can
|
2015-09-05 11:13:48 -07:00 |
|
David Rowe
|
8d85309925
|
Use cubic interpolation instead of cosine
|
2015-09-05 10:50:05 -07:00 |
|
David Rowe
|
12b8a5a1d5
|
Add alpha property support to ParticleEffect entities
Add at same "level" as color so that it's available for other entity
types to use in the future.
|
2015-09-05 10:23:27 -07:00 |
|
David Rowe
|
c910da7179
|
Add radiusStart and radiusFinish entity particle properties
|
2015-09-04 12:27:18 -07:00 |
|
David Rowe
|
2bc2582797
|
Fix missing entity property gets for velocity and acceleration spread
|
2015-09-03 14:55:09 -07:00 |
|
David Rowe
|
45ff118249
|
Add new radiusSpread entity particle property
|
2015-09-03 14:55:08 -07:00 |
|