60 commits

Author	SHA1	Message	Date
Sam Gateau	a757229c0e	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-25 19:18:01 -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
Andrew Meadows	7b68916010	Merge pull request #4343 from ZappoMan/hangOnExit ... BUG FIX: Hang on exit	2015-02-25 17:02:26 -08:00
ZappoMan	05d7d47045	some cleanup	2015-02-25 16:32:48 -08:00
ZappoMan	5eecb6a837	correctly delete glbuffers	2015-02-25 14:44:10 -08:00
Stephen Birarda	5e264f8241	add GLEW as dependency external project	2015-02-20 13:47:38 -08:00
Stephen Birarda	b2e587dbbd	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -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
Brad Hefta-Gaub	1827d9f3cd	Merge pull request #4256 from samcake/temp1 ... Getting rid of glLIghts and replacing by the model::Light	2015-02-13 10:49:53 -08:00
Stephen Birarda	54ce79db5a	remove glm dependency in gpu library	2015-02-13 10:29:19 -08:00
Sam Gateau	b9fd116dbf	Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu	2015-02-10 18:38:48 -08:00
Sam Gateau	ace6dc4faf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-08 23:23:06 -08:00
Brad Hefta-Gaub	12ab841191	Merge pull request #4248 from samcake/temp0 ... Remove unneeded texture memory once loaded to GPU and Lightmap control in FBX	2015-02-06 16:52:40 -08:00
Sam Gateau	469ee29f0b	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2015-02-06 16:30:47 -08:00
Sam Gateau	bdf9164c7b	debugging the new global light pass	2015-02-06 16:30:07 -08:00
Sam Gateau	d4566bb1d7	Adding support for hifi_global light intensity & COlor and use it to adjust the lighmap parameters	2015-02-06 15:51:57 -08:00
Sam Gateau	e9add29af1	texture memory	2015-02-06 12:17:51 -08:00
Stephen Birarda	219e78425b	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
Seth Alves	a645d784d8	uint32_t rather than uint, which mac doesn't like	2015-02-04 11:26:05 -08:00
Stephen Birarda	11f3161029	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
Seth Alves	450787fde2	Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter	2015-02-03 17:33:27 -08:00
Sam Gateau	5719e277dd	FIx the lightmap not displaying when using the texcoord0	2015-02-03 16:10:31 -08:00
Seth Alves	c1ae98fa1a	quiet some compiler warnings about signed vs unsigned comparisons	2015-02-02 15:02:29 -08:00
Atlante45	0cc4f5b226	Merge branch 'android' of git://github.com/birarda/hifi into android	2015-01-30 13:30:17 -08:00
samcake	e3fa2e1995	Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval ... Removal of glColorXXX()	2015-01-30 10:21:18 -08:00
Sam Gateau	b2f16be92a	Fixing the non loading of some texture because the QImage bit size is not exactly what's expected	2015-01-29 15:17:55 -08:00
Stephen Birarda	d7ad20e476	fix gpu CMakeLists for Android	2015-01-29 15:01:15 -08:00
ZappoMan	6821f31f14	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing ... Conflicts: libraries/gpu/src/gpu/GLBackend.cpp	2015-01-28 10:46:30 -08:00
Sam Gateau	4592bdcb4f	fixes after review by Brad	2015-01-27 15:42:56 -08:00
Sam Gateau	80784a7a33	fixing a bug in texture storage when accessing mip #0	2015-01-22 16:57:33 -08:00
Sam Gateau	49dde269a6	experimenting with linear space vs srgb space	2015-01-22 16:27:17 -08:00
dev	03a5c398ec	splitting the GLBackend.cpp in several files and fixing the build for mac	2015-01-22 12:38:24 -08:00
Sam Gateau	1e84f260a9	Removing gl calls for texture from TextureCache	2015-01-21 16:53:35 -08:00
Sam Gateau	d19bfa69f2	Even more gpu::Texture in the model rnedering	2015-01-21 10:07:10 -08:00
Sam Gateau	4302db109f	First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture	2015-01-20 16:02:26 -08:00
ZappoMan	41c039f283	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2015-01-19 13:34:28 -08:00
ZappoMan	bddb7856af	more work	2015-01-19 13:34:09 -08:00
Sam Gateau	6b55b4ff82	No more Magic numbers and fixing the code path for linux	2015-01-16 10:26:51 -08:00
ZappoMan	439a1c0495	solid cube now streamizing	2015-01-15 18:46:44 -08:00
dev	d7ad5a35d6	fixes for glsl mac	2015-01-13 18:24:32 -08:00
Sam Gateau	979d50f7d8	fixed pointers which were using 0 instead of NULL and syntax in resource.h	2014-12-22 11:20:04 -08:00
Brad Hefta-Gaub	fb15b0f2a7	Merge pull request #3992 from samcake/temp0 ... Add the BufferView class in gpu::Resource	2014-12-22 10:12:48 -08:00
Stephen Birarda	2780415b1d	put glew link back into gpu	2014-12-19 15:07:31 -08:00
Stephen Birarda	d7d11955f3	Revert "add a test to confirm link fail" ... This reverts commit 691be3bf7c.	2014-12-19 15:05:13 -08:00
Stephen Birarda	691be3bf7c	add a test to confirm link fail	2014-12-19 14:59:55 -08:00
Stephen Birarda	9bd0bc671b	resolve conflicts on merge with upstream master	2014-12-19 14:48:18 -08:00
ZappoMan	b7165abd5b	possible glew warning fix for windows	2014-12-19 14:33:45 -08:00
Sam Gateau	a7b039fbb9	Disabling glDebug	2014-12-19 13:28:19 -08:00
Sam Gateau	096b09e8e1	Importing fixes from Model branch to the gpu library	2014-12-19 12:44:46 -08:00
Stephen Birarda	504cd86fef	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-19 09:13:06 -08:00