3749 commits

Author	SHA1	Message	Date
Sam Gateau	c7c1cdd8c3	Merge pull request #13529 from Zvork/transparent ... Fix number of rendering issues with some transparent objects on Mac and AMD GPUs	2018-07-05 17:20:24 +02:00
Olivier Prat	bda0c0a89f	Discard fragments all the time if opacity is under threshold	2018-07-03 16:51:56 +02:00
Olivier Prat	74a9b03a5e	Merge branch 'master' of http://github.com/highfidelity/hifi into transparent	2018-07-03 09:26:29 +02:00
SamGondelman	773efe8cf0	fix blurry tablet if overlay is drawing	2018-07-02 13:32:25 -07:00
Olivier Prat	51fe60ec45	Fixed android compilation error and removed _glUniformi call	2018-07-02 14:59:09 +02:00
Olivier Prat	d2a612580c	Fixed NaN with specular on transparent objects	2018-07-02 12:20:55 +02:00
Sam	1f90e86b87	fix shader shadow bug on mac	2018-07-02 11:08:14 +02:00
Sam	a6cbc44885	Merged with zvork fix	2018-07-02 10:50:37 +02:00
Sam	c1856a5e36	Make shadows work with one cascade	2018-07-02 10:46:53 +02:00
Olivier Prat	de831ffea9	Switched shadow maps to sampler2DArrayShadow to try to fix on Mac	2018-06-29 16:55:33 +02:00
Sam Gondelman	7fb2e535ff	Merge pull request #13468 from SamGondelman/secondaryShadows ... Disable shadows in secondary camera	2018-06-26 15:45:44 -07:00
SamGondelman	97ee02811c	disable shadows in secondary camera	2018-06-26 12:27:59 -07:00
Sam Gondelman	fbe54437b8	Merge pull request #13409 from humbletim/add-raypick-shapeID ... Include shapeID in RayPick results	2018-06-26 10:25:39 -07:00
Andrew Meadows	4424a8df11	Merge pull request #13303 from highfidelity/workload ... workload project part 1	2018-06-20 15:39:01 -07:00
Andrew Meadows	44c3620b6e	remove cruft	2018-06-18 17:45:58 -07:00
humbletim	dc5c5c20df	raypick partIndex commit ... include shapeID for accessing proper material index add raypick shapeID test script	2018-06-18 18:22:30 -04:00
Sam Gateau	56a1137f7b	Merge pull request #13312 from SamGondelman/overlayPipelines ... Fix layered overlay rendering and highlight	2018-06-18 14:35:03 -07:00
Andrew Meadows	6d422e4678	Merge 'master' into 'workload'	2018-06-18 10:30:13 -07:00
John Conklin II	2483c45f40	Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly ... Remove functionality for rendering collision models directly in the Model class	2018-06-15 14:46:40 -07:00
sabrina-shanman	79fd3cb181	Rename createVisibleRenderItemSet() to createRenderItemSet() in Model class	2018-06-14 15:49:40 -07:00
sabrina-shanman	3c4050884e	Remove straggler ifdef in Model class	2018-06-14 14:40:22 -07:00
sabrina-shanman	82fddfc31f	Remove unused constant in Model.cpp	2018-06-13 13:03:07 -07:00
Sam Gondelman	e8ec32c7f8	Merge pull request #13340 from SamGondelman/modelTextures ... Try to fix ModelOverlay texture loading	2018-06-11 16:09:10 -07:00
sabrina-shanman	440c77905a	Remove functionality for rendering collision meshes directly in the Model class	2018-06-11 11:03:57 -07:00
Sam Gondelman	c7f05d96b4	Merge pull request #13309 from Cristo86/android_crashes_domains ... Android - Double Click crash and dev-mobile crash with Pixel XL	2018-06-08 13:36:53 -07:00
howard-stearns	df0ecb44a8	fix crash setting model texture ... (cherry picked from commit b152bf02af4eb17cf5c169ca9c577154c83901f7)	2018-06-07 13:21:45 -07:00
John Conklin II	277758cd03	Merge pull request #13275 from luiscuenca/fixNoAvatarMaterials ... Check for null material pointer in CauterizedModel	2018-06-07 09:41:03 -07:00
SamGondelman	d2f8ee327d	properly reset highlight framebuffer	2018-06-05 18:18:24 -07:00
Cristian Luis Duarte	b38eae3731	Only add RenderShadowTask if isDeferred	2018-06-05 18:54:48 -03:00
SamGondelman	aec7206901	get rid of overlay pipelines and just use forward rendering	2018-06-05 14:44:44 -07:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
luiscuenca	60758dec8d	Check for null pointer	2018-05-31 11:32:45 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
samcake	873cabe284	Cleaning the code	2018-05-29 17:46:25 -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
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
samcake	44a8d880fa	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-24 14:31:53 -07:00
John Conklin II	36d2baab60	Merge pull request #13214 from SamGondelman/primCrash ... Fix crash in GL45Backend::do_drawIndexedInstanced	2018-05-24 13:33:06 -07:00
Andrew Meadows	d50da2babc	Merge 'master' into 'workload'	2018-05-23 14:51:05 -07:00
SamGondelman	9dfc61a452	possible fix for gl crash	2018-05-22 12:51:32 -07:00
samcake	f536f7b6c9	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-21 15:52:51 -07:00
samcake	2dc28a504c	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-21 15:52:42 -07:00
Sam Gateau	87989268bf	Merge pull request #13182 from jherico/feature/batch_pooling ... Use pooled gpu batches	2018-05-21 15:47:55 -07:00
Brad Davis	9c26b2c1d3	Use pooled gpu batches	2018-05-21 13:53:44 -07:00
Sam Gateau	e1690a28e1	Merging with master	2018-05-20 23:04:11 -07:00
samcake	3aaa01788c	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-18 17:42:30 -07:00