207 commits

Author	SHA1	Message	Date
Zach Pomerantz	3e9e083df5	Update users of NetworkGeometry	2016-03-24 11:35:41 -07:00
Brad Hefta-Gaub	492e71345a	Revert "Revert "Fix ModelBlender crash"" ... This reverts commit f274cdcc7f.	2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub	f274cdcc7f	Revert "Fix ModelBlender crash"	2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub	7483b8546b	remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it	2016-03-17 17:05:35 -07:00
howard-stearns	ddc658af5f	After a modelURL change to an existing model, allow the model to be ... snapped and scaled to the existing entity registration and dimensions.	2016-03-15 12:20:51 -07:00
Seth Alves	01659cf93b	try, try again	2016-03-11 16:21:20 -08:00
Seth Alves	2ad15f7568	try harder to get queryAABoxes to be correct	2016-03-11 14:38:31 -08:00
Seth Alves	f611d8f747	if needed, set querryAACube when dimensions are updated	2016-03-11 12:41:18 -08:00
Seth Alves	40c953e0b9	fix model hulls	2016-03-07 11:40:18 -08:00
Seth Alves	8b8604f9b0	move offset handling for models back to how it was before this PR	2016-03-07 11:32:25 -08:00
Seth Alves	c95d1f68f6	remove debug print	2016-03-06 14:38:03 -08:00
Seth Alves	5c585acd9a	offset is included in shape key for models	2016-03-06 14:29:30 -08:00
Seth Alves	dcb720a832	fix polyvox hull when registration changes.	2016-03-06 14:09:45 -08:00
Seth Alves	59804a0f54	cleanups	2016-03-06 12:59:41 -08:00
Seth Alves	5241dc5394	this seems to be working now. more cleanups to come	2016-03-06 12:59:33 -08:00
Seth Alves	8bc2c76a8b	change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape	2016-03-05 08:01:30 -08:00
Seth Alves	9346171695	if entity registration isn't default, adjust physics shapes to match	2016-03-04 16:47:30 -08: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
Zach Pomerantz	0e9d696859	Cache renderable model orig texs as QVariantMap	2016-02-15 11:09:10 -08:00
Zach Pomerantz	0903e14b06	Revert model texs when unset	2016-02-12 15:57:24 -08:00
Seth Alves	6a646f1c24	put isMoving back and change all uses to isMovingRelativeToParent	2016-02-10 19:01:41 -08:00
Atlante45	7e8ea4dc77	Update primitive instance rendering calls	2016-02-01 18:50:01 +01:00
Andrew Meadows	d25f54485c	fix crash for emtpy modelUrl in ModelEntityItem	2016-01-22 22:01:30 -08:00
Seth Alves	edea0320e6	try again to make this thread safe	2016-01-19 15:44:22 -08:00
Seth Alves	a515d6debe	call into correct thread to getJointNames on entity	2016-01-19 15:16:58 -08:00
Seth Alves	f265656e74	expose getJointNames for entities to js	2016-01-19 12:55:17 -08:00
Seth Alves	4232e400cc	add getJointIndex call	2016-01-18 11:15:03 -08:00
David Rowe	a59cbd1aca	Merge branch 'master' into 20763	2016-01-14 17:25:44 +13:00
Atlante45	11dc3cd261	Move primitive rendering out of DeferredLightingEffect	2016-01-13 11:47:43 -08:00
David Rowe	25309e84b3	Fix interpreting textures properties	2016-01-07 17:30:28 +13:00
David Rowe	f64481c510	Warn user if cannot evaluate model's textures property	2016-01-07 16:47:48 +13:00
Seth Alves	942e77166e	merge from upstream	2016-01-05 11:11:19 -08:00
Seth Alves	ef8673610f	debugging	2016-01-04 14:58:13 -08:00
Seth Alves	6c8eb90ee0	debugging	2016-01-04 14:42:37 -08:00
Seth Alves	7f2e0cd103	expose a way to set translation and rotation of all model joints at once	2016-01-04 14:13:08 -08:00
Seth Alves	d35bbbb9f2	incorporate changes from #6732	2015-12-30 13:15:36 -08:00
Seth Alves	4e312dd8f8	undo temporary hack	2015-12-30 12:45:19 -08:00
Seth Alves	83f60d6e97	make entity properties for model-entity joint-states	2015-12-23 15:43:50 -08:00
Seth Alves	84bcfb7d71	hook up a way for scripts to set model-entity joint state	2015-12-22 17:43:01 -08:00
Seth Alves	1d9a81d5d4	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-21 09:14:37 -08:00
Seth Alves	d71cecbc61	Merge pull request #6675 from AndrewMeadows/crash-fix ... fix crash when visiting new domain with gun in hand	2015-12-20 06:24:44 -08:00
Seth Alves	489d4099a7	add locationChanged to model entities	2015-12-16 15:21:20 -08:00
Andrew Meadows	c14433979b	fix crash mode when model late to get collision URL	2015-12-16 15:11:47 -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
Seth Alves	1492fd6090	merge from upstream	2015-12-12 12:37:57 -08:00
Seth Alves	8ec84bdde8	don't simulate model until it has geometry	2015-12-11 17:35:18 -08:00
Seth Alves	6c033d9603	call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model	2015-12-11 11:35:42 -08:00
Seth Alves	3a35df191a	remove an off-brand change	2015-12-10 11:19:26 -08:00
Seth Alves	1467a9d2eb	handle initial simulation of _model	2015-12-10 11:17:40 -08:00
Seth Alves	2dd40beed5	formatting	2015-12-10 10:42:25 -08:00