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

cr lf mismatch

This commit is contained in:
Paolo Cignoni 2004-02-23 23:44:21 +00:00
parent adb4bd3f1b
commit 547edd7427
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vcg/space/box3.h
View File

@ -23,7 +23,10 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2004/02/19 15:40:56 cignoni
Added doxygen groups
Revision 1.1 2004/02/13 02:16:22 cignoni Revision 1.1 2004/02/13 02:16:22 cignoni
First working release. First working release.
@ -144,21 +147,21 @@ public:
if(max.z() < p.z()) max.z() = p.z(); if(max.z() < p.z()) max.z() = p.z();
} }
} }
//
// Aggiunge ad un box un altro box trasformato secondo la matrice m //// Aggiunge ad un box un altro box trasformato secondo la matrice m
void Add( const Matrix44<BoxScalarType> &m, const Box3<BoxScalarType> & b ) //void Add( const Matrix44<BoxScalarType> &m, const Box3<BoxScalarType> & b )
{ //{
const Point3<BoxScalarType> &mn= b.min; // const Point3<BoxScalarType> &mn= b.min;
const Point3<BoxScalarType> &mx= b.max; // const Point3<BoxScalarType> &mx= b.max;
Add(m.Apply(Point3<BoxScalarType>(mn[0],mn[1],mn[2]))); // Add(m.Apply(Point3<BoxScalarType>(mn[0],mn[1],mn[2])));
Add(m.Apply(Point3<BoxScalarType>(mx[0],mn[1],mn[2]))); // Add(m.Apply(Point3<BoxScalarType>(mx[0],mn[1],mn[2])));
Add(m.Apply(Point3<BoxScalarType>(mn[0],mx[1],mn[2]))); // Add(m.Apply(Point3<BoxScalarType>(mn[0],mx[1],mn[2])));
Add(m.Apply(Point3<BoxScalarType>(mx[0],mx[1],mn[2]))); // Add(m.Apply(Point3<BoxScalarType>(mx[0],mx[1],mn[2])));
Add(m.Apply(Point3<BoxScalarType>(mn[0],mn[1],mx[2]))); // Add(m.Apply(Point3<BoxScalarType>(mn[0],mn[1],mx[2])));
Add(m.Apply(Point3<BoxScalarType>(mx[0],mn[1],mx[2]))); // Add(m.Apply(Point3<BoxScalarType>(mx[0],mn[1],mx[2])));
Add(m.Apply(Point3<BoxScalarType>(mn[0],mx[1],mx[2]))); // Add(m.Apply(Point3<BoxScalarType>(mn[0],mx[1],mx[2])));
Add(m.Apply(Point3<BoxScalarType>(mx[0],mx[1],mx[2]))); // Add(m.Apply(Point3<BoxScalarType>(mx[0],mx[1],mx[2])));
} //}
/** Calcola l'intersezione tra due bounding box. Al bounding box viene assegnato il valore risultante. /** Calcola l'intersezione tra due bounding box. Al bounding box viene assegnato il valore risultante.
@param b Il bounding box con il quale si vuole effettuare l'intersezione @param b Il bounding box con il quale si vuole effettuare l'intersezione
*/ */
@ -298,7 +301,6 @@ public:
#endif
typedef Box3<short> Box3s; typedef Box3<short> Box3s;
typedef Box3<int> Box3i; typedef Box3<int> Box3i;
typedef Box3<float> Box3f; typedef Box3<float> Box3f;