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

resolved minor compilation issues

This commit is contained in:
Nico Pietroni 2012-02-09 14:02:34 +00:00
parent f786569888
commit 69508353bb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vcg/space/poly_packer.h
View File

@ -22,6 +22,7 @@
****************************************************************************/ ****************************************************************************/
#ifndef __VCG_POLY_PACKER_H__ #ifndef __VCG_POLY_PACKER_H__
#define __VCG_POLY_PACKER_H__ #define __VCG_POLY_PACKER_H__
#include <limits> #include <limits>
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
@ -32,6 +33,8 @@
#include <vcg/space/point2.h> #include <vcg/space/point2.h>
#include <vcg/math/similarity2.h> #include <vcg/math/similarity2.h>
namespace vcg namespace vcg
{ {
@ -57,7 +60,7 @@ public:
{ {
const int stepNum=16; const int stepNum=16;
float bestAngle; float bestAngle;
float bestArea = std::numeric_limits<float>::max(); float bestArea = std::numeric_limits<float>::max();
Box2f bestBB; Box2f bestBB;
for(int i=0;i<stepNum;++i) for(int i=0;i<stepNum;++i)
@ -87,9 +90,9 @@ static bool PackAsEqualSquares(const std::vector< std::vector<Point2x> > &polyV
std::vector<Similarity2x> &trVec, std::vector<Similarity2x> &trVec,
Point2x &coveredContainer) Point2x &coveredContainer)
{ {
int minSide = int( std::min(containerSizeX[0],containerSizeX[1])); int minSide = int(min(containerSizeX[0],containerSizeX[1]));
const vcg::Point2i containerSize(minSide,minSide); const vcg::Point2i containerSize(minSide,minSide);
int polyPerLine = ceil(sqrt(polyVec.size())); int polyPerLine = ceil(sqrt((double)polyVec.size()));
int pixelPerPoly = minSide / (polyPerLine); int pixelPerPoly = minSide / (polyPerLine);
if(pixelPerPoly < 1) return false; if(pixelPerPoly < 1) return false;
@ -103,7 +106,7 @@ static bool PackAsEqualSquares(const std::vector< std::vector<Point2x> > &polyV
bbMax.Add(bbVec.back()); bbMax.Add(bbVec.back());
} }
float unitScale = 1.0/std::max(bbMax.DimX(),bbMax.DimY()); float unitScale = 1.0/max(bbMax.DimX(),bbMax.DimY());
float polyScale = unitScale * pixelPerPoly; float polyScale = unitScale * pixelPerPoly;
int baseX =0; int baseX =0;