From 850f92eae3dc7319ecb2a8988378bb1cb8c9f7f5 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 20 Jan 2015 17:54:11 -0800 Subject: [PATCH] Don't call Settings::set when you don't need too. --- libraries/octree/src/OctreeQuery.cpp | 6 ++++-- libraries/octree/src/ViewFrustum.cpp | 12 ++++++++---- libraries/shared/src/Settings.h | 4 +++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/libraries/octree/src/OctreeQuery.cpp b/libraries/octree/src/OctreeQuery.cpp index dc8d5fe8c2..a0b25f5102 100644 --- a/libraries/octree/src/OctreeQuery.cpp +++ b/libraries/octree/src/OctreeQuery.cpp @@ -25,8 +25,10 @@ OctreeQuery::OctreeQuery() { } void OctreeQuery::setMaxOctreePacketsPerSecond(int maxOctreePPS) { - _maxOctreePPS = maxOctreePPS; - SettingHandles::maxOctreePacketsPerSecond.set(_maxOctreePPS); + if (maxOctreePPS != _maxOctreePPS) { + _maxOctreePPS = maxOctreePPS; + SettingHandles::maxOctreePacketsPerSecond.set(_maxOctreePPS); + } } diff --git a/libraries/octree/src/ViewFrustum.cpp b/libraries/octree/src/ViewFrustum.cpp index dd25ac51c3..b42cbbc944 100644 --- a/libraries/octree/src/ViewFrustum.cpp +++ b/libraries/octree/src/ViewFrustum.cpp @@ -44,12 +44,16 @@ void ViewFrustum::setOrientation(const glm::quat& orientationAsQuaternion) { } void ViewFrustum::setFieldOfView(float f) { - _fieldOfView = f; - SettingHandles::fieldOfView.set(f); + if (f != _fieldOfView) { + _fieldOfView = f; + SettingHandles::fieldOfView.set(f); + } } void ViewFrustum::setRealWorldFieldOfView(float realWorldFieldOfView) { - _realWorldFieldOfView = realWorldFieldOfView; - SettingHandles::realWorldFieldOfView.set(realWorldFieldOfView); + if (realWorldFieldOfView != _realWorldFieldOfView) { + _realWorldFieldOfView = realWorldFieldOfView; + SettingHandles::realWorldFieldOfView.set(realWorldFieldOfView); + } } // ViewFrustum::calculateViewFrustum() diff --git a/libraries/shared/src/Settings.h b/libraries/shared/src/Settings.h index b0ebf4b27f..c1ebd73058 100644 --- a/libraries/shared/src/Settings.h +++ b/libraries/shared/src/Settings.h @@ -101,7 +101,9 @@ T SettingHandle::getDefault() const { template inline void SettingHandle::set(const T& value) const { - SettingsBridge::setInSettings(_key, QVariant(value)); + if (value != get()) { + SettingsBridge::setInSettings(_key, QVariant(value)); + } } template inline