Commit graph

224 commits

Author SHA1 Message Date
David Rowe
f95e20153c Fix upright head model position calculation for avatar scale changes 2014-09-22 15:13:08 -07:00
David Rowe
a11bf7f15b Decouple Rift head tracking from avatar's head position
This makes the Rift's view reflect the user's physical movements exactly
while the avatar follows the movements as best it can.
2014-09-22 11:02:12 -07:00
Andrzej Kapolka
4a2e68fea4 Fix for eyes on skeleton (e.g., Mixamo) models. 2014-09-17 15:36:22 -07:00
Andrzej Kapolka
df192e297c Apply blendshapes to skeleton as well as head. 2014-09-11 14:01:11 -07:00
Andrew Meadows
1e19566e93 fix for bad avatar bounding shape on resize 2014-09-04 09:53:07 -07:00
Andrzej Kapolka
e29a4e7683 Merge pull request #3312 from AndrewMeadows/ragdoll
use dispatchTable for shape-vs-shape collision queries
2014-08-25 15:43:48 -07:00
Andrew Meadows
3ebd8c1969 use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
Andrew Meadows
7e4c72445e JS scripts set joint animation priorities 2014-08-20 17:14:59 -07:00
Andrew Meadows
a01d3781d9 simplified SkeletonModel::maybeUpdateLeanRotation() 2014-08-20 12:48:52 -07:00
Andrew Meadows
f511fe2657 Ragdoll cannot assume skeleton's rootIndex is 0
some Models have extra "joints" not part of the normal skeleton
2014-08-19 11:31:50 -07:00
Atlante45
6d567e67a9 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 15:41:19 -07:00
Atlante45
1d30b52ec2 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 14:23:40 -07:00
Andrew Meadows
c2f4648ad7 Merge branch 'ragdoll' of ssh://github.com/AndrewMeadows/hifi into ragdoll 2014-08-18 12:55:10 -07:00
Andrew Meadows
7e7978de1a compute and store Ragdoll::_accumulatedMovement 2014-08-18 12:53:04 -07:00
Andrew Meadows
77047b0130 no NULL check on delete SkeletonModel::_ragdoll 2014-08-18 11:25:51 -07:00
Atlante45
9e5b68fa9d Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 15:38:03 -07:00
Andrew Meadows
60d411ead5 cleanup Ragdoll API (less "ragdoll" qualifiers) 2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9 split SkeletonModel and Ragdoll classes apart 2014-08-14 14:29:03 -07:00
Atlante45
2981132395 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-14 11:39:44 -07:00
Andrew Meadows
ca4a23e532 use "visible joint positions" for MyAvatar only 2014-08-14 09:21:15 -07:00
Atlante45
73a3a13c59 More recording work 2014-08-12 18:15:48 -07:00
Andrew Meadows
2286eae64a head connects to neck during ragdoll simulation 2014-08-08 10:53:38 -07:00
Andrew Meadows
05318acc7f don't make shapes for joints with zero radius 2014-08-08 08:37:28 -07:00
Andrew Meadows
9a55252587 remove extraneous roots from Model::_jointStates 2014-08-07 17:02:28 -07:00
Andrew Meadows
94da63006c VerletPoint::_mass is now private
We set the mass of other avatars artificially high
so they are less movable.
2014-08-07 14:35:32 -07:00
Andrew Meadows
87350ad2d0 ragdoll simulation now in model-relative frame
(same rotation as world-frame, but translated to MyAvatar origin)
2014-08-07 11:45:06 -07:00
Andrew Meadows
3305f5edf9 merge upstream/master into andrew/ragdoll 2014-08-01 11:13:18 -07:00
Andrew Meadows
34628aef3b separate muscle constraints from joint constraints 2014-07-29 16:47:54 -07:00
Atlante45
fb670275c2 Don't recompute unchaged transform 2014-07-28 16:42:16 -07:00
Andrew Meadows
b8b1df5799 MuscleConstraints for ragdoll; velocity for verlet points 2014-07-25 15:24:44 -07:00
Andrew Meadows
2ddca4fbf9 split independent classes out of Ragdoll files 2014-07-24 09:50:16 -07:00
Andrew Meadows
1d124ebc61 fix comments 2014-07-24 08:49:41 -07:00
Andrew Meadows
559188cace parent-relative linear slaving of verlet shapes 2014-07-23 17:00:17 -07:00
Andrew Meadows
783cde7376 minor tweak to rate at which ragdoll shapes follow joints 2014-07-17 10:51:17 -07:00
Andrew Meadows
3ad4a2e170 more stability when fingers follow ragdoll 2014-07-16 09:32:46 -07:00
Andrew Meadows
0667cb6e5f add constraints between child joints of same parent 2014-07-16 08:54:28 -07:00
Andrew Meadows
b8fb5e0298 namechange FromBindFrame ==> InBindFrame 2014-07-14 15:33:05 -07:00
Andrew Meadows
00544aa975 add JointState::_positionInParentFrame 2014-07-14 15:18:34 -07:00
Andrew Meadows
7e4efa6c73 Skeleton gets custom update for visible transforms 2014-07-10 16:21:12 -07:00
Andrew Meadows
8fa7bf4fa0 rename: ParentFrame --> ConstrainedFrame 2014-07-09 16:43:46 -07:00
Andrew Meadows
6e5d77f0fc merge upstream/master into andrew/ragdoll
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
2014-07-02 09:41:13 -07:00
Andrew Meadows
49d54dd6f0 Add Model::inverseKinematics() for stable hand IK
(removed constraint enforcement which was causing problems,
will add that back later)
2014-07-02 09:33:51 -07:00
Andrew Meadows
57c17eb972 remove unecessary clearRagdollConstraintsAndPoints() 2014-06-30 09:18:31 -07:00
Andrew Meadows
f33728b615 guarantee that ragdoll is clear before initialized 2014-06-30 09:13:42 -07:00
Andrew Meadows
0d18f2fbab fix for avatar models with multiple roots 2014-06-26 09:12:44 -07:00
Andrew Meadows
c12c869cdf add "visible" transforms to JointState
also stubbery for using them in Model and SkeletonModel
2014-06-25 18:06:56 -07:00
Andrew Meadows
1b24a111fe JointState::_rotationInParentFrame is now private 2014-06-25 09:56:18 -07:00
Andrew Meadows
b5aca45ab6 smaller timescale for slaving shapes to skeleton 2014-06-23 12:59:38 -07:00
Andrew Meadows
9713e3d513 remove some unused var warnings in Release build 2014-06-23 12:30:53 -07:00
Andrew Meadows
8ad2a679c4 move code to SkeletonModel::stepRagdollForward() 2014-06-23 11:16:18 -07:00