Andrzej Kapolka
498f9e73ac
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2014-05-14 10:23:44 -07:00
Andrew Meadows
498f2843b0
Fix for bad hand rotations
2014-05-14 09:06:46 -07:00
Andrzej Kapolka
eceb600de7
More work on PrioVR integration.
2014-05-13 14:44:24 -07:00
Andrzej Kapolka
0321821b55
More work on PrioVR integration.
2014-05-13 11:38:24 -07:00
Andrew Meadows
cea472b730
remove the last of Leap specific cruft
2014-05-12 11:48:56 -07:00
Andrew Meadows
49dedb72c9
remove FingerData class and related cleanup
2014-05-12 11:09:12 -07:00
Philip Rosedale
2c6c57eec2
increase hand restoration rate, improve function name clarity
2014-05-08 00:28:02 -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
141250d51c
Don't constrain elbow when rotating forearm with wrist.
2014-04-23 12:22:24 -07:00
Andrzej Kapolka
0386dec2a6
Provide option to align wrists with forearms.
2014-04-23 12:09:54 -07:00
Andrzej Kapolka
511fc8367f
More work on IK.
2014-04-23 11:34:34 -07:00
Andrzej Kapolka
f7bc1ae62c
Working on integrating rotation into IK.
2014-04-23 10:47:24 -07:00
Andrzej Kapolka
6add0dfb42
Tweaked Hydra "IK" to propagate delta rotations up the hierarchy while
...
preserving joint constraints.
2014-04-18 15:04:42 -07:00
Andrzej Kapolka
30248747d6
Provide a means of visualizing the joint constraints.
2014-04-18 14:26:34 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Andrew Meadows
715f2c53d5
merge upstream/master into avatar-interaction
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:28:22 -07:00
Andrew Meadows
933cade6b0
Re-add fullUpdate hint to Model::simulate()
2014-04-02 16:34:33 -07:00
Andrew Meadows
97ba5250a5
Only simulate() Avatar Models when necessary
...
Also: rebuild collision shapes when Model scale changes
2014-04-02 12:01:18 -07:00
Andrzej Kapolka
865ca7de20
Align forearms with wrists. Closes #2577 .
2014-04-01 16:01:29 -07:00
Andrew Meadows
b65855a384
merge upstream/master into avatar-interaction
2014-04-01 12:53:47 -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
5406490719
rename _shapes -> _jointShapes
...
also stubbed Model::createBoundingShape()
2014-03-28 11:00:30 -07:00
Stephen Birarda
3c8aa90ae0
Merge pull request #2559 from AndrewMeadows/avatar-interaction-2
...
split lean input from lean perturbations
2014-03-28 09:25:36 -07:00
Andrew Meadows
796d20168e
splitting lean input from lean perturbations
2014-03-27 15:30:30 -07:00
Andrew Meadows
c383b69b61
merge upstream/master into enforce-standard
...
Conflicts:
interface/src/avatar/Hand.cpp
2014-03-27 10:53:54 -07:00
Andrew Meadows
4c64c11144
making some type casts abide by coding standard
2014-03-26 16:58:47 -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
9079c3ecd8
explicit casts to remove warnings
2014-03-18 10:41:14 -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
cd7da205de
improved index sanity checking
2014-03-12 15:49:46 -07:00
Andrzej Kapolka
f088912ecf
More GCC warning fixes.
2014-03-12 12:51:43 -07:00
Andrzej Kapolka
e249b29b45
Merge pull request #2268 from AndrewMeadows/radians
...
prefer radians over degrees
2014-03-12 12:10:29 -07:00
Andrew Meadows
aa8c2fc8cb
use radians instead of degrees (almost) everywhere
2014-03-11 17:26:58 -07:00
Andrzej Kapolka
35d0fa7189
Don't render avatars until they've been simulated, init before first simulate.
...
Closes #2262 .
2014-03-11 13:46:58 -07:00
Andrew Meadows
47e340dafe
Merge upstream/master
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-03-07 09:16:33 -08:00
Andrzej Kapolka
3adea84b81
Basic joint data sending. Closes #2166 .
2014-03-06 17:07:29 -08:00
Andrew Meadows
37b088ebfa
Hands can collide with avatar head again
2014-03-06 12:38:07 -08:00
Stephen Birarda
90d4bbee78
Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm
2014-03-06 09:16:22 -08:00
Andrew Meadows
7db5aaaf37
new collision pipeline for avatar shapes
2014-03-05 07:08:59 -08:00
Stephen Birarda
7451cfe130
remove glm so it is referenced only externally
2014-03-04 15:19:47 -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
4010f3ab3f
Remove Avatar::_head, use AvatarData::_headData
2014-02-18 17:41:46 -08:00
Andrew Meadows
c134b8de5b
Remove Avatar::_hand, use AvatarData::_handData
2014-02-18 17:08:12 -08:00
Andrzej Kapolka
91fac4eebe
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 17:38:23 -08:00
Andrzej Kapolka
b08d452749
Fix for head appearing at wrong position for a single frame.
2014-02-13 16:49:42 -08:00
