222 commits

Author	SHA1	Message	Date
Brad Davis	cd1e910844	Add a generic shape primitive	2016-05-21 23:46:44 -07:00
samcake	1ec9ef560e	Fixing the srgb color format conversion for web entities	2016-05-11 10:46:54 -07:00
samcake	88f816fab4	Adding reflection of the ambient map for translucent	2016-04-28 18:18:18 -07:00
samcake	9d0803e6b8	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-02-23 09:33:54 -08:00
Zach Pomerantz	fd6aa9a78b	Add layering to renderGrid, draw edit grid not layered	2016-02-19 13:57:32 -08:00
Zach Pomerantz	9daefbdb94	Fix grid antialiasing	2016-02-19 11:39:11 -08:00
Zach Pomerantz	07a5c7bd16	Update grid shader for major/minor lines	2016-02-19 11:22:01 -08:00
Zach Pomerantz	2bfbf1b5fd	Reimplement renderGrid to use frag shader	2016-02-18 11:30:03 -08:00
samcake	71863a1550	Fixing the material names	2016-02-16 09:33:24 -08:00
samcake	0ad7bacf02	Changing diffuse to albedo and breaking everything...	2016-02-15 21:50:10 -08:00
Zach Pomerantz	d9132f3973	Clean up geometry instanced calls	2016-02-05 11:22:45 -08:00
Zach Pomerantz	44d297e7e2	Differentiate named calls by pipeline	2016-02-04 15:32:47 -08:00
Zach Pomerantz	f0797d8ea0	Move instanced pipeline setup to lambda from batch	2016-02-04 15:32:28 -08:00
Zach Pomerantz	cb06d4a9e4	Fix -Wunused-variable for geometry solid stream formats	2016-02-04 10:13:35 -08:00
Zach Pomerantz	a790b09892	Supply normals to GeometryCache draw calls	2016-02-03 19:18:56 -08:00
Zach Pomerantz	d14ce8a9fe	Pass an explicit pipeline to render.*Instance calls	2016-02-03 19:18:56 -08:00
Atlante45	a5603140de	Fix for mac	2016-02-01 18:50:01 +01:00
Atlante45	7e8ea4dc77	Update primitive instance rendering calls	2016-02-01 18:50:01 +01:00
Atlante45	ccb183e518	Unify Named/Normal calls	2016-02-01 18:50:01 +01:00
Atlante45	741c22c0ac	Move SimpleProgramKey to cpp	2016-01-13 11:47:43 -08:00
Atlante45	1789878be1	Remove dead code	2016-01-13 11:47:43 -08:00
Atlante45	c30569cd55	Naming coding standard	2016-01-13 11:47:43 -08:00
Atlante45	205c14eb43	Remove unused headers	2016-01-13 11:47:43 -08:00
Atlante45	11dc3cd261	Move primitive rendering out of DeferredLightingEffect	2016-01-13 11:47:43 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Bradley Austin Davis	011a43d5f2	Add sphere and cube triangle counts to displayed stats	2015-12-08 11:08:22 -08:00
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
Brad Davis	5cbb2562cd	Move GL utilities out to their own library	2015-10-27 15:53:42 -07:00
samcake	c75c31ddc8	Fixing the index Offset issue with instanced shapes from Geometry cache	2015-10-06 18:04:08 -07:00
samcake	8735aa8003	Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux	2015-09-23 12:19:17 -07:00
Brad Hefta-Gaub	17a3fd159a	apparently unix doesn't like the generic type version of sqrt()	2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub	cd9aad4f41	more warnings fixes	2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub	5b00783f18	more warnings fixes	2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub	6f7e13b3c1	more warning fixes	2015-09-22 17:26:45 -07:00
Brad Hefta-Gaub	efda121619	fix a bunch of warnings on windows	2015-09-22 16:40:17 -07:00
Brad Davis	deaa4a747b	Batch side implementation of multi-draw indirect	2015-09-22 15:56:58 -07:00
samcake	910038cf82	Merging	2015-09-21 17:47:23 -07:00
Bradley Austin Davis	b3aeaba5f4	CR feedback	2015-09-21 15:44:47 -07:00
Bradley Austin Davis	e12e4ece34	Fixing lighting and atmosphere	2015-09-21 13:51:08 -07:00
Bradley Austin Davis	e024d23366	Instancing work, second pass	2015-09-21 13:27:02 -07:00
samcake	d3b1bcb86d	Redistributing the files to create the model-networking lib and separate that from the redner-utils	2015-09-21 13:21:35 -07:00
samcake	6a714f405c	Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map	2015-09-21 00:53:48 -07:00
samcake	3614812681	MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce	2015-09-20 23:31:59 -07:00
samcake	c9cb768945	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-09-19 09:00:19 -07:00
samcake	9a8dc6ca5d	Fix compilation issues on mac	2015-09-19 08:59:47 -07:00
samcake	8941741508	Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap	2015-09-18 18:47:18 -07:00
Brad Davis	8a703d0363	Instanced rendering, first pass	2015-09-18 16:29:29 -07:00
Sam Gateau	9074d0d6e1	very first version of the TextureStorage working	2015-09-14 09:29:46 -07:00
Sam Gateau	c37cdce750	Merging back with master	2015-09-10 17:53:50 -07:00
Stephen Birarda	b8bf9a1104	fix OBJReader loading with URL	2015-09-08 14:51:51 -07:00