Andrew Meadows
1b778603c8
fix for crash in SkeletonModel::updateStandingFoot()
2014-11-20 14:21:08 -08:00
Atlante45
4d5451fafe
Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/SkeletonModel.cpp
2014-11-19 17:28:24 -08:00
Atlante45
ae3bcc8f06
No more .f
2014-11-19 16:53:39 -08:00
Andrew Meadows
6673d9d0c2
avatar stands on lowest toe
2014-11-19 09:13:24 -08:00
Andrzej Kapolka
14eb87aefd
Eliminate wacky scales in favor of newfangled "meters."
2014-11-14 12:23:47 -08:00
Andrew Meadows
4c3cdf5b7a
move stuff out of shared and into physics library
2014-10-28 13:51:45 -07:00
Andrew Meadows
c1728c0296
Merge upstream/master into andrew/experimental
2014-10-27 10:08:48 -07:00
Sam Gateau
4f26c9e0fa
fix formatting and syntax issues
2014-10-06 11:06:23 -07:00
Andrew Meadows
01a3eaa26b
added experimental MyAvatar.setSkeletonOffset()
...
for improved walk animations
2014-10-05 19:10:55 -07:00
Sam Gateau
738369e21f
Replacing glutSolidSphere by a cached Geometry
...
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)
- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using fOuterRadius
2014-10-03 16:55:58 -07:00
David Rowe
dbf6daf80c
Fix default eye model calculation to be reliable
2014-09-27 11:25:37 -07:00
David Rowe
c0419c61f4
Fix missing constructor initialization
2014-09-26 09:15:17 -07:00
David Rowe
aa9511c263
Position Rift camera at avatar model's mid-eye location
2014-09-25 22:49:12 -07:00
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
