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 |
|
Andrew Meadows
|
c9ba71aa01
|
fix for broken neck on some body models
|
2014-06-10 09:38:38 -07:00 |
|
Andrew Meadows
|
589b2e8fb7
|
recover some code for one less magic vec3
|
2014-06-09 16:12:54 -07:00 |
|
Andrew Meadows
|
e8b6338de9
|
Fix IK for hydra hands.
|
2014-06-09 15:40:29 -07:00 |
|
Andrew Meadows
|
5a76a9b4b1
|
RagDoll keeps a pointer to list of shapes
|
2014-06-09 11:04:20 -07:00 |
|
Andrew Meadows
|
8e536ebd9a
|
Use NULL Shape* for non-colliding joints in Models
|
2014-06-09 09:35:27 -07:00 |
|
Andrew Meadows
|
131a2c27b8
|
move RagDoll to libraries/shared
|
2014-06-06 15:51:50 -07:00 |
|
Andrew Meadows
|
551029c2f5
|
slave SkeletonModel's collision shapes to RagDoll
|
2014-06-06 08:51:22 -07:00 |
|
Andrew Meadows
|
1b2cd2e144
|
adding RagDoll scaffold
|
2014-06-05 11:07:35 -07:00 |
|
Andrew Meadows
|
212ac13802
|
setRotation -> setJointRotationFromBindFrame
|
2014-06-04 14:10:28 -07:00 |
|
Andrew Meadows
|
323fa70cf3
|
remove last of "InModelFrame" qualifiers
|
2014-06-04 14:03:29 -07:00 |
|
Andrew Meadows
|
ccfd620c84
|
setJointPositionInModelFrame -> setJointPosition
|
2014-06-04 13:56:37 -07:00 |
|
Andrew Meadows
|
3af4b1b333
|
getJointPositionInModelFrame -> getJointPosition
|
2014-06-04 13:51:43 -07:00 |
|
Andrew Meadows
|
971268d4f2
|
setRotationInModelFrame -> setRotation
|
2014-06-04 13:46:08 -07:00 |
|
Andrew Meadows
|
b3cabb8156
|
applyRotationDeltaInModelFrame -> applyRotationDelta
|
2014-06-04 13:43:15 -07:00 |
|
Andrew Meadows
|
d8f5e10947
|
getPositionInModelFrame -> getPosition
|
2014-06-04 13:36:54 -07:00 |
|
Andrew Meadows
|
4a3fbfcdee
|
getRotationInModelFrame -> getRotation
|
2014-06-04 13:34:58 -07:00 |
|
Andrew Meadows
|
4ae58153e0
|
computeTransformInModelFrame -> computeTransform
|
2014-06-04 13:31:31 -07:00 |
|
Andrew Meadows
|
d32e14ca04
|
renames of JointState data members
|
2014-06-04 13:27:28 -07:00 |
|
Andrew Meadows
|
19f0f453a5
|
remove JointState::setRotation()
instead use JointState::setRotationInModelFrame()
|
2014-06-04 11:52:07 -07:00 |
|
Andrew Meadows
|
30d936c15b
|
getJointPosition -> getJointPositionInWorldFrame
|
2014-06-04 10:52:10 -07:00 |
|
Andrew Meadows
|
14e782e439
|
remove some JointState::getHybridTransform() calls
|
2014-06-04 10:42:04 -07:00 |
|
Andrew Meadows
|
7f46e9d514
|
remove JointState::getJointRotation()
(use getRotationModelFrame() instead)
|
2014-06-03 15:42:38 -07:00 |
|
Andrew Meadows
|
e7f32c211b
|
remove world-frame hand/palm set methods
|
2014-06-03 14:48:57 -07:00 |
|
Andrew Meadows
|
05af993262
|
Add more model-frame methods
|
2014-06-03 14:24:04 -07:00 |
|
Andrew Meadows
|
03bf1fe69d
|
Add joint manipulations in model-frame
|
2014-06-03 14:04:09 -07:00 |
|
Andrew Meadows
|
f99489c157
|
rolling back previous change for IK instability
|
2014-06-03 10:40:30 -07:00 |
|
Andrew Meadows
|
d7be5faa9d
|
unravel rotation code by giving proper names
The goal is: eliminate dependency on JointState::_combinedRotation
(which is joint-to-world) and store joint-to-model transforms instead
|
2014-06-02 14:43:25 -07:00 |
|
Andrew Meadows
|
9b3773fa3b
|
remove 'fromBind' argument to getJointRotation()
|
2014-06-02 14:20:13 -07:00 |
|
Andrew Meadows
|
a62a270004
|
merge andrew/inertia into andrew/ragdoll
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/renderer/Model.h
|
2014-06-02 11:56:27 -07:00 |
|
Andrew Meadows
|
9e60b758df
|
Made JointState transforms private.
Also changed some function names to be more descriptive.
Using "Hybrid" to describe frame with world-rotation + model-local-origin.
|
2014-06-02 11:34:59 -07:00 |
|
Andrew Meadows
|
8e7daed2b3
|
Merge upsrtream/master into andrew/inertia
Conflicts:
interface/src/renderer/Model.cpp
|
2014-06-02 11:32:23 -07:00 |
|
Andrzej Kapolka
|
164192fb50
|
If the skeleton doesn't have eye joints (as with the Fuse models), make up
some positions based on the head and neck joints.
|
2014-05-30 11:03:46 -07:00 |
|
Andrew Meadows
|
4eb4334ed8
|
replace Model::setJointRotation() with JointState::setRotation()
|
2014-05-30 09:57:32 -07:00 |
|
Andrew Meadows
|
6efa851104
|
minor cleanup + use 'fraction' instead of 'percent'
|
2014-05-29 15:44:27 -07:00 |
|
Andrew Meadows
|
2e99d316ac
|
remove JointState::_translation
(use corresponding data in FBXJoint instead)
|
2014-05-29 12:52:05 -07:00 |
|