summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-04 17:10:40 -0500
committerDave Parks <davep@lindenlab.com>2011-05-04 17:10:40 -0500
commita81356f841860c0da1ff991393239f6c9221c9f1 (patch)
treed91c1f878014ece7a12323fc4024178465d7a10f /indra
parentfa210390b06b6f8e9849372d59ac616679bc2930 (diff)
SH-1456 Fix for bad DoF focal point when camera is at rest.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/pipeline.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 02c17f9e78..923c02b860 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6305,7 +6305,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
LLViewerObject* obj = LLViewerMediaFocus::getInstance()->getFocusedObject();
if (obj && obj->mDrawable && obj->isSelected())
- {
+ { //focus on selected media object
S32 face_idx = LLViewerMediaFocus::getInstance()->getFocusedFace();
if (obj && obj->mDrawable)
{
@@ -6320,11 +6320,11 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
if (focus_point.isExactlyZero())
{
if (LLViewerJoystick::getInstance()->getOverrideCamera())
- {
+ { //focus on point under cursor
focus_point = gDebugRaycastIntersection;
}
else if (gAgentCamera.cameraMouselook())
- {
+ { //focus on point under mouselook crosshairs
gViewerWindow->cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE,
NULL,
&focus_point);
@@ -6333,12 +6333,12 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
{
LLViewerObject* obj = gAgentCamera.getFocusObject();
if (obj)
- {
+ { //focus on alt-zoom target
focus_point = LLVector3(gAgentCamera.getFocusGlobal()-gAgent.getRegion()->getOriginGlobal());
}
else
- {
- focus_point = gDebugRaycastIntersection;
+ { //focus on your avatar
+ focus_point = gAgent.getPositionAgent();
}
}
}