3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved debugging of the EdgeGrid distance field function.

Browse source
This commit is contained in:
bubnikv 2017-01-05 09:09:26 +01:00
parent bb22f1dc8a
commit aad3d4107f
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xs/src/libslic3r/EdgeGrid.cpp
View file

@ -839,6 +839,8 @@ void EdgeGrid::Grid::calculate_sdf()
} }
#if 0 #if 0
static int iRun = 0;
++ iRun;
//#ifdef SLIC3R_GUI //#ifdef SLIC3R_GUI
{ {
wxImage img(ncols, nrows); wxImage img(ncols, nrows);
@ -862,7 +864,7 @@ void EdgeGrid::Grid::calculate_sdf()
} }
} }
} }
img.SaveFile(debug_out_path("unsigned_df.png"), wxBITMAP_TYPE_PNG); img.SaveFile(debug_out_path("unsigned_df-%d.png", iRun), wxBITMAP_TYPE_PNG);
} }
{ {
wxImage img(ncols, nrows); wxImage img(ncols, nrows);
@ -895,7 +897,7 @@ void EdgeGrid::Grid::calculate_sdf()
} }
} }
} }
img.SaveFile(debug_out_path("signed_df.png"), wxBITMAP_TYPE_PNG); img.SaveFile(debug_out_path("signed_df-%d.png", iRun), wxBITMAP_TYPE_PNG);
} }
#endif /* SLIC3R_GUI */ #endif /* SLIC3R_GUI */
@ -1020,7 +1022,7 @@ void EdgeGrid::Grid::calculate_sdf()
} }
} }
} }
img.SaveFile(debug_out_path("signed_df-signs.png"), wxBITMAP_TYPE_PNG); img.SaveFile(debug_out_path("signed_df-signs-%d.png", iRun), wxBITMAP_TYPE_PNG);
} }
#endif /* SLIC3R_GUI */ #endif /* SLIC3R_GUI */
@ -1049,7 +1051,7 @@ void EdgeGrid::Grid::calculate_sdf()
} }
} }
} }
img.SaveFile(debug_out_path("signed_df2.png"), wxBITMAP_TYPE_PNG); img.SaveFile(debug_out_path("signed_df2-%d.png", iRun), wxBITMAP_TYPE_PNG);
} }
#endif /* SLIC3R_GUI */ #endif /* SLIC3R_GUI */
} }
@ -1364,17 +1366,18 @@ void EdgeGrid::save_png(const EdgeGrid::Grid &grid, const BoundingBox &bbox, coo
++iRun; ++iRun;
const coord_t search_radius = grid.resolution() * 2; const coord_t search_radius = grid.resolution() * 2;
const coord_t display_blend_radius = grid.resolution() * 5; const coord_t display_blend_radius = grid.resolution() * 2;
for (coord_t r = 0; r < h; ++r) { for (coord_t r = 0; r < h; ++r) {
for (coord_t c = 0; c < w; ++ c) { for (coord_t c = 0; c < w; ++ c) {
unsigned char *pxl = data + (((h - r - 1) * w) + c) * 3; unsigned char *pxl = data + (((h - r - 1) * w) + c) * 3;
Point pt(c * resolution + bbox.min.x, r * resolution + bbox.min.y); Point pt(c * resolution + bbox.min.x, r * resolution + bbox.min.y);
coordf_t min_dist; coordf_t min_dist;
bool on_segment; bool on_segment = true;
// if (grid.signed_distance_edges(pt, search_radius, min_dist, &on_segment)) { #if 0
if (grid.signed_distance_edges(pt, search_radius, min_dist, &on_segment)) {
#else
if (grid.signed_distance(pt, search_radius, min_dist)) { if (grid.signed_distance(pt, search_radius, min_dist)) {
//FIXME #endif
on_segment = true;
float s = 255 * std::abs(min_dist) / float(display_blend_radius); float s = 255 * std::abs(min_dist) / float(display_blend_radius);
int is = std::max(0, std::min(255, int(floor(s + 0.5f)))); int is = std::max(0, std::min(255, int(floor(s + 0.5f))));
if (min_dist < 0) { if (min_dist < 0) {
@ -1383,9 +1386,9 @@ void EdgeGrid::save_png(const EdgeGrid::Grid &grid, const BoundingBox &bbox, coo
pxl[1] = 255 - is; pxl[1] = 255 - is;
pxl[2] = 255 - is; pxl[2] = 255 - is;
} else { } else {
pxl[0] = 128; pxl[0] = 255;
pxl[1] = 128; pxl[1] = 0;
pxl[2] = 255 - is; pxl[2] = 255 - is;
} }
} }
else { else {