summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llinventory/llsettingssky.cpp4
-rw-r--r--indra/llui/llxyvector.cpp72
-rw-r--r--indra/llui/llxyvector.h4
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml9
4 files changed, 56 insertions, 33 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index f21cca34a6..ace530ae54 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -37,8 +37,8 @@ namespace {
const F32 NIGHTTIME_ELEVATION = -8.0f; // degrees
const F32 NIGHTTIME_ELEVATION_SIN = (F32)sinf(NIGHTTIME_ELEVATION * DEG_TO_RAD);
const LLUUID IMG_BLOOM1("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef");
- const LLUUID IMG_RAINBOW("12149143-f599-91a7-77ac-b52a3c0f59cd");
- const LLUUID IMG_HALO("11b4c57c-56b3-04ed-1f82-2004363882e4");
+ const LLUUID IMG_RAINBOW("11b4c57c-56b3-04ed-1f82-2004363882e4");
+ const LLUUID IMG_HALO("12149143-f599-91a7-77ac-b52a3c0f59cd");
}
namespace {
diff --git a/indra/llui/llxyvector.cpp b/indra/llui/llxyvector.cpp
index 9d5823e368..08dedc157b 100644
--- a/indra/llui/llxyvector.cpp
+++ b/indra/llui/llxyvector.cpp
@@ -37,6 +37,8 @@
#include "lluictrlfactory.h"
#include "llrender.h"
+#include "llmath.h"
+
// Globals
static LLDefaultChildRegistry::Register<LLXYVector> register_xy_vector("xy_vector");
@@ -63,7 +65,8 @@ LLXYVector::Params::Params()
arrow_color("arrow_color", LLColor4::white),
ghost_color("ghost_color"),
area_color("area_color", LLColor4::grey4),
- grid_color("grid_color", LLColor4::grey % 0.25f)
+ grid_color("grid_color", LLColor4::grey % 0.25f),
+ logarithmic("logarithmic", FALSE)
{
}
@@ -77,7 +80,8 @@ LLXYVector::LLXYVector(const LLXYVector::Params& p)
mIncrementX(p.increment_x),
mMinValueY(p.min_val_y),
mMaxValueY(p.max_val_y),
- mIncrementY(p.increment_y)
+ mIncrementY(p.increment_y),
+ mLogarithmic(p.logarithmic)
{
mGhostColor = p.ghost_color.isProvided() ? p.ghost_color() % 0.3f : p.arrow_color() % 0.3f;
@@ -138,6 +142,9 @@ LLXYVector::~LLXYVector()
BOOL LLXYVector::postBuild()
{
+ mLogScaleX = (2 * log(mMaxValueX)) / mTouchArea->getRect().getWidth();
+ mLogScaleY = (2 * log(mMaxValueY)) / mTouchArea->getRect().getHeight();
+
return TRUE;
}
@@ -165,9 +172,24 @@ void LLXYVector::draw()
{
S32 centerX = mTouchArea->getRect().getCenterX();
S32 centerY = mTouchArea->getRect().getCenterY();
+ S32 pointX;
+ S32 pointY;
+
+ if (mLogarithmic)
+ {
+ pointX = (log(llabs(mValueX) + 1)) / mLogScaleX;
+ pointX *= (mValueX < 0) ? -1 : 1;
+ pointX += centerX;
- S32 pointX = centerX + (mValueX * mTouchArea->getRect().getWidth() / (2 * mMaxValueX));
- S32 pointY = centerY + (mValueY * mTouchArea->getRect().getHeight() / (2 * mMaxValueY));
+ pointY = (log(llabs(mValueY) + 1)) / mLogScaleY;
+ pointY *= (mValueY < 0) ? -1 : 1;
+ pointY += centerY;
+ }
+ else // linear
+ {
+ pointX = centerX + (mValueX * mTouchArea->getRect().getWidth() / (2 * mMaxValueX));
+ pointY = centerY + (mValueY * mTouchArea->getRect().getHeight() / (2 * mMaxValueY));
+ }
// fill
gl_rect_2d(mTouchArea->getRect(), mAreaColor, true);
@@ -222,22 +244,8 @@ void LLXYVector::setValue(const LLSD& value)
void LLXYVector::setValue(F32 x, F32 y)
{
- x = llclamp(x, mMinValueX, mMaxValueX);
- y = llclamp(y, mMinValueY, mMaxValueY);
-
- // Round the values to nearest increments
- x -= mMinValueX;
- x += mIncrementX / 2.0001f;
- x -= fmod(x, mIncrementX);
- x += mMinValueX;
-
- y -= mMinValueY;
- y += mIncrementY / 2.0001f;
- y -= fmod(y, mIncrementY);
- y += mMinValueY;
-
- mValueX = x;
- mValueY = y;
+ mValueX = ll_round(llclamp(x, mMinValueX, mMaxValueX), mIncrementX);
+ mValueY = ll_round(llclamp(y, mMinValueY, mMaxValueY), mIncrementY);
update();
}
@@ -269,13 +277,23 @@ BOOL LLXYVector::handleHover(S32 x, S32 y, MASK mask)
{
if (hasMouseCapture())
{
- F32 valueX = F32(x - mTouchArea->getRect().getCenterX()) / mTouchArea->getRect().getWidth();
- F32 valueY = F32(y - mTouchArea->getRect().getCenterY()) / mTouchArea->getRect().getHeight();
-
- valueX *= 2 * mMaxValueX;
- valueY *= 2 * mMaxValueY;
-
- setValueAndCommit(valueX, valueY);
+ if (mLogarithmic)
+ {
+ F32 valueX = llfastpow(F_E, mLogScaleX*(llabs(x - mTouchArea->getRect().getCenterX()))) - 1;
+ valueX *= (x < mTouchArea->getRect().getCenterX()) ? -1 : 1;
+
+ F32 valueY = llfastpow(F_E, mLogScaleY*(llabs(y - mTouchArea->getRect().getCenterY()))) - 1;
+ valueY *= (y < mTouchArea->getRect().getCenterY()) ? -1 : 1;
+
+ setValueAndCommit(valueX, valueY);
+ }
+ else //linear
+ {
+ F32 valueX = 2 * mMaxValueX * F32(x - mTouchArea->getRect().getCenterX()) / mTouchArea->getRect().getWidth();
+ F32 valueY = 2 * mMaxValueY * F32(y - mTouchArea->getRect().getCenterY()) / mTouchArea->getRect().getHeight();
+
+ setValueAndCommit(valueX, valueY);
+ }
}
return TRUE;
diff --git a/indra/llui/llxyvector.h b/indra/llui/llxyvector.h
index 4d67db3251..bb3822dd26 100644
--- a/indra/llui/llxyvector.h
+++ b/indra/llui/llxyvector.h
@@ -59,6 +59,7 @@ public:
Optional<LLUIColor> ghost_color;
Optional<LLUIColor> area_color;
Optional<LLUIColor> grid_color;
+ Optional<BOOL> logarithmic;
Params();
};
@@ -112,6 +113,9 @@ private:
LLUIColor mAreaColor;
LLUIColor mGridColor;
+ BOOL mLogarithmic;
+ F32 mLogScaleX;
+ F32 mLogScaleY;
};
#endif
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 457082ede2..11a852f40b 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -128,10 +128,11 @@
visible="true"
left_delta="0"
top_delta="21"
- min_val_x="-10"
- max_val_x="10"
- min_val_y="-10"
- max_val_y="10" />
+ min_val_x="-30"
+ max_val_x="30"
+ min_val_y="-30"
+ max_val_y="30"
+ logarithmic="1"/>
<text
follows="left|top"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-26 09:38:14 +0000