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
42 42
43void SkeletonModel::initJointStates() {43void SkeletonModel::initJointStates() {
44 const FBXGeometry& geometry = _geometry->getFBXGeometry();44 const FBXGeometry& geometry = _geometry->getFBXGeometry();
45 glm::mat4 geometryOffset = geometry.offset;
46 glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);45 glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
47 _rig->initJointStates(geometry, modelOffset);46 _rig->initJointStates(geometry, modelOffset);
48 47
@@ -237,11 +236,6 @@ void SkeletonModel::applyPalmData(int jointIndex, const PalmData& palm) { · 188 unmodified lines
237 if (parentJointIndex == -1) {236 if (parentJointIndex == -1) {
238 return;237 return;
239 }238 }
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();
245}239}
246 240
247bool SkeletonModel::getLeftHandPosition(glm::vec3& position) const {241bool SkeletonModel::getLeftHandPosition(glm::vec3& position) const {