89 commits

Author	SHA1	Message	Date
Andrew Meadows	b95cb566cd	fix collision mesh for non-trivial registration	2016-08-24 22:26:56 -07:00
Andrew Meadows	68dd66daec	create collision render geometry only when needed	2016-08-24 22:26:56 -07:00
Andrew Meadows	b0a0293e6e	move compoundResource out of Model class	2016-08-24 22:26:56 -07:00
Andrew Meadows	6b0ae654ba	cleanup logic around creating RenderItems	2016-08-24 22:26:56 -07:00
Andrew Meadows	726928c14c	creae collision Geometry from mesh	2016-08-24 22:25:45 -07:00
Andrew Meadows	499150bbed	finish hook alert for new entity collision shape	2016-08-24 22:25:45 -07:00
Andrew Meadows	b2dfa49a6f	stubbery for alerting entity that shape changed	2016-08-24 22:25:45 -07:00
Brad Hefta-Gaub	a714f325fe	Merge pull request #8333 from SamGondelman/miscFixes ... Miscellaneous cmake and render engine improvements	2016-08-10 11:06:50 -07:00
SamGondelman	328d3128fa	merge from master	2016-08-08 13:30:39 -07:00
Ryan Huffman	d367583426	Clean up priority loading implementation	2016-08-08 08:53:06 -07:00
SamGondelman	b6e73e06a2	merge from master	2016-08-04 13:34:38 -07:00
SamGondelman	ac9a80131a	refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes	2016-08-04 12:34:46 -07:00
Stephen Birarda	5d3e125a06	make failed geomtetry request not hold physics	2016-08-02 16:32:41 -07:00
SamGondelman	676f4bdfcf	misc fixes from particles branch	2016-07-29 15:36:32 -07:00
Andrew Meadows	d591561a88	remove RenderableModelEntityItem::_points ... use ShapeInfo::_points instead	2016-06-03 10:47:54 -07:00
Seth Alves	ceb6aa582f	don't crash when a moving model entity is deleted	2016-05-13 13:32:45 -07:00
Seth Alves	970e7ca17d	don't crash when a moving model entity is deleted	2016-05-13 13:32:00 -07:00
Seth Alves	79141e3869	dry up some code	2016-05-13 07:06:25 -07:00
Zach Pomerantz	7a15339631	Use AnimationCache for models	2016-04-13 15:44:47 -07:00
Seth Alves	43f735dd21	avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.	2016-04-09 22:18:43 -07:00
Anthony J. Thibault	8f530ceaf9	Reading animation properties without an entityTree lock is considered harmful ... In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock. In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.	2016-04-07 13:42:40 -07:00
Zach Pomerantz	01db2be6b8	Avoid JSON parsing texs every render cycle	2016-03-30 14:48:57 -07:00
Zach Pomerantz	2de94e672b	Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching	2016-03-28 14:08:30 -07:00
Brad Hefta-Gaub	4ebb114a8e	also fix joint simulation from 3rd party editors	2016-03-25 11:43:32 -07:00
Brad Hefta-Gaub	6c6131c7b3	fix the doppelganger	2016-03-25 11:22:54 -07:00
Zach Pomerantz	3e9e083df5	Update users of NetworkGeometry	2016-03-24 11:35:41 -07:00
Brad Hefta-Gaub	3fa3b40f43	fix non-animated motor proteins	2016-03-23 15:56:31 -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
Seth Alves	5241dc5394	this seems to be working now. more cleanups to come	2016-03-06 12:59:33 -08:00
Andrew Meadows	492c026f78	Merge pull request #7102 from zzmp/fix/model-tex-revert ... Revert model texs when unset	2016-02-16 09:25:40 -08:00
Zach Pomerantz	0e9d696859	Cache renderable model orig texs as QVariantMap	2016-02-15 11:09:10 -08:00
samcake	355b8ee40d	THursday morning the frustum culling seems broken in one particular angle	2016-02-11 10:05:39 -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	25309e84b3	Fix interpreting textures properties	2016-01-07 17:30:28 +13: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	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	489d4099a7	add locationChanged to model entities	2015-12-16 15:21:20 -08:00
Atlante45	a07d7494f0	More OS X warning cleanup	2015-12-11 14:20:36 -08:00
Seth Alves	3a35df191a	remove an off-brand change	2015-12-10 11:19:26 -08:00
Seth Alves	d09f70239c	make entity-tree a global. change how network-requests to load model geometry are triggered	2015-12-10 09:03:53 -08:00
Seth Alves	4d60c7bbc0	update model location with SpatiallyNestable's locationChanged call	2015-12-09 10:42:32 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
Atlante45	18198cb6fb	Fix missing override	2015-12-07 08:36:49 -08:00
Seth Alves	96e9580473	change some more parameters back to being pass-by-reference, where it's safe	2015-12-07 05:30:19 -08:00
Seth Alves	a948ae5f19	children of avatar joints might be right, now	2015-12-06 10:48:00 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents ... Parents	2015-12-04 10:26:57 -08:00