Philip Rosedale
01108bdf6b
Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors
...
Synchronize eye joint and debugging vectors
2015-08-17 16:56:01 -07:00
Howard Stearns
d28c555a79
Synchronize eye joint and debugging vectors when the other avatar is looking at me.
2015-08-14 16:47:34 -07:00
Andrew Meadows
488f6aa7d8
fix bug in ElbowConstraint::apply()
2015-08-12 13:34:23 -07:00
Howard Stearns
295d655eec
Merge pull request #5545 from AndrewMeadows/chlorine
...
rotation constraints in preparation for inverse kinematics
2015-08-11 09:19:16 -07:00
Andrew Meadows
8e82e48f76
remove more std::max/min favor of glm utilities
2015-08-11 08:17:54 -07:00
Andrew Meadows
a38c1c82d1
use glm::clamp() instead if std::max() and min()
2015-08-10 23:08:36 -07:00
Andrew Meadows
80b36f9f12
fix typo
2015-08-10 15:11:00 -07:00
Seth Alves
b26d6d2b9c
Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization
...
Renderable model entity item optimizations
2015-08-10 15:10:12 -07:00
Andrew Meadows
43bf4a85d2
add RotationConstraint and friends
2015-08-10 14:48:22 -07:00
Howard Stearns
964d04d24f
Restore correct space for eye joint rotations.
...
Also, do not correct for camera position on my avatar. (That will be done by zero or one receivers.)
2015-08-10 12:34:01 -07:00
ZappoMan
ae958dd42d
Merge branch 'master' of https://github.com/highfidelity/hifi into RenderableModelEntityItemOptimization
2015-08-10 09:59:45 -07:00
ZappoMan
668778cfd9
optimize JointState::setRotationInConstrainedFrameInternal() to short cut cases where targetRotation matches previous targetRotation
2015-08-09 16:55:43 -07:00
Brad Davis
64fcd2da96
Merge pull request #5530 from ZappoMan/RenderableModelEntityItemOptimization
...
optimizations to RenderableModelEntityItem::render()
2015-08-07 15:32:07 -07:00
Seth Alves
b1e69537f3
Merge pull request #5524 from howard-stearns/cleanup-jointstate
...
Clean Up JointState
2015-08-07 13:50:02 -07:00
ZappoMan
cec0f8ed1d
optimize ModelEntityItem::getAnimationFrame()
2015-08-07 13:43:57 -07:00
Howard Stearns
145b730f80
Clean up instantiation.
2015-08-07 12:27:26 -07:00
Howard Stearns
a840a17106
Change name originalRotation defaultRotation.
2015-08-06 19:45:58 -07:00
Howard Stearns
42cc34cd64
JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx.
2015-08-06 16:54:09 -07:00
Howard Stearns
02f57286e4
Don't let individual startAnimation get messed up by blend/fade.
2015-08-06 11:30:18 -07:00
Howard Stearns
bb974edf7f
Add assert on mix range.
2015-08-05 11:09:04 -07:00
Howard Stearns
f51b5be167
Simplify fade normalization, eliminating a loop.
2015-08-05 11:00:40 -07:00
Howard Stearns
653e46fdd3
const methods.
2015-08-05 10:51:26 -07:00
Howard Stearns
2f2b59b6b6
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
2015-08-05 10:05:05 -07:00
Howard Stearns
a1f86cc7b8
Make MSVC happy.
2015-08-04 19:49:12 -07:00
Howard Stearns
731bcba956
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
2015-08-04 17:27:23 -07:00
Howard Stearns
61198a658c
Smooth fading of animations in and out.
...
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
2015-08-04 17:04:15 -07:00
Seth Alves
9171033f21
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-08-04 16:06:38 -07:00
Eric Levin
f506e58687
Merge pull request #5490 from howard-stearns/restart-animations-at-specified-parameters
...
restart animations at specified parameters
2015-08-04 15:09:11 -07:00
Howard Stearns
61afc362e7
For startAnimation (but not startAnimationByRole), use the specified parameters even if the animation
...
was already playing. This fixes the behavior exercised by the squeezeHands.js script.
Fixes https://app.asana.com/0/32622044445063/44025709513292
2015-08-03 17:00:39 -07:00
Howard Stearns
2e5142e9bb
Fix end of idle.
2015-08-03 16:09:48 -07:00
Howard Stearns
cdb697760f
Remove some debug.
2015-08-03 15:51:07 -07:00
Howard Stearns
4c1d1a65d5
Provide initial fight club animations and use them in rig.
...
Still only active when you do Settings.setValue('enableRig', true) and restart.
(Will be more exposed after fadein/fadeout is implemented.)
2015-08-03 15:41:15 -07:00
Seth Alves
241e767ab6
move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders
2015-07-30 18:44:09 -07:00
Seth Alves
c80516a051
Merge branch 'rig' of github.com:howard-stearns/hifi into rig
2015-07-30 18:39:09 -07:00
Seth Alves
c1f777e18f
move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders
2015-07-30 18:39:01 -07:00
Howard Stearns
78a900c866
Prototype blend. Just equal weighting for now.
2015-07-30 17:01:48 -07:00
Anthony J. Thibault
7a10b31dd9
Clear translation on root joint.
...
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
2015-07-30 15:04:27 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Anthony J. Thibault
4bb415fd0d
Fix for torso twist.
...
Off by one error, 0 is a valid parent bone index.
2015-07-30 09:31:23 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Howard Stearns
dc34c025bd
whitespace
2015-07-29 18:54:05 -07:00
Anthony J. Thibault
c2934bdb5d
Fix avatar head, eye and torso twist.
...
* Updated SkeletionModel::updateRig to explicitly pass a set of HeadParameters
to the rig to do procedural animation.
* Moved torso lean procedural animation from SkeletonModel into Rig.
* Moved eye tracking procedural animation from HeadModel into Rig.
* Moved neck procedural animation from HeadModel into Rig.
2015-07-29 17:35:29 -07:00
Howard Stearns
a9f76324b5
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2
2015-07-29 10:49:27 -07:00
Anthony J. Thibault
b06485c266
Remove cauterize code from Rig and move it back into Model.
...
* cauterize code is used as at render time and is not dependent on
the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
makes the decision to perform cauterization or not in preRender.
2015-07-28 17:45:33 -07:00
Howard Stearns
4754615159
Fix NPC animations.
2015-07-28 12:34:10 -07:00
Seth Alves
6e5aca6da4
merge from upstream
2015-07-27 16:52:36 -07:00
Howard Stearns
1bb734aec0
Kill warnings.
2015-07-27 15:26:03 -07:00
Howard Stearns
146ddd2240
Cleanup false starts.
2015-07-27 13:42:18 -07:00
Howard Stearns
990f0d6d07
Pass correct position/velocity/orientation to Rig simulation.
2015-07-27 12:57:39 -07:00
Seth Alves
a3c6a4b9bc
merge from upstream
2015-07-27 09:29:18 -07:00
