From 747aab2097326e78c76bb105d1ccf0f40982648e Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Thu, 27 Sep 2018 10:16:11 -0700 Subject: [PATCH] persisting signed values --- interface/src/Application.cpp | 5 ++--- interface/src/Application.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2ffd49a0b7..69f2445dd3 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -365,7 +365,6 @@ static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SI static const uint32_t INVALID_FRAME = UINT32_MAX; -static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation static const float INITIAL_QUERY_RADIUS = 10.0f; // priority radius for entities before physics enabled static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); @@ -6569,8 +6568,8 @@ bool Application::gpuTextureMemSizeStable() { auto renderConfig = qApp->getRenderEngine()->getConfiguration(); auto renderStats = renderConfig->getConfig("Stats"); - quint64 textureResourceGPUMemSize = renderStats->textureResourceGPUMemSize; - quint64 texturePopulatedGPUMemSize = renderStats->textureResourcePopulatedGPUMemSize; + qint64 textureResourceGPUMemSize = renderStats->textureResourceGPUMemSize; + qint64 texturePopulatedGPUMemSize = renderStats->textureResourcePopulatedGPUMemSize; if (_gpuTextureMemSizeAtLastCheck == textureResourceGPUMemSize) { _gpuTextureMemSizeStabilityCount++; diff --git a/interface/src/Application.h b/interface/src/Application.h index d9fff89915..cb37e655fc 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -730,8 +730,8 @@ private: std::atomic _fullSceneReceivedCounter { 0 }; // how many times have we received a full-scene octree stats packet uint32_t _fullSceneCounterAtLastPhysicsCheck { 0 }; // _fullSceneReceivedCounter last time we checked physics ready - quint64 _gpuTextureMemSizeStabilityCount { 0 }; - quint64 _gpuTextureMemSizeAtLastCheck { 0 }; + qint64 _gpuTextureMemSizeStabilityCount { 0 }; + qint64 _gpuTextureMemSizeAtLastCheck { 0 }; quint64 _lastPhysicsCheckTime { usecTimestampNow() }; // when did we last check to see if physics was ready