diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-10 15:16:18 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-10 15:16:18 -0600 |
| commit | ab939f2683431bb194b07f16f527d45f80e3178d (patch) | |
| tree | f5919eff089753b0f3e3ae50b3cf052650025acf /indra/newview/pipeline.cpp | |
| parent | ffd7779e5b1f048c9c2220496f7382c2ad1b02eb (diff) | |
DoF tweaks cleanup.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
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)) |