426 commits

Author	SHA1	Message	Date
HifiExperiments	89e6cbbfa4	mirrors wip	2023-11-13 14:40:56 -08:00
Julian Groß	ae7d229d0e	Fix copyright headers	2023-05-19 00:17:38 +02:00
Heather Anderson	1e018dbc64	isolate calls to the QtScript libraries to an interface we control	2023-05-19 00:17:33 +02:00
Dale Glass	b8d1057e1f	Replace the deprecated QMutex{ QMutex::Recursive} with QRecursiveMutex ... This fixes around 1700 warnings.	2021-09-26 01:27:19 +02:00
HifiExperiments	ae26416c59	Merge branch 'master' into billboard	2021-02-09 22:57:10 -08:00
HifiExperiments	1f71a23082	optimize picking	2021-01-17 13:09:09 -08:00
HifiExperiments	2a27fc4de2	billboarding for model entities	2021-01-13 22:31:21 -08:00
HifiExperiments	20e0c24163	cleanup + create	2021-01-02 00:04:24 -08:00
HifiExperiments	002271a4cc	finishing touches	2021-01-01 21:52:16 -08:00
HifiExperiments	1475cae504	wip	2020-12-23 21:29:59 -08:00
HifiExperiments	7069e48073	working on pivot	2020-12-16 21:01:56 -08:00
HifiExperiments	ccd5ef80b3	remove isActive, fix contains, maybe fix green box issue	2020-11-09 19:14:30 -08:00
HifiExperiments	c8532a1ac5	another unused variable	2020-11-04 22:21:24 -08:00
HifiExperiments	9142b7123d	collisions and dimensions seem to be working	2020-10-13 16:27:48 -07:00
HifiExperiments	5a8c1a0374	starting improve entity updates pt 2	2020-10-12 18:50:46 -07:00
HifiExperiments	e78ece7fc5	CR	2020-08-17 14:16:41 -07:00
HifiExperiments	0d62798860	Merge remote-tracking branch 'upstream/master' into parenting	2020-08-04 08:52:13 -07:00
HifiExperiments	aa6eedf0fe	make sure render with zones works on models on restart/reload	2020-07-21 12:06:38 -07:00
HifiExperiments	56d359f2ba	Merge remote-tracking branch 'upstream/master' into parenting	2020-06-14 17:30:26 -07:00
Kasen IO	21fd10d154	Revert commit 359248829c using -m 1 to temporarily fix issue 383.	2020-06-03 16:08:18 -04:00
HifiExperiments	405d557725	Merge branch 'master' into blendshapes	2020-05-07 13:38:59 -07:00
HifiExperiments	ebc9dae78d	Merge branch 'master' into parenting	2020-05-07 13:35:32 -07:00
HifiExperiments	8017e30ab9	Merge branch 'master' into blendshapes	2020-05-07 13:27:22 -07:00
HifiExperiments	3bf690571c	Merge branch 'master' into zoneOcclusion	2020-05-07 13:13:20 -07:00
HifiExperiments	eb26d9b4e3	working on parenting fixes	2020-04-06 13:41:01 -07:00
HifiExperiments	bc319cb340	zone occlusion	2020-01-11 22:29:07 -08:00
HifiExperiments	ef8f085b47	support blendshapes on model entities	2020-01-05 02:37:44 -08:00
SamGondelman	1736252f0d	trying and failing to fix models	2019-12-12 23:04:47 -05:00
HifiExperiments	3dfd63d46b	merge with master	2019-11-26 20:42:44 -08:00
sabrina-shanman	7b14c00540	Merge branch 'master' into instancing	2019-11-05 10:22:24 -08:00
Sam Gateau	695b9cdba6	Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform	2019-10-18 03:31:06 -07:00
Sam Gateau	05ac9aefa8	the clusterMatrices should be working, but n skin index and weights are assigned yet	2019-10-14 02:21:01 -07:00
Sam Gateau	a995f2c09f	in the middle of something	2019-10-10 17:09:54 -07:00
Sam Gateau	1f3993c308	getting the transform right for the rigid bodies	2019-10-08 18:13:24 -07:00
Sam Gateau	521ce3936b	I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion...	2019-10-07 15:19:23 -07:00
SamGondelman	6d3e23a7fe	merge with master	2019-05-16 20:03:10 -07:00
SamGondelman	de90c5088c	(✿◠‿◠)	2019-05-16 19:33:07 -07:00
Anthony J. Thibault	98fe059d97	Fix blender::run crash ... Pass a shared_ptr of the HFMModel to the Blender. This will prevent the HFMModel from being destroyed on the main thread if an Avatar changes their skeletonModelURL. Also the _blendshapeOffset hash in Model has been eliminated, it was not necessary and was also a source of data races. The body of Blender::run has been updated slightly to reduce the number of allocation necessary for temporary QVectors.	2019-05-16 13:12:16 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
Shannon Romano	29e415a104	Merge pull request #15498 from SamGondelman/crash ... Case 22444: Try to fix materialMapping crash	2019-05-02 16:29:39 -07:00
SamGondelman	50e538a73c	try to fix materialMapping crash	2019-05-01 17:23:19 -07:00
SamGondelman	0bcd8b81e1	trying and failing to fix models	2019-05-01 12:01:49 -07:00
SamGondelman	5a184bd584	fix model bounds	2019-04-30 13:38:11 -07:00
SamGondelman	27338c3639	fix cauterization of entities that are children of MyAvatar's head	2019-04-08 19:48:11 -07:00
Andrew Meadows	72ac35c6f7	avoid nan in Model::_scale	2019-04-04 08:28:03 -07:00
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
SamGondelman	fdbcf4b2ea	cleanup and expose mapped materials to getScriptableModel	2019-02-12 12:03:35 -08:00
SamGondelman	61346437da	working on material mapping	2019-02-12 09:22:31 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00