get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes

Seth Alves committed 11 years ago

Commit 33c97a11 parent 4566d169 files · +137 −140Browse files

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

Unified · Split

interface/src/avatar/SkeletonModel.cpp+32−58

     _standingFoot(NO_FOOT),
     _standingOffset(0.0f),
     _clampedFootPosition(0.0f),
-    _headClipDistance(DEFAULT_NEAR_CLIP),
+    _headClipDistance(DEFAULT_NEAR_CLIP)
-    _isFirstPerson(false)
 {
     assert(_rig);
     assert(_owningAvatar);
 void SkeletonModel::initJointStates(QVector<JointState> states) {
     const FBXGeometry& geometry = _geometry->getFBXGeometry();
     glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset) * geometry.offset;
-    _boundingRadius = _rig->initJointStates(states, parentTransform);
+    _boundingRadius = _rig->initJointStates(states, parentTransform, geometry.neckJointIndex);
     // Determine the default eye position for avatar scale = 1.0
     int headJointIndex = _geometry->getFBXGeometry().headJointIndex;
 const float PALM_PRIORITY = DEFAULT_PRIORITY;
 const float LEAN_PRIORITY = DEFAULT_PRIORITY;
+void SkeletonModel::updateClusterMatrices() {
+    const FBXGeometry& geometry = _geometry->getFBXGeometry();
+    glm::mat4 modelToWorld = glm::mat4_cast(_rotation);
+    for (int i = 0; i < _meshStates.size(); i++) {
+        MeshState& state = _meshStates[i];
+        const FBXMesh& mesh = geometry.meshes.at(i);
+        if (_showTrueJointTransforms) {
+            for (int j = 0; j < mesh.clusters.size(); j++) {
+                const FBXCluster& cluster = mesh.clusters.at(j);
+                state.clusterMatrices[j] =
+                    modelToWorld * _rig->getJointTransform(cluster.jointIndex) * cluster.inverseBindMatrix;
+            }
+        } else {
+            for (int j = 0; j < mesh.clusters.size(); j++) {
+                const FBXCluster& cluster = mesh.clusters.at(j);
+                state.clusterMatrices[j] =
+                    modelToWorld * _rig->getJointVisibleTransform(cluster.jointIndex) * cluster.inverseBindMatrix;
+            }
+        }
+    }
+}
 void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
     setTranslation(_owningAvatar->getSkeletonPosition());
     static const glm::quat refOrientation = glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f));
         }
     }
-    if (_isFirstPerson) {
+    // if (_isFirstPerson) {
-        cauterizeHead();
+    //     cauterizeHead();
+    //     updateClusterMatrices();
+    // }
+    if (_rig->getJointsAreDirty()) {
         updateClusterMatrices();
     }
         // geometry or joints have not yet been created
         return;
     }
     const FBXGeometry& geometry = _geometry->getFBXGeometry();
     if (geometry.joints.isEmpty()) {
         return;
     // draw a green cylinder between the two points
     glm::vec3 origin(0.0f);
     Avatar::renderJointConnectingCone(batch, origin, axis, _boundingShape.getRadius(), _boundingShape.getRadius(),
                                       glm::vec4(0.6f, 0.8f, 0.6f, alpha));
 }
     return isActive() ? _geometry->getFBXGeometry().rootJointIndex != -1 : false;
 }
-void SkeletonModel::initHeadBones() {
-    _headBones.clear();
-    const FBXGeometry& fbxGeometry = _geometry->getFBXGeometry();
-    const int neckJointIndex = fbxGeometry.neckJointIndex;
-    std::queue<int> q;
-    q.push(neckJointIndex);
-    _headBones.push_back(neckJointIndex);
-    // fbxJoints only hold links to parents not children, so we have to do a bit of extra work here.
-    while (q.size() > 0) {
-        int jointIndex = q.front();
-        for (int i = 0; i < fbxGeometry.joints.size(); i++) {
-            const FBXJoint& fbxJoint = fbxGeometry.joints[i];
-            if (jointIndex == fbxJoint.parentIndex) {
-                _headBones.push_back(i);
-                q.push(i);
-            }
-        }
-        q.pop();
-    }
-}
-void SkeletonModel::invalidateHeadBones() {
-    _headBones.clear();
-}
-void SkeletonModel::cauterizeHead() {
-    if (isActive()) {
-        const FBXGeometry& geometry = _geometry->getFBXGeometry();
-        const int neckJointIndex = geometry.neckJointIndex;
-        if (neckJointIndex > 0 && neckJointIndex < _rig->getJointStateCount()) {
-            // lazy init of headBones
-            if (_headBones.size() == 0) {
-                initHeadBones();
-            }
-            // preserve the translation for the neck
-            // glm::vec4 trans = _jointStates[neckJointIndex].getTransform()[3];
-            glm::vec4 trans = _rig->getJointTransform(neckJointIndex)[3];
-            glm::vec4 zero(0, 0, 0, 0);
-            for (const int &i : _headBones) {
-                glm::mat4 newXform(zero, zero, zero, trans);
-                _rig->setJointTransform(i, newXform);
-                _rig->setJointVisibleTransform(i, newXform);
-            }
-        }
-    }
-}
 void SkeletonModel::onInvalidate() {
-    invalidateHeadBones();
 }

get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code