Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 16:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1465 from daleglass/fix-meshstates-assertion

Browse source 
Fix for _meshStates.empty() assertion.
This commit is contained in:
Dale Glass 2021-11-25 23:17:05 +01:00 committed by GitHub
commit 57167cdfef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -295,7 +295,20 @@ bool Model::updateGeometry() {
// TODO: should all Models have a valid _rig? // TODO: should all Models have a valid _rig?
if (_rig.jointStatesEmpty() && getHFMModel().joints.size() > 0) { if (_rig.jointStatesEmpty() && getHFMModel().joints.size() > 0) {
initJointStates(); initJointStates();
assert(_meshStates.empty());
if (!_meshStates.empty()) {
// See https://github.com/vircadia/vircadia/issues/958 for a discussion of the issues found here with
// a previously existing assert, and the likely reasons for things going wrong here.
//
// TL;DR: There may be a threading issue, or it could be due to something lacking joints, which would cause
// initJointStates() to fail to make _rig.jointStatesEmpty() false, causing things to end up here twice.
//
// In any case it appears to be safe to simply clear _meshStates here, even though this shouldn't happen.
_meshStates.clear();
qCWarning(renderutils) << "_meshStates has" << _meshStates.size() << "items when it should have none. Model with URL "
<< _url.toString() << "; translation" << _translation << "; rotation" << _rotation << "; scale" << _scale
<< "; joint state count" << _rig.getJointStateCount() << "; type" << (modelProviderType == NestableType::Avatar ? "Avatar" : "Entity");
}
const HFMModel& hfmModel = getHFMModel(); const HFMModel& hfmModel = getHFMModel();
int i = 0; int i = 0;
@ -841,8 +854,8 @@ void Model::calculateTriangleSets(const HFMModel& hfmModel) {
int i2 = part.quadIndices[vIndex++]; int i2 = part.quadIndices[vIndex++];
int i3 = part.quadIndices[vIndex++]; int i3 = part.quadIndices[vIndex++];
// track the model space version... these points will be transformed by the FST's offset, // track the model space version... these points will be transformed by the FST's offset,
// which includes the scaling, rotation, and translation specified by the FST/FBX, // which includes the scaling, rotation, and translation specified by the FST/FBX,
// this can't change at runtime, so we can safely store these in our TriangleSet // this can't change at runtime, so we can safely store these in our TriangleSet
glm::vec3 v0 = glm::vec3(meshTransform * glm::vec4(mesh.vertices[i0], 1.0f)); glm::vec3 v0 = glm::vec3(meshTransform * glm::vec4(mesh.vertices[i0], 1.0f));
glm::vec3 v1 = glm::vec3(meshTransform * glm::vec4(mesh.vertices[i1], 1.0f)); glm::vec3 v1 = glm::vec3(meshTransform * glm::vec4(mesh.vertices[i1], 1.0f));
@ -863,8 +876,8 @@ void Model::calculateTriangleSets(const HFMModel& hfmModel) {
int i1 = part.triangleIndices[vIndex++]; int i1 = part.triangleIndices[vIndex++];
int i2 = part.triangleIndices[vIndex++]; int i2 = part.triangleIndices[vIndex++];
// track the model space version... these points will be transformed by the FST's offset, // track the model space version... these points will be transformed by the FST's offset,
// which includes the scaling, rotation, and translation specified by the FST/FBX, // which includes the scaling, rotation, and translation specified by the FST/FBX,
// this can't change at runtime, so we can safely store these in our TriangleSet // this can't change at runtime, so we can safely store these in our TriangleSet
glm::vec3 v0 = glm::vec3(meshTransform * glm::vec4(mesh.vertices[i0], 1.0f)); glm::vec3 v0 = glm::vec3(meshTransform * glm::vec4(mesh.vertices[i0], 1.0f));
glm::vec3 v1 = glm::vec3(meshTransform * glm::vec4(mesh.vertices[i1], 1.0f)); glm::vec3 v1 = glm::vec3(meshTransform * glm::vec4(mesh.vertices[i1], 1.0f));