History

Avatar Warning fixes on linux

Anthony J. Thibault committed 10 years ago

Commit 99065f11 parent 45592723 files · +4 −8Browse files

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

Unified · Split

interface/src/avatar/SkeletonModel.cpp+0−6
@@ -42,7 +42,6 @@ SkeletonModel::~SkeletonModel() { · 41 unmodified lines
4242
4343 void SkeletonModel::initJointStates() {
4444 const FBXGeometry& geometry = _geometry->getFBXGeometry();
45− glm::mat4 geometryOffset = geometry.offset;
4645 glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
4746 _rig->initJointStates(geometry, modelOffset);
4847
@@ -237,11 +236,6 @@ void SkeletonModel::applyPalmData(int jointIndex, const PalmData& palm) { · 188 unmodified lines
237236 if (parentJointIndex == -1) {
238237 return;
239238 }
240−
241− // the palm's position must be transformed into the model-frame
242− glm::quat inverseRotation = glm::inverse(_rotation);
243− glm::vec3 palmPosition = inverseRotation * (palm.getPosition() - _translation);
244− glm::quat palmRotation = inverseRotation * palm.getRotation();
245239 }
246240
247241 bool SkeletonModel::getLeftHandPosition(glm::vec3& position) const {