3915 commits

Author	SHA1	Message	Date
Sam	87efeb1a70	make sure that we compile, dah	2018-10-03 16:15:07 -07:00
sam gateau	81e0d5ced0	Merge branch 'black-bis' of github.com:samcake/hifi into black-bis	2018-10-03 16:03:33 -07:00
sam gateau	702d26d2bd	Addressing the bug on Mac AMD	2018-10-03 16:03:09 -07:00
Sam Gateau	c194e795ac	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-03 12:12:15 -07:00
sam gateau	5d0f2e3035	And more changes for better syntax and less useless stuff	2018-10-02 13:09:04 -07:00
sam gateau	ff24a99032	Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform	2018-10-02 11:18:20 -07:00
Sam Gateau	c95c736b1f	FOUnd a working path for gl41	2018-10-01 22:50:29 -07:00
Sam Gateau	d1d4920c35	Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport	2018-10-01 21:35:18 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
David Rowe	2f3a9412f3	Make highlight occlusion match overlay occlusion	2018-10-02 15:36:18 +13:00
Sam Gateau	c593f00839	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-01 19:10:18 -07:00
sam gateau	392e2ff535	trying and failing andad trying and rince and repeat	2018-10-01 17:45:16 -07:00
John Conklin II	0ef407a45c	Merge pull request #14116 from sethalves/fix-bad-render-downcasts ... get asan to not complain about invalid downcasts during transaction.updateItem	2018-10-01 16:57:03 -07:00
sam gateau	c12115bfda	Addressing the 4.1 pass and make sure it works on windows pc and mac	2018-10-01 11:51:46 -07:00
Sam Gateau	5842416ae6	Exploring the possible packing schemes and trying to debug the tangent	2018-09-30 23:11:36 -07:00
Seth Alves	90d9af35b5	minimize diff	2018-09-30 16:05:08 -07:00
Seth Alves	e30497595c	static_cast can be used here rather than dynamic	2018-09-30 15:49:42 -07:00
Seth Alves	749b02cfb8	get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor	2018-09-30 15:12:49 -07:00
sam gateau	1ff4c54c1c	Packing normal and tangents	2018-09-28 17:49:52 -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	faf489855c	Packing the offsets and catching up performances	2018-09-28 02:13:08 -07:00
sam gateau	215818e313	adjusting page size but still seeing a perf drop	2018-09-27 17:18:43 -07:00
Sam Gateau	8923055e91	Exploring the bad peroformances	2018-09-27 00:15:34 -07:00
sam gateau	4078be3df5	Better naming and simpler template maybe	2018-09-26 17:58:06 -07:00
sam gateau	34203c67b0	Addressing the merge with master	2018-09-26 15:42:13 -07:00
John Conklin II	b02e2c8123	Merge pull request #14081 from SamGondelman/blendshapes ... Improve ModelBlender queuing	2018-09-26 15:10:02 -07:00
sam gateau	1e112d3c84	bringing back a bug fix from samuel	2018-09-26 14:15:42 -07:00
sam gateau	b5a47b2e76	Finalizing the renaming from Skinned to Deformed	2018-09-26 14:11:22 -07:00
sam gateau	09dae5aee3	Addressing merge conflict in HighlightEffect.cpp	2018-09-26 13:24:21 -07:00
sam gateau	efa1dd0274	rename the files from skin to deformed	2018-09-25 17:32:04 -07:00
sam gateau	cc0019479a	fixing review comments	2018-09-25 14:07:07 -07:00
sam gateau	e41b8f06e1	Cleaning up the pipeline and checking that it is working for all cases	2018-09-25 13:57:50 -07:00
SamGondelman	21cd3948ae	improve blender queuing	2018-09-25 12:07:05 -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
SamGondelman	ad73cb3996	fix avatar highlighting	2018-09-24 14:02:35 -07:00
SamGondelman	d772cdb34a	please	2018-09-24 10:16:35 -07:00
Sam Gateau	4210ce46aa	bringing the tex corrd transform in the Material struct and shaving one ubo	2018-09-23 23:10:56 -07:00
sam gateau	d8984dafa0	ui allows to enable/disable the deformer componenets	2018-09-21 16:45:21 -07:00
sam gateau	aa02dcb087	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-21 08:19:50 -07:00
sam gateau	d3ff4b8630	Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off	2018-09-20 17:26:26 -07:00
John Conklin II	0560b8678c	Merge pull request #14022 from jherico/fix/amd_highlight ... Fix AMD highlighting effect	2018-09-20 16:17:10 -07:00
sam gateau	5d80a89094	Apply fix to gl41 backend needed for proper Resource BUffer on gl41	2018-09-20 16:09:08 -07:00
Sam Gateau	377464f5a2	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-09-19 19:00:30 -07:00
sam gateau	6b6551c8bd	the missing file	2018-09-19 17:29:10 -07:00
sam gateau	4fc6466250	update shaders	2018-09-19 17:27:58 -07:00
John Conklin II	60c07280f8	Merge pull request #13971 from SamGondelman/parabola ... Correct transparent parabola shader	2018-09-19 11:46:24 -07:00
Brad Davis	783ea21951	Fix AMD highlighting effect	2018-09-19 11:21:12 -07:00
sam gateau	c05cbf065b	fixing the texcoord1 input in skined vertex shader	2018-09-19 10:13:14 -07:00
Sam Gateau	61644c48f0	Update the slp tp reflect the chanes in the vertex shaders	2018-09-19 09:18:09 -07:00