Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature Request: Add Camera preset switching functionality (part of quicksettings)

Browse Source 
Hitting Escape will reset to the normal Back preset
Adds new Cam_Preset_*_(On|Off).png textures, these should probably be reskinned, any volunteers?
This commit is contained in:
Inusaito Sayori
2013-11-01 17:35:12 -04:00
parent 2d421a27e1
commit 0fc9d540bf
10 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/wlfPanel_AdvSettings.cpp
View File

@@ -47,6 +47,7 @@
#include "llfloaterwindlight.h"
#include "llfloaterwater.h"
#include "llagentcamera.h"
#include "lldaycyclemanager.h"
#include "llenvmanager.h"
#include "llwaterparammanager.h"
@@ -58,6 +59,7 @@ wlfPanel_AdvSettings::wlfPanel_AdvSettings() : mExpanded(false)
setVisible(false);
setIsChrome(TRUE);
setFocusRoot(TRUE);
mCommitCallbackRegistrar.add("Wlf.ChangeCameraPreset", boost::bind(&wlfPanel_AdvSettings::onChangeCameraPreset, this, _1, _2));
if(rlv_handler_t::isEnabled())
gRlvHandler.setBehaviourToggleCallback(boost::bind(&wlfPanel_AdvSettings::onRlvBehaviorChange, this, _1, _2));
}
@@ -184,6 +186,14 @@ BOOL wlfPanel_AdvSettings::postBuild()
mTimeSlider->setCommitCallback(boost::bind(&wlfPanel_AdvSettings::onChangeDayTime, this, _2));
updateTimeSlider();
updateRlvVisibility();
const U32 preset(gSavedSettings.getU32("CameraPreset"));
if (preset == CAMERA_PRESET_REAR_VIEW)
getChildView("Rear")->setValue(true);
else if (preset == CAMERA_PRESET_FRONT_VIEW)
getChildView("Front")->setValue(true);
else if (preset == CAMERA_PRESET_GROUP_VIEW)
getChildView("Group")->setValue(true);
}
return TRUE;
}
@@ -203,6 +213,24 @@ void wlfPanel_AdvSettings::onClickExpandBtn(void* user_data)
gSavedSettings.setBOOL("wlfAdvSettingsPopup",!gSavedSettings.getBOOL("wlfAdvSettingsPopup"));
}
void wlfPanel_AdvSettings::onChangeCameraPreset(LLUICtrl* ctrl, const LLSD& param)
{
if (!ctrl->getValue()) // One of these must be set at all times
{
ctrl->setValue(true);
return;
}
// 0 is rear, 1 is front, 2 is group
const ECameraPreset preset((param.asInteger() == 0) ? CAMERA_PRESET_REAR_VIEW : (param.asInteger() == 1) ? CAMERA_PRESET_FRONT_VIEW : CAMERA_PRESET_GROUP_VIEW);
// Turn off the other preset indicators
if (preset != CAMERA_PRESET_REAR_VIEW) getChildView("Rear")->setValue(false);
if (preset != CAMERA_PRESET_FRONT_VIEW) getChildView("Front")->setValue(false);
if (preset != CAMERA_PRESET_GROUP_VIEW) getChildView("Group")->setValue(false);
// Actually switch the camera
gAgentCamera.switchCameraPreset(preset);
}
void wlfPanel_AdvSettings::onUseRegionSettings(const LLSD& value)
{
LLEnvManagerNew::instance().setUseRegionSettings(value.asBoolean(), gSavedSettings.getBOOL("PhoenixInterpolateSky"));