revert some now unnecessary changes that were impacting performance

(cherry picked from commit b6984de16c2fd17f04ea72de7b339c31db6467ab)
This commit is contained in:
SamGondelman 2019-03-22 11:41:02 -07:00
parent 6956d01099
commit c1c45d8a01
2 changed files with 7 additions and 14 deletions

View file

@ -178,7 +178,6 @@ void CauterizedModel::updateClusterMatrices() {
}
}
}
computeMeshPartLocalBounds();
// post the blender if we're not currently waiting for one to finish
auto modelBlender = DependencyManager::get<ModelBlender>();

View file

@ -1346,19 +1346,14 @@ void Model::updateRig(float deltaTime, glm::mat4 parentTransform) {
}
void Model::computeMeshPartLocalBounds() {
render::Transaction transaction;
auto meshStates = _meshStates;
for (auto renderItem : _modelMeshRenderItemIDs) {
transaction.updateItem<ModelMeshPartPayload>(renderItem, [this, meshStates](ModelMeshPartPayload& data) {
const Model::MeshState& state = meshStates.at(data._meshIndex);
if (_useDualQuaternionSkinning) {
data.computeAdjustedLocalBound(state.clusterDualQuaternions);
} else {
data.computeAdjustedLocalBound(state.clusterMatrices);
}
});
for (auto& part : _modelMeshRenderItems) {
const Model::MeshState& state = _meshStates.at(part->_meshIndex);
if (_useDualQuaternionSkinning) {
part->computeAdjustedLocalBound(state.clusterDualQuaternions);
} else {
part->computeAdjustedLocalBound(state.clusterMatrices);
}
}
AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
}
// virtual
@ -1391,7 +1386,6 @@ void Model::updateClusterMatrices() {
}
}
}
computeMeshPartLocalBounds();
// post the blender if we're not currently waiting for one to finish
auto modelBlender = DependencyManager::get<ModelBlender>();