Andrew Meadows
46c91052c9
split SkeletonModel and Ragdoll classes apart
2014-08-14 14:29:03 -07:00
Andrew Meadows
ca4a23e532
use "visible joint positions" for MyAvatar only
2014-08-14 09:21:15 -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
Andrew Meadows
8b24e9cd67
Update SkeletonModel::_boundingShape position
2014-06-23 09:39:14 -07:00
Andrew Meadows
b2ea8c0bf9
Compute more correct masses for ragdoll parts
...
also pin root ragdoll shape at the local-frame origin
for stability
2014-06-23 08:37:11 -07:00
Andrew Meadows
c17b8fdb60
collisions update shapes
...
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
2014-06-20 16:31:39 -07:00
Andrew Meadows
4a0ce7a9ae
support disabling collisions btw adjacent joints
2014-06-19 17:39:50 -07:00
Andrew Meadows
fbafcb6fd8
Fix distance constraint lengths
2014-06-19 11:46:09 -07:00
Andrew Meadows
2453e9c36a
build ragdoll constraints again
2014-06-19 10:31:55 -07:00
Andrew Meadows
5e74ee8c05
VerletPoint has position, lastPosition, and mass
2014-06-19 09:54:32 -07:00
Andrew Meadows
10ee307752
merge upstream/master into andrew/ragdoll
2014-06-19 08:35:29 -07:00
David Rowe
afab5f1cbf
Fix startup crash where Hydra controllers are not properly plugged in
...
Crash occurs if the left controller is plugged in but right one isn't.
2014-06-18 20:52:17 -07:00
Andrew Meadows
d4b5550cda
Skeleton now creates VerletShape
2014-06-18 17:22:39 -07:00
Andrew Meadows
9e839f0980
Shape::getCenter() -> Shape::getTranslation()
2014-06-18 08:55:48 -07:00
Andrew Meadows
b9d4545aef
merge upstream/master into andrew/ragdoll
...
Conflicts:
libraries/shared/src/Shape.h
libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
Andrew Meadows
ecbf5043d7
code out of Model into base and derived classes
...
PhysicalEntity (base class) gets some shape management stuff
SkeletonModel (derived class) gets some boundary shape and
joint-shape stuff
2014-06-17 16:22:18 -07:00
Andrew Meadows
118717d96a
Shapes moved from Model into PhysicalEntity
2014-06-16 14:51:58 -07:00
Andrew Meadows
d7a28e1441
enable shape collisions for MyAvatar skeleton
...
also some stubbery for main simulation loop
2014-06-15 18:07:47 -07:00
Andrew Meadows
158c7de76e
Ragdoll not an Entity. SkeletonModel is a Ragdoll
2014-06-13 12:27:58 -07:00
Andrew Meadows
5bd37acdb8
Changed RagDoll to Ragdoll
2014-06-13 11:55:39 -07:00
Andrew Meadows
718b98f70a
Only build shapes for models that need them
2014-06-12 18:15:44 -07:00
Andrew Meadows
e0ebc61b25
merge upstream/master into andrew/ragdoll
2014-06-10 15:26:16 -07:00