139 commits

Author	SHA1	Message	Date
HifiExperiments	ce7c304025	Merge remote-tracking branch 'overte/master' into taa	2024-10-29 23:30:11 -07:00
HifiExperiments	8fc734b168	Merge remote-tracking branch 'overte/master' into master_to_protocol_changes3	2024-08-17 12:07:21 -07:00
HifiExperiments	2a3d1c639c	disabled fallback	2024-06-29 22:49:55 -07:00
HifiExperiments	ee705d285e	Merge branch master into protocol_changes	2024-06-18 21:08:21 -07:00
HifiExperiments	d5e251d8da	minor cleanup, copyright	2024-02-28 15:23:04 -08:00
HifiExperiments	56f697e5f0	merge old work	2024-02-24 23:26:34 -08:00
HifiExperiments	c04c037588	native MToon materials	2024-02-02 17:59:32 -08:00
Dale Glass	e7591d6794	Revert "Revert "Mirrors + Portals""	2024-01-13 11:23:36 +01:00
ksuprynowicz	c6e4e5de37	Revert "Mirrors + Portals"	2024-01-13 11:18:08 +01:00
HifiExperiments	3336efb6ee	portals use exit as ignoreItem	2023-11-19 14:57:02 -08:00
HifiExperiments	10de1288c2	fix view + projection, texture flipping, billboarding	2023-11-13 14:40:56 -08:00
HifiExperiments	89e6cbbfa4	mirrors wip	2023-11-13 14:40:56 -08:00
David Rowe	12ceb0d93e	Fix avatar parts rotating	2021-03-28 21:11:58 +13:00
HifiExperiments	92ea14a059	proper render bounds for models (need to pass RenderArgs to getBound everywhere)	2021-01-17 22:08:06 -08:00
HifiExperiments	2a27fc4de2	billboarding for model entities	2021-01-13 22:31:21 -08: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	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	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
Kasen IO	9839b23061	Made Sam's graphics patches work with 86 K2.	2019-12-13 02:38:14 -05: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	a4696992e8	Renaming the env variable to enable Material Proecural Shaders	2019-11-04 11:15:37 -08:00
Sam Gateau	a95a4b5aa2	Address warnings and comments from review	2019-10-18 11:43:25 -07:00
Sam Gateau	f049ab7887	Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model	2019-10-15 18:12:09 -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
SamGondelman	de90c5088c	(✿◠‿◠)	2019-05-16 19:33:07 -07:00
SamGondelman	14c38c0fb0	ಠ⌣ಠ	2019-05-16 10:27:59 -07:00
SamGondelman	0bcd8b81e1	trying and failing to fix models	2019-05-01 12:01:49 -07:00
SamGondelman	27338c3639	fix cauterization of entities that are children of MyAvatar's head	2019-04-08 19:48:11 -07:00
Jeff Clinton	d92d256cfc	Merge pull request #14656 from SamGondelman/matFallthrough ... Case 20241: Material entity fallthrough	2019-01-25 14:01:27 -08:00
SamGondelman	1b5c1d0677	working on primitiveMode and groupCulled	2019-01-08 10:02:03 -08:00
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
SamGondelman	9155853889	working on material fallthrough	2018-12-20 16:03:58 -08:00
Seth Alves	2ce8ed25f8	Merge pull request #14125 from Atlante45/fix/mac-warnings ... Fix new Mac warnings	2018-10-20 13:40:53 -07:00
SamGondelman	327c2f4e3d	move blendshape buffers to render thread	2018-10-10 15:32:53 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Sam Gateau	c593f00839	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-01 19:10:18 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
Sam Gateau	69734ce21b	Getting better'	2018-09-24 22:34:43 -07:00
sam gateau	7cf7eaa7c8	Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape	2018-09-24 17:34:42 -07:00
sam gateau	ec6117e9bb	bringing the blendshape in skin shader only work in master	2018-09-18 17:40:29 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
Sam Gateau	2f94c43968	Removing the getLayer from the meshPArtPayload and check that it s working	2018-05-28 23:20:04 -07:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
samcake	221b513b19	Oh boy	2018-05-25 16:33:34 -07:00