History

Fix for model offset when using Rig Animations.

Anthony J. Thibault committed 11 years ago

Commit c0be32d1 parent fc7b6de3 files · +9 −6Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 3 files). Show all

Unified · Split

interface/src/avatar/SkeletonModel.cpp+4−1
@@ -247,7 +247,10 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { · 246 unmodified lines
247 hand->getLeftRightPalmIndices(leftPalmIndex, rightPalmIndex);247 hand->getLeftRightPalmIndices(leftPalmIndex, rightPalmIndex);
248 248
249 // let rig compute the model offset249 // let rig compute the model offset
250 setOffset(_rig->getModelOffset());250 glm::vec3 modelOffset;
251 if (_rig->getModelOffset(modelOffset)) {
252 setOffset(modelOffset);
253 }
251 254
252 // Don't Relax toward hand positions when in animGraph mode.255 // Don't Relax toward hand positions when in animGraph mode.
253 if (!_rig->getEnableAnimGraph()) {256 if (!_rig->getEnableAnimGraph()) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t