Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 14:42:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #999 from ZappoMan/master

Browse source 
fix hang on preference dialog box
This commit is contained in:
Philip Rosedale 2013-09-30 15:28:20 -07:00
commit 19e20f64b4
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/VoxelSystem.cpp
View file

@ -150,6 +150,9 @@ VoxelSystem::~VoxelSystem() {
}
void VoxelSystem::setMaxVoxels(int maxVoxels) {
if (maxVoxels == _maxVoxels) {
return;
}
pthread_mutex_lock(&_bufferWriteLock);
bool wasInitialized = _initialized;
if (wasInitialized) {
@ -161,13 +164,16 @@ void VoxelSystem::setMaxVoxels(int maxVoxels) {
init();
}
pthread_mutex_unlock(&_bufferWriteLock);
if (wasInitialized) {
forceRedrawEntireTree();
}
}
void VoxelSystem::setUseVoxelShader(bool useVoxelShader) {
if (_useVoxelShader == useVoxelShader) {
return;
}
pthread_mutex_lock(&_bufferWriteLock);
bool wasInitialized = _initialized;
if (wasInitialized) {
@ -896,6 +902,11 @@ void VoxelSystem::updateVBOSegment(glBufferIndex segmentStart, glBufferIndex seg
void VoxelSystem::render(bool texture) {
PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "render()");
// If we got here and we're not initialized then bail!
if (!_initialized) {
return;
}
// get the lock so that the update thread won't change anything
pthread_mutex_lock(&_bufferWriteLock);
@ -1034,8 +1045,6 @@ void VoxelSystem::clearAllNodesBufferIndex() {
_nodeCount = 0;
_tree->recurseTreeWithOperation(clearAllNodesBufferIndexOperation);
qDebug("clearing buffer index of %d nodes\n", _nodeCount);
_tree->setDirtyBit();
setupNewVoxelsForDrawing();
}
bool VoxelSystem::forceRedrawEntireTreeOperation(VoxelNode* node, void* extraData) {