diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-03 02:41:26 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-03 02:41:26 -0600 |
| commit | 0db5669b68ecb46db9161782ff42d320b4c331b7 (patch) | |
| tree | 4f38fbd6fb39e0672a08eec779840113e9449f5b | |
| parent | 48b107ac97a3de61ba028c6058fc1c848309e60f (diff) | |
| parent | 5d7fe43f64e904d5873d6c2f6e53b90e82753c7b (diff) | |
merge
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 14 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
2 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ef3803aed6..10799a6ed8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1380,7 +1380,19 @@ <real>0.05</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>54</real> + </map> + + <key>CertStore</key> <map> <key>Comment</key> diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 1c91c528f7..fa156c85e3 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6161,8 +6161,9 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) subject_distance *= 1000.f; F32 fnumber = gSavedSettings.getF32("CameraFNumber"); F32 focal_length = gSavedSettings.getF32("CameraFocalLength"); - F32 coc = gSavedSettings.getF32("CameraCoC"); + F32 coc_ratio = gSavedSettings.getF32("CameraCoCRatio"); + F32 coc = coc_ratio/mScreen.getHeight(); F32 hyperfocal_distance = (focal_length*focal_length)/(fnumber*coc); |