221 commits

Author	SHA1	Message	Date
SamGondelman	7fe0e5909e	fix black albedo coloring	2019-02-07 10:14:10 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
SamGondelman	d17e04967a	fix zone bugs	2019-01-18 13:49:16 -08:00
SamGondelman	717da1b6fa	track texture loading	2019-01-17 15:59:32 -08:00
SamGondelman	ff3545beab	working with texture transform fallthrough	2019-01-07 13:28:00 -08:00
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
SamGondelman	9155853889	working on material fallthrough	2018-12-20 16:03:58 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
Sam Gondelman	860d920368	more typos	2018-11-28 09:55:10 -08:00
Sam Gondelman	ecd936705b	typo	2018-11-28 09:54:20 -08:00
Sam Gateau	87730884ab	Merge pull request #14340 from Nex-Pro/patch-5 ... Change to English spelling of 'declination'	2018-11-27 10:53:28 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Nex-Pro	3eb70a7617	Change to English spelling of 'declination' ... Addressed other minor typos. NB: Searched all sources in the project for the call and it is only found in this file.	2018-11-03 16:08:53 +00:00
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
SamGondelman	e8c5324e39	start removing branching	2018-10-25 11:59:04 -07:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
SamGondelman	d254db02dc	small cleanup	2018-10-23 11:27:17 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
SamGondelman	5652fa0b1e	merge with master	2018-10-22 10:18:52 -07:00
SamGondelman	cce0981d6c	Merge remote-tracking branch 'upstream/master' into police	2018-10-17 11:40:01 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
sam gateau	215818e313	adjusting page size but still seeing a perf drop	2018-09-27 17:18:43 -07:00
SamGondelman	e069817978	more fixes	2018-09-27 14:18:43 -07:00
sam gateau	4078be3df5	Better naming and simpler template maybe	2018-09-26 17:58:06 -07:00
SamGondelman	0f24c18de5	slightly fix forward pipelines	2018-09-26 15:01:46 -07:00
sam gateau	b5a47b2e76	Finalizing the renaming from Skinned to Deformed	2018-09-26 14:11:22 -07:00
SamGondelman	09a6053044	cleaning up fragment shaders	2018-09-26 14:10:47 -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	7349562111	Removing commented code	2018-09-06 15:50:31 -07:00
sam gateau	e428248472	Adressing build warnings	2018-09-06 11:33:26 -07:00
sam gateau	21f65d8a78	position are used correctly for evaluting bounds in the Mesh	2018-09-05 17:50:06 -07:00
sam gateau	0e614ad578	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-05 11:35:08 -07:00
sam gateau	761e8a3f95	fixing warnings	2018-09-04 09:19:24 -07:00
Sam Gateau	e8d922a56c	Interleaving the attributes and relying on just 3 input buffers	2018-09-03 02:48:07 -07:00
SamGondelman	d01b438cb3	CR	2018-08-31 11:25:17 -07:00
SamGondelman	5f08ed5027	misc perf improvements	2018-08-30 16:55:15 -07:00
John Conklin II	467fe56103	Merge pull request #13845 from SamGondelman/perf ... Move blendshape packing to worker thread	2018-08-27 09:40:03 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
SamGondelman	70f4d0c634	Merge remote-tracking branch 'upstream/master' into perf	2018-08-24 14:04:37 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
SamGondelman	a0c3c09b05	Merge remote-tracking branch 'upstream/master' into bloom	2018-08-08 14:44:02 -07:00
SamGondelman	2959a406d7	working on enabling bloom	2018-08-07 21:52:05 -07:00
Sam Gateau	07cb0db425	Fix bug with texel opaque and transparent cut off shader function	2018-08-07 11:16:50 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	04e84f1d23	Moving to cmake time shader compiling	2018-08-03 14:58:11 -07:00
Olivier Prat	d2763841be	Working background blend on haze	2018-07-05 17:15:39 +02:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b ... # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
David Rowe	a2bb9de441	Graphics API JSDoc stubs	2018-05-12 12:53:43 +12:00
Olivier Prat	ff88911f93	Protected procedural skyboxes from NaNs and negative values returned by procedural shader	2018-05-11 12:26:03 +02:00
SamGondelman	c2004debd5	test using highp floats everywhere for android	2018-05-07 11:41:19 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Sam Gateau	d1e2e9ce71	Merge pull request #12921 from SamGondelman/precisionq ... Fix AMD shader compilation	2018-04-23 10:17:35 -07:00
SamGondelman	901301485b	reorganizing shader defines to fix compilation errors	2018-04-17 15:11:56 -07:00
Olivier Prat	f9cc4994df	Merge branch 'master' of http://github.com/highfidelity/hifi into haze	2018-04-16 14:00:33 +02:00
Olivier Prat	6a089be973	Enabled haze to be vertically inverted (ceiling lower than base)	2018-04-16 12:15:08 +02:00
John Conklin II	3d90f93cf1	Merge pull request #12812 from SamGondelman/compression ... Support ETC2/EAC compressed textures	2018-04-12 16:04:08 -07:00
SamGondelman	44ea5a2e84	add etc2/eac support	2018-04-05 18:59:22 -07:00
Brad Davis	ae8df7e24e	Merge remote-tracking branch 'origin/gl_common' into HEAD	2018-03-21 12:35:17 -07:00
Seth Alves	2fd6bc4130	rename Mesh api getPos3 to getPos, deprecate but still support getPos3	2018-03-14 10:24:44 -07:00
Brad Davis	9056ee0f14	Merge branch 'gl_common' into bindless	2018-03-12 11:27:30 -07:00
Brad Davis	09996e0b65	Bindless texture work cleanup	2018-03-08 16:01:18 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
Brad Davis	d858d34523	Update material binding	2018-03-07 17:27:47 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
NissimHadar	000b08f7c0	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
SamGondelman	a66125fbb7	scriptablematerial -> scriptablemateriallayer	2018-03-01 16:56:51 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -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
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
humbletim	767569bc40	* changes per CR feedback ... * make MeshPart.topology read-only * JS Graphics API starter documentation * remove redundant qscriptvalue sequence registrations	2018-02-26 18:00:22 -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
humbletim	54dc0240b0	remove bufferviewscripting refs; fix compiler warnings	2018-02-26 05:26:35 -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
humbletim	6ea4b660b7	CR feedback; remove ok bool pointer and all metadata; cleanup	2018-02-23 07:47:39 -05:00
humbletim	0dd3672162	CR feedback / cleanup	2018-02-22 21:20:56 -05:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
humbletim	dd90c8c515	fix ubuntu compile warnings	2018-02-22 10:16:34 -05:00
humbletim	e4a2a589a5	CR fedback and cleanup	2018-02-22 07:56:09 -05:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -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
Gabriel Calero	72e02d6207	Restore default precision qualifier (needed for pixel)	2018-02-16 09:14:20 -08:00
Gabriel Calero	3effb6097b	Add precision qualifier in fragment shaders for struct fields	2018-02-16 09:14:14 -08:00
SamGondelman	2d754edf74	CR	2018-02-15 15:48:41 -08:00
Nissim Hadar	7e99570824	Fixed Ubuntu warnings.	2018-02-15 07:54:55 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
SamGondelman	38290064c1	replace materials by name, hide material mode for now	2018-02-13 13:24:08 -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
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
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
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	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
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
Brad Davis	dca3061107	Fix material key on Android	2018-02-02 13:45:24 -08: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
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
Brad Davis	08df262474	Fix haze parameters uniform buffer size	2018-01-27 11:42:17 -08:00
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
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05: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
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00