Andrew Meadows
a01d3781d9
simplified SkeletonModel::maybeUpdateLeanRotation()
2014-08-20 12:48:52 -07:00
Andrew Meadows
46c91052c9
split SkeletonModel and Ragdoll classes apart
2014-08-14 14:29:03 -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
b8b1df5799
MuscleConstraints for ragdoll; velocity for verlet points
2014-07-25 15:24:44 -07:00
TonyPeng
56eadcb0dc
Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays.
2014-07-09 12:05:34 -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
415dfd98aa
remove one line of cuft
2014-06-23 13:40:50 -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
2453e9c36a
build ragdoll constraints again
2014-06-19 10:31:55 -07:00
Andrew Meadows
d4b5550cda
Skeleton now creates VerletShape
2014-06-18 17:22:39 -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
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
c9ba71aa01
fix for broken neck on some body models
2014-06-10 09:38:38 -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
323fa70cf3
remove last of "InModelFrame" qualifiers
2014-06-04 14:03:29 -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
6efa851104
minor cleanup + use 'fraction' instead of 'percent'
2014-05-29 15:44:27 -07:00
Andrew Meadows
a898fcbf75
move details of getJointRotation() into JointState
...
also: remove unused getLeft/RightHandRotation() methods
2014-05-29 11:43:25 -07:00
Andrew Meadows
ae3b792a35
move face/head code from Model into SkeletonModel
2014-05-27 15:28:41 -07:00
Andrew Meadows
6efa417742
move hand/arm stuff from Model to SkeletonModel
2014-05-27 15:06:50 -07:00
Andrzej Kapolka
8388255542
Working on alternate IK mode.
2014-05-14 15:29:16 -07:00
Andrew Meadows
498f2843b0
Fix for bad hand rotations
2014-05-14 09:06:46 -07:00
Andrzej Kapolka
963434f784
Try using the head neck/eye rotation updates on the skeleton.
2014-05-02 11:04:52 -07:00
Andrzej Kapolka
30248747d6
Provide a means of visualizing the joint constraints.
2014-04-18 14:26:34 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -07:00
Andrew Meadows
933cade6b0
Re-add fullUpdate hint to Model::simulate()
2014-04-02 16:34:33 -07:00
Andrew Meadows
1bbdc9d78b
Adding bounding capsule shape for Model
...
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
2014-04-01 09:25:25 -07:00
Andrew Meadows
9a4db152ff
avatar responds to hand-vs-head collisions again
2014-03-26 13:20:18 -07:00
Andrew Meadows
fff7a36b54
merge upstream/master into physics project
...
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/avatar/Hand.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/renderer/Model.h
2014-03-25 15:55:26 -07:00
Andrzej Kapolka
62884f1f4f
Don't use textures/fancy shaders when rendering shadow map. Closes #2270 .
2014-03-24 13:15:03 -07:00
Andrew Meadows
02c58447df
merge upstream/master into "shapes" project
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
libraries/avatars/src/HandData.h
libraries/shared/src/SharedUtil.h
2014-03-18 12:41:20 -07:00
Andrew Meadows
d4c7e25f8e
Merge branch upstream/master into "hands" project
2014-03-14 14:28:50 -07:00
Andrew Meadows
a045a87cca
Remove arm stretching, add sixense calibration
2014-03-14 11:11:00 -07:00
Andrzej Kapolka
43feef3ebd
Only update the full set of joints when we've received new data from the
...
mixer. Closes #2274 .
2014-03-13 12:03:02 -07:00
Andrew Meadows
37b088ebfa
Hands can collide with avatar head again
2014-03-06 12:38:07 -08:00
Andrew Meadows
7db5aaaf37
new collision pipeline for avatar shapes
2014-03-05 07:08:59 -08:00
Andrzej Kapolka
cd2bd32210
Delay loading models until we know that we need them (i.e., that we're not
...
beyond billboard distance). Closes #2121 .
2014-02-27 12:30:46 -08:00
Andrew Meadows
32f3621855
merge upstream work into local repo
2014-01-15 14:13:48 -08:00
Andrew Meadows
22679687c5
Minor cleanup: moved #include out of header and into cpp file.
2014-01-14 16:17:37 -08:00
Andrzej Kapolka
5d88953f12
First cut at stretching the arms out and aligning forearms with wrists.
...
Closes #1423 , #1504 .
2014-01-14 15:27:28 -08:00
Andrzej Kapolka
0461335887
Align hand with forearm in mouse-pointing mode.
2014-01-02 14:56:29 -08:00
Andrzej Kapolka
a29dfe9c63
Yet another finger attempt.
2013-11-07 16:14:23 -08:00
Andrzej Kapolka
c3049d4378
Another shot at the fingers. Not attempting IK on the anymore.
2013-11-07 14:25:01 -08:00