339 commits

Author	SHA1	Message	Date
Seth Alves	6cb195b335	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-20 15:53:56 -07:00
Seth Alves	bc99ef778c	change how render engine is told about model position changes	2015-10-20 12:04:29 -07:00
Seth Alves	4903db45b1	give other avatars an anim-skeleton	2015-10-15 14:21:06 -07:00
samcake	0a351a8a0c	FIx the problem with cauterizedClusterMatrices in the case rear view mirror is used. Clean the way to define the depth stencil format for texture	2015-10-07 14:26:33 -07:00
samcake	c92a6d58ab	Dispatch classes in their properly named files to appease the coding standard gods	2015-10-06 09:46:32 -07:00
samcake	59afbf1a04	Remove the renderPart call from model.cpp and put the code path in the MeshPartPayload::render()	2015-10-06 01:15:53 -07:00
samcake	fc7f0c77a5	Rename ModelRenderPayload files to ModelRenderItem	2015-10-06 00:20:51 -07:00
samcake	12fedb6ff0	Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer	2015-10-05 18:31:05 -07:00
samcake	9e393ced46	MOving rednering code of Model into ModelRenderPayload.h/cpp	2015-10-05 09:17:16 -07:00
samcake	fd232b7d32	ONe more file to deal with the Model rendering	2015-10-04 22:27:48 -07:00
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
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
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
Andrew Meadows	09ac01a5e7	remove cruft from old verlet avatar simulation	2015-10-01 13:44:50 -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
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
samcake	d7d332acd4	Merge branch 'master' of https://github.com/highfidelity/hifi into orange ... t :wq	2015-09-23 09:51:31 -07:00
samcake	518f5fe17c	Starting to clean the mesh part of the RenderItem....	2015-09-22 18:21:36 -07:00
Andrew Meadows	2edffaf91a	remove unused variables	2015-09-22 17:20:13 -07:00
samcake	80e5581639	fixing review comments	2015-09-21 22:51:14 -07:00
samcake	91b9940fe9	Merging and a fix for the diffuse map floating around	2015-09-21 18:09:25 -07:00
samcake	910038cf82	Merging	2015-09-21 17:47:23 -07:00
samcake	21f53f1bbd	debugging the lighting issue on the craps table	2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub	dc9c774eb5	merge model part quads and triangles together to reduce the number of draw calls	2015-09-21 13:09:43 -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
Sam Gateau	d45547aa1a	Merge and update	2015-09-16 13:46:07 -07:00
Brad Davis	f4818c17cf	Fix avatar and other model animations	2015-09-15 08:04:17 -07:00
Brad Davis	3f688f92d3	Don't do an O(N^2) operation on cluster matrices	2015-09-15 08:04:17 -07:00
Brad Hefta-Gaub	70fcdbf2fd	Revert "Fix over-calculation of cluster matrices"	2015-09-14 21:20:11 -07:00
Brad Davis	35e4440c4f	Don't do an O(N^2) operation on cluster matrices	2015-09-14 16:09:13 -07:00
Sam Gateau	9074d0d6e1	very first version of the TextureStorage working	2015-09-14 09:29:46 -07:00
Seth Alves	49ee251238	quiet compiler	2015-09-12 09:59:25 -07:00
Sam Gateau	c37cdce750	Merging back with master	2015-09-10 17:53:50 -07:00
Howard Stearns	eb67254e54	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
Howard Stearns	27f4bca0a4	Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! ... Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.	2015-09-08 14:49:58 -07:00
Howard Stearns	efeaf21305	Checkpoint smoother.	2015-09-07 16:32:51 -07:00
Howard Stearns	0065c64b31	Snapshot of no-judder, before cleanup.	2015-09-07 09:57:05 -07:00
Howard Stearns	d3106de7c1	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-04 14:32:58 -07:00