livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup for windlight preset controls. Thanks to Kitty Barnett and Zi Ree for help.

meow-7.2.2
WoLf 2011-06-22 18:44:37 +02:00
parent b86c8800e2
commit 7d3d45645e
6 changed files with 134 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloaterwater.cpp
View File

@ -628,10 +628,8 @@ void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl)
}
// > Presets prev/next controls -WoLf
void LLFloaterWater::onPrevPreset(void* user_data)
void LLFloaterWater::onPrevPreset()
{
LLFloaterWater* self = (LLFloaterWater*) user_data;
LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
LLWaterParamSet & currentParams = param_mgr->mCurParams;
@ -650,14 +648,12 @@ void LLFloaterWater::onPrevPreset(void* user_data)
mIt--;
}
param_mgr->loadPreset(mIt->first, true);
LLComboBox* WWcomboBox = self->getChild<LLComboBox>("WaterPresetsCombo");
LLComboBox* WWcomboBox = getChild<LLComboBox>("WaterPresetsCombo");
WWcomboBox->setSimple(mIt->first);
}
void LLFloaterWater::onNextPreset(void* user_data)
void LLFloaterWater::onNextPreset()
{
LLFloaterWater* self = (LLFloaterWater*) user_data;
LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
LLWaterParamSet& currentParams = param_mgr->mCurParams;
@ -676,7 +672,7 @@ void LLFloaterWater::onNextPreset(void* user_data)
mIt++;
}
param_mgr->loadPreset(mIt->first, true);
LLComboBox* WWcomboBox = self->getChild<LLComboBox>("WaterPresetsCombo");
LLComboBox* WWcomboBox = getChild<LLComboBox>("WaterPresetsCombo");
WWcomboBox->setSimple(mIt->first);
}
// < Presets prev/next controls -WoLf

4
indra/newview/llfloaterwater.h
View File

@ -100,8 +100,8 @@ public:
void syncMenu();
/// Preset prev/next controls -WoLf
static void onPrevPreset(void* user_data);
static void onNextPreset(void* user_data);
void onPrevPreset();
void onNextPreset();
private:
static std::set<std::string> sDefaultPresets;

13
indra/newview/llfloaterwindlight.cpp
View File

@ -889,12 +889,9 @@ void LLFloaterWindLight::deactivateAnimator()
LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
}
// > Presets prev/next controls -WoLf
void LLFloaterWindLight::onPrevPreset(void* user_data)
void LLFloaterWindLight::onPrevPreset()
{
LLFloaterWindLight* self = (LLFloaterWindLight*) user_data;
// find place of current param
std::map<std::string, LLWLParamSet>::iterator mIt =
LLWLParamManager::instance()->mParamList.find(LLWLParamManager::instance()->mCurParams.mName);
@ -918,14 +915,12 @@ void LLFloaterWindLight::onPrevPreset(void* user_data)
}
deactivateAnimator();
LLWLParamManager::instance()->loadPreset(mIt->first, true);
LLComboBox* WLcomboBox = self->getChild<LLComboBox>("WLPresetsCombo");
LLComboBox* WLcomboBox = getChild<LLComboBox>("WLPresetsCombo");
WLcomboBox->setSimple(mIt->first);
}
void LLFloaterWindLight::onNextPreset(void* user_data)
void LLFloaterWindLight::onNextPreset()
{
LLFloaterWindLight* self = (LLFloaterWindLight*) user_data;
// find place of current param
std::map<std::string, LLWLParamSet>::iterator mIt =
LLWLParamManager::instance()->mParamList.find(LLWLParamManager::instance()->mCurParams.mName);
@ -949,7 +944,7 @@ void LLFloaterWindLight::onNextPreset(void* user_data)
}
deactivateAnimator();
LLWLParamManager::instance()->loadPreset(mIt->first, true);
LLComboBox* WLcomboBox = self->getChild<LLComboBox>("WLPresetsCombo");
LLComboBox* WLcomboBox = getChild<LLComboBox>("WLPresetsCombo");
WLcomboBox->setSimple(mIt->first);
}
// < Presets prev/next controls -WoLf

4
indra/newview/llfloaterwindlight.h
View File

@ -105,8 +105,8 @@ public:
static void deactivateAnimator();
/// Preset prev/next controls -WoLf
static void onPrevPreset(void* user_data);
static void onNextPreset(void* user_data);
void onPrevPreset();
void onNextPreset();
private:
static std::set<std::string> sDefaultPresets;

124
indra/newview/quickprefs.cpp
View File

@ -58,12 +58,10 @@ void FloaterQuickPrefs::onOpen(const LLSD& key)
void FloaterQuickPrefs::initCallbacks(void) {
getChild<LLUICtrl>("WaterPresetsCombo")->setCommitCallback(boost::bind(&FloaterQuickPrefs::onChangeWaterPreset, this, _1));
getChild<LLUICtrl>("WLPresetsCombo")->setCommitCallback(boost::bind(&FloaterQuickPrefs::onChangeSkyPreset, this, _1));
getChild<LLUICtrl>("WLPrevPreset")->setCommitCallback(boost::bind(&LLFloaterWindLight::onPrevPreset, this));
getChild<LLUICtrl>("WLNextPreset")->setCommitCallback(boost::bind(&LLFloaterWindLight::onNextPreset, this));
getChild<LLUICtrl>("WWPrevPreset")->setCommitCallback(boost::bind(&LLFloaterWater::onPrevPreset, this));
getChild<LLUICtrl>("WWNextPreset")->setCommitCallback(boost::bind(&LLFloaterWater::onNextPreset, this));
getChild<LLUICtrl>("WLPrevPreset")->setCommitCallback(boost::bind(&FloaterQuickPrefs::onClickSkyPrev, this));
getChild<LLUICtrl>("WLNextPreset")->setCommitCallback(boost::bind(&FloaterQuickPrefs::onClickSkyNext, this));
getChild<LLUICtrl>("WWPrevPreset")->setCommitCallback(boost::bind(&FloaterQuickPrefs::onClickWaterPrev, this));
getChild<LLUICtrl>("WWNextPreset")->setCommitCallback(boost::bind(&FloaterQuickPrefs::onClickWaterNext, this));
}
BOOL FloaterQuickPrefs::postBuild()
@ -107,11 +105,123 @@ void FloaterQuickPrefs::onChangeWaterPreset(LLUICtrl* ctrl)
void FloaterQuickPrefs::onChangeSkyPreset(LLUICtrl* ctrl)
{
LLFloaterWindLight::deactivateAnimator();
deactivateAnimator();
std::string data = ctrl->getValue().asString();
if(!data.empty())
{
LLWLParamManager::instance()->loadPreset( data);
}
}
void FloaterQuickPrefs::deactivateAnimator()
{
LLWLParamManager::instance()->mAnimator.mIsRunning = false;
LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
}
void FloaterQuickPrefs::onClickWaterPrev()
{
LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
LLWaterParamSet & currentParams = param_mgr->mCurParams;
// find place of current param
std::map<std::string, LLWaterParamSet>::iterator mIt =
param_mgr->mParamList.find(currentParams.mName);
// if at the beginning, loop
if(mIt == param_mgr->mParamList.begin())
{
std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
mIt = last;
}
else
{
mIt--;
}
param_mgr->loadPreset(mIt->first, true);
LLComboBox* WWcomboBox = getChild<LLComboBox>("WaterPresetsCombo");
WWcomboBox->setSimple(mIt->first);
}
void FloaterQuickPrefs::onClickWaterNext()
{
LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
LLWaterParamSet& currentParams = param_mgr->mCurParams;
// find place of current param
std::map<std::string, LLWaterParamSet>::iterator mIt =
param_mgr->mParamList.find(currentParams.mName);
// if at the end, loop
std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
if(mIt == last)
{
mIt = param_mgr->mParamList.begin();
}
else
{
mIt++;
}
param_mgr->loadPreset(mIt->first, true);
LLComboBox* WWcomboBox = getChild<LLComboBox>("WaterPresetsCombo");
WWcomboBox->setSimple(mIt->first);
}
void FloaterQuickPrefs::onClickSkyPrev()
{
// find place of current param
std::map<std::string, LLWLParamSet>::iterator mIt =
LLWLParamManager::instance()->mParamList.find(LLWLParamManager::instance()->mCurParams.mName);
// shouldn't happen unless you delete every preset but Default
if (mIt == LLWLParamManager::instance()->mParamList.end())
{
llwarns << "No more presets left!" << llendl;
return;
}
// if at the beginning, loop
if(mIt == LLWLParamManager::instance()->mParamList.begin())
{
std::map<std::string, LLWLParamSet>::iterator last = LLWLParamManager::instance()->mParamList.end(); --last;
mIt = last;
}
else
{
mIt--;
}
deactivateAnimator();
LLWLParamManager::instance()->loadPreset(mIt->first, true);
LLComboBox* WLcomboBox = getChild<LLComboBox>("WLPresetsCombo");
WLcomboBox->setSimple(mIt->first);
}
void FloaterQuickPrefs::onClickSkyNext()
{
// find place of current param
std::map<std::string, LLWLParamSet>::iterator mIt =
LLWLParamManager::instance()->mParamList.find(LLWLParamManager::instance()->mCurParams.mName);
// shouldn't happen unless you delete every preset but Default
if (mIt == LLWLParamManager::instance()->mParamList.end())
{
llwarns << "No more presets left!" << llendl;
return;
}
// if at the end, loop
std::map<std::string, LLWLParamSet>::iterator last = LLWLParamManager::instance()->mParamList.end(); --last;
if(mIt == last)
{
mIt = LLWLParamManager::instance()->mParamList.begin();
}
else
{
mIt++;
}
deactivateAnimator();
LLWLParamManager::instance()->loadPreset(mIt->first, true);
LLComboBox* WLcomboBox = getChild<LLComboBox>("WLPresetsCombo");
WLcomboBox->setSimple(mIt->first);
}

5
indra/newview/quickprefs.h
View File

@ -46,6 +46,11 @@ class FloaterQuickPrefs : public LLTransientDockableFloater
void initCallbacks(void);
void onChangeWaterPreset(LLUICtrl* ctrl);
void onChangeSkyPreset(LLUICtrl* ctrl);
void deactivateAnimator();
void onClickSkyPrev();
void onClickSkyNext();
void onClickWaterPrev();
void onClickWaterNext();
};
#endif