Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 06:24:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15082 from SamGondelman/modelCrash

Browse source 
Case 21528: Possible fix for model crash
This commit is contained in:
Sam Gondelman 2019-03-05 11:27:46 -08:00 committed by GitHub
commit fd5e2b4672
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1346,14 +1346,19 @@ void Model::updateRig(float deltaTime, glm::mat4 parentTransform) {
} }
void Model::computeMeshPartLocalBounds() { void Model::computeMeshPartLocalBounds() {
for (auto& part : _modelMeshRenderItems) { render::Transaction transaction;
const Model::MeshState& state = _meshStates.at(part->_meshIndex); 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) { if (_useDualQuaternionSkinning) {
part->computeAdjustedLocalBound(state.clusterDualQuaternions); data.computeAdjustedLocalBound(state.clusterDualQuaternions);
} else { } else {
part->computeAdjustedLocalBound(state.clusterMatrices); data.computeAdjustedLocalBound(state.clusterMatrices);
} }
});
} }
AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
} }
// virtual // virtual