172 commits

Author	SHA1	Message	Date
Thijs Wenker	58539171a3	give particle trails a nice smooth path between frames	2016-02-20 22:46:19 +01:00
ericrius1	92f96cbb2f	Removed un-needed libraries from particle effect entity	2015-12-17 12:49:30 -08:00
ericrius1	5b52b5e5e7	Merge branch 'master' into polylineOptimizations	2015-12-17 11:41:34 -08:00
ericrius1	2aaefbcfcb	refactoring, adding headers	2015-12-17 11:32:48 -08:00
Anthony J. Thibault	2eecb61da5	Prefer erase over repeated pop_front calls	2015-12-16 19:08:31 -08:00
Anthony J. Thibault	1b08563079	ParticleEffectEntityItem: fix for invalid iterator increment ... Was causing an assert in debug, due to calling ++ on an invalid iterator. In release this might lead to memory corruption.	2015-12-16 16:56:49 -08:00
ericrius1	61bad36d5c	tweaks	2015-12-15 18:49:04 -08:00
ericrius1	d9c93130e5	In a state where non uniform random vals are clear	2015-12-15 18:02:11 -08:00
ericrius1	dca83a054e	Changed additiveBlending to emitterShouldTrail	2015-12-15 10:30:57 -08:00
ericrius1	c561a53f7c	Going to change additive blending to world position prop	2015-12-15 09:56:28 -08:00
ericrius1	8d691f2132	light ball	2015-12-14 11:44:42 -08:00
Atlante45	1d513cfbba	Merge branch 'master' of https://github.com/highfidelity/hifi into particle	2015-12-09 15:09:19 -08:00
Atlante45	180ffcc456	Typo (English is weird)	2015-12-03 15:01:18 -08:00
Atlante45	0f316e6ae1	Remove particles emiter bounds compute	2015-11-24 11:51:56 -08:00
Atlante45	e25ea122d8	Start moving update to shader	2015-11-24 11:51:56 -08:00
Atlante45	ca17c75631	Save one array traversal	2015-11-24 11:51:56 -08:00
Atlante45	230a413ec1	First pass at new particle shader	2015-11-24 11:51:56 -08:00
Atlante45	7d0a5677fa	More code cleanup	2015-11-24 11:51:56 -08:00
Atlante45	964ac5bad6	More cleanup	2015-11-24 11:51:56 -08:00
Atlante45	40e802bae7	Get rid of global variable for sort ... Fix rhs/lhs	2015-11-24 11:51:56 -08:00
Atlante45	a71ed7b166	Implement particle bounds with Extents	2015-11-24 11:51:56 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
David Rowe	b3b73e8cd1	Fix particle aging	2015-11-17 12:02:35 +13:00
ericrius1	31fe5fa953	Bump version num, use different shader for additive blending effect	2015-11-03 17:15:10 -08:00
ericrius1	0ed868077d	Added additive blending as option for particle effect	2015-11-03 10:02:51 -08:00
Seth Alves	61269c3ce8	fix up entity constructors so that setProperties isn't called during the constructor	2015-10-23 13:52:50 -07:00
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
Andrew Meadows	614fad0811	remove warnings from linux build	2015-08-27 19:12:25 -07:00
ericrius1	5586c2ff17	fixed ordering of bitsream reading for old svo files with particle entities	2015-08-26 11:45:19 -07:00
ericrius1	f25b75093c	cleaned up conditional bitstream parsing	2015-08-26 09:44:29 -07:00
ericrius1	13892db866	removed logging	2015-08-24 11:41:03 -07:00
ericrius1	5fa27a7cf1	added back computeAndUpdate mmethod for particles, and now handling parsing old streams	2015-08-24 10:59:38 -07:00
ericrius1	e191a301d8	added a spread to defaults to create a default fountain effect	2015-08-13 16:08:38 -07:00
ericrius1	bb84e0e403	fixed defaults	2015-08-13 15:57:45 -07:00
ericrius1	6fe8703492	added defaults to particle effect for velocity and acceleration	2015-08-13 15:50:00 -07:00
ericrius1	5b2e966ca5	fixing accel issues	2015-08-13 10:55:21 -07:00
ericrius1	d38d29e0f5	fixed argument signatues and optimized particle position calculations	2015-08-13 10:35:32 -07:00
ericrius1	f3d6992dd2	remove outdated comment	2015-08-12 17:28:07 -07:00
ericrius1	36ca0c54fc	acceleration spread working properly	2015-08-12 16:13:00 -07:00
ericrius1	16279bd415	emitters trail particles now	2015-08-12 14:01:42 -07:00
ericrius1	528d662c58	getting acceleration spread hooked up	2015-08-12 09:50:01 -07:00
ericrius1	2db053e56a	adding acceleration spread property	2015-08-11 17:09:48 -07:00
ericrius1	0031c2a39a	changed localGravity prop to acceleration, which can be along any arbitrary direction	2015-08-11 16:05:18 -07:00
ericrius1	c2915fc0f5	changing to velocity spread	2015-08-11 15:16:36 -07:00
ericrius1	ddaba19a4e	chaning to velocity from direction	2015-08-11 14:43:05 -07:00
ericrius1	7ed408bf97	fixed merge conflics	2015-08-10 15:50:51 -07:00
ericrius1	d341dc337d	added direction spread property to particle entity to enable users to create more varied effects (such as falling snow	2015-08-10 15:48:28 -07:00
ericrius1	23dcc647c4	adding more for direction spread	2015-08-10 15:00:21 -07:00
ericrius1	460eaa515b	adding direction spread	2015-08-10 14:19:25 -07:00
ericrius1	c299d77c92	fixed implicit double to float casting and incorrect header author attribution	2015-08-10 10:57:53 -07:00
Seth Alves	a9556660c4	fix linux build	2015-07-29 20:53:24 -07:00