Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix linux warning and HMD breaks flow

Browse source
This commit is contained in:
luiscuenca 2019-02-21 16:41:24 -07:00
parent ec4d069011
commit dcbf57ee0b
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/animation/src/Flow.cpp
View file

@ -460,16 +460,12 @@ void Flow::calculateConstraints(const std::shared_ptr<AnimSkeleton>& skeleton,
if (!skeleton) { if (!skeleton) {
return; return;
} }
int rightHandIndex = -1;
auto flowPrefix = FLOW_JOINT_PREFIX.toUpper(); auto flowPrefix = FLOW_JOINT_PREFIX.toUpper();
auto simPrefix = SIM_JOINT_PREFIX.toUpper(); auto simPrefix = SIM_JOINT_PREFIX.toUpper();
std::vector<int> handsIndices; std::vector<int> handsIndices;
for (int i = 0; i < skeleton->getNumJoints(); i++) { for (int i = 0; i < skeleton->getNumJoints(); i++) {
auto name = skeleton->getJointName(i); auto name = skeleton->getJointName(i);
if (name == "RightHand") {
rightHandIndex = i;
}
if (std::find(HAND_COLLISION_JOINTS.begin(), HAND_COLLISION_JOINTS.end(), name) != HAND_COLLISION_JOINTS.end()) { if (std::find(HAND_COLLISION_JOINTS.begin(), HAND_COLLISION_JOINTS.end(), name) != HAND_COLLISION_JOINTS.end()) {
handsIndices.push_back(i); handsIndices.push_back(i);
} }

7
libraries/animation/src/Rig.cpp
View file

@ -1910,13 +1910,6 @@ void Rig::initAnimGraph(const QUrl& url) {
connect(_networkLoader.get(), &AnimNodeLoader::error, [networkUrl](int error, QString str) { connect(_networkLoader.get(), &AnimNodeLoader::error, [networkUrl](int error, QString str) {
qCritical(animation) << "Error loading: code = " << error << "str =" << str; qCritical(animation) << "Error loading: code = " << error << "str =" << str;
}); });
connect(this, &Rig::onLoadComplete, [&]() {
_internalFlow.setActive(false);
_internalFlow.cleanUp();
_networkFlow.setActive(false);
_networkFlow.cleanUp();
});
} }
} }

1
libraries/render-utils/src/Model.cpp
View file

@ -1158,6 +1158,7 @@ void Model::setURL(const QUrl& url) {
resource->setLoadPriority(this, _loadingPriority); resource->setLoadPriority(this, _loadingPriority);
_renderWatcher.setResource(resource); _renderWatcher.setResource(resource);
} }
_rig.initFlow(false);
onInvalidate(); onInvalidate();
} }