From ffd7779e5b1f048c9c2220496f7382c2ad1b02eb Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 10 Dec 2010 15:13:58 -0600 Subject: DoF tweaks -- reviewed by Falcon. --- indra/newview/pipeline.cpp | 65 ++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 25 deletions(-) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index f0446b024c..fc8abc2084 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6160,44 +6160,59 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) //convert to mm subject_distance *= 1000.f; F32 fnumber = gSavedSettings.getF32("CameraFNumber"); - F32 focal_length = gSavedSettings.getF32("CameraFocalLength"); - F32 coc_ratio = gSavedSettings.getF32("CameraCoCRatio"); + const F32 default_focal_length = gSavedSettings.getF32("CameraFocalLength"); + //F32 coc_ratio = gSavedSettings.getF32("CameraCoCRatio"); - F32 coc = coc_ratio/mScreen.getHeight(); + //F32 coc = coc_ratio/mScreen.getHeight(); - F32 hyperfocal_distance = (focal_length*focal_length)/(fnumber*coc); - - subject_distance = llmin(hyperfocal_distance, subject_distance); - - //adjust focal length for subject distance - focal_length = llmax(focal_length, 1.f/(1.f/focal_length - 1.f/subject_distance)); - - //adjust focal length for zoom F32 fov = LLViewerCamera::getInstance()->getView(); - focal_length *= 1.f/fov; - - F32 near_focal_distance = hyperfocal_distance*subject_distance/(hyperfocal_distance+subject_distance); - //beyond far clip plane is effectively infinity - F32 far_focal_distance = 4096.f; + const F32 default_fov = gSavedSettings.getF32("CameraFieldOfView") * F_PI/180.f; + const F32 default_aspect_ratio = gSavedSettings.getF32("CameraAspectRatio"); + + F32 aspect_ratio = (F32) mScreen.getWidth()/(F32)mScreen.getHeight(); + + F32 dv = 2.f*default_focal_length * tanf(default_fov/2.f); + F32 dh = 2.f*default_focal_length * tanf(default_fov*default_aspect_ratio/2.f); - if (subject_distance < hyperfocal_distance) - { - far_focal_distance = hyperfocal_distance*subject_distance/(hyperfocal_distance-subject_distance); - far_focal_distance /= 1000.f; - } + F32 focal_length = dv/(2*tanf(fov/2.f)); + + //F32 hyperfocal_distance = (focal_length*focal_length)/(fnumber*coc); + + //subject_distance = llmin(hyperfocal_distance, subject_distance); - near_focal_distance /= 1000.f; + //adjust focal length for subject distance + //focal_length = llmax(focal_length, 1.f/(1.f/focal_length - 1.f/subject_distance)); - shader->uniform1f("far_focal_distance", -far_focal_distance); - shader->uniform1f("near_focal_distance", -near_focal_distance); + F32 tan_pixel_angle = tanf(LLDrawable::sCurPixelAngle); + + // from wikipedia -- c = |s2-s1|/s2 * f^2/(N(S1-f)) + // where N = fnumber + // s2 = dot distance + // s1 = subject distance + // f = focal length + // + + F32 blur_constant = focal_length*focal_length/(fnumber*(subject_distance-focal_length)); + blur_constant /= 1000.f; //convert to meters for shader + F32 magnification = focal_length/(subject_distance-focal_length); + + shader->uniform1f("focal_distance", -subject_distance/1000.f); + shader->uniform1f("blur_constant", blur_constant); + shader->uniform1f("tan_pixel_angle", tanf(1.f/LLDrawable::sCurPixelAngle)); + shader->uniform1f("magnification", magnification); S32 channel = shader->enableTexture(LLViewerShaderMgr::DEFERRED_DIFFUSE, LLTexUnit::TT_RECT_TEXTURE); if (channel > -1) { mScreen.bindTexture(0, channel); - gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT); + gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR); } + //channel = shader->enableTexture(LLViewerShaderMgr::DEFERRED_DEPTH, LLTexUnit::TT_RECT_TEXTURE); + //if (channel > -1) + //{ + //gGL.getTexUnit(channel)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR); + //} gGL.begin(LLRender::TRIANGLE_STRIP); gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); -- cgit v1.2.3 From ab939f2683431bb194b07f16f527d45f80e3178d Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 10 Dec 2010 15:16:18 -0600 Subject: DoF tweaks cleanup. --- indra/newview/pipeline.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index fc8abc2084..64c24750b7 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6161,10 +6161,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) subject_distance *= 1000.f; F32 fnumber = gSavedSettings.getF32("CameraFNumber"); const F32 default_focal_length = gSavedSettings.getF32("CameraFocalLength"); - //F32 coc_ratio = gSavedSettings.getF32("CameraCoCRatio"); - - //F32 coc = coc_ratio/mScreen.getHeight(); - + F32 fov = LLViewerCamera::getInstance()->getView(); const F32 default_fov = gSavedSettings.getF32("CameraFieldOfView") * F_PI/180.f; @@ -6177,13 +6174,6 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) F32 focal_length = dv/(2*tanf(fov/2.f)); - //F32 hyperfocal_distance = (focal_length*focal_length)/(fnumber*coc); - - //subject_distance = llmin(hyperfocal_distance, subject_distance); - - //adjust focal length for subject distance - //focal_length = llmax(focal_length, 1.f/(1.f/focal_length - 1.f/subject_distance)); - F32 tan_pixel_angle = tanf(LLDrawable::sCurPixelAngle); // from wikipedia -- c = |s2-s1|/s2 * f^2/(N(S1-f)) -- cgit v1.2.3