3785 commits

Author	SHA1	Message	Date
Olivier Prat	e3908662fe	Merge branch 'master' of http://github.com/highfidelity/hifi into zeye	2018-04-04 09:50:37 +02:00
samcake	fa35d659dc	Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload	2018-04-03 17:56:41 -07:00
Simon Walton	7d16ca9c1c	Remove uses of addRepeatedMessageRegex() and its implementation ... Change to new log-message ID scheme.	2018-04-03 17:54:01 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
samcake	59a081bcdb	merge with upstream	2018-03-30 18:08:38 -07:00
Sam Gateau	d5496d68fd	FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly	2018-03-30 16:58:41 -07:00
Olivier Prat	02cf15d115	Lightclusters no unpack position from zdb	2018-03-30 10:06:27 -04:00
Olivier Prat	6f7a1eaefa	Fixed correct inverse projection matrix when computing from Zeye	2018-03-29 18:05:43 -04:00
Olivier Prat	bd0e13463d	Fix on unpackDeferredPosition	2018-03-29 17:06:23 -04:00
Olivier Prat	e4416db06f	Added save/file dialog for transition configurations in transition editor	2018-03-28 16:54:53 -04:00
Olivier Prat	7fa5e384b9	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-28 11:21:07 -04:00
Brad Davis	0e7ee95c95	Merge remote-tracking branch 'upstream/master' into bindless	2018-03-21 19:16:55 -07:00
Brad Davis	ae8df7e24e	Merge remote-tracking branch 'origin/gl_common' into HEAD	2018-03-21 12:35:17 -07:00
John Conklin II	2d63afbe28	Merge pull request #12588 from SamGondelman/shapeTex ... Materials on primitives	2018-03-21 12:08:24 -07:00
John Conklin II	283aff71ec	Merge pull request #12612 from jherico/gl_common ... Break out common GL and GLES code into a single shared library	2018-03-21 11:28:24 -07:00
Olivier Prat	6b44d79f90	Proposal to improve fade editing with some extra visual cues	2018-03-20 17:48:41 -07:00
Olivier Prat	143a315f1d	Fade edited objects are now selected with ray picking	2018-03-20 15:29:50 -07:00
Sam Gateau	a7533e5287	Merge pull request #12675 from SamGondelman/hotfix ... Model behaves correctly if missing material	2018-03-20 14:27:21 -07:00
Stephen Birarda	0074c0470d	Merge pull request #12524 from birarda/feat/runtime-beside-exe ... switch back to app-local VC runtimes and UCRT	2018-03-20 14:07:27 -07:00
Olivier Prat	f0a7a9b21c	Merged with master	2018-03-20 10:24:41 -07:00
Brad Davis	f77228bbfe	Fixing missing m_pi define	2018-03-20 09:58:47 -07:00
SamGondelman	444534f4ff	model behaves correctly if missing material ... (cherry picked from commit 1e89debc4e)	2018-03-16 15:51:37 -07:00
SamGondelman	984a48316d	CR	2018-03-16 13:51:29 -07:00
samcake	2fc23d799a	adding the correct flag maybe?	2018-03-15 18:05:58 -07:00
SamGondelman	e59af8892a	make same changes to gles backend from taa pr	2018-03-14 12:09:59 -07:00
SamGondelman	3b877db992	fix hud sphere	2018-03-13 14:58:29 -07:00
samcake	2af88c11f2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 13:35:31 -07:00
SamGondelman	4adc357534	apply taa to text and web entities/overlays	2018-03-13 11:57:14 -07:00
samcake	f8acca76e2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 09:31:50 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
samcake	69fe1ace0b	THe View rings are rendering corectly, let s ship it	2018-03-12 11:59:03 -07:00
Brad Davis	9056ee0f14	Merge branch 'gl_common' into bindless	2018-03-12 11:27:30 -07:00
Sam Gateau	9e7260839c	Better rendering of the view circles	2018-03-12 01:05:07 -07:00
samcake	4a7d3e8e0e	REndering the view rings better	2018-03-09 17:49:50 -08:00
samcake	e8b5a875d6	REndering the view rings better	2018-03-09 17:40:58 -08:00
Sam Gateau	f087bb7623	Adjust the freeze view and start drawing the views better	2018-03-09 01:38:00 -08:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
Brad Davis	09996e0b65	Bindless texture work cleanup	2018-03-08 16:01:18 -08:00
samcake	a0db5c6135	Merge with master	2018-03-08 15:35:58 -08:00
Stephen Birarda	2158acecf4	tell cmake we are fine ignoring generated for CMP0071	2018-03-08 12:39:40 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
NissimHadar	a703b5a3b5	Added check to correct crashing when selecting ambient occlusion from menu.	2018-03-08 12:15:26 -08:00
Brad Hefta-Gaub	d2e264ab32	Merge pull request #12583 from samcake/punk ... Fix Local lights not showing anymore	2018-03-08 10:31:58 -08:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
Sam Gateau	ceb38dbc97	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-03-07 18:54:21 -08:00
Sam Gateau	dc122b4ce8	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-07 18:14:44 -08:00
Brad Davis	d858d34523	Update material binding	2018-03-07 17:27:47 -08:00
Brad Davis	ddd60ded03	Merge remote-tracking branch 'upstream/master' into bindless_master	2018-03-07 16:04:35 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
SamGondelman	96e48a0162	warnings	2018-03-07 13:50:51 -08:00
SamGondelman	19e4fb2355	materials on primitives	2018-03-07 12:22:17 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
samcake	4a91ac11c9	Adding controls of the regions	2018-03-06 18:19:02 -08:00
samcake	923c81ae28	Swap order of the ZoneRendererJob with DrawLocalLights to fix the local lights	2018-03-06 17:38:27 -08:00
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Brad Davis	f9605cffb1	Target available mip	2018-03-06 11:20:54 -08:00
Sam Gateau	7e96608699	introducing the first stage of the workload engine to setup view and expand the view definition	2018-03-06 01:35:16 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
NissimHadar	1eb0dde3d2	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-05 11:36:39 -08:00
samcake	660c4c30e9	Representing the view spheres	2018-03-02 18:22:51 -08:00
samcake	7179a31d17	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-03-02 17:51:19 -08:00
samcake	cc392944b5	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 17:49:10 -08:00
samcake	fc8f1c1e65	Resolving conflicts	2018-03-02 14:20:33 -08:00
Cristian Luis Duarte	76e4a5bef2	Android - Change for test, this cast should avoid crashes due to SIGSEV in ToneMappingDeferred::run inputs.get1().	2018-03-02 18:46:14 -03:00
samcake	b8fb97c824	Resolving conflicts	2018-03-02 10:36:55 -08:00
samcake	a40f8cefa2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-03-02 09:01:16 -08:00
samcake	d4d5f3a7f0	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 08:50:47 -08:00
NissimHadar	000b08f7c0	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
samcake	5b8e18f15d	Adding the pipeline to render the view spheres	2018-03-01 17:57:44 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
samcake	a227cf1edb	Fixing bad key/pipeline pair	2018-03-01 10:49:58 -08:00
samcake	94fa2ef6a0	Adding debug color of the region	2018-02-28 17:59:59 -08:00
samcake	b1b539e07a	Adding debug color of the region	2018-02-28 17:56:37 -08:00
samcake	dc286544c5	Merging with nissim's pr	2018-02-28 17:54:54 -08:00
samcake	a7542d5b90	fixing the shadow	2018-02-28 17:46:22 -08:00
samcake	d91fb543f3	Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api	2018-02-28 17:15:40 -08:00
NissimHadar	5d7e6651a7	Use correct pixel shader.	2018-02-28 11:05:02 -08:00
samcake	e6d5f90847	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-02-28 10:30:14 -08:00
Andrew Meadows	3ca21dda67	Merge hifi/master of into hifi/workload	2018-02-28 10:28:31 -08:00
samcake	31462a87c3	now identifying the issue with ResourceBUffer	2018-02-28 10:13:13 -08:00
NissimHadar	faad930e35	WIP.	2018-02-28 08:44:01 -08:00
NissimHadar	5764a21c4a	WIP.	2018-02-28 08:12:48 -08:00
Olivier Prat	bf70e1d4ee	Merge branch 'master' of http://github.com/highfidelity/hifi into taapre	2018-02-28 09:16:31 +01:00
samcake	3360c5a968	Debugging the ssbo bug	2018-02-27 18:46:12 -08:00
NissimHadar	7cae04883e	WIP.	2018-02-27 17:19:02 -08:00
NissimHadar	f52f146db5	WIP.	2018-02-27 16:28:46 -08:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
NissimHadar	00f3682bbe	NOT WORKING YET.	2018-02-27 14:09:31 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
SamGondelman	cc53b338db	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-02-27 13:30:03 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
SamGondelman	a4b04d9d43	merge	2018-02-27 10:08:30 -08:00
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00
Brad Davis	f01c42dcc9	Fixing merged dual-quat pipelines	2018-02-27 08:54:46 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting ... Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
Olivier Prat	f356d9d9ee	Merge branch 'taa' into taapre	2018-02-27 10:17:26 +01:00
Olivier Prat	2eb7be26cf	Merged with master and fixed tablet NoAA flag	2018-02-27 10:16:25 +01:00
Olivier Prat	2d71d7da9f	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-27 09:11:43 +01:00
humbletim	d3bae87066	* remove unneeded Q_DECLARE_METATYPEs ... * CR feedback	2018-02-26 19:07:55 -05:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
SamGondelman	6fe2d46d7c	merge	2018-02-26 12:40:14 -08:00
Sam Gondelman	d1d6adf447	Merge pull request #12493 from sethalves/fix-shadows-on-osx-1 ... fix osx shadows	2018-02-26 11:46:43 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
Anthony J. Thibault	0404b722e4	Code review feedback	2018-02-26 10:00:32 -08:00
Brad Davis	3e552e5739	Fix warnings	2018-02-26 09:53:35 -08:00
Olivier Prat	12d7e89d7e	Switched back velocity buffer job to original place while I try to get more info on how/where that tablet is rendered	2018-02-26 18:13:41 +01:00
Olivier Prat	d288ebe79e	Moved velocity buffer job just before antialiasing job to be sure tablet model in HMD writes correct velocity and gets properly antialiased	2018-02-26 18:07:44 +01:00
Olivier Prat	c04bf095ec	Limited sharpen range	2018-02-26 16:48:10 +01:00
Olivier Prat	16cd1e3fd5	Adjusted bloom effect to work with antialiasing	2018-02-26 15:26:12 +01:00
Olivier Prat	419e064e65	Moved antialiasing before tonemapping	2018-02-26 14:57:59 +01:00
humbletim	3dbe5d79bb	fix windows punctilious warnings	2018-02-26 06:01:16 -05:00
humbletim	f824edd04e	* remove Model_temporary_hack ... * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanup	2018-02-26 04:58:22 -05:00
SamGondelman	b56f755034	material reflection	2018-02-23 17:58:46 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Olivier Prat	37fdf81f1b	Fix warnings on mac and ubuntu	2018-02-23 19:37:12 +01:00
Seth Alves	59bd05aa55	make shadow-related shader compile on osx	2018-02-23 09:22:34 -08:00
humbletim	058e4d1926	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:12:33 -05:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
Olivier Prat	6a550e983f	Disable sharpen with FXAA	2018-02-23 14:46:37 +01:00
Olivier Prat	095f426f31	Adjusted default sharpen	2018-02-23 14:43:22 +01:00
humbletim	6ea4b660b7	CR feedback; remove ok bool pointer and all metadata; cleanup	2018-02-23 07:47:39 -05:00
Olivier Prat	c9a6d6bf14	Added adjustable post sharpen filter	2018-02-23 11:53:05 +01:00
Olivier Prat	4636f43728	Simplified camera view history and TAA is now working in all circumstances.	2018-02-23 10:19:05 +01:00
Anthony J. Thibault	0469eafbe4	Switch between dualQuats and matrix skinning based on model entity scale factor.	2018-02-22 18:35:16 -08:00
Bradley Austin Davis	12d1885dff	Merge pull request #12428 from gcalero/android_ui_fixes ... Android ui fixes	2018-02-22 18:28:18 -08:00
Brad Davis	e0e7fb04f2	Fix merge issues	2018-02-22 18:08:56 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
samcake	101872abce	Still marinating how to represent the proxy values...	2018-02-22 16:44:35 -08:00
NissimHadar	3150b963c0	Implemented call to abortTask().	2018-02-22 16:29:58 -08:00
Brad Davis	4e2d3f23a6	Fix tonemapping on forward render pipeline / GLES	2018-02-22 15:38:15 -08:00
Olivier Prat	ebe05d1f6f	Still have to fix TAA when GPU is slower than game	2018-02-22 18:59:25 +01:00
Anthony J. Thibault	86351f19a9	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-22 08:44:21 -08:00
humbletim	010c714abc	restore original Entities.getMeshes	2018-02-22 08:51:54 -05:00
humbletim	4d43e54346	use shared buffer_helpers::clone	2018-02-22 08:41:15 -05:00
humbletim	e4a2a589a5	CR fedback and cleanup	2018-02-22 07:56:09 -05:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
Olivier Prat	aa46d16699	A bit of cleanup in TAA shaders	2018-02-22 10:09:03 +01:00
samcake	9c136e7dac	Trying to render the proxies without success	2018-02-21 17:31:53 -08:00
Nissim Hadar	bf4ba07b72	Added parameters to canCastShadow - still sucks.	2018-02-21 12:36:34 -08:00
Olivier Prat	dca7b7aaba	TAA is working on HMD! Still some issues when game rate is low	2018-02-21 17:34:51 +01:00
Olivier Prat	093a1491cd	Renamed resourcering to resourceswapchain	2018-02-21 15:43:19 +01:00
Olivier Prat	f53c2f41a5	Merge branch 'master' of http://github.com/highfidelity/hifi into prev	2018-02-21 09:46:38 +01:00
Nissim Hadar	6f84e4c977	Moved shadows and ambient occlusion to menu checkboxes.	2018-02-20 23:45:07 -08:00
samcake	f1dcfeb25e	Adding shaders and means to render the proxies contained in the workload SPace	2018-02-20 18:20:12 -08:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -08:00
SamGondelman	4f0f6709c1	fix build errors	2018-02-20 13:56:06 -08:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
Nissim Hadar	b2a06cdb98	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/ShapeEntityItem.h # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2018-02-19 13:05:57 -08:00
Nissim Hadar	6a9bbaf0a5	WIP - clean-up.	2018-02-19 12:00:30 -08:00
Gabriel Calero	779e45aae7	Restore avatar overlays	2018-02-19 16:12:41 -03:00
Sam Gateau	fd49c0d100	Merge pull request #12401 from SamGondelman/decals ... Material Entities	2018-02-19 10:58:02 -08:00
Olivier Prat	18af60f3eb	Added RingBuffer mechanism to gpu lib	2018-02-19 18:48:58 +01:00
Olivier Prat	9cfe53be3e	Merged from orgin taa	2018-02-19 17:50:10 +01:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
David Rowe	67cfe783be	Entity properties JSDoc	2018-02-19 12:17:31 +13:00
Nissim Hadar	7ba8a9935a	No extraneous shadows.	2018-02-16 19:23:31 -08:00
Nissim Hadar	a2cc78b200	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-16 14:01:57 -08:00
Nissim Hadar	4c1f22f84e	Models and Avatar cast shadows (box doesn't, yet).	2018-02-16 14:01:33 -08:00
Nissim Hadar	194c7f4101	WIP - for review.	2018-02-16 09:28:15 -08:00
SamGondelman	b189433855	merge	2018-02-15 15:50:36 -08:00
SamGondelman	2d754edf74	CR	2018-02-15 15:48:41 -08:00
Nissim Hadar	df7a8389b3	Fixed possible crash.	2018-02-15 11:51:06 -08:00
samcake	b21b98c810	Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work	2018-02-15 11:24:20 -08:00
Nissim Hadar	26e7a85a95	Fixed possible crash.	2018-02-14 21:15:29 -08:00
Nissim Hadar	a679b6f828	Fixed possible crash.	2018-02-14 18:55:04 -08:00
samcake	246ac25d0a	Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight	2018-02-14 17:36:46 -08:00
Sam Gondelman	15cdfef16a	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
Nissim Hadar	054b2bf3e2	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # scripts/system/html/js/entityProperties.js	2018-02-14 17:10:07 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
samcake	6357f36a97	Fixing names	2018-02-14 10:39:14 -08:00
Nissim Hadar	1632ab9782	Changed flag to "cast shadow" instead of "don't cast shadow".	2018-02-13 18:27:36 -08:00
samcake	1d3ae1b187	Work in progress to get the render items beeing tagged correctly for groupCulled	2018-02-13 17:50:01 -08:00
Anthony J. Thibault	d2c199104e	Avatars use Dual Quaternion Skinning and Model Entities do not.	2018-02-13 17:47:49 -08:00
Nissim Hadar	23a29b8d4b	Added don't castr shadow flag to entity and shape classes.	2018-02-13 16:16:04 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
SamGondelman	38290064c1	replace materials by name, hide material mode for now	2018-02-13 13:24:08 -08:00
Andrew Meadows	20c2a4470e	merge 'findByID' into 'workload-001'	2018-02-13 11:47:02 -08:00
Anthony J. Thibault	7f5f48bca9	Models can now switch between dual quats and matrix palette skinning. ... but not dynamically, because we still only compile one version of the shader.	2018-02-13 11:37:14 -08:00
Gabriel Calero	99f6c80b2a	Temporary remove ToneMappingDeferred	2018-02-13 10:00:31 -08:00
Sam Gateau	040710807d	Merge pull request #12346 from Zvork/scripts ... Fix transition (ex-fade) debugging scripts	2018-02-13 09:08:35 -08:00
Andrew Meadows	8231a56b22	pull task out of render and into its own lib	2018-02-13 08:56:11 -08:00
Anthony J. Thibault	cf5452313a	WIP check in of making the use of dq or mat dynamic per model	2018-02-12 18:44:24 -08:00
Nissim Hadar	34aab4a9c8	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/entities-renderer/src/RenderableZoneEntityItem.cpp	2018-02-12 17:50:39 -08:00
John Conklin II	51bf3c1466	Merge pull request #12323 from Zvork/shadow ... Shadow performance / acnee improvements	2018-02-12 14:41:13 -08:00
John Conklin II	d084e58f48	Merge pull request #12328 from Atlante45/fix/misc-bugs ... Misc bug fixes	2018-02-12 14:31:38 -08:00
Nissim Hadar	4acd0a34f5	Seems OK. Before adding flag to entity.	2018-02-12 12:55:14 -08:00
SamGondelman	9e8aa1898c	warnings, load material from URL, shapeID -> parentMaterialID	2018-02-12 12:50:09 -08:00
SamGondelman	5337377ef5	Merge remote-tracking branch 'upstream/master' into decals	2018-02-09 14:40:20 -08:00
samcake	522c577e73	FIxing the bad ambient lighting on scattering surfaces	2018-02-09 14:08:55 -08:00
SamGondelman	84cd0e1529	wip live material swapping on model entities, model overlays, avatars, ... and albedo swap on shape entities	2018-02-09 12:00:08 -08:00
samcake	e64c029424	fixing the scattering bad ambient lighting	2018-02-09 11:32:29 -08:00
NissimHadar	7ee5245aeb	Added shadow caster flag to filter.	2018-02-09 10:45:29 -08:00
samcake	4419dfe622	Addressing review comments	2018-02-09 10:02:16 -08:00
humbletim	a08770c816	cleanup	2018-02-09 02:29:20 -05:00
Sam Gateau	0e25b7bd35	Fixing the normal map computation	2018-02-08 23:27:12 -08:00
Sam Gateau	f20e1a727e	Removing the specular pipeline since we now take care of it with the base shader, remove unused shader include files adding the tone map pass	2018-02-08 23:07:39 -08:00
samcake	b66da1897d	improving the forward rendering pass, removing the specular variation and making it defautl	2018-02-08 17:59:07 -08:00
NissimHadar	950a62f3f8	Global graphics flag default to on. ... Added cast shadows flag to zone/keylight. Exit the RenderShadowMap job if current keylight doesn't cast shadows.	2018-02-08 15:52:20 -08:00
Bradley Austin Davis	ab5355dbdd	First pass at bindless textures	2018-02-08 11:11:36 -08:00
samcake	03aeb7adda	Adding the ubo slot assignment for the resource texture table	2018-02-08 11:08:23 -08:00
samcake	536ada3973	Introducing the TextureTable in the gpu shader system	2018-02-08 11:00:37 -08:00
samcake	caacd3e5cf	Trying to fix the forwaard rendering	2018-02-07 18:46:47 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Bradley Austin Davis	ae092f6c0b	Merge remote-tracking branch 'upstream/master' into fix/shader_length	2018-02-07 09:48:23 -08:00
NissimHadar	d01f9cd1fb	Fixing git crap.	2018-02-06 23:51:08 -08:00
Bradley Austin Davis	0455fb37b6	Merge remote-tracking branch 'upstream/master' into fix/shader_length	2018-02-06 15:55:01 -08:00
Olivier Prat	d248e1ed79	Merge branch 'master' of http://github.com/highfidelity/hifi into scripts	2018-02-06 18:00:38 +01:00
Olivier Prat	733d36df47	Fixed save / load of fade effect configurations	2018-02-06 17:57:04 +01:00
Olivier Prat	179aca2bf9	Shadow task now uses LOD culling from main view task	2018-02-06 11:47:39 +01:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
Olivier Prat	92279b5939	Merged with master	2018-02-05 18:24:05 +01:00
Olivier Prat	445ffbd82f	Added tag bits to shadow octree query	2018-02-05 16:35:55 +01:00
Olivier Prat	2940a67b3e	Merged with master	2018-02-03 16:55:25 +01:00
SamGondelman	4d4294dd6a	Merge remote-tracking branch 'upstream/master' into decals	2018-02-02 16:50:01 -08:00
SamGondelman	d7f4b033e8	wip finish adding material entity	2018-02-02 16:49:33 -08:00
John Conklin II	c8bb26ae74	Merge pull request #12294 from samcake/pastel ... Improve startup time by optimizing shader bookkeeping	2018-02-02 16:37:44 -08:00
John Conklin II	9f4820df3b	Merge pull request #12255 from Zvork/trnormalmap ... Normal map support on translucent objects	2018-02-02 14:19:50 -08:00
Brad Davis	08e52e5ef3	Fix additional highp	2018-02-02 14:15:21 -08:00
Brad Davis	dca3061107	Fix material key on Android	2018-02-02 13:45:24 -08:00
Atlante45	8ebb3e52d8	Misc bug fixes	2018-02-02 13:10:49 -08:00
Olivier Prat	03daba9bac	Removed duplicate shader include	2018-02-02 18:18:24 +01:00
Olivier Prat	8a011036ef	Removed warnings on mac and ubuntu	2018-02-02 18:07:35 +01:00
Seth Alves	861497e907	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-02-02 08:56:18 -08:00
Seth Alves	14d5029f4d	only update cauterization of child entities when something relevant changes	2018-02-02 08:56:11 -08:00
Olivier Prat	e9747e9d85	Small optimisations in shadow shader	2018-02-02 15:06:22 +01:00
Olivier Prat	ac92b3c130	Merge branch 'master' of http://github.com/highfidelity/hifi into scribe	2018-02-02 14:01:59 +01:00
Olivier Prat	234cb1e3e6	Added anti frustum test to remove lower cascade objects from higher shadow cascades	2018-02-02 12:15:43 +01:00
Olivier Prat	1f4671ba17	Cleaned up orthographic shadow culling functor	2018-02-02 11:09:28 +01:00
Olivier Prat	3804917cf4	Orthographic octree selection seems to be working	2018-02-02 09:40:57 +01:00
Olivier Prat	a44c5c9814	Merge branch 'master' of http://github.com/highfidelity/hifi into trnormalmap	2018-02-02 08:46:38 +01:00
humbletim	06afaa7470	BufferView <-> QVariant/QScriptValue conversion ... update MeshProxy/SimpleMeshProxy and ScriptableModel ModelScriptingInterface / scriptable::ModelProvider integration update to RC-63 initial graphics-scripting refactoring graphics-scripting baseline commit wip commit Geometry -> MeshPart remove SimpleMeshProxy collapse graphics-utils -> graphics-scripting scriptable::Model => scriptable::ScriptableModel	2018-02-01 16:30:29 -05:00
Anthony J. Thibault	a1b67afabf	Fix for rigidly bound mesh not being properly cauterized. ... For example, sometimes in first person view, you can see the back of your avatar's eyes or the brim of your avatar's hat.	2018-02-01 11:57:50 -08:00
Seth Alves	482be7ba4e	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-02-01 06:36:04 -08:00
Sam Gateau	351f619555	Fixing a shader error on android	2018-01-31 23:35:16 -08:00
samcake	582ef2a8a2	MErging with master	2018-01-31 11:00:23 -08:00
Seth Alves	64a46bf5df	merge from upstream	2018-01-31 10:43:41 -08:00
Olivier Prat	d422545c78	Changed shadow task to do a single octree query as well as pipeline/depth sort for all cascades. Still issue with disapearing objects from shadow map with viewpoint	2018-01-31 17:13:06 +01:00
Olivier Prat	3fa2babec2	Moved cascade frustum pre-computation to single ShadowSetup job	2018-01-31 11:55:46 +01:00
Olivier Prat	f344e44d26	Switched to a simpler manual fixed/slope based shadow bias system. Automatic stuff fail most of the time	2018-01-31 10:19:17 +01:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
Olivier Prat	5e6300ce46	Merged with master	2018-01-30 09:52:30 +01:00
MiladNazeri	3585bead96	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes ... Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
samcake	1fd4c5c1a4	Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information	2018-01-29 12:20:51 -08:00
John Conklin II	92b9290294	Merge pull request #12267 from hyperlogic/bug-fix/rc63-neck-cauterization ... RC63: Bug fix for avatar neck cauterization	2018-01-29 10:52:10 -08:00
Olivier Prat	0324f41565	Trying to improve adaptive shadow bias	2018-01-29 17:23:35 +01:00
Olivier Prat	70a7ecc5f0	Fixed merge with remote trnormalmap	2018-01-29 10:50:17 +01:00
Olivier Prat	4cbfef55ef	Merged with master. Had to add back shaders and code	2018-01-29 10:33:16 +01:00
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00