395 commits

Author	SHA1	Message	Date
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
Brad Davis	d72bb71030	Merge pull request #4636 from samcake/orange ... Introduce the gpu::Framebuffer and its sidekick the gpu::Swapchain	2015-04-16 13:39:04 -07:00
Andrew Meadows	83d54eb46b	merge upstream/master into andrew/bispinor	2015-04-16 12:07:22 -07:00
Sam Gateau	cd1bbb2855	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-15 10:16:28 -07:00
Sam Gateau	fec52f6b10	Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly	2015-04-14 18:27:24 -07:00
David Rowe	85e5216fc1	Condense logic	2015-04-14 16:54:29 -07:00
David Rowe	2c5201f116	Fix animation not automatically starting at start-up	2015-04-14 16:54:14 -07:00
Sam Gateau	87030236cb	working version with the gpu::SAmpler and the gpu::Framebuffer	2015-04-14 15:53:24 -07:00
Andrew Meadows	9388ae4212	fix warning about unused variable	2015-04-14 14:52:21 -07:00
Sam Gateau	c34c5f6075	adding the Fremabuffer to be used for shadows and main rendering	2015-04-14 08:47:52 -07:00
Clément Brisset	36631dd3a3	Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting ... CR for Animation fixes	2015-04-09 11:39:13 +02:00
Sam Gateau	ad9129b552	Fixing all the shaders for entities to work correctly with the now supported color attribute field	2015-04-07 14:26:45 -07:00
David Rowe	43a130dabe	Fix Stop button not working at the end of a non-looped animation	2015-04-07 14:02:42 -07:00
Sam Gateau	f0efade06d	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-07 12:56:21 -07:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 ... Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Sam Gateau	9d6839e6a1	Merge branch 'temp1' of https://github.com/samcake/hifi into orange	2015-04-07 11:45:57 -07:00
Sam Gateau	25643479c9	Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly	2015-04-07 11:20:55 -07:00
Sam Gateau	88afb3cedc	solution to the color attribute case	2015-04-07 10:04:51 -07:00
Seth Alves	ef5dffecf6	fix filenames in comments	2015-04-07 10:03:14 -07:00
Sam Gateau	dee651069c	adding support for color attribute in FBX, and displaying it correctly	2015-04-06 23:33:13 -07:00
Seth Alves	cd5245d0d6	logging group for render-utils	2015-04-06 18:16:01 -07:00
Sam Gateau	7f46736bb4	playing with the shadwos	2015-04-06 17:17:25 -07:00
Sam Gateau	07e7f6ea1d	FIx review comments	2015-04-06 15:40:29 -07:00
Sam Gateau	4aa695d5f3	fixed an issue with skinned normaled map models not doing the correct transformation	2015-04-06 12:24:01 -07:00
Sam Gateau	7de54917b8	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-04-06 10:20:23 -07:00
Sam Gateau	ecdffadcb7	trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct	2015-04-06 10:17:31 -07:00
Sam Gateau	a85daaee41	COmmented the review questions in code	2015-04-06 10:03:47 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
Sam Gateau	17743c6013	FIxed the broken shadows	2015-04-03 17:58:21 -07:00
Sam Gateau	38d1e29a1d	getting ready for pr for a few syntax issues	2015-04-03 17:16:18 -07:00
Sam Gateau	2dcabb97b4	getting ready for pr for a few syntax issues	2015-04-03 17:10:51 -07:00
Sam Gateau	b8db0ff2d7	getting ready for pr for a few syntax issues	2015-04-03 17:05:08 -07:00
Sam Gateau	423434af10	FInd one of the issue with shadows for avatars	2015-04-03 12:34:30 -07:00
Sam Gateau	3f581d03d2	mirror means we render the Closkwise side	2015-04-03 10:45:30 -07:00
Sam Gateau	6f5c411a46	Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly	2015-04-03 10:32:20 -07:00
Seth Alves	57a4f3abe3	clear _saveNonCollisionGeometry when it's not needed, remove some debug prints	2015-04-02 06:57:27 -07:00
Seth Alves	eb78fa0f85	if switching to the mode where collision hulls are drawn, updateGeometry and simulate	2015-04-01 18:24:25 -07:00
Seth Alves	78af7f900e	don't need _collisionGeometryScale	2015-04-01 18:23:25 -07:00
Seth Alves	8940ba0c2a	new member variables related to rendering collision hulls	2015-04-01 17:52:18 -07:00
Sam Gateau	0d721ec1e9	merging	2015-03-31 17:47:05 -07:00
Sam Gateau	9b63739a72	Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations	2015-03-31 17:35:34 -07:00
Stephen Birarda	86174d6a29	Merge pull request #4551 from ZappoMan/neverCullAvatarParts ... never cull mesh parts for avatars	2015-03-31 16:29:01 -07:00
Brad Hefta-Gaub	b43761a6c1	Merge pull request #4545 from samcake/orange ... No more FLat global lighting, always use one of the SPherical harmonics presets	2015-03-31 15:52:49 -07:00
Sam Gateau	74f04c0c84	remove useless comment	2015-03-31 14:57:51 -07:00
ZappoMan	a889191916	never cull mesh parts for avatars	2015-03-31 14:27:34 -07:00
Seth Alves	ea2c5ff622	formatting	2015-03-31 14:04:33 -07:00
Sam Gateau	edf0ca2b06	Forbifd the global ambient lighting to go the simple global value and instead fallback to the first Spherical harmonics preset	2015-03-31 10:29:03 -07:00
samcake	1a18719031	and make it compile on mac... remove the field map from state just because it's unecessary	2015-03-30 21:53:59 -07:00
Philip Rosedale	5325478940	Merge pull request #4528 from ZappoMan/avatarUI ... Support for Auto-detecting FST type, and adding type hint to FST files when packaged	2015-03-30 21:31:22 -07:00
Bradley Austin Davis	87c4f8433c	Fixing consecutive spaces issue with text renderer	2015-03-30 16:21:57 -07:00