diff options
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 13 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 12 |
2 files changed, 1 insertions, 24 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 054c8d793a..20882dd2de 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1392,19 +1392,6 @@ <real>1.5</real> </map> - <key>CameraCoCRatio</key> - <map> - <key>Comment</key> - <string>Ratio of circle of confusion to vertical resolution for DoF effect.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>45</real> - </map> - - <key>CertStore</key> <map> <key>Comment</key> 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)) |