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

small tweaks

Browse source
This commit is contained in:
Dante Ruiz 2018-10-04 17:02:44 -07:00
parent 2a3b4a85c7
commit 5d011bafb2
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.h
View file

@ -583,7 +583,7 @@ private:
QElapsedTimer _lastTimeUpdated; QElapsedTimer _lastTimeUpdated;
QElapsedTimer _lastTimeRendered; QElapsedTimer _lastTimeRendered;
int _minimumGPUTextureMemSizeStabilityCount { 20 }; int _minimumGPUTextureMemSizeStabilityCount { 30 };
ShapeManager _shapeManager; ShapeManager _shapeManager;
PhysicalEntitySimulationPointer _entitySimulation; PhysicalEntitySimulationPointer _entitySimulation;

6
interface/src/octree/SafeLanding.cpp
View file

@ -147,6 +147,10 @@ bool SafeLanding::isSequenceNumbersComplete() {
(startIter != _sequenceNumbers.end() (startIter != _sequenceNumbers.end()
&& endIter != _sequenceNumbers.end() && endIter != _sequenceNumbers.end()
&& distance(startIter, endIter) == sequenceSize - 1)) { && distance(startIter, endIter) == sequenceSize - 1)) {
bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
if (!enableInterstitial) {
_trackingEntities = false; // Don't track anything else that comes in.
}
return true; return true;
} }
} }
@ -193,7 +197,7 @@ bool SafeLanding::isEntityLoadingComplete() {
entityTree->addingEntity(entityMapIter->first); entityTree->addingEntity(entityMapIter->first);
} }
qDebug() << EntityTypes::getEntityTypeName(entity->getType()) << entity->isVisuallyReady() << hasRenderable << entity->isParentPathComplete(); qDebug() << EntityTypes::getEntityTypeName(entity->getType()) << entity->isVisuallyReady() << hasRenderable << entity->isParentPathComplete();
isVisuallyReady = entity->isVisuallyReady() || (!entityRenderable && !entity->isParentPathComplete()); isVisuallyReady = entity->isVisuallyReady() || (!entityRenderable && !entity->isParentPathComplete());
} }
if (isEntityPhysicsReady(entity) && isVisuallyReady) { if (isEntityPhysicsReady(entity) && isVisuallyReady) {