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

Merge pull request #184 from overte-org/fix/voxel_state_machine

Browse source 
Fix voxel state machine
This commit is contained in:
Dale Glass 2022-09-03 21:34:16 +02:00 committed by GitHub
commit f379cb4f01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -1099,6 +1099,10 @@ void RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket() {
voxelZSize = _voxelVolumeSize.z; voxelZSize = _voxelVolumeSize.z;
}); });
#ifdef WANT_DEBUG
qDebug() << "Compressing voxel and sending data packet";
#endif
QtConcurrent::run([voxelXSize, voxelYSize, voxelZSize, entity] { QtConcurrent::run([voxelXSize, voxelYSize, voxelZSize, entity] {
auto polyVoxEntity = std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity); auto polyVoxEntity = std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity);
QByteArray uncompressedData = polyVoxEntity->volDataToArray(voxelXSize, voxelYSize, voxelZSize); QByteArray uncompressedData = polyVoxEntity->volDataToArray(voxelXSize, voxelYSize, voxelZSize);
@ -1386,7 +1390,11 @@ void RenderablePolyVoxEntityItem::setMesh(graphics::MeshPointer mesh) {
} }
_shapeReady = false; _shapeReady = false;
_mesh = mesh; _mesh = mesh;
if (_state == PolyVoxState::BakingMeshNoCompress) {
_state = PolyVoxState::BakingMeshNoCompressFinished;
} else {
_state = PolyVoxState::BakingMeshFinished; _state = PolyVoxState::BakingMeshFinished;
}
_meshReady = true; _meshReady = true;
startUpdates(); startUpdates();
}); });