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

Feature Request: Add an option to "Make rightclick zoom instantaneous, not smooth" (in Input & Camera preferences)

Browse Source
This commit is contained in:
Lirusaito
2014-05-25 12:44:48 -04:00
parent 0d94dd7bf8
commit 0a3a4a51bd
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -867,6 +867,17 @@
<key>Value</key> <key>Value</key>
<boolean>1</boolean> <boolean>1</boolean>
</map> </map>
<key>LiruMouselookInstantZoom</key>
<map>
<key>Comment</key>
<string>Whether or not the right click zoom in mouselook will be instant or smoothly transition between zooms</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>0</boolean>
</map>
<key>LiruMouselookMenu</key> <key>LiruMouselookMenu</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

3
indra/newview/lltoolcomp.cpp
View File

@@ -783,6 +783,7 @@ BOOL LLToolCompGun::handleRightMouseUp(S32 x, S32 y, MASK mask)
mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV(); mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
mTargetFOV = mOriginalFOV; mTargetFOV = mOriginalFOV;
gSavedSettings.getBOOL("LiruMouselookInstantZoom") ? LLViewerCamera::getInstance()->setDefaultFOV(mTargetFOV) :
mTimerFOV.start(); mTimerFOV.start();
} }
@@ -814,6 +815,7 @@ BOOL LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
else mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV(); else mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
mTargetFOV = gSavedSettings.getF32("ExodusAlternativeFOV"); mTargetFOV = gSavedSettings.getF32("ExodusAlternativeFOV");
gSavedSettings.getBOOL("LiruMouselookInstantZoom") ? LLViewerCamera::getInstance()->setDefaultFOV(mTargetFOV) :
mTimerFOV.start(); mTimerFOV.start();
return TRUE; return TRUE;
@@ -832,6 +834,7 @@ BOOL LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks)
llclamp(mTargetFOV -= (0.05f * -clicks), 0.1f, 3.0f) llclamp(mTargetFOV -= (0.05f * -clicks), 0.1f, 3.0f)
); );
gSavedSettings.getBOOL("LiruMouselookInstantZoom") ? LLViewerCamera::getInstance()->setDefaultFOV(mTargetFOV) :
mTimerFOV.start(); mTimerFOV.start();
} }
else if (clicks > 0) gAgentCamera.changeCameraToDefault(); else if (clicks > 0) gAgentCamera.changeCameraToDefault();

1
indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
View File

@@ -4,6 +4,7 @@
<text bottom="-20" follows="top" height="10" left="148" name=" Mouse Sensitivity:">Mouse Sensitivity:</text> <text bottom="-20" follows="top" height="10" left="148" name=" Mouse Sensitivity:">Mouse Sensitivity:</text>
<slider_bar bottom="-26" follows="top" height="16" increment="0.25" initial_val="2" left="276" max_val="15" min_val="0" name="mouse_sensitivity" width="128"/> <slider_bar bottom="-26" follows="top" height="16" increment="0.25" initial_val="2" left="276" max_val="15" min_val="0" name="mouse_sensitivity" width="128"/>
<check_box bottom_delta="-18" follows="top" height="16" label="Invert Mouse" left="148" name="invert_mouse"/> <check_box bottom_delta="-18" follows="top" height="16" label="Invert Mouse" left="148" name="invert_mouse"/>
<check_box bottom_delta="-18" follows="top" height="16" control_name="LiruMouselookInstantZoom" label="Make rightclick zoom instantaneous, not smooth" name="instant_zoom"/>
<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Show Avatar in Mouselook" name="first_person_avatar_visible"/> <check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Show Avatar in Mouselook" name="first_person_avatar_visible"/>
<check_box bottom_delta="-18" follows="top" height="16" control_name="UseRealisticMouselook" label="Use 'realistic' Camera behavior in Mouselook" name="UseRealisticMouselook"/> <check_box bottom_delta="-18" follows="top" height="16" control_name="UseRealisticMouselook" label="Use 'realistic' Camera behavior in Mouselook" name="UseRealisticMouselook"/>
<text bottom_delta="-18" follows="top" height="16" name="UI Hidden in mouselook:">UI Hidden in mouselook:</text> <text bottom_delta="-18" follows="top" height="16" name="UI Hidden in mouselook:">UI Hidden in mouselook:</text>