Performance and tuning

Performance and tuning floater updated including fixes

1 files changed, 97 insertions, 0 deletions

diff --git a/indra/newview/mpfloatertuning.cpp b/indra/newview/mpfloatertuning.cpp
new file mode 100644
index 0000000000..938299cacf
--- /dev/null
+++ b/indra/newview/mpfloatertuning.cpp
@@ -0,0 +1,97 @@
+/**
+* @file mpfloatertuning.cpp
+* @brief Controller for viewer tuning
+* @author observeur@megapahit.net
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "mpfloatertuning.h"
+#include "llsliderctrl.h"
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "llviewercontrol.h"
+#include "llsdserialize.h"
+
+#include "../llrender/llvertexbuffer.cpp"
+
+MPFloaterTuning::MPFloaterTuning(const LLSD& key) : LLFloater(key)
+{
+}
+
+void MPFloaterTuning::syncFromPreferenceSetting(void *user_data)
+{
+    MPFloaterTuning *self = static_cast<MPFloaterTuning*>(user_data);
+
+    U32 fps = gSavedSettings.getU32("MaxFPS");
+    LLSliderCtrl* fpsSliderCtrl = self->getChild<LLSliderCtrl>("fpsSlider");
+    fpsSliderCtrl->setValue(fps,FALSE);
+
+    U32 optBuf = gSavedSettings.getU32("MPVBufferOptiMode");
+
+    if(optBuf == 0)
+    {
+        if(gGLManager.mIsApple) optBuf = 2;
+        else optBuf = 1;
+    }
+
+    LLComboBox * optBufCtrl = self->getChild<LLComboBox>("MPVBuffModeComboBox");
+    optBufCtrl->setCurrentByIndex(optBuf-1);
+
+    LL_INFOS() << "syncFromPreferenceSetting optBuf=" << optBuf << LL_ENDL;
+}
+
+BOOL MPFloaterTuning::postBuild()
+{
+    LLSliderCtrl* fpsSliderCtrl = getChild<LLSliderCtrl>("fpsSlider");
+    fpsSliderCtrl->setMinValue(0);
+    fpsSliderCtrl->setMaxValue(165);
+    fpsSliderCtrl->setSliderMouseUpCallback(boost::bind(&MPFloaterTuning::onFinalCommit,this));
+
+    LLComboBox* optBufCtrl = getChild<LLComboBox>("MPVBuffModeComboBox");
+    optBufCtrl->setCommitCallback(boost::bind(&MPFloaterTuning::onFinalCommit,this));
+
+    syncFromPreferenceSetting(this);
+
+    return TRUE;
+}
+
+// Do send-to-the-server work when slider drag completes, or new
+// value entered as text.
+void MPFloaterTuning::onFinalCommit()
+{
+    LLSliderCtrl* fpsSliderCtrl = getChild<LLSliderCtrl>("fpsSlider");
+    U32 fps = (U32)fpsSliderCtrl->getValueF32();
+    gSavedSettings.setU32("MaxFPS",fps);
+
+    LLComboBox* optBufCtrl = getChild<LLComboBox>("MPVBuffModeComboBox");
+    S16 optBuf = optBufCtrl->getCurrentIndex() + 1;
+    gSavedSettings.setU32("MPVBufferOptiMode",optBuf);
+
+    LLVertexBuffer::sMappingMode = optBuf;
+}
+
+void MPFloaterTuning::onClose(bool app_quitting)
+{
+}
\ No newline at end of file