87 commits

Author	SHA1	Message	Date
Brad Davis	9509e32928	PR feedback	2016-05-14 08:28:51 -07:00
Zach Pomerantz	4e3ab73941	layout std140 in particle shader	2016-04-07 17:27:51 -07:00
samcake	1c53f9bc87	Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly	2016-02-23 10:40:50 -08:00
samcake	6922c9adf0	updating all the entity types when their bound is changing	2016-02-10 16:41:09 -08:00
Atlante45	11dc3cd261	Move primitive rendering out of DeferredLightingEffect	2016-01-13 11:47:43 -08:00
Seth Alves	bfa8cc1969	merge from upstream	2016-01-03 06:47:25 -08:00
ericrius1	fdb909ca31	merged	2015-12-22 09:40:42 -08:00
Seth Alves	76df582a6c	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 14:29:32 -08:00
samcake	aef748b894	Adding linear color in Particule system	2015-12-21 10:40:29 -08:00
ericrius1	2aaefbcfcb	refactoring, adding headers	2015-12-17 11:32:48 -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
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Atlante45	03ee07c8b7	Merge branch 'master' of https://github.com/highfidelity/hifi into particle	2015-12-10 13:37:20 -08:00
James B. Pollack	4e93f3ae81	respect visibility yay	2015-12-09 18:26:13 -08:00
James B. Pollack	b4c272aaa1	sam just left	2015-12-09 17:28:45 -08:00
Atlante45	1d513cfbba	Merge branch 'master' of https://github.com/highfidelity/hifi into particle	2015-12-09 15:09:19 -08:00
Brad Hefta-Gaub	d07629489c	Merge pull request #6543 from Atlante45/pointer ... gpu::Shader::create* return shared_ptr	2015-12-04 11:17:02 -08:00
Atlante45	bd23a4137e	Move toGlm to GLMHelpers	2015-12-03 15:01:17 -08:00
Atlante45	9c5486fb4b	More particle work	2015-12-03 15:01:17 -08:00
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
Atlante45	2dd494b5df	Remove additive blending option (force it)	2015-11-24 11:51:56 -08:00
Atlante45	4827a96bfa	Fix vertex shader (nested struct unsupported)	2015-11-24 11:51:56 -08:00
Atlante45	9adc437553	Make Particle's Payload/PendingChanges *almost* pointer free	2015-11-24 11:51:56 -08:00
Atlante45	0f316e6ae1	Remove particles emiter bounds compute	2015-11-24 11:51:56 -08:00
Atlante45	2cb2ca29e6	More particle shader work	2015-11-24 11:51:56 -08:00
Atlante45	e25ea122d8	Start moving update to shader	2015-11-24 11:51:56 -08:00
Atlante45	61511d57bb	Rename struct/Add type aliases	2015-11-24 11:51:56 -08:00
Atlante45	ca17c75631	Save one array traversal	2015-11-24 11:51:56 -08:00
Atlante45	cb14fbf4a1	Instance particle draw calls	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	964ac5bad6	More cleanup	2015-11-24 11:51:56 -08:00
Atlante45	c33b6205a8	Some 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	395822c6cd	Use make_shared	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	4646c0c103	unmangle merge	2015-11-21 10:49:31 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Seth Alves	f07d5d9d3f	show network and physics status on boxes and spheres	2015-11-11 11:32:12 -08:00
Seth Alves	39b92d2b52	terse log when ownership changes	2015-11-10 17:06:12 -08:00
Brad Hefta-Gaub	0ea901fd72	fix various warnings	2015-11-10 08:34:58 -08:00
ericrius1	af0c0e6a1b	spacing fix	2015-11-03 17:32:22 -08:00
ericrius1	31fe5fa953	Bump version num, use different shader for additive blending effect	2015-11-03 17:15:10 -08:00
ericrius1	470f814776	Fixed glitches with large particles being sorted along wrong axis	2015-11-03 16:39:16 -08:00
ericrius1	0c8a712935	removed comment	2015-11-03 15:36:11 -08:00
ericrius1	0ed868077d	Added additive blending as option for particle effect	2015-11-03 10:02:51 -08:00
ericrius1	f57f3c1138	Disabled writing to depth buffer for particles and no longer sorting the,	2015-11-02 15:25:42 -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