livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DoF tweaks -- halo hiding, etc.

meow-7.2.2
Dave Parks 2010-12-03 03:52:57 -06:00
parent 0db5669b68
commit ec9ba94b69
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
View File

@ -73,12 +73,14 @@ void main()
{ //pixel is behind far focal plane
float w = 1.0;
float fd = far_focal_distance;
float fd = (depth[0]-far_focal_distance)*0.5+far_focal_distance;
float sc = far_focal_distance - depth[0];
sc /= -far_focal_distance;
sc /= near_focal_distance-far_focal_distance;
sc = sqrt(sc);
sc = min(sc, 8.0);
while (sc > 1.0)
{
dofSample(diff,w, fd, sc,sc);
@ -104,8 +106,10 @@ void main()
{ //pixel is in front of near focal plane
//diff.r = 1.0;
float w = 1.0;
float sc = depth[0] - fd;
sc = min(-sc/fd*16.0, 8.0);
float sc = near_focal_distance-depth[0];
sc /= near_focal_distance;
sc *= 8.0;
sc = min(sc, 8.0);
fd = depth[0];
while (sc > 1.0)

5
indra/newview/pipeline.cpp
View File

@ -6174,8 +6174,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
//adjust focal length for zoom
F32 fov = LLViewerCamera::getInstance()->getView();
F32 default_fov = LLViewerCamera::getInstance()->getDefaultFOV();
focal_length *= default_fov/fov;
focal_length *= 1.f/fov;
F32 near_focal_distance = hyperfocal_distance*subject_distance/(hyperfocal_distance+subject_distance);
@ -6197,7 +6196,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
if (channel > -1)
{
mScreen.bindTexture(0, channel);
gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
}
gGL.begin(LLRender::TRIANGLE_STRIP);