TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass canvas to info_display_default

Browse source
This commit is contained in:
Kp 2017-03-10 01:22:26 +00:00
parent c708d30ca4
commit 4a7a6663d5
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
similar/editor/info.cpp
View file

@ -196,7 +196,7 @@ static void info_display_segsize(grs_canvas &canvas, int show_all)
}
// ---------------------------------------------------------------------------------------------------
static void info_display_default(int show_all)
static void info_display_default(grs_canvas &canvas, int show_all)
{
static int old_Num_segments = -1;
static int old_Num_vertices = -1;
@ -221,27 +221,27 @@ static void info_display_default(int show_all)
old_Num_triggers = -1;
}
gr_set_fontcolor(*grd_curcanv, CBLACK, CWHITE);
gr_set_fontcolor(canvas, CBLACK, CWHITE);
//--------------- Number of segments ----------------
if ( old_Num_segments != Num_segments ) {
gr_uprintf(*grd_curcanv, 0, 0, "Segments: %4d/%4" PRIuFAST32, Num_segments, static_cast<uint_fast32_t>(MAX_SEGMENTS));
old_Num_segments = Num_segments;
gr_uprintf(canvas, 0, 0, "Segments: %4d/%4" PRIuFAST32, Num_segments, static_cast<uint_fast32_t>(MAX_SEGMENTS));
}
//---------------- Number of vertics -----------------
if ( old_Num_vertices != Num_vertices ) {
gr_uprintf(*grd_curcanv, 0, 16, "Vertices: %4d/%4" PRIuFAST32, Num_vertices, static_cast<uint_fast32_t>(MAX_VERTICES));
old_Num_vertices = Num_vertices;
gr_uprintf(canvas, 0, 16, "Vertices: %4d/%4" PRIuFAST32, Num_vertices, static_cast<uint_fast32_t>(MAX_VERTICES));
}
//---------------- Number of objects -----------------
if ( old_Num_objects != num_objects ) {
old_Num_objects = num_objects;
gr_uprintf(*grd_curcanv, 0, 32, "Objs: %3d/%3" DXX_PRI_size_type, num_objects, MAX_OBJECTS);
gr_uprintf(canvas, 0, 32, "Objs: %3d/%3" DXX_PRI_size_type, num_objects, MAX_OBJECTS);
}
//--------------- Current_segment_number -------------
@ -250,9 +250,9 @@ static void info_display_default(int show_all)
if (old_Cursegp_num != Cursegp || old_Curside != Curside)
{
old_Cursegp_num = Cursegp;
gr_uprintf(*grd_curcanv, 0, 48, "Cursegp/side: %3hu/%1d", static_cast<segnum_t>(Cursegp), Curside);
gr_uprintf(*grd_curcanv, 0, 128, " tmap1,2,o: %3d/%3dx%1d", Cursegp->sides[Curside].tmap_num, Cursegp->sides[Curside].tmap_num2 & 0x3FFF, (Cursegp->sides[Curside].tmap_num2 >> 14) & 3);
old_Curside = Curside;
gr_uprintf(canvas, 0, 48, "Cursegp/side: %3hu/%1d", static_cast<segnum_t>(Cursegp), Curside);
gr_uprintf(canvas, 0, 128, " tmap1,2,o: %3d/%3dx%1d", Cursegp->sides[Curside].tmap_num, Cursegp->sides[Curside].tmap_num2 & 0x3FFF, (Cursegp->sides[Curside].tmap_num2 >> 14) & 3);
}
//--------------- Current_vertex_numbers -------------
@ -260,9 +260,9 @@ static void info_display_default(int show_all)
if (old_Cursegp_num_for_verts != Cursegp)
{
old_Cursegp_num_for_verts = Cursegp;
gr_uprintf(*grd_curcanv, 0, 64, "{%3d,%3d,%3d,%3d,", Cursegp->verts[0],Cursegp->verts[1],
gr_uprintf(canvas, 0, 64, "{%3d,%3d,%3d,%3d,", Cursegp->verts[0],Cursegp->verts[1],
Cursegp->verts[2],Cursegp->verts[3] );
gr_uprintf(*grd_curcanv, 0, 80," %3d,%3d,%3d,%3d}", Cursegp->verts[4],Cursegp->verts[5],
gr_uprintf(canvas, 0, 80," %3d,%3d,%3d,%3d}", Cursegp->verts[4],Cursegp->verts[5],
Cursegp->verts[6],Cursegp->verts[7] );
}
@ -270,24 +270,23 @@ static void info_display_default(int show_all)
if ( old_Num_walls != Num_walls ) {
// gr_uprintf(*grd_curcanv, 0, 96, "Walls/Links %d/%d", Num_walls, Num_links );
gr_uprintf(*grd_curcanv, 0, 96, "Walls %3d", Num_walls );
old_Num_walls = Num_walls;
gr_uprintf(canvas, 0, 96, "Walls %3d", Num_walls);
}
//--------------- Num triggers ----------------------
if ( old_Num_triggers != Num_triggers ) {
gr_uprintf(*grd_curcanv, 0, 112, "Num_triggers %2d", Num_triggers );
old_Num_triggers = Num_triggers;
gr_uprintf(canvas, 0, 112, "Num_triggers %2d", Num_triggers);
}
//--------------- Current texture number -------------
if ( old_CurrentTexture != CurrentTexture ) {
gr_uprintf(*grd_curcanv, 0, 144, "Tex/Light: %3d %5.2f", CurrentTexture, f2fl(TmapInfo[CurrentTexture].lighting));
old_CurrentTexture = CurrentTexture;
gr_uprintf(canvas, 0, 144, "Tex/Light: %3d %5.2f", CurrentTexture, f2fl(TmapInfo[CurrentTexture].lighting));
}
}
// ------------------------------------------------------------------------------------
@ -327,7 +326,7 @@ static window_event_result info_display_all(window *wind,const d_event &event, c
info_display_segsize(*grd_curcanv, show_all);
break;
default:
info_display_default(show_all);
info_display_default(*grd_curcanv, show_all);
break;
}
grd_curcanv = save_canvas;