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

[RLVa] Fix things that weren't working (new commands with params)

Browse Source 
Code cleanup, better word a comment or two
Don't claim to support camdraw* or camtextures commands until we actually do
This commit is contained in:
Inusaito Sayori
2015-06-04 09:35:59 -04:00
parent e7a0867cf3
commit 63b67d62ef
3 changed files with 45 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/rlvui.cpp
View File

@@ -97,6 +97,12 @@ RlvUIEnabler::RlvUIEnabler()
// onToggleCamXXX
m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_CAMUNLOCK, boost::bind(&RlvUIEnabler::onToggleCamUnlock, this)));
void onToggleCamZoom(const ERlvBehaviour& eBhvr);
m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_CAMZOOMMAX, boost::bind(onToggleCamZoom, RLV_BHVR_CAMZOOMMAX)));
m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_CAMZOOMMIN, boost::bind(onToggleCamZoom, RLV_BHVR_CAMZOOMMIN)));
void onToggleCamDist(const ERlvBehaviour& eBhvr);
m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_CAMDISTMAX, boost::bind(onToggleCamDist, RLV_BHVR_CAMDISTMAX)));
m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_CAMDISTMIN, boost::bind(onToggleCamDist, RLV_BHVR_CAMDISTMIN)));
// onToggleTp
m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_TPLOC, boost::bind(&RlvUIEnabler::onToggleTp, this)));
@@ -356,6 +362,35 @@ void RlvUIEnabler::onToggleCamUnlock()
gAgentCamera.resetView(true, true);
}
// Checked: 2015-06-04 (RLVa:LF)
void onToggleCamZoom(const ERlvBehaviour& eBhvr)
{
if (gRlvHandler.hasBehaviour(eBhvr))
{
LLViewerCamera& inst(LLViewerCamera::instance());
inst.mSavedFOVLoaded ? inst.loadDefaultFOV() : inst.setDefaultFOV(gSavedSettings.getF32("CameraAngle"));
}
}
// Checked: 2015-06-04 (RLVa:LF)
void onToggleCamDist(const ERlvBehaviour& eBhvr)
{
if (gRlvHandler.hasBehaviour(eBhvr))
{
if (eBhvr == RLV_BHVR_CAMDISTMAX && gRlvHandler.camPole(eBhvr) <= 0)
{
if (!gAgentCamera.cameraMouselook())
gAgentCamera.changeCameraToMouselook();
}
else
{
if (eBhvr == RLV_BHVR_CAMDISTMIN && gRlvHandler.camPole(eBhvr) > 0 && gAgentCamera.cameraMouselook())
gAgentCamera.changeCameraToDefault();
gAgentCamera.cameraPanUp(0); // Hacky, but meh, issues a proper call to calcCameraPositionTargetGlobal().
}
}
}
// Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
void RlvUIEnabler::onToggleTp()
{