4446 commits

Author	SHA1	Message	Date
Sabrina Shanman	518d6a530a	Merge pull request #16507 from highfidelity/master ... Merge master into instancing	2019-11-18 13:54:33 -08:00
HifiExperiments	b73a608094	procedural vertex shaders	2019-11-15 00:22:40 -08:00
sabrina-shanman	516debdcb2	Fix code style / remove cruft	2019-11-13 12:50:13 -08:00
sabrina-shanman	b7da5d0d72	Update Model::calculateTriangleSets to use hfm::Shapes	2019-11-08 13:56:49 -08:00
Sam Gateau	8175b9486f	Fix crash when highlighting custom pipeline shapes	2019-11-08 11:18:02 -08:00
Sabrina Shanman	eebb9ad51f	Merge pull request #16475 from highfidelity/master ... Merge master into instancing	2019-11-08 10:10:50 -08:00
Sam Gateau	269289412e	Same fix for highlight effects	2019-11-08 09:11:58 -08:00
Sam Gateau	5682e8ee2f	Fixing bug with custom pipeline and deformed shape renderItems in shadow pass	2019-11-07 15:16:11 -08:00
Sam Gateau	86b62f921d	Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it	2019-11-07 14:01:50 -08:00
sabrina-shanman	da5f80c139	Use std::vector types in ShapeInfo	2019-11-05 10:57:55 -08:00
sabrina-shanman	67e05a70d4	Fix build error with _drawTransform	2019-11-05 10:56:29 -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
HifiExperiments	bae2ba7bae	merge with master	2019-11-02 01:08:56 -07:00
HifiExperiments	6e5217b80d	fix build error, add environment variable	2019-11-02 01:03:34 -07:00
Sabrina Shanman	05ac16536e	Merge pull request #16436 from highfidelity/master ... Merge master into instancing	2019-10-31 17:39:15 -07:00
sabrina-shanman	4e0db5d641	Fix build warnings	2019-10-24 15:49:03 -07:00
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
Anthony J. Thibault	92f1b59cc8	Full legacy API and FST support	2019-10-18 16:30:32 -07:00
Sam Gateau	a95a4b5aa2	Address warnings and comments from review	2019-10-18 11:43:25 -07: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	9159258b50	clean ups	2019-10-16 17:42:36 -07:00
Sam Gateau	0a9c389641	last issue	2019-10-16 08:06:35 -07:00
Sam Gateau	eecaeb1155	FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer	2019-10-16 04:02:05 -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	108d331d86	more	2019-10-14 17:45:07 -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	8a1f3648f9	fooling around to get the cluster working	2019-10-11 18:06:44 -07:00
Sam Gateau	a995f2c09f	in the middle of something	2019-10-10 17:09:54 -07:00
Sam Gateau	3e8d6671f7	Merge branch 'instancing' of github.com:highfidelity/hifi into instancing	2019-10-10 09:04:22 -07:00
Sabrina Shanman	63fa9afa13	Merge pull request #16323 from highfidelity/master ... Merge master into instancing	2019-10-09 16:59:54 -07:00
Sam Gateau	1f3993c308	getting the transform right for the rigid bodies	2019-10-08 18:13:24 -07:00
Brad Davis	960cab9994	Qt 5.13 warnings & fixes	2019-10-08 15:40:13 -07:00
Sam Gateau	936ac6f120	REmoving more repetitions of the meshParts	2019-10-07 18:03:33 -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
Sam Gateau	1d19671e88	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-01 11:27:16 -07:00
Sam Gateau	4d94cbe0d8	Pass 3rd of the hope to clean it up...	2019-09-27 00:29:10 -07:00
Sam Gateau	24cc302a8b	second pass of cleaning on the code to make it ready for merge	2019-09-26 16:56:00 -07:00
Sam Gateau	9d999baab2	FIrst pass to clean up before pushing a pr:	2019-09-26 11:59:01 -07:00
Sam Gateau	819c942056	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-19 09:01:19 -07:00
Seth Alves	73e6be9c37	allow drawing DebugDraw spheres with a specific size	2019-09-17 09:43:19 -07:00
sabrina-shanman	a166b41216	Fix build warnings/errors	2019-09-13 15:39:29 -07:00
Sam Gateau	68b754fc0c	Changes driven by the alpha mode	2019-09-12 17:01:16 -07:00
sabrina-shanman	c4db6c78d8	std::vector-ize meshes/mesh parts in hfm::Model	2019-09-11 16:50:50 -07:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
Sam Gateau	df0eb901a2	REverting the change in the jittering sequence length	2019-09-03 17:01:03 -07:00
Sam Gateau	03c5dfad3d	propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version	2019-09-03 16:28:32 -07:00
Sam Gateau	cda2943b9a	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-03 12:01:12 -07:00
Andrew Meadows	8957cc5b2b	render opaque PolyLines with opaque pipepline	2019-08-22 08:13:11 -07:00
Sam Gateau	e1e4d9ac6c	Exposing the AA mode of the AA job	2019-08-20 18:15:35 -07:00
Sam Gateau	c5bd9ecf4f	REfreshing the antialiasing qml na dconfig of the Jitter Job	2019-08-19 18:14:29 -07:00
Sam Gateau	aeb407698d	bloom ui	2019-08-18 22:15:20 -07:00
Sam Gateau	859016bf37	Addressing review comments	2019-08-14 10:28:42 -07:00
Sam Gateau	4a93b23d83	Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly	2019-08-13 18:47:57 -07:00
Sam Gateau	9139edc8b1	Maybe fixed the problem, cannot render the gl41 version properly	2019-08-12 00:44:14 -07:00
MiladNazeri	ae7b415152	Merge pull request #16008 from HifiExperiments/text ... Supporting text effects + fonts on Text Entities	2019-08-02 14:25:28 -07:00
HifiExperiments	029a494beb	try to fix android shader build error	2019-08-01 21:29:01 -07:00
Anna	4e4f8866cd	fix android/mac build error	2019-07-30 13:15:26 -07:00
Anna	f58400950a	made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility	2019-07-30 11:57:01 -07:00
Anna	0cd532a47b	cleaning up	2019-07-30 10:08:38 -07:00
HifiExperiments	078ca7edea	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
Anna	458b3f18df	changes from cr	2019-07-29 18:25:36 -07:00
Anna	379a262b07	bug fix in deferred, finish merging android & windows forward	2019-07-29 18:15:54 -07:00
Anna	d3107efb82	added optional output buffer to ToneMapAndResampleTask	2019-07-29 16:27:54 -07:00
Anna	3a437cf190	fix on android, merge android and windows forward pipelines	2019-07-29 14:59:15 -07:00
Anna	2fca77867b	broken on android again somehow	2019-07-29 13:45:08 -07:00
Anna	db49a0b9d6	fixed some typos from merge	2019-07-29 11:55:12 -07:00
Anna	0cc8c1f434	making my changes work on android	2019-07-29 10:43:20 -07:00
Anna	8aef9db4b9	works on android!	2019-07-26 20:09:18 -07:00
Anna	6a6b2f6d27	added tone mapping back	2019-07-26 18:55:08 -07:00
Anna	0d2b2a2aef	added tone mapping config	2019-07-26 12:53:18 -07:00
Anna	16595d9412	created tonemapandresample	2019-07-26 11:56:25 -07:00
Anna	1b0d8ee603	removed typo	2019-07-24 13:37:33 -07:00
Anna	27586727db	make tonemapandresampletask run on android	2019-07-24 11:38:47 -07:00
Shannon Romano	2942bfaad0	Merge pull request #15939 from SamGondelman/shader ... Condense directional light shaders using slp defines	2019-07-24 09:01:49 -07:00
Anna	1df43fc83a	Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample	2019-07-23 15:41:01 -07:00
Brad Davis	449f3d00f9	BUGZ-987: fix depth testing of HUD layer 3D objects	2019-07-23 12:09:12 -07:00
Anna	45d1672edd	remove testing variables	2019-07-16 15:44:29 -07:00
Anna	58a04c1ccf	fix jenkins errors for real this time	2019-07-16 15:44:29 -07:00
Anna	2cd2e35736	fixing jenkins build errors	2019-07-16 15:44:29 -07:00
Anna	8d9760ae0c	typo fix	2019-07-16 15:44:29 -07:00
Anna	e129f88723	deleted tone mapping mirrored slf and slp since they auto generate	2019-07-16 15:44:29 -07:00
Anna	b59d967b6c	fixed luci, made tone mapping mirrored auto generate, changed color format on forward, bug fixes	2019-07-16 15:44:28 -07:00
Anna	0b51e3c129	progress	2019-07-16 15:43:47 -07:00
Anna	24f022ec3b	init commit for this pr, still buggy	2019-07-16 15:41:01 -07:00
Shannon Romano	53a67dcfa9	Merge pull request #15872 from SamGondelman/bias ... DEV-202: Expose shadow bias and max distance to Zone Entity	2019-07-16 15:22:37 -07:00
SamGondelman	965feb6f7a	condense direction light shaders using slp defines	2019-07-16 11:24:19 -07:00
SamGondelman	1789e16cc4	possible fix for shader compilation error	2019-07-12 16:22:01 -07:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
SamGondelman	046b25ab67	fix haze on web entities, deferred and forward	2019-07-11 14:56:17 -07:00
SamGondelman	22a7a97a9a	fix forward web + parabola blending	2019-07-11 12:23:04 -07:00
SamGondelman	9539664749	add haze to skybox	2019-07-11 11:00:30 -07:00
SamGondelman	d545ba5bc6	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
SamGondelman	8fd2251612	mostly working equation?	2019-07-09 13:34:33 -07:00
SamGondelman	68b2c8c2fb	wip adding haze to forward rendering	2019-07-09 00:46:24 -07:00
Sam Gondelman	732a7b0a89	fix build error	2019-07-03 22:43:35 -07:00
SamGondelman	8b9fcd43b1	merge with master	2019-07-03 17:58:23 -07:00
SamGondelman	72f52b069e	cleanup, fix shadow qml	2019-07-03 16:21:47 -07:00
Sam Gateau	1a71a63a8b	Merge pull request #15867 from SamGondelman/unlit ... BUGZ-661: Add unlit property to text entities	2019-07-03 18:43:26 +02:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00