Skip to content

Commit

Permalink
Made loading stages configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
Xottab-DUTY committed Feb 9, 2018
1 parent fd56bca commit 404d528
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/Layers/xrRender/dxApplicationRender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ void dxApplicationRender::load_draw_internal(CApplication& owner)
float fTargetWidth = 600.0f * k.x * (b_ws ? 0.8f : 1.0f);
draw_multiline_text(owner.pFontSystem, fTargetWidth, owner.ls_tip);

owner.pFontSystem->OnRender();

// draw level-specific screenshot
if (hLevelLogo)
{
Expand All @@ -233,10 +231,11 @@ void dxApplicationRender::load_draw_internal(CApplication& owner)
logo_tex_coords.rb.set(1.0f, 0.77926f);

draw_face(hLevelLogo, r, logo_tex_coords, Fvector2().set(1, 1));
owner.pFontSystem->SetColor(color_rgba(180, 180, 180, 200));
if (ps_rs_loading_stages)
owner.pFontSystem->SetColor(color_rgba(180, 180, 180, 200));
}

owner.pFontSystem->OutI(0.f, 0.385f, owner.ls_title); // XXX: 0.385f <- hardcoded coordinates
if (ps_rs_loading_stages)
owner.pFontSystem->OutI(0.f, 0.385f, owner.ls_title); // XXX: 0.385f <- hardcoded coordinates
owner.pFontSystem->OnRender();
}

Expand Down
2 changes: 2 additions & 0 deletions src/Layers/xrRender/xrRender_console.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ u32 ps_r3_minmax_sm = 3; // = 0;
const xr_token qminmax_sm_token[] = {{"off", 0}, {"on", 1}, {"auto", 2}, {"autodetect", 3}, {nullptr, 0}};

int ps_r2_fxaa = 0;
int ps_rs_loading_stages = 0;

// “Off”
// “DX10.0 style [Standard]”
Expand Down Expand Up @@ -652,6 +653,7 @@ void xrRender_initconsole()
{
CMD3(CCC_Preset, "_preset", &ps_Preset, qpreset_token);

CMD4(CCC_Integer, "rs_loadingstages", &ps_rs_loading_stages, 0, 1);
CMD4(CCC_Integer, "rs_skeleton_update", &psSkeletonUpdate, 2, 128);
#ifdef DEBUG
CMD1(CCC_DumpResources, "dump_resources");
Expand Down
1 change: 1 addition & 0 deletions src/Layers/xrRender/xrRender_console.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ extern ECORE_API u32 ps_r3_minmax_sm; // = 0;
extern ECORE_API const xr_token qminmax_sm_token[];

extern ECORE_API int ps_r2_fxaa;
extern ECORE_API int ps_rs_loading_stages;

extern ENGINE_API int ps_r__Supersample;
extern ECORE_API int ps_r__LightSleepFrames;
Expand Down

0 comments on commit 404d528

Please sign in to comment.