From 40c627172bbf33a28f8ba12777dc7c17bb91d83c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 28 Oct 2024 16:52:48 +0100 Subject: [PATCH] More banging at selection beams --- indra/newview/lggbeamcolormapfloater.cpp | 4 ++-- indra/newview/lggbeamcolormapfloater.h | 4 ++-- indra/newview/lggbeammapfloater.cpp | 4 ++-- indra/newview/lggbeammapfloater.h | 11 +++++----- indra/newview/lggbeammaps.cpp | 4 ++-- indra/newview/lggbeammaps.h | 28 ++++++++---------------- indra/newview/lggbeamscolors.cpp | 7 ------ indra/newview/lggbeamscolors.h | 8 +++---- 8 files changed, 26 insertions(+), 44 deletions(-) diff --git a/indra/newview/lggbeamcolormapfloater.cpp b/indra/newview/lggbeamcolormapfloater.cpp index f7bf950a6f..4255415b87 100644 --- a/indra/newview/lggbeamcolormapfloater.cpp +++ b/indra/newview/lggbeamcolormapfloater.cpp @@ -186,7 +186,7 @@ void lggBeamColorMapFloater::onClickSlider() fixOrder(); } -F32 lggBeamColorMapFloater::getHueFromLocation(S32 x, S32 y) +F32 lggBeamColorMapFloater::getHueFromLocation(S32 x, S32 y) const { if (y > (201 + CORRECTION_Y) && y < (277 + CORRECTION_Y)) { @@ -227,7 +227,7 @@ void lggBeamColorMapFloater::setData(FSPanelPrefs* data) } } -LLSD lggBeamColorMapFloater::getDataSerialized() +LLSD lggBeamColorMapFloater::getDataSerialized() const { return mData.toLLSD(); } diff --git a/indra/newview/lggbeamcolormapfloater.h b/indra/newview/lggbeamcolormapfloater.h index f3b4e562c9..b01bb6c756 100644 --- a/indra/newview/lggbeamcolormapfloater.h +++ b/indra/newview/lggbeamcolormapfloater.h @@ -46,9 +46,9 @@ protected: void onSaveCallback(const std::vector& filenames); void onLoadCallback(const std::vector& filenames); - F32 getHueFromLocation(S32 x, S32 y); + F32 getHueFromLocation(S32 x, S32 y) const; void fixOrder(); - LLSD getDataSerialized(); + LLSD getDataSerialized() const; F32 mContextConeOpacity; F32 mContextConeInAlpha; diff --git a/indra/newview/lggbeammapfloater.cpp b/indra/newview/lggbeammapfloater.cpp index 483ded0cae..5c9afdf3bb 100644 --- a/indra/newview/lggbeammapfloater.cpp +++ b/indra/newview/lggbeammapfloater.cpp @@ -57,7 +57,7 @@ void lggBeamMapFloater::draw() } LLFloater::draw(); - LLRect rec = mBeamshapePanel->getRect(); + const LLRect& rec = mBeamshapePanel->getRect(); gGL.pushMatrix(); gGL.color4fv(LLColor4::white.mV); @@ -120,7 +120,7 @@ void lggBeamMapFloater::onBackgroundChange() mBeamshapePanel->setBackgroundColor(getChild("back_color_swatch")->get()); } -LLSD lggBeamMapFloater::getDataSerialized() +LLSD lggBeamMapFloater::getDataSerialized() const { LLSD out; LLRect r = mBeamshapePanel->getRect(); diff --git a/indra/newview/lggbeammapfloater.h b/indra/newview/lggbeammapfloater.h index 76eaa3a3e3..c2bafb903f 100644 --- a/indra/newview/lggbeammapfloater.h +++ b/indra/newview/lggbeammapfloater.h @@ -19,12 +19,11 @@ class FSPanelPrefs; class LLPanel; -class lggPoint +struct lggPoint { - public: - S32 x; - S32 y; - LLColor4 c; + S32 x; + S32 y; + LLColor4 c; }; //////////////////////////////////////////////////////////////////////////// @@ -54,7 +53,7 @@ private: void clearPoints(); - LLSD getDataSerialized(); + LLSD getDataSerialized() const; std::vector mDots; F32 mContextConeOpacity; diff --git a/indra/newview/lggbeammaps.cpp b/indra/newview/lggbeammaps.cpp index 365d44e76f..c8a64bd203 100644 --- a/indra/newview/lggbeammaps.cpp +++ b/indra/newview/lggbeammaps.cpp @@ -88,7 +88,7 @@ void hslToRgb(F32 hValIn, F32 sValIn, F32 lValIn, F32& rValOut, F32& gValOut, F3 } } -LLSD lggBeamMaps::getPic(const std::string& filename) +LLSD lggBeamMaps::getPic(const std::string& filename) const { LLSD data; llifstream importer(filename.c_str()); @@ -136,7 +136,7 @@ LLColor4U lggBeamMaps::beamColorFromData(const lggBeamsColors& data) LLColor4U toReturn; F32 difference = data.mEndHue - data.mStartHue; - F32 timeinc = difference != 0.f ? timer.getElapsedTimeF32() * 0.3f * (data.mRotateSpeed + 0.01f) * (360 / difference) : 0.f; + F32 timeinc = difference != 0.f ? timer.getElapsedTimeF32() * 0.3f * (data.mRotateSpeed + 0.01f) * (360.f / difference) : 0.f; S32 rounded_difference = ll_round(difference); if (rounded_difference == 360 || rounded_difference == 720) diff --git a/indra/newview/lggbeammaps.h b/indra/newview/lggbeammaps.h index cf795d924d..b304ded906 100644 --- a/indra/newview/lggbeammaps.h +++ b/indra/newview/lggbeammaps.h @@ -21,9 +21,8 @@ F32 hueToRgb(F32 val1In, F32 val2In, F32 valHUeIn); void hslToRgb(F32 hValIn, F32 sValIn, F32 lValIn, F32& rValOut, F32& gValOut, F32& bValOut); -class lggBeamData +struct lggBeamData { -public: LLVector3d p; LLColor4U c; }; @@ -31,15 +30,6 @@ public: class lggBeamMaps { public: - lggBeamMaps() : - mLastFileName(""), - mScale(0.0f), - mDuration(0.25f), - mPartsNow(false), - mBeamLastAt(LLVector3d::zero) - {} - ~lggBeamMaps() {} - F32 setUpAndGetDuration(); void fireCurrentBeams(LLPointer, const LLColor4U& rgb); void forceUpdate(); @@ -51,15 +41,15 @@ public: string_vec_t getColorsFileNames() const; private: - LLSD getPic(const std::string& filename); + LLSD getPic(const std::string& filename) const; - std::string mLastFileName; - std::string mLastColorFileName; - lggBeamsColors mLastColorsData; - F32 mDuration; - F32 mScale; - bool mPartsNow; - LLVector3d mBeamLastAt; + std::string mLastFileName{}; + std::string mLastColorFileName{}; + lggBeamsColors mLastColorsData{}; + F32 mDuration{ 0.25f }; + F32 mScale{ 0.0f }; + bool mPartsNow{ false }; + LLVector3d mBeamLastAt{ LLVector3d::zero }; std::vector mDots; }; diff --git a/indra/newview/lggbeamscolors.cpp b/indra/newview/lggbeamscolors.cpp index 0a958ae2db..b0bf3fc5d9 100644 --- a/indra/newview/lggbeamscolors.cpp +++ b/indra/newview/lggbeamscolors.cpp @@ -60,10 +60,3 @@ lggBeamsColors::lggBeamsColors(F32 startHue, F32 endHue, F32 rotateSpeed) : mRotateSpeed(rotateSpeed) { } - -lggBeamsColors::lggBeamsColors(): - mStartHue(0.0f), - mEndHue(360.0f), - mRotateSpeed(1.0f) -{ -} diff --git a/indra/newview/lggbeamscolors.h b/indra/newview/lggbeamscolors.h index f0643dc203..798f3a0689 100644 --- a/indra/newview/lggbeamscolors.h +++ b/indra/newview/lggbeamscolors.h @@ -20,11 +20,11 @@ class lggBeamsColors { public: lggBeamsColors(F32 startHue, F32 endHue, F32 rotateSpeed); - lggBeamsColors(); + lggBeamsColors() = default; - F32 mStartHue; - F32 mEndHue; - F32 mRotateSpeed; + F32 mStartHue{ 0.0f }; + F32 mEndHue{ 360.0f }; + F32 mRotateSpeed{ 1.f }; LLSD toLLSD() const; static lggBeamsColors fromLLSD(const LLSD& inputData);