From bcf9a3c20c92a8adc5b332d5723ca0263de79f18 Mon Sep 17 00:00:00 2001 From: wangyix Date: Tue, 29 Jul 2014 17:17:10 -0700 Subject: [PATCH] changed default max frames over desired in client to 20 --- interface/src/Menu.cpp | 2 +- interface/src/Menu.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 3fe2ac9e5d..e72c929a44 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -629,7 +629,7 @@ void Menu::loadSettings(QSettings* settings) { } _audioJitterBufferFrames = loadSetting(settings, "audioJitterBufferFrames", 0); - _maxFramesOverDesired = loadSetting(settings, "maxFramesOverDesired", 0); + _maxFramesOverDesired = loadSetting(settings, "maxFramesOverDesired", DEFAULT_MAX_FRAMES_OVER_DESIRED); _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES); _realWorldFieldOfView = loadSetting(settings, "realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES); _faceshiftEyeDeflection = loadSetting(settings, "faceshiftEyeDeflection", DEFAULT_FACESHIFT_EYE_DEFLECTION); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 2bc750007a..66c4115927 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -47,6 +47,8 @@ const float ADJUST_LOD_MAX_SIZE_SCALE = DEFAULT_OCTREE_SIZE_SCALE; const float MINIMUM_AVATAR_LOD_DISTANCE_MULTIPLIER = 0.1f; const float MAXIMUM_AVATAR_LOD_DISTANCE_MULTIPLIER = 15.0f; +const int DEFAULT_MAX_FRAMES_OVER_DESIRED = 20; + enum FrustumDrawMode { FRUSTUM_DRAW_MODE_ALL, FRUSTUM_DRAW_MODE_VECTORS,