History

remove references to PrioVR in interface code

Stephen Birarda committed 11 years ago

Commit fc2f6d41 parent 38f77196 files · +2 −326Browse files

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

Unified · Split

interface/src/avatar/SkeletonModel.cpp+1−16
@@ -106,21 +106,6 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { · 105 unmodified lines
106106 }
107107
108108 const FBXGeometry& geometry = _geometry->getFBXGeometry();
109− PrioVR* prioVR = Application::getInstance()->getPrioVR();
110− if (prioVR->isActive()) {
111− for (int i = 0; i < prioVR->getJointRotations().size(); i++) {
112− int humanIKJointIndex = prioVR->getHumanIKJointIndices().at(i);
113− if (humanIKJointIndex == -1) {
114− continue;
115− }
116− int jointIndex = geometry.humanIKJointIndices.at(humanIKJointIndex);
117− if (jointIndex != -1) {
118− JointState& state = _jointStates[jointIndex];
119− state.setRotationInBindFrame(prioVR->getJointRotations().at(i), PALM_PRIORITY);
120− }
121− }
122− return;
123− }
124109
125110 // find the left and rightmost active palms
126111 int leftPalmIndex, rightPalmIndex;
@@ -294,7 +279,7 @@ void SkeletonModel::updateJointState(int index) { · 167 unmodified lines
294279 }
295280
296281 void SkeletonModel::maybeUpdateLeanRotation(const JointState& parentState, JointState& state) {
297− if (!_owningAvatar->isMyAvatar() || Application::getInstance()->getPrioVR()->isActive()) {
282+ if (!_owningAvatar->isMyAvatar()) {
298283 return;
299284 }
300285 // get the rotation axes in joint space and use them to adjust the rotation

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