summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-03-08 14:15:24 -0600
committerDave Parks <davep@lindenlab.com>2011-03-08 14:15:24 -0600
commit94b0ce6d842a1f34bd46535a8b4db68aa397a541 (patch)
treece6531f0130aaf9e01378bebdf1335ffb66656ac /indra/newview/pipeline.cpp
parent00c861f9678d21fc10a4cf481158732cf88c3805 (diff)
Make DoF focal point match behavior described in test plan at http://wiki.secondlife.com/wiki/Depth_of_Field_test
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 6af371072b..c8ef75030d 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6202,6 +6202,12 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
{
focus_point = gDebugRaycastIntersection;
}
+ else if (gAgentCamera.cameraMouselook())
+ {
+ gViewerWindow->cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE,
+ NULL,
+ &focus_point);
+ }
else
{
LLViewerObject* obj = gAgentCamera.getFocusObject();
@@ -6209,6 +6215,10 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
{
focus_point = LLVector3(gAgentCamera.getFocusGlobal()-gAgent.getRegion()->getOriginGlobal());
}
+ else
+ {
+ focus_point = gDebugRaycastIntersection;
+ }
}
}