834 commits

Author	SHA1	Message	Date
Olivier Prat	95882e0cde	Merged with master	2018-01-24 10:51:54 +01:00
Olivier Prat	c92a9975ba	Merged with master	2018-01-24 09:53:38 +01:00
Seth Alves	1cbc2e31cf	merge from upstream	2018-01-23 15:21:03 -08:00
Seth Alves	bce9b5f459	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-01-19 09:53:54 -08:00
Seth Alves	6aa389cad0	trying to now show overlays in mirrors	2018-01-19 09:53:41 -08:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Seth Alves	31c007d167	more backwards logic, added withViewVisibilityMask call in ItemKey	2018-01-18 14:15:30 -08:00
Olivier Prat	902bfac380	Merged with master	2018-01-18 18:31:04 +01:00
Seth Alves	97a4f141eb	fix link trouble	2018-01-18 08:12:14 -08:00
Sam Gateau	7a9740d258	visible-perview	2018-01-18 02:18:46 -08:00
SamGondelman	a44c965f56	fix black flashing on transparent objects	2018-01-17 15:59:07 -08:00
samcake	51ed878683	Merge branch 'master' of https://github.com/highfidelity/hifi into visible-perview	2018-01-17 09:32:03 -08:00
Olivier Prat	e6caa83d73	Merged with master	2018-01-17 16:35:31 +01:00
Olivier Prat	efa6a8c0b5	Merged with master	2018-01-17 15:49:46 +01:00
Olivier Prat	49549ced17	Fixed compilation with new shader system	2018-01-17 10:52:58 +01:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Olivier Prat	3911ce59cc	Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code	2018-01-16 19:02:12 +01:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Olivier Prat	54eab1c878	First working local lights on transparent objects	2018-01-15 17:49:55 +01:00
Sam Gateau	d6e771f01d	Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid	2018-01-13 10:02:53 -08:00
samcake	836b69ab1b	exposing several visibility flags	2018-01-12 17:42:18 -08:00
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
SamGondelman	a9d5dda976	always push default haze to current frame	2018-01-04 17:54:23 -08:00
Nissim Hadar	409eade006	Merge branch 'master' into hazeOnTransparent	2017-12-14 11:41:53 -08:00
Sam Gateau	a75010fb94	Merge pull request #11938 from Zvork/csm ... Cascaded Shadow Maps and bug fix	2017-12-14 00:32:43 +07:00
samcake	63fb9b5503	fix float literal syntax	2017-12-11 09:30:31 -08:00
Olivier Prat	a679dc6705	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-11 08:48:48 +01:00
Sam Gateau	eec4e966a7	Fix the linux build and correct the name of the property Intensity to Opacity	2017-12-10 10:13:49 -08:00
Olivier Prat	92e1fe8e5c	Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug	2017-12-08 18:02:27 +01:00
samcake	6148458aeb	Workable state, need final clean up and testing	2017-12-07 16:04:08 -08:00
samcake	5f85e8e2cb	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-07 08:48:12 -08:00
Bradley Austin Davis	2a91e98813	Fix iterator names	2017-12-06 14:26:07 -08:00
Brad Davis	e626ca3ccd	Working on scene threading optimizations	2017-12-06 14:26:07 -08:00
Olivier Prat	0b6dcb2717	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-05 09:18:26 +01:00
samcake	1514cdfb2f	extend the set of interface for multi highlight	2017-11-21 17:59:45 -08:00
samcake	a74372b233	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-20 09:26:29 -08:00
Brad Hefta-Gaub	33d35bbe14	Merge pull request #11770 from AndrewMeadows/sort-and-throttle ... sort and throttle UpdateRenderables work... when necessary	2017-11-19 11:09:08 -08:00
samcake	e0740b323d	keep debuging the seelction highlight	2017-11-17 18:11:18 -08:00
Olivier Prat	d98dfff0a8	Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage)	2017-11-17 19:25:21 +01:00
Olivier Prat	f8c241c429	Merged disappearing shadow bug fix from pcf branch	2017-11-16 12:19:19 +01:00
Sam Gateau	3f5b21ec22	Merge pull request #11559 from Zvork/bloom ... Bloom	2017-11-15 15:11:31 -08:00
Olivier Prat	e4818f1b4f	Merged request changes from shadow	2017-11-15 17:51:06 +01:00
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Andrew Meadows	5050a554a2	remove warning about signed/unsigned comparison	2017-11-14 15:57:17 -08:00
Olivier Prat	5102c8e1b1	Merged with master	2017-11-14 21:56:00 +01:00
Olivier Prat	7515c341ad	Merged with PCF fix with dithered filtering	2017-11-13 14:47:35 +01:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
Olivier Prat	fa58cf2e60	Merged with master	2017-11-13 14:07:48 +01:00
Olivier Prat	103e036b70	Shadow maps rendered in cascades	2017-11-10 18:30:37 +01:00
Olivier Prat	4f7ed38e98	Fixed potential link errors on Mac	2017-11-09 11:26:08 +01:00
Olivier Prat	bccd6df57c	Fixed warning on Mac and Ubuntu	2017-11-09 11:19:28 +01:00
Nissim Hadar	a8a118582d	WIP - passing uniform into model translucency shader.	2017-11-08 09:37:58 -08:00
Nissim Hadar	3d2c8186e7	Added Haze model as input to transparency shader.	2017-11-08 08:01:19 -08:00
Olivier Prat	39604363ea	Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes	2017-11-08 11:38:20 +01:00
Olivier Prat	ffa46b487a	Only non empty selections are now linked to highlight passes	2017-11-07 17:07:37 +01:00
Olivier Prat	9817cb4c44	Added highlight configuration in HighlightStageSetup job	2017-11-07 15:35:43 +01:00
Olivier Prat	3cc445ff02	Renamed outline to highlight	2017-11-07 11:07:25 +01:00
Olivier Prat	9e6472b577	Added OutlineStyleStage	2017-11-06 15:55:57 +01:00
Olivier Prat	fcf1c301b6	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-03 18:12:15 +01:00
Olivier Prat	4b598a6e24	Working stencil mask with object bounding boxes	2017-11-03 14:26:36 +01:00
Olivier Prat	bced566510	Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo	2017-10-27 10:45:43 +02:00
Olivier Prat	5d83284ac5	Fixed small bug in shadow bounds computation	2017-10-26 16:47:20 +02:00
Olivier Prat	6cf689a385	First draft version of tighter shadow frustum	2017-10-26 12:42:36 +02:00
SamGondelman	046e5ca716	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
Olivier Prat	3227b9d64a	Fixed potential bug when item doesn't have a payload	2017-10-20 09:50:37 +02:00
Olivier Prat	32df0209f3	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-19 17:38:05 +02:00
Olivier Prat	410b1904cd	Fixed bug in outline.qml that associated outline tab to wrong outline job config	2017-10-19 17:36:16 +02:00
Olivier Prat	25b3549e04	Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled	2017-10-18 15:00:53 +02:00
Olivier Prat	055270df9c	Removed compilation warnings on Mac and Ubuntu	2017-10-12 19:26:05 +02:00
Nissim Hadar	30fdf9d08e	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
Olivier Prat	f55d44dfc3	Threshold now doesn't downsample anymore. Done in separate pass	2017-10-10 17:49:35 +02:00
SamGondelman	3acbd7820b	build error	2017-10-09 11:48:54 -07:00
Olivier Prat	0261265330	Working bloom but still visually unstable with geometry aliasing	2017-10-09 19:17:51 +02:00
Olivier Prat	cda48cbf67	Three blurs working	2017-10-09 15:13:32 +02:00
Olivier Prat	98d39ff9e0	Merged with master	2017-10-09 09:37:18 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Nissim Hadar	794cb961d5	Merge branch 'master' into hazeZone	2017-10-04 23:03:59 -07:00
SamGondelman	477dfdff1e	wip hud layering and fix crashes	2017-10-04 11:45:21 -07:00
samcake	d7333d3fa3	Merging with master	2017-10-04 10:55:38 -07:00
Nissim Hadar	d4acb00aa5	Merge branch 'master' into hazeZone	2017-10-03 17:44:31 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
Andrew Meadows	e9d48a2713	fix warning about double-to-float conversion	2017-10-02 13:08:17 -07:00
Nissim Hadar	ffecf42ebb	Some clean-up.	2017-10-01 21:12:29 -07:00
Nissim Hadar	5a7fed022c	Merging haze branch.	2017-09-30 00:04:28 -07:00
Nissim Hadar	95f8f1ffc5	Added Varying8	2017-09-29 18:05:48 -07:00
samcake	577378f539	Adding stuff that seems to break?	2017-09-29 17:45:10 -07:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Olivier Prat	27b9f3516d	Added mix parameter to blur and bloom	2017-09-25 18:05:30 +02:00
Olivier Prat	22b1507597	Fixed blur to work correctly on four sides of screen	2017-09-25 16:41:20 +02:00
Olivier Prat	443d6dfacb	Added user definable taps in blur task	2017-09-25 14:24:40 +02:00
Brad Davis	27350bd7de	Don't add items to the scene graph until they have a valid parent chain	2017-09-20 16:52:23 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Seth Alves	967d3f69d3	suppress repeated 'item could not be rendered' messages	2017-09-08 14:13:58 -07:00
Olivier Prat	d6d36cbd43	Outline working on voxels	2017-09-08 11:14:06 +02:00
Olivier Prat	10643feb78	Working with specific zpass rendering for outline. Debug script needs relinking to correct config	2017-09-06 18:40:38 +02:00
Olivier Prat	d6ea01c4f3	Created outline task but still need to create specific render job with z-pass shaders	2017-09-06 17:34:29 +02:00
Olivier Prat	700d4a4b43	First working version of outline working with selection interface.	2017-09-06 15:47:10 +02:00
Zach Fox	0cdef28cfd	Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-28 14:55:18 -07:00
Zach Fox	3c7fadb1ce	Final touch	2017-08-24 14:30:42 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Zach Fox	52ef0f2037	More progress	2017-08-23 16:37:13 -07:00
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
Zach Fox	9020607ccf	First pass	2017-07-25 17:54:46 -07:00
Olivier Prat	b08e2598c2	Some factorization in transition management and transition item application is now completely recursive on sub items and not just level 1 subitems	2017-07-21 12:49:51 +02:00
Olivier Prat	3316be4dea	Working fade parameters through instanced draw calls	2017-07-18 17:01:17 +02:00
Olivier Prat	1f14b6ef38	Shape entities have the correct pipeline picked when fading is activated. Still need to support instanced rendering	2017-07-17 17:50:59 +02:00
Olivier Prat	5e5148ca91	Merge branch 'fade' into fadeshape	2017-07-17 09:53:26 +02:00
Olivier Prat	b125fba2e1	Removed untested avatar bubble fade code. Made changes as requested by Andrew	2017-07-13 23:04:55 +02:00
Olivier Prat	96f0c35b79	Yet some more compilation fixes for Mac and Linux	2017-07-13 18:22:18 +02:00
Olivier Prat	93218da473	Fixed compilation errors on Mac and Linux	2017-07-13 17:51:16 +02:00
Olivier Prat	1b8696fdda	First draft of custom pipeline on geometry cache	2017-07-13 17:09:49 +02:00
Olivier Prat	736ecf0082	Fixed infinite recursion in collectMetaSubItems due to meta sending itself as sub-item	2017-07-13 14:43:41 +02:00
Olivier Prat	21a11d72c4	Added define to activate/deactivate transition support (fade) in Scene	2017-07-13 12:44:26 +02:00
Olivier Prat	53a92c1506	Fade edit is working again and time based transitions are garbage collected	2017-07-13 12:31:10 +02:00
Olivier Prat	4081cd2cbf	Merge branch 'fader' of http://github.com/samcake/hifi into fade	2017-07-13 11:19:28 +02:00
Olivier Prat	2d2722bfc5	Added async transition query on scene	2017-07-13 11:05:04 +02:00
Sam Gateau	b065b99b0b	fix linux compilation maybe	2017-07-13 09:30:04 +02:00
Olivier Prat	0f60cca617	Merged cleaned up fader branch from Sam	2017-07-12 18:09:17 +02:00
Sam Gateau	5394ac8672	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +02:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +02:00
Sam Gateau	98cc8c0683	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
Olivier Prat	7552cca316	First alpha version of bubble collision fade events. Missing a lot of information.	2017-07-11 19:26:15 +02:00
Olivier Prat	381e0c64a8	Working avatar fade in / fade out except that it is also triggered on bubble collisions	2017-07-11 16:43:27 +02:00
Olivier Prat	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00
Olivier Prat	9758a6ded0	Edition picking again (but without bounding box highlighting)	2017-07-10 17:57:02 +02:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
Olivier Prat	cc4e168369	Working fade again	2017-07-10 16:45:13 +02:00
Olivier Prat	66d09a4c3c	Some objects fade and fixed crash due to invalid meta item id	2017-07-10 16:02:12 +02:00
Olivier Prat	267531cc1a	First working fade	2017-07-10 15:27:09 +02:00
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02:00
Sam Gateau	c3dd25e499	Drafting the mechanism to add shape pipeline	2017-07-07 18:26:10 +02:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02:00
Olivier Prat	4256a1f2a7	Preparing for merge with stage. DOESN'T COMPILE!	2017-07-07 15:16:20 +02:00
Sam Gateau	d15c4ea2d3	Merging with the stage branch	2017-07-07 15:12:40 +02:00
Olivier Prat	5ab093dc38	Preparing to introducte TransitionStage	2017-07-07 11:01:47 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
Olivier Prat	69a7ec42fd	Added fade state in render::Item	2017-07-07 09:16:54 +02:00
Olivier Prat	e178e36963	Fixed compilation error	2017-07-06 17:29:14 +02:00
Olivier Prat	018c0489f4	Merged with 21378	2017-07-06 16:53:47 +02:00
Sam Gateau	53ffca796f	Drafting a better SHape plumber to render the items	2017-07-06 16:35:40 +02:00
Olivier Prat	5cee2cff9f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-07-04 17:48:07 +02:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Olivier Prat	972db8f54c	Fixed compilation error on Mac and Linux	2017-07-03 17:17:37 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Olivier Prat	87833abd31	Sky working again.	2017-06-30 16:46:25 +02:00