Skip to content

Commit

Permalink
Details casts shadow from dynamic lights.
Browse files Browse the repository at this point in the history 
Console command r2_sun_details renamed to r2_detail_shadow.
  • Loading branch information
@RainbowZerg
RainbowZerg committed Jul 6, 2018
1 parent ba25be8 commit e1e6db1
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/Layers/xrRender/xrRender_console.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,7 @@ void xrRender_initconsole()

//CMD4(CCC_Float, "r__detail_density", &ps_r__Detail_density, .05f, 0.99f);
CMD4(CCC_Float, "r__detail_density", &ps_current_detail_density/*&ps_r__Detail_density*/, 0.04f, 0.6f); //AVO: extended from 0.2f to 0.04f and replaced variable
CMD3(CCC_Mask, "r2_detail_shadow", &ps_r2_ls_flags, R2FLAG_DETAIL_SHADOW);

#ifdef DEBUG
CMD4(CCC_Float, "r__detail_l_ambient", &ps_r__Detail_l_ambient, .5f, .95f);
Expand Down Expand Up @@ -786,7 +787,6 @@ void xrRender_initconsole()
#endif // DEBUG

CMD3(CCC_Mask, "r2_sun", &ps_r2_ls_flags, R2FLAG_SUN);
CMD3(CCC_Mask, "r2_sun_details", &ps_r2_ls_flags, R2FLAG_SUN_DETAILS);
CMD3(CCC_Mask, "r2_sun_focus", &ps_r2_ls_flags, R2FLAG_SUN_FOCUS);
//CMD3(CCC_Mask, "r2_sun_static", &ps_r2_ls_flags, R2FLAG_SUN_STATIC);
//CMD3(CCC_Mask, "r2_exp_splitscene", &ps_r2_ls_flags, R2FLAG_EXP_SPLIT_SCENE);
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/xrRender_console.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ enum
R2FLAG_SUN = (1 << 0),
R2FLAG_SUN_FOCUS = (1 << 1),
R2FLAG_SUN_TSM = (1 << 2),
R2FLAG_SUN_DETAILS = (1 << 3),
R2FLAG_DETAIL_SHADOW = (1 << 3),
R2FLAG_TONEMAP = (1 << 4),
R2FLAG_AA = (1 << 5),
R2FLAG_GI = (1 << 6),
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRenderPC_GL/r2_R_sun.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ void CRender::render_sun_near()
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(fuckingsun->X.D.combine);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
fuckingsun->X.D.transluent = FALSE;
if (bSpecial)
Expand Down Expand Up @@ -1369,7 +1369,7 @@ void CRender::render_sun_cascade(u32 cascade_ind)
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(fuckingsun->X.D.combine);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
fuckingsun->X.D.transluent = FALSE;
if (bSpecial)
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_GL/r3_R_rain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ void CRender::render_rain()
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(RainLight.X.D.combine);
r_dsgraph_render_graph(0);
//if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
//if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
// Details->Render () ;
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/xrRenderPC_R2/r2_R_lights.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ void CRender::render_lights(light_Package& LP)
RCache.set_xform_view(L->X.S.view);
RCache.set_xform_project(L->X.S.project);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
L->X.S.transluent = FALSE;
if (bSpecial)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRenderPC_R2/r2_R_sun.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ void CRender::render_sun_near()
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(fuckingsun->X.D.combine);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
fuckingsun->X.D.transluent = FALSE;
if (bSpecial)
Expand Down Expand Up @@ -1754,7 +1754,7 @@ void CRender::render_sun_cascade(u32 cascade_ind)
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(fuckingsun->X.D.combine);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
fuckingsun->X.D.transluent = FALSE;
if (bSpecial)
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/xrRenderPC_R3/r2_R_lights.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ void CRender::render_lights(light_Package& LP)
RCache.set_xform_view(L->X.S.view);
RCache.set_xform_project(L->X.S.project);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
L->X.S.transluent = FALSE;
if (bSpecial)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R3/r3_R_rain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ void CRender::render_rain()
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(RainLight.X.D.combine);
r_dsgraph_render_graph(0);
// if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
// if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
// Details->Render () ;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRenderPC_R3/r3_R_sun.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ void CRender::render_sun_near()
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(fuckingsun->X.D.combine);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
fuckingsun->X.D.transluent = FALSE;
if (bSpecial)
Expand Down Expand Up @@ -1345,7 +1345,7 @@ void CRender::render_sun_cascade(u32 cascade_ind)
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(fuckingsun->X.D.combine);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
fuckingsun->X.D.transluent = FALSE;
if (bSpecial)
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/xrRenderPC_R4/r2_R_lights.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ void CRender::render_lights(light_Package& LP)
RCache.set_xform_view(L->X.S.view);
RCache.set_xform_project(L->X.S.project);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
L->X.S.transluent = FALSE;
if (bSpecial)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_R4/r4_R_rain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ void CRender::render_rain()
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(RainLight.X.D.combine);
r_dsgraph_render_graph(0);
// if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
// if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
// Details->Render () ;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRenderPC_R4/r4_R_sun.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ void CRender::render_sun_near()
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(fuckingsun->X.D.combine);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
fuckingsun->X.D.transluent = FALSE;
if (bSpecial)
Expand Down Expand Up @@ -1343,7 +1343,7 @@ void CRender::render_sun_cascade(u32 cascade_ind)
RCache.set_xform_view(Fidentity);
RCache.set_xform_project(fuckingsun->X.D.combine);
r_dsgraph_render_graph(0);
if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
if (ps_r2_ls_flags.test(R2FLAG_DETAIL_SHADOW))
Details->Render();
fuckingsun->X.D.transluent = FALSE;
if (bSpecial)
Expand Down

0 comments on commit e1e6db1

Please sign in to comment.