From 0914f5c48f777705bdc57188e7372707f7977e5a Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 15 Jun 2021 19:25:08 +0300 Subject: SL-15297 WIP Implement performance floater #2 --- .../newview/llfloaterpreferencesgraphicsadvanced.h | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 indra/newview/llfloaterpreferencesgraphicsadvanced.h (limited to 'indra/newview/llfloaterpreferencesgraphicsadvanced.h') diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.h b/indra/newview/llfloaterpreferencesgraphicsadvanced.h new file mode 100644 index 0000000000..3e9046eba9 --- /dev/null +++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.h @@ -0,0 +1,63 @@ +/** + * @file llfloaterpreferencesgraphicsadvanced.h + * + * $LicenseInfo:firstyear=2021&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2021, 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$ + */ + +#ifndef LLFLOATERPREFERENCEGRAPHICSADVANCED_H +#define LLFLOATERPREFERENCEGRAPHICSADVANCED_H + +#include "llcontrol.h" +#include "llfloater.h" + +class LLSliderCtrl; +class LLTextBox; + +class LLFloaterPreferenceGraphicsAdvanced : public LLFloater +{ +public: + LLFloaterPreferenceGraphicsAdvanced(const LLSD& key); + ~LLFloaterPreferenceGraphicsAdvanced(); + /*virtual*/ BOOL postBuild(); + void onOpen(const LLSD& key); + void onClickCloseBtn(bool app_quitting); + void disableUnavailableSettings(); + void refreshEnabledGraphics(); + void refreshEnabledState(); + void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box); + void updateMaxNonImpostors(); + void setMaxNonImpostorsText(U32 value, LLTextBox* text_box); + void updateMaxComplexity(); + void setMaxComplexityText(U32 value, LLTextBox* text_box); + void refresh(); + // callback for when client modifies a render option + void onRenderOptionEnable(); + void onAdvancedAtmosphericsEnable(); + LOG_CLASS(LLFloaterPreferenceGraphicsAdvanced); + +protected: + void onBtnOK(const LLSD& userdata); + void onBtnCancel(const LLSD& userdata); +}; + +#endif //LLFLOATERPREFERENCEGRAPHICSADVANCED_H + -- cgit v1.2.3 From f24682d8510f778cba11b057d561915cd0fe3905 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Fri, 23 Jul 2021 15:18:11 +0300 Subject: SL-15667 FIXED Complexity value is not updated in Advanced floater --- indra/newview/llfloaterpreferencesgraphicsadvanced.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterpreferencesgraphicsadvanced.h') diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.h b/indra/newview/llfloaterpreferencesgraphicsadvanced.h index 3e9046eba9..c5d21ba35b 100644 --- a/indra/newview/llfloaterpreferencesgraphicsadvanced.h +++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.h @@ -47,7 +47,7 @@ public: void updateMaxNonImpostors(); void setMaxNonImpostorsText(U32 value, LLTextBox* text_box); void updateMaxComplexity(); - void setMaxComplexityText(U32 value, LLTextBox* text_box); + void updateComplexityText(); void refresh(); // callback for when client modifies a render option void onRenderOptionEnable(); @@ -57,6 +57,8 @@ public: protected: void onBtnOK(const LLSD& userdata); void onBtnCancel(const LLSD& userdata); + + boost::signals2::connection mComplexityChangedSignal; }; #endif //LLFLOATERPREFERENCEGRAPHICSADVANCED_H -- cgit v1.2.3 From d7603ffc9c94a6cdab94bc23745903c7fff25ff1 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 24 Jan 2022 16:33:44 +0200 Subject: SL-16627 AutoFPS first pass --- indra/newview/llfloaterpreferencesgraphicsadvanced.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterpreferencesgraphicsadvanced.h') diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.h b/indra/newview/llfloaterpreferencesgraphicsadvanced.h index c5d21ba35b..cf3ed02614 100644 --- a/indra/newview/llfloaterpreferencesgraphicsadvanced.h +++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.h @@ -45,6 +45,8 @@ public: void refreshEnabledState(); void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box); void updateMaxNonImpostors(); + void updateIndirectMaxNonImpostors(const LLSD& newvalue); + void onUICtrlMouseDown(); void setMaxNonImpostorsText(U32 value, LLTextBox* text_box); void updateMaxComplexity(); void updateComplexityText(); -- cgit v1.2.3 From b50de181623874ab799fdc31532dffe8f7bc610a Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 25 Jan 2022 19:43:32 +0200 Subject: SL-16627 add auto-adjustment warning for affected settings --- indra/newview/llfloaterpreferencesgraphicsadvanced.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llfloaterpreferencesgraphicsadvanced.h') diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.h b/indra/newview/llfloaterpreferencesgraphicsadvanced.h index cf3ed02614..7f26ff8b00 100644 --- a/indra/newview/llfloaterpreferencesgraphicsadvanced.h +++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.h @@ -46,7 +46,6 @@ public: void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box); void updateMaxNonImpostors(); void updateIndirectMaxNonImpostors(const LLSD& newvalue); - void onUICtrlMouseDown(); void setMaxNonImpostorsText(U32 value, LLTextBox* text_box); void updateMaxComplexity(); void updateComplexityText(); -- cgit v1.2.3 From f0809019f807bdcfec719f32538582ea86edf9e3 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Sat, 19 Nov 2022 12:04:33 +0200 Subject: SL-18670 change limits of RenderVolumeLODFactor in Preference similar to Distance detail ctrl; update slider text correctly --- indra/newview/llfloaterpreferencesgraphicsadvanced.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterpreferencesgraphicsadvanced.h') diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.h b/indra/newview/llfloaterpreferencesgraphicsadvanced.h index 7f26ff8b00..2c92f3dbf1 100644 --- a/indra/newview/llfloaterpreferencesgraphicsadvanced.h +++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.h @@ -49,6 +49,7 @@ public: void setMaxNonImpostorsText(U32 value, LLTextBox* text_box); void updateMaxComplexity(); void updateComplexityText(); + void updateObjectMeshDetailText(); void refresh(); // callback for when client modifies a render option void onRenderOptionEnable(); @@ -60,6 +61,7 @@ protected: void onBtnCancel(const LLSD& userdata); boost::signals2::connection mComplexityChangedSignal; + boost::signals2::connection mLODFactorChangedSignal; }; #endif //LLFLOATERPREFERENCEGRAPHICSADVANCED_H -- cgit v1.2.3