1158 commits

Author	SHA1	Message	Date
amantley	12dbaa0ea0	changed the condition so that you can turn off ik in hmd mode if you want to for debug purposes	2019-02-25 14:56:17 -08:00
amantley	363c0cc26f	moved the update of last ik to outside the if changed statement	2019-02-25 13:03:28 -08:00
amantley	cff0fd470a	re-enabled ik off by default on Desktop	2019-02-25 12:23:03 -08:00
Anthony Thibault	8785f733db	Merge pull request #14817 from amantley/animSplineIK ... AnimSplineIK node added to inverse kinematics	2019-02-21 17:13:41 -08:00
Anthony Thibault	e54754c4ce	Merge pull request #14926 from luiscuenca/flowCpp ... Cpp implementation of the Flow script	2019-02-21 17:10:05 -08:00
luiscuenca	dcbf57ee0b	Fix linux warning and HMD breaks flow	2019-02-21 16:41:24 -07:00
amantley	c9db426ce4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-21 14:36:13 -08:00
amantley	6323f49f26	changed the define variable to HIFI_USE_OPTIMIZED_IK	2019-02-21 14:36:05 -08:00
amantley	0bdc527ce7	turned off pole vector when hand behind back	2019-02-21 13:14:51 -08:00
amantley	afed0b5442	review changes	2019-02-21 11:08:29 -08:00
luiscuenca	ec4d069011	Allow threads with only one joint, remove dummy joints and unused constants	2019-02-21 12:00:19 -07:00
amantley	33fd64c68c	direction on compare in positional theta function	2019-02-21 09:00:23 -08:00
amantley	f8a74efdc2	fixed build errors from jenkins	2019-02-20 17:59:45 -08:00
amantley	97da20781e	removed whitespace	2019-02-20 15:19:36 -08:00
amantley	27bfe2f0fe	changed name of pre processor variable	2019-02-20 15:14:12 -08:00
amantley	95b3fbdc35	removed ulnar coeff, too jumpy	2019-02-20 15:02:12 -08:00
John Conklin II	87556059d3	Merge pull request #13901 from Cristo86/android_handshake ... case 20058: Android - Handshake implementation	2019-02-20 13:33:52 -08:00
luiscuenca	bea7680864	Fix shared_ptr not part of std error	2019-02-20 10:57:11 -07:00
luiscuenca	fa44687de6	fix errors and remove debug draw	2019-02-20 09:22:39 -07:00
Angus Antley	7639eac3ad	cleaning up theta functions	2019-02-20 07:18:14 -08:00
Angus Antley	1e73422b80	added the wrist and position coeffs back in, 1.0 works	2019-02-20 06:25:44 -08:00
amantley	951380db15	tweaked the constraints, to do: start conditions and possibly using base rotation on shoulder to determine hand offset	2019-02-19 17:53:59 -08:00
luiscuenca	04e57d0dd1	No Rig pointer on Flow class, solve network animations and fixed bug	2019-02-19 17:45:46 -07:00
Angus Antley	f2301e7dac	fixed relative wrist correction problem	2019-02-19 07:35:13 -08:00
Angus Antley	748368bfda	mid tweak on the wrist and position coeffs	2019-02-17 23:32:52 -08:00
Angus Antley	e1dfd7d288	cleanup white space	2019-02-16 23:40:16 -08:00
Angus Antley	0982c37c5e	took out the theta animvar and just use theta converted to pole vector	2019-02-16 14:50:47 -08:00
Angus Antley	70764bc3c4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-15 19:24:30 -08:00
amantley	d78f253d24	code to generate pole vector from theta	2019-02-15 17:43:53 -08:00
amantley	95530e6ba5	removed the unnecessary animArmIK.h and .cpp	2019-02-15 15:41:23 -08:00
amantley	36093926d0	added fake android defines for running the new ik on pc	2019-02-15 15:00:39 -08:00
amantley	3f9b761e42	updating the android only if defs	2019-02-15 14:05:42 -08:00
luiscuenca	b670f72e84	fix warning on linux	2019-02-15 12:35:17 -07:00
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
amantley	7119bc5972	reverted the scale optimization in animspline.cpp	2019-02-15 10:54:02 -08:00
amantley	0fcaa695ba	Merge remote-tracking branch 'upstream/master' into animArmIK	2019-02-15 10:35:33 -08:00
amantley	d6dfaacf6f	adding ifdef for android os	2019-02-15 10:35:25 -08:00
luiscuenca	98c321c718	Fix warnings	2019-02-15 09:40:49 -07:00
amantley	425413419a	fixed merge conflict in avatar.h	2019-02-15 08:26:54 -08:00
Angus Antley	07af2c525e	tweaked ulnar radial limit and extend limit	2019-02-15 07:31:28 -08:00
Angus Antley	382a03929e	changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint	2019-02-15 07:06:43 -08:00
Angus Antley	f8554d10a8	starting cleanup	2019-02-14 23:45:45 -08:00
amantley	40196dcb40	wrist action works in rig now	2019-02-14 18:17:31 -08:00
amantley	5c26bbec5c	moving the theta calculation to rig	2019-02-14 18:06:20 -08:00
luiscuenca	624a53449f	Merge branch 'master' into flowCpp ... # Solved Conflicts: # interface/src/avatar/MyAvatar.cpp	2019-02-14 18:55:43 -07:00
luiscuenca	3e66bce112	set useFlow function	2019-02-14 18:30:37 -07:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
Anthony Thibault	f0e163b4df	Revert "AnimPose::inverse() optimization" ... This reverts commit 5c7e81584c.	2019-02-14 16:10:26 -08:00
Angus Antley	1924018d2c	added code to convert theta to a projected pole vector	2019-02-14 07:15:58 -08:00
Angus Antley	aa0c52abd7	fixed wrap around 180 degrees	2019-02-13 18:33:01 -08:00