diff --git a/vcg/space/outline2_packer.h b/vcg/space/outline2_packer.h index 476ca956..ff01bb0b 100644 --- a/vcg/space/outline2_packer.h +++ b/vcg/space/outline2_packer.h @@ -45,29 +45,29 @@ class PolyPacker public: - static Box2f getPolyBB(const std::vector &poly) + static Box2x getPolyBB(const std::vector &poly) { - Box2f bb; + Box2x bb; for(size_t i=0;i &poly, float &rot) + static Box2x getPolyOOBB(const std::vector &poly, float &rot) { const int stepNum=32; float bestAngle; float bestArea = std::numeric_limits::max(); - Box2f bestBB; + Box2x bestBB; for(int i=0;i > &polyV trVec.clear(); trVec.resize(polyVec.size()); - Box2f bbMax; + Box2x bbMax; std::vector bbVec; for(size_t i=0;i > &pol assert(polyVec[i].size()>0); bbVec.push_back(getPolyBB(polyVec[i])); } - return RectPacker::Pack(bbVec,containerSizeX,trVec,coveredContainer); + return RectPacker::Pack(bbVec,containerSizeX,trVec,coveredContainer); } static bool PackAsObjectOrientedRect(const std::vector< std::vector > &polyVec, @@ -148,7 +148,7 @@ static bool PackAsObjectOrientedRect(const std::vector< std::vector > & trVec.clear(); trVec.resize(polyVec.size()); std::vector bbVec; - std::vector rotVec; + std::vector rotVec; for(size_t i=0;i > & rotVec.push_back(rot); } - bool ret= RectPacker::Pack(bbVec,containerSizeX,trVec,coveredContainer); + bool ret= RectPacker::Pack(bbVec,containerSizeX,trVec,coveredContainer); for(size_t i=0;i