1365 commits

Author	SHA1	Message	Date
samcake	1799322c67	Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp	2015-10-04 18:46:35 -07:00
samcake	55f5ab3732	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-04 18:31:56 -07:00
samcake	48416262a1	Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced	2015-10-04 18:31:19 -07:00
samcake	edaa8f998a	Migrating to the new mesh for rendering and having problems with multi part mesh	2015-10-02 18:12:16 -07:00
Brad Hefta-Gaub	255689e24f	add GLEW_STATIC to fix link warnings	2015-10-02 15:08:04 -07:00
Howard Stearns	f6665a4ac6	Merge pull request #5839 from sethalves/transmit-joint-translation ... WARNING protocol change: Transmit joint translation	2015-10-02 13:37:56 -07:00
samcake	a22ee03732	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-02 12:25:09 -07:00
samcake	edb485cb0f	working on getting the Model payload to use model::Mesh	2015-10-02 12:24:41 -07:00
Anthony J. Thibault	fc7b6dee84	Merge branch 'master' into transmit-joint-translation	2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub	4c556dd43a	Merge pull request #5962 from samcake/calvin ... Rendering the background elements after opaque and only work on the far pixels	2015-10-02 11:38:45 -07:00
Brad Hefta-Gaub	c6c430ca76	Merge pull request #5977 from jherico/marge ... Fixing 2D overlay mouse interaction	2015-10-02 11:11:04 -07:00
Brad Davis	aa8979570c	Working on 2D overlay mouse interaction	2015-10-02 00:35:37 -07:00
samcake	b8ea83099a	Debuggging	2015-10-01 21:13:22 -07:00
samcake	4478ca79ca	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-01 19:55:14 -07:00
samcake	71ad6195f2	Merge branch 'master' of https://github.com/highfidelity/hifi into calvin	2015-10-01 19:25:25 -07:00
samcake	690620d74d	Cleaning code	2015-10-01 19:23:32 -07:00
samcake	3490e08521	Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances	2015-10-01 18:42:09 -07:00
Anthony J. Thibault	fa864d29f9	Merge branch 'master' into transmit-joint-translation	2015-10-01 16:55:24 -07:00
Andrew Meadows	09ac01a5e7	remove cruft from old verlet avatar simulation	2015-10-01 13:44:50 -07:00
samcake	0398f9429e	fix the coo/texel blender mode for the case when color is black and the stereo issue	2015-09-30 18:39:13 -07:00
samcake	75e858cd13	Putting together the stencil buffer for opaque vs background and using it for the backgroud render items	2015-09-30 15:54:03 -07:00
Sam Gateau	e78f1521ab	getting the stencil buffer in place	2015-09-30 09:24:36 -07:00
samcake	dc3c9b48ea	MOving forward on the background beeing drawn last	2015-09-29 18:28:20 -07:00
Brad Hefta-Gaub	04115052b3	Merge pull request #5938 from samcake/calvin ... Fixing the lighting view matrix for stereo again	2015-09-29 15:08:41 -07:00
samcake	1bd07b58c3	Fixing the lighting view matrix for stereo again	2015-09-29 14:40:37 -07:00
Brad Hefta-Gaub	00c32fc7cd	Merge pull request #5924 from jherico/marge ... Support for accessing IPD in scripts	2015-09-29 14:24:53 -07:00
Seth Alves	d0a1e206ca	Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation	2015-09-29 13:55:13 -07:00
samcake	840f92bd06	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-09-29 10:54:09 -07:00
samcake	a9f6c93a2c	merging	2015-09-29 10:53:56 -07:00
samcake	202d2944ab	Merge branch 'master' of https://github.com/highfidelity/hifi into calvin	2015-09-28 17:24:59 -07:00
Brad Davis	7b1c04512a	Adding support for accessing IPD in scripts	2015-09-28 16:24:38 -07:00
samcake	95ea874d43	Minor fixes to the way the specular color is interpreted	2015-09-28 12:43:15 -07:00
Brad Hefta-Gaub	ce3da099f6	normalize the surface normal from the triangle, coding standard fix, update example	2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub	430cbcca7e	first cut at adding surface normals to ray intersection	2015-09-27 21:57:50 -07:00
Seth Alves	50dd8eba45	Relay joint translations across network. Apply animation's root-joint translation to avatar.	2015-09-26 11:40:39 -07:00
Brad Hefta-Gaub	85b2322acc	more work on batch optimzation	2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub	5e82b9c433	more warning fixes	2015-09-24 08:26:56 -07:00
samcake	46e9c463fc	Merge pull request #5885 from ZappoMan/batchOptimizations ... Batch optimizations	2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub	5a80c4d0e7	Merge pull request #5886 from samcake/calvin ... Expose multi Draw Indirect in Batch (Hijack Austin's work...)	2015-09-23 19:13:28 -07:00
Brad Hefta-Gaub	9a0e5b9870	address Sam's concerns	2015-09-23 17:37:48 -07:00
samcake	8bdfc853d9	Merge branch 'orange' of https://github.com/samcake/hifi into hobbes	2015-09-23 17:31:04 -07:00
ZappoMan	65a079cb53	fix mac build	2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub	ef25876c9a	implement vector caching for gpu::Batch	2015-09-23 14:46:47 -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
Anthony J. Thibault	90a551214e	Fix for AnimDebugDraw crash on shutdown.	2015-09-23 11:09:43 -07:00
Anthony J. Thibault	a9848cd157	Merge branch 'master' into tony/lean-threshold	2015-09-23 10:54:12 -07:00
samcake	7f8450f77b	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-09-23 10:30:51 -07:00
samcake	d7d332acd4	Merge branch 'master' of https://github.com/highfidelity/hifi into orange ... t :wq	2015-09-23 09:51:31 -07:00
Brad Hefta-Gaub	387c4fbd92	fix bad oglplus pragma warnings	2015-09-22 21:52:16 -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