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

Added NaCl version of rightclick-mousewheel-zoom for mouselook. From Charlice Yao, NaCl

meow-7.2.2
Selo 2011-09-18 15:25:54 +02:00
parent 0fda801820
commit b538c41018
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/app_settings/settings.xml
View File

@ -16408,5 +16408,20 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>_NACL_MLFovValues</key>
<map>
<key>Comment</key>
<string>NaCl Fov zoom values</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Vector3</string>
<key>Value</key>
<array>
<real>1.047197551</real>
<real>1.047197551</real>
<real>0.0</real>
</array>
</map>
</map>
</llsd>

37
indra/newview/lltoolcomp.cpp
View File

@ -741,9 +741,30 @@ BOOL LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
*/
// Returning true will suppress the context menu
// NaCl - Rightclick-mousewheel zoom
static LLCachedControl<LLVector3> _NACL_MLFovValues(gSavedSettings,"_NACL_MLFovValues");
static LLCachedControl<F32> CameraAngle(gSavedSettings,"CameraAngle");
LLVector3 vTemp=_NACL_MLFovValues;
vTemp.mV[0]=CameraAngle;
vTemp.mV[2]=1.0f;
gSavedSettings.setVector3("_NACL_MLFovValues",vTemp);
gSavedSettings.setF32("CameraAngle",vTemp.mV[1]);
// NaCl End
return TRUE;
}
// NaCl - Rightclick-mousewheel zoom
BOOL LLToolCompGun::handleRightMouseUp(S32 x, S32 y, MASK mask)
{
static LLCachedControl<LLVector3> _NACL_MLFovValues(gSavedSettings,"_NACL_MLFovValues");
static LLCachedControl<F32> CameraAngle(gSavedSettings,"CameraAngle");
LLVector3 vTemp=_NACL_MLFovValues;
vTemp.mV[1]=CameraAngle;
vTemp.mV[2]=0.0f;
gSavedSettings.setVector3("_NACL_MLFovValues",vTemp);
gSavedSettings.setF32("CameraAngle",vTemp.mV[0]);
return TRUE;
}
// NaCl End
BOOL LLToolCompGun::handleMouseUp(S32 x, S32 y, MASK mask)
{
@ -777,7 +798,19 @@ void LLToolCompGun::handleDeselect()
BOOL LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks)
{
if (clicks > 0)
// NaCl - Rightclick-mousewheel zoom
static LLCachedControl<LLVector3> _NACL_MLFovValues(gSavedSettings,"_NACL_MLFovValues");
static LLCachedControl<F32> CameraAngle(gSavedSettings,"CameraAngle");
LLVector3 vTemp=_NACL_MLFovValues;
vTemp.mV[1]=CameraAngle;
if(vTemp.mV[2] > 0.0f)
{
vTemp.mV[1]+=clicks*0.1;
gSavedSettings.setVector3("_NACL_MLFovValues",vTemp);
gSavedSettings.setF32("CameraAngle",vTemp.mV[1]);
}
else if (clicks > 0)
// NaCl End
{
gAgentCamera.changeCameraToDefault();

6
indra/newview/lltoolcomp.h
View File

@ -53,6 +53,9 @@ public:
virtual BOOL handleHover(S32 x, S32 y, MASK mask) { return mCur->handleHover( x, y, mask ); }
virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) { return mCur->handleScrollWheel( x, y, clicks ); }
virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) { return mCur->handleRightMouseDown( x, y, mask ); }
// NaCl - Rightclick-mousewheel zoom
virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask) { return mCur->handleRightMouseUp( x, y, mask ); }
// NaCl End
virtual LLViewerObject* getEditingObject() { return mCur->getEditingObject(); }
virtual LLVector3d getEditingPointGlobal() { return mCur->getEditingPointGlobal(); }
@ -218,6 +221,9 @@ public:
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
// NaCl - Rightclick-mousewheel zoom
virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask);
// NaCl End
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
virtual void onMouseCaptureLost();