Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 4 files). Show all
Unified · Split
| @@ -40,13 +40,14 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent) : · 39 unmodified lines | |||
| 40 | _clampedFootPosition(0.0f), | 40 | _clampedFootPosition(0.0f), |
| 41 | _headClipDistance(DEFAULT_NEAR_CLIP) | 41 | _headClipDistance(DEFAULT_NEAR_CLIP) |
| 42 | { | 42 | { |
| 43 | assert(_owningAvatar); | ||
| 43 | } | 44 | } |
| 44 | 45 | ||
| 45 | SkeletonModel::~SkeletonModel() { | 46 | SkeletonModel::~SkeletonModel() { |
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | void SkeletonModel::setJointStates(QVector<JointState> states) { | 49 | void SkeletonModel::initJointStates(QVector<JointState> states) { |
| 49 | Model::setJointStates(states); | 50 | Model::initJointStates(states); |
| 50 | 51 | ||
| 51 | // Determine the default eye position for avatar scale = 1.0 | 52 | // Determine the default eye position for avatar scale = 1.0 |
| 52 | int headJointIndex = _geometry->getFBXGeometry().headJointIndex; | 53 | int headJointIndex = _geometry->getFBXGeometry().headJointIndex; |