manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uniformed syntax of the name of the parameters of the rect packer

This commit is contained in:
Paolo Cignoni 2013-04-15 20:56:40 +00:00
parent 14d7fc5bff
commit a1c03d2e61
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vcg/space/rect_packer.h
View File

@ -146,7 +146,7 @@ static bool PackOccupancy(const std::vector<Box2x > & rectVec, /// the set of
return true; return true;
} }
static bool PackMulti(const std::vector<Box2x > & rectVec, /// the set of rectangles that have to be packed (generic floats, no req.) static bool PackMulti(const std::vector<Box2x > & rectVec, /// the set of rectangles that have to be packed (generic floats, no req.)
const Point2i containerSizeX, /// the size of the container where they has to be fitted (usually in pixel size) const Point2i containerSizeI, /// the size of the container where they has to be fitted (usually in pixel size)
const int containerNum, const int containerNum,
std::vector<Similarity2x> &trVec, /// the result, a set of similarity transformation that have to be applied to the rect to get their position std::vector<Similarity2x> &trVec, /// the result, a set of similarity transformation that have to be applied to the rect to get their position
std::vector<int> &indVec, std::vector<int> &indVec,
@ -163,7 +163,7 @@ static bool PackMulti(const std::vector<Box2x > & rectVec, /// the set of rect
{ {
stat().pack_attempt_num++; stat().pack_attempt_num++;
int t0=clock(); int t0=clock();
ret=PackOccupancyMulti(rectVec,containerSizeX,containerNum,currOccupancy,currTrVec, currIndVec, currCovered); ret=PackOccupancyMulti(rectVec,containerSizeI,containerNum,currOccupancy,currTrVec, currIndVec, currCovered);
stat().pack_attempt_time = float(clock()-t0)/float(CLOCKS_PER_SEC); stat().pack_attempt_time = float(clock()-t0)/float(CLOCKS_PER_SEC);
if(ret) if(ret)
{ {