155 commits

Author	SHA1	Message	Date
Seth Alves	021dc64789	merge from upstream	2015-06-18 15:03:09 -07:00
Seth Alves	53b5c8e6e7	more merge fallout	2015-06-18 10:19:12 -07:00
Seth Alves	b258aeaa3d	merge from master	2015-06-18 10:04:14 -07:00
Atlante45	a9d2bb1e1c	Coding standard	2015-06-18 15:23:50 +02:00
ZappoMan	fb59939cf4	CR feedback	2015-06-17 10:02:02 -07:00
ZappoMan	689e10cc27	build buster fix	2015-06-17 09:53:50 -07:00
ZappoMan	8162c37013	cleanup	2015-06-17 09:33:15 -07:00
ZappoMan	268bb370cc	cleanup	2015-06-17 09:24:42 -07:00
ZappoMan	ea98581d22	reorganize files to cleanup headers	2015-06-17 09:18:00 -07:00
Seth Alves	0ec7d3ded8	fix some float/double jumble	2015-06-17 07:02:54 -07:00
ZappoMan	569971582d	more hacking on trying to port atmospheres to the new pipeline	2015-06-16 18:39:35 -07:00
Seth Alves	508ae276c6	enable -Wdouble-promotion	2015-06-16 18:23:10 -07:00
ZappoMan	167e7d1377	first cut at atmospheres in batch (doesn't work)	2015-06-16 14:05:14 -07:00
Sam Gateau	2785f1a0e2	Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox	2015-06-10 01:50:52 -07:00
Sam Gateau	7de4c2eff7	first take on the materialKey	2015-06-09 12:17:10 -07:00
Seth Alves	8cb5717b86	formatting, cleanups	2015-05-27 15:16:15 -07:00
Seth Alves	66760afadb	quiet compiler	2015-05-26 14:27:22 -07:00
Seth Alves	728e6d121b	changes sam made to get normals to work on a mesh	2015-05-26 14:12:01 -07:00
Seth Alves	fd19c63449	fix bug in mesh	2015-05-21 14:26:40 -07:00
Seth Alves	138077ede9	hook up mesh renderer	2015-05-20 18:22:07 -07:00
Sam Cake	765145b898	Moving the load of the texture and the generation of the cube map irradiance in the same thread	2015-05-15 11:28:59 -07:00
Brad Hefta-Gaub	d1f52231be	Merge pull request #4863 from samcake/orange ... Using the skymap for ambient lighting	2015-05-14 09:12:46 -07:00
David Rowe	2032d36b1f	Fix double/float mismatch build warnings	2015-05-13 17:32:40 -07:00
Sam Cake	238d3751c5	cleaning up the SH generation	2015-05-13 16:00:05 -07:00
Sam Cake	65e83df214	Generating the SH from the cube map!	2015-05-13 11:08:18 -07:00
Sam Cake	536fff4502	Trying to create the SH from the skybox cubemap	2015-05-12 23:11:52 -07:00
Atlante45	00864afe53	Quiet compiler	2015-05-12 17:06:40 +02:00
samcake	449ca6df6d	fix the color blending on Mac	2015-05-11 17:27:22 -07:00
Sam Gateau	e6bba04151	Enable the color blending for the skybox	2015-05-11 17:05:45 -07:00
Sam Gateau	6c606f630e	adjust the alpha of the skybox to make it work with the glow effect	2015-05-11 15:22:13 -07:00
Sam Gateau	f1fcce3ea0	refactoring th ecube texure loading to support 2 different layouts	2015-05-11 10:47:45 -07:00
Sam Gateau	deb303838d	Cleaning code	2015-05-07 17:15:45 -07:00
Sam Gateau	ce5295a55f	THese is not final but we have a basic working framework so let's try to share	2015-05-07 17:06:15 -07:00
Sam Gateau	54c47fe3f9	merging	2015-05-07 11:35:58 -07:00
Sam Gateau	653d2e72b1	Skybox kind of working	2015-05-07 11:23:11 -07:00
ZappoMan	496da6fcd5	wire up the skybox color property to the new skybox renderer	2015-05-06 20:36:06 -07:00
Sam Gateau	8fd77f964c	Fix include filke case for ubuntu...	2015-05-06 14:23:42 -07:00
Sam Gateau	0fbccf1d33	get ready for PR, SKY_DOME by default	2015-05-06 12:22:19 -07:00
samcake	06e1330e42	Clean up the includes in gpu, make the skybox shader works	2015-05-06 12:12:54 -07:00
Sam Gateau	fe3b5d1867	preparing for PR, back to the default background mode SKy_DOME	2015-05-06 10:27:31 -07:00
Sam Gateau	dc81a3ecc2	Cube texture are working with the GL backend, useing it in SKybox successfullly	2015-05-06 09:53:36 -07:00
Sam Gateau	b1fb05e543	merge	2015-05-05 12:04:30 -07:00
Sam Gateau	6d02d4d25e	adding skybox step by step	2015-05-05 11:40:00 -07:00
Sam Gateau	ade404a74d	getting rid of QSHaredPointer in favor of std::shared_ptr	2015-05-04 13:43:30 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Sam Gateau	48364cb598	refined the names of the key light porperties in Stage	2015-04-21 11:04:14 -07:00
Sam Gateau	687ca7fee5	Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working	2015-04-17 19:00:40 -07:00
Sam Gateau	b5b146b81b	Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution ... Expose these to javascript	2015-04-16 17:35:37 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
Sam Gateau	3b92910a91	Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters	2015-04-01 12:22:35 -07:00
Sam Gateau	c9e0360394	using gpu::Pipeline it s mostly working but still glUniforms to get rid of	2015-03-26 13:48:49 -07:00
Sam Gateau	6284159892	Revisiting the rendering pipeline pick and trying to use our brand new gpu::Pipeline	2015-03-24 14:58:41 -07:00
Sam Gateau	19a96c4815	Adding the State to gpu and wiring the pipeline in glBackend to potentially make it work soon :)	2015-03-23 22:33:25 -07:00
Sam Gateau	69667fb5ca	making the state work	2015-03-23 10:21:35 -07:00
Sam Gateau	5f3c4b743f	drafting a simple skybox	2015-03-22 19:04:33 -07:00
Sam Gateau	fdbf4e5288	cleaning code for review	2015-03-20 11:55:00 -07:00
Sam Gateau	5a40fcee17	set the defines for GPU profile correctly AGAIN	2015-03-17 16:51:59 -07:00
Sam Gateau	03da3aeab4	Clean up on the GPU Profile defines in order to control features	2015-03-17 16:15:10 -07:00
Stephen Birarda	471e55c8ce	fix some lingering warnings	2015-03-12 12:36:39 -07:00
Sam Gateau	853cf75f60	adding the atmosphere in the directional lighting pass, debug	2015-03-10 09:37:13 -07:00
Sam Gateau	d9c071a2a9	trying to put the atmospheric effect in a shader header and use it on the directional lighting pass	2015-03-10 00:47:27 -07:00
samcake	ee5409b0a8	fixing compilation on macosx	2015-03-09 14:25:59 -07:00
Sam Gateau	cc85f468d6	splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu	2015-03-09 11:14:42 -07:00
Sam Gateau	23a6326aa1	testing the shader features in Model and refining the shader making workflow	2015-03-08 10:53:29 -07:00
Seth Alves	8a4339e57f	stray control-Ms	2015-03-07 07:52:20 -08:00
Sam Gateau	d5f6129082	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis	2015-03-06 10:44:15 -08:00
Sam Gateau	c097c6aad2	Adding the self introspection of shaders	2015-03-06 10:41:53 -08:00
Brad Hefta-Gaub	9649ed9936	Merge pull request #4371 from huffman/light-radius ... Update Light to set direction when setting orientation	2015-03-03 15:50:04 -08:00
Ryan Huffman	3fef8a1622	Update Light to set direction when setting orientation	2015-03-03 12:41:51 -08:00
Sam Gateau	cb737d64d3	Testing the gpu::Shader compilation and building steps, ready to be used for real	2015-03-01 15:20:32 -08:00
Sam Gateau	660d9237e6	First version of the Shader and the magical shader program	2015-02-28 13:07:16 -08:00
Sam Gateau	ea88cbd75f	Merge with upstream master	2015-02-27 13:19:50 -08:00
Sam Gateau	f6a9bd1870	REfining the naming and introducing an orientation offset	2015-02-26 17:26:41 -08:00
Sam Gateau	e3b3c8e1ef	Setting the defalt at a better time of the day	2015-02-26 16:09:21 -08:00
Sam Gateau	d8ebb0c5b9	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
dev	b04dbf7a34	fixing compilation issue on macos	2015-02-26 11:27:40 -08:00
Sam Gateau	fcb293d0b2	CLean up before pr	2015-02-26 10:45:00 -08:00
Sam Gateau	a757229c0e	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-25 19:18:01 -08:00
Sam Gateau	4959e2924e	add an example script to control the sun light	2015-02-25 19:17:38 -08:00
Sam Gateau	6b29e314c2	Adding the Stage of the Scene and exposing control of the sun light from javascript	2015-02-25 19:05:27 -08:00
Leonardo Murillo	006b3ed0ac	Merge pull request #4300 from birarda/dependencies ... NOT MERGEABLE - add some externals as cmake external projects	2015-02-25 13:22:49 -08:00
Sam Gateau	6070bf8a37	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-18 16:02:18 -08:00
Sam Gateau	11060ed273	trying to tackle the unenderstood transform value not going through corectly?	2015-02-18 16:00:37 -08:00
Stephen Birarda	b2e587dbbd	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
Atlante45	5230b805d2	Fix warnings	2015-02-18 19:24:29 +01:00
Stephen Birarda	c110fcbfad	merge with upstream/master	2015-02-17 17:34:48 -08:00
Stephen Birarda	e99012efbb	updates to build guides to remove soxr	2015-02-17 10:33:12 -08:00
Andrew Meadows	53855c89e9	Merge pull request #4289 from birarda/dependencies ... add gverb and glm as cmake external projects	2015-02-17 10:00:29 -08:00
Stephen Birarda	8c998a65ee	use the glm find_package and check externals	2015-02-13 12:50:32 -08:00
Stephen Birarda	1d90c1c827	use glm external project in model library	2015-02-13 10:31:41 -08:00
Sam Gateau	e2e61c64b1	Support include path to shaders from the hifi libraries to cmake	2015-02-13 01:30:04 -08:00
Sam Gateau	11beb51ec1	Clean up comments	2015-02-09 18:02:34 -08:00
Sam Gateau	1b22a3ef36	connecting the globalLight info to the DeferredLightingEffect	2015-02-05 17:30:57 -08:00
Sam Gateau	9b0036d010	adding Light and replace glLights also for the first deferred pass	2015-02-05 14:10:06 -08:00
Sam Gateau	00a9f55bc3	lightings seems to work correctly now	2015-02-05 10:20:19 -08:00
Sam Gateau	8e1eebbbd4	FInally getting the angular attenuation	2015-02-04 17:24:23 -08:00
Sam Gateau	16f12dd267	working on the point light shader edge representation	2015-02-02 16:31:36 -08:00
Sam Gateau	b6836af071	improving on the poin light attenuatiion formula	2015-01-28 00:09:15 -08:00
Sam Gateau	db427cdf5e	adding Light class in model and the shader in render utils	2015-01-27 15:45:10 -08:00
Sam Gateau	ae3233b119	in the middle of something	2015-01-27 15:44:10 -08:00