1184 commits

Author	SHA1	Message	Date
Howard Stearns	5a0c1a9402	Checkpoint testing stuff.	2015-07-22 21:03:48 -07:00
Seth Alves	ee334ff826	JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.	2015-07-22 18:43:10 -07:00
Seth Alves	47965bc39c	merge from upstream	2015-07-22 13:48:19 -07:00
Seth Alves	7c8d52cbd1	back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer	2015-07-22 13:41:31 -07:00
Marcel Verhagen	8f0893ba21	Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives. ... Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file. So it now does not break existing content. Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.	2015-07-22 22:34:45 +02:00
Howard Stearns	a161f527c4	Comments documenting direction and questions.	2015-07-22 11:41:24 -07:00
Seth Alves	abfe60aa20	whenever Model class uses _jointState, use the Rig version if there is a Rig.	2015-07-20 18:31:42 -07:00
Howard Stearns	ed815a0573	Reflect dependencies in unit test setup.	2015-07-17 16:53:41 -07:00
Seth Alves	bcd6b30ec3	move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists	2015-07-17 13:31:48 -07:00
Howard Stearns	6ca458b624	Instantiated in MyAvatar	2015-07-15 15:59:24 -07:00
Howard Stearns	5312993e56	Hmm, last was missing some emptiness.	2015-07-15 15:30:34 -07:00
Howard Stearns	bbb5f832a2	Empty Rig.	2015-07-15 15:11:16 -07:00
Atlante45	22f0dbdefb	CR	2015-07-14 15:16:00 -07:00
Atlante45	c11864acf3	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-10 15:57:40 -07:00
ZappoMan	1dd40af162	fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change	2015-07-10 12:43:35 -07:00
Atlante45	6c591131ba	Made Animations safe for resource reload	2015-07-10 12:01:51 -07:00
Atlante45	f77fab2fe0	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
Atlante45	38729c5790	Made dependencies inherit from Dependency	2015-01-13 20:38:01 -08:00
Atlante45	2a82ff9768	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 ... Conflicts: assignment-client/src/voxels/VoxelServer.cpp interface/src/Application.cpp interface/src/Audio.cpp interface/src/DatagramProcessor.cpp interface/src/Menu.cpp interface/src/Util.cpp interface/src/avatar/MyAvatar.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp libraries/networking/src/NodeList.cpp libraries/shared/src/DependencyManager.h	2015-01-13 11:03:14 -08:00
Atlante45	8415098fc2	Set different caches size depending on cache type	2015-01-12 15:36:36 -08:00
ZappoMan	a0ec2ddfe9	clamp frame index between 0 and 100,000	2014-12-29 21:07:04 -08:00
Atlante45	296c0025de	Switched to auto and changed macro	2014-12-18 15:42:38 -08:00
Atlante45	ce7f72d2cd	Update macro	2014-12-17 15:26:47 -08:00
Atlante45	b2dac6f53f	DM users update	2014-12-16 15:32:11 -08:00
ZappoMan	660bf2720e	convert AnimationCache to DependencyManager	2014-12-15 19:48:15 -08:00
ZappoMan	5c2cc20313	fixes the stutter in animation when observer moves	2014-11-28 17:36:55 -08:00
ZappoMan	ef17659ea2	cleanup	2014-11-12 16:57:42 -08:00
ZappoMan	dd22683672	fixing up animation loop issues	2014-11-12 16:53:16 -08:00
ZappoMan	ba79f40007	add some debug	2014-11-12 16:12:34 -08:00
ZappoMan	6ff8abcbdd	sepearate looping logic from AnimationHandle	2014-11-12 14:47:10 -08:00
ZappoMan	68bd6c23d9	sepearate looping logic from AnimationHandle	2014-11-12 14:47:02 -08:00
ZappoMan	8755e2d42e	CR feedback	2014-07-03 13:38:52 -07:00
ZappoMan	a53d007c33	add support for getting current animation details for running avatar animations	2014-07-03 11:59:18 -07:00
ZappoMan	106c8bffd8	first cut at animations in models	2014-05-09 16:08:06 -07:00