@@ -52,17 +52,17 @@ Tesselator::Tesselator(TopoDS_Shape aShape,
5252 Standard_Real aScaleV,
5353 Standard_Real aRotationAngle) :
5454 // set local variables
55+ myShape(aShape),
56+ myTxtMapType(aTxtMapType),
57+ myAutoScaleSizeOnU(anAutoScaleSizeOnU),
58+ myAutoScaleSizeOnV(anAutoScaleSizeOnV),
5559 myDeviation(aDeviation),
5660 myUOrigin(aUOrigin),
5761 myVOrigin(aVOrigin),
5862 myURepeat(aURepeat),
5963 myVRepeat(aVRepeat),
6064 myScaleU(aScaleU),
6165 myScaleV(aScaleV),
62- myAutoScaleSizeOnU(anAutoScaleSizeOnU),
63- myAutoScaleSizeOnV(anAutoScaleSizeOnV),
64- myTxtMapType(aTxtMapType),
65- myShape(aShape),
6666 myRotationAngle(aRotationAngle)
6767{
6868 // prepare bbox tex coords
@@ -361,7 +361,7 @@ void Tesselator::ComputeDefaultDeviation()
361361 Standard_Real yDim = std::abs ((long )aYmax - (long )aYmin);
362362 Standard_Real zDim = std::abs ((long )aZmax - (long )aZmin);
363363
364- Standard_Real adeviation = std::max (aXmax-aXmin , std::max (aYmax-aYmin, aZmax-aZmin )) * 2e-2 ;
364+ Standard_Real adeviation = std::max (xDim , std::max (yDim, zDim )) * 2e-2 ;
365365 myDeviation = adeviation;
366366}
367367
@@ -446,7 +446,7 @@ std::string formatFloatNumber(float f)
446446{
447447 // returns string representation of the float number f.
448448 // set epsilon to 1e-3
449- float epsilon = 1e-3 ;
449+ float epsilon = 1e-3f ;
450450 std::stringstream formatted_float;
451451 if (std::abs (f) < epsilon) {
452452 f = 0 .;
0 commit comments