minor bug
This commit is contained in:
parent
65c81124dd
commit
ee86220f5c
|
@ -1,29 +1,32 @@
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* VCGLib o o *
|
* VCGLib o o *
|
||||||
* Visual and Computer Graphics Library o o *
|
* Visual and Computer Graphics Library o o *
|
||||||
* _ O _ *
|
* _ O _ *
|
||||||
* Copyright(C) 2004 \/)\/ *
|
* Copyright(C) 2004 \/)\/ *
|
||||||
* Visual Computing Lab /\/| *
|
* Visual Computing Lab /\/| *
|
||||||
* ISTI - Italian National Research Council | *
|
* ISTI - Italian National Research Council | *
|
||||||
* \ *
|
* \ *
|
||||||
* All rights reserved. *
|
* All rights reserved. *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
* it under the terms of the GNU General Public License as published by *
|
* it under the terms of the GNU General Public License as published by *
|
||||||
* the Free Software Foundation; either version 2 of the License, or *
|
* the Free Software Foundation; either version 2 of the License, or *
|
||||||
* (at your option) any later version. *
|
* (at your option) any later version. *
|
||||||
* *
|
* *
|
||||||
* This program is distributed in the hope that it will be useful, *
|
* This program is distributed in the hope that it will be useful, *
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
|
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.5 2004/05/05 08:21:55 cignoni
|
||||||
|
syntax errors in inersection plane line.
|
||||||
|
|
||||||
Revision 1.4 2004/05/04 02:37:58 ganovelli
|
Revision 1.4 2004/05/04 02:37:58 ganovelli
|
||||||
Triangle3<T> replaced by TRIANGLE
|
Triangle3<T> replaced by TRIANGLE
|
||||||
Segment<T> replaced by EDGETYPE
|
Segment<T> replaced by EDGETYPE
|
||||||
|
@ -60,128 +63,128 @@ Initial Commit
|
||||||
/** \addtogroup space */
|
/** \addtogroup space */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
/**
|
/**
|
||||||
Function computing the intersection between couple of geometric primitives in
|
Function computing the intersection between couple of geometric primitives in
|
||||||
3 dimension
|
3 dimension
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace vcg {
|
namespace vcg {
|
||||||
/// interseciton between sphere and line
|
/// interseciton between sphere and line
|
||||||
template<class T>
|
template<class T>
|
||||||
inline bool Intersection( const Sphere3<T> & sp, const Line3<T> & li, Point3<T> & p0,Point3<T> & p1 ){
|
inline bool Intersection( const Sphere3<T> & sp, const Line3<T> & li, Point3<T> & p0,Point3<T> & p1 ){
|
||||||
|
|
||||||
// Per prima cosa si sposta il sistema di riferimento
|
// Per prima cosa si sposta il sistema di riferimento
|
||||||
// fino a portare il centro della sfera nell'origine
|
// fino a portare il centro della sfera nell'origine
|
||||||
Point3<T> neworig=li.Origin()-sp.Center();
|
Point3<T> neworig=li.Origin()-sp.Center();
|
||||||
// poi si risolve il sistema di secondo grado (con maple...)
|
// poi si risolve il sistema di secondo grado (con maple...)
|
||||||
T t1 = li.Direction().x()*li.Direction().x();
|
T t1 = li.Direction().x()*li.Direction().x();
|
||||||
T t2 = li.Direction().y()*li.Direction().y();
|
T t2 = li.Direction().y()*li.Direction().y();
|
||||||
T t3 = li.Direction().z()*li.Direction().z();
|
T t3 = li.Direction().z()*li.Direction().z();
|
||||||
T t6 = neworig.y()*li.Direction().y();
|
T t6 = neworig.y()*li.Direction().y();
|
||||||
T t7 = neworig.x()*li.Direction().x();
|
T t7 = neworig.x()*li.Direction().x();
|
||||||
T t8 = neworig.z()*li.Direction().z();
|
T t8 = neworig.z()*li.Direction().z();
|
||||||
T t15 = sp.Radius()*sp.Radius();
|
T t15 = sp.Radius()*sp.Radius();
|
||||||
T t17 = neworig.z()*neworig.z();
|
T t17 = neworig.z()*neworig.z();
|
||||||
T t19 = neworig.y()*neworig.y();
|
T t19 = neworig.y()*neworig.y();
|
||||||
T t21 = neworig.x()*neworig.x();
|
T t21 = neworig.x()*neworig.x();
|
||||||
T t28 = 2.0*t7*t6+2.0*t6*t8+2.0*t7*t8+t1*t15-t1*t17-t1*t19-t2*t21+t2*t15-t2*t17-t3*t21+t3*t15-t3*t19;
|
T t28 = 2.0*t7*t6+2.0*t6*t8+2.0*t7*t8+t1*t15-t1*t17-t1*t19-t2*t21+t2*t15-t2*t17-t3*t21+t3*t15-t3*t19;
|
||||||
if(t28<0) return false;
|
if(t28<0) return false;
|
||||||
T t29 = sqrt(t28);
|
T t29 = sqrt(t28);
|
||||||
T val0 = 1/(t1+t2+t3)*(-t6-t7-t8+t29);
|
T val0 = 1/(t1+t2+t3)*(-t6-t7-t8+t29);
|
||||||
T val1 = 1/(t1+t2+t3)*(-t6-t7-t8-t29);
|
T val1 = 1/(t1+t2+t3)*(-t6-t7-t8-t29);
|
||||||
|
|
||||||
p0=li.P(val0);
|
p0=li.P(val0);
|
||||||
p1=li.P(val1);
|
p1=li.P(val1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// intersection between line and plane
|
/// intersection between line and plane
|
||||||
template<class T>
|
template<class T>
|
||||||
inline bool Intersection( const Plane3<T> & pl, const Line3<T> & li, Point3<T> & po){
|
inline bool Intersection( const Plane3<T> & pl, const Line3<T> & li, Point3<T> & po){
|
||||||
const T epsilon = T(1e-8);
|
const T epsilon = T(1e-8);
|
||||||
|
|
||||||
T k = pl.Direction() * li.Direction(); // Compute 'k' factor
|
T k = pl.Direction() * li.Direction(); // Compute 'k' factor
|
||||||
if( (k > -epsilon) && (k < epsilon))
|
if( (k > -epsilon) && (k < epsilon))
|
||||||
return false;
|
return false;
|
||||||
T r = (pl.Offset() - pl.Direction()*li.Origin())/k; // Compute ray distance
|
T r = (pl.Offset() - pl.Direction()*li.Origin())/k; // Compute ray distance
|
||||||
po = li.Origin() + li.Direction()*r;
|
po = li.Origin() + li.Direction()*r;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// intersection between segment and plane
|
||||||
|
template<typename SEGMENTTYPE>
|
||||||
|
inline bool Intersection( const Plane3<typename SEGMENTTYPE::ScalarType> & pl,
|
||||||
|
const SEGMENTTYPE & sg,
|
||||||
|
Point3<typename SEGMENTTYPE::ScalarType> & po){
|
||||||
|
typedef typename SEGMENTTYPE::ScalarType T;
|
||||||
|
const T epsilon = T(1e-8);
|
||||||
|
|
||||||
|
T k = pl.Direction() * (sg.P1()-sg.P0());
|
||||||
|
if( (k > -epsilon) && (k < epsilon))
|
||||||
|
return false;
|
||||||
|
T r = (pl.Offset() - pl.Direction()*sg.P0())/k; // Compute ray distance
|
||||||
|
if( (r<0) || (r > 1.0))
|
||||||
|
return false;
|
||||||
|
po = sg.P0()*(1-r)+sg.P1() * r;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// intersection between plane and triangle
|
||||||
|
// not optimal: uses plane-segment intersection (and the fact the two or none edges can be intersected)
|
||||||
|
template<typename TRIANGLETYPE>
|
||||||
|
inline bool Intersection( const Plane3<typename TRIANGLETYPE::ScalarType> & pl,
|
||||||
|
const TRIANGLETYPE & tr,
|
||||||
|
Segment3<typename TRIANGLETYPE::ScalarType> & sg){
|
||||||
|
typedef typename TRIANGLETYPE::ScalarType T;
|
||||||
|
if(Intersection(pl,Segment3<T>(tr.P(0),tr.P(1)),sg.P0())){
|
||||||
|
if(Intersection(pl,Segment3<T>(tr.P(0),tr.P(2)),sg.P1()))
|
||||||
return true;
|
return true;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Intersection(pl,Segment3<T>(tr.P(1),tr.P(2)),sg.P1());
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
if(Intersection(pl,Segment3<T>(tr.P(1),tr.P(2)),sg.P0()))
|
||||||
|
{
|
||||||
|
Intersection(pl,Segment3<T>(tr.P(0),tr.P(2)),sg.P1());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/// intersection between segment and plane
|
/// intersection between two triangles
|
||||||
template<typename SEGMENTTYPE>
|
template<typename TRIANGLETYPE>
|
||||||
inline bool Intersection( const Plane3<typename SEGMENTTYPE::ScalarType> & pl,
|
inline bool Intersection(const TRIANGLETYPE & t0,const TRIANGLETYPE & t1){
|
||||||
const SEGMENTTYPE & sg,
|
return NoDivTriTriIsect(t0.P0(0),t0.P0(1),t0.P0(2),
|
||||||
Point3<typename SEGMENTTYPE::ScalarType> & po){
|
t1.P0(0),t1.P0(1),t1.P0(2));
|
||||||
typedef typename SEGMENTTYPE::ScalarType T;
|
}
|
||||||
const T epsilon = T(1e-8);
|
template<class T>
|
||||||
|
inline bool Intersection(Point3<T> V0,Point3<T> V1,Point3<T> V2,
|
||||||
|
Point3<T> U0,Point3<T> U1,Point3<T> U2){
|
||||||
|
return NoDivTriTriIsect(V0,V1,V2,U0,U1,U2);
|
||||||
|
}
|
||||||
|
|
||||||
T k = pl.Direction() * (sg.P1()-sg.P0());
|
template<class T>
|
||||||
if( (k > -epsilon) && (k < epsilon))
|
inline bool Intersection(Point3<T> V0,Point3<T> V1,Point3<T> V2,
|
||||||
return false;
|
Point3<T> U0,Point3<T> U1,Point3<T> U2,int *coplanar,
|
||||||
T r = (pl.Offset() - pl.Direction()*sg.P0())/k; // Compute ray distance
|
Point3<T> &isectpt1,Point3<T> &isectpt2){
|
||||||
if( (r<0) || (r > 1.0))
|
|
||||||
return false;
|
|
||||||
po = sg.P0()*(1-r)+sg.P1() * r;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// intersection between plane and triangle
|
return tri_tri_intersect_with_isectline(V0,V1,V2,U0,U1,U2,
|
||||||
// not optimal: uses plane-segment intersection (and the fact the two or none edges can be intersected)
|
coplanar,isectpt1,isectpt2);
|
||||||
template<typename TRIANGLETYPE>
|
}
|
||||||
inline bool Intersection( const Plane3<typename TRIANGLETYPE::ScalarType> & pl,
|
template<typename TRIANGLETYPE,typename SEGMENTTYPE >
|
||||||
const TRIANGLETYPE & tr,
|
inline bool Intersection(const TRIANGLETYPE & t0,const TRIANGLETYPE & t1,bool &coplanar,
|
||||||
Segment3<typename TRIANGLETYPE::ScalarType> & sg){
|
SEGMENTTYPE & sg){
|
||||||
typedef typename TRIANGLETYPE::ScalarType T;
|
Point3<SEGMENTTYPE::PointType> ip0,ip1;
|
||||||
if(Intersection(pl,Segment3<T>(tr.P(0),tr.P(1)),sg.P0())){
|
return tri_tri_intersect_with_isectline(t0.P0(0),t0.P0(1),t0.P0(2),
|
||||||
if(Intersection(pl,Segment3<T>(tr.P(0),tr.P(2)),sg.P1()))
|
t1.P0(0),t1.P0(1),t1.P0(2),
|
||||||
return true;
|
coplanar,sg.P0(),sg.P1()
|
||||||
else
|
);
|
||||||
{
|
}
|
||||||
Intersection(pl,Segment3<T>(tr.P(1),tr.P(2)),sg.P1());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}else
|
|
||||||
{
|
|
||||||
if(Intersection(pl,Segment3<T>(tr.P(1),tr.P(2)),sg.P0()))
|
|
||||||
{
|
|
||||||
Intersection(pl,Segment3<T>(tr.P(0),tr.P(2)),sg.P1());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// intersection between two triangles
|
|
||||||
template<typename TRIANGLETYPE>
|
|
||||||
inline bool Intersection( const TRIANGLETYPE & t0,const TRIANGLETYPE & t1){
|
|
||||||
return NoDivTriTriIsect(t0.P0(0),t0.P0(1),t0.P0(2),
|
|
||||||
t1.P0(0),t1.P0(1),t1.P0(2));
|
|
||||||
}
|
|
||||||
template<class T>
|
|
||||||
inline bool Intersection( Point3<T> V0,Point3<T> V1,Point3<T> V2,
|
|
||||||
Point3<T> U0,Point3<T> U1,Point3<T> U2){
|
|
||||||
return NoDivTriTriIsect(V0,V1,V2,U0,U1,U2);
|
|
||||||
}
|
|
||||||
|
|
||||||
template<class T>
|
|
||||||
inline bool Intersection( Point3<T> V0,Point3<T> V1,Point3<T> V2,
|
|
||||||
Point3<T> U0,Point3<T> U1,Point3<T> U2,int *coplanar,
|
|
||||||
Point3<T> &isectpt1,Point3<T> &isectpt2){
|
|
||||||
|
|
||||||
return tri_tri_intersect_with_isectline(V0,V1,V2,U0,U1,U2,
|
|
||||||
coplanar,isectpt1,isectpt2);
|
|
||||||
}
|
|
||||||
template<typename TRIANGLETYPE,typename SEGMENTTYPE >
|
|
||||||
inline bool Intersection( const TRIANGLETYPE & t0,const TRIANGLETYPE & t1,bool &coplanar,
|
|
||||||
SEGMENTTYPE & sg){
|
|
||||||
Point3<T> ip0,ip1;
|
|
||||||
return tri_tri_intersect_with_isectline(t0.P0(0),t0.P0(1),t0.P0(2),
|
|
||||||
t1.P0(0),t1.P0(1),t1.P0(2),
|
|
||||||
coplanar,sg.P0(),sg.P1()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} // end namespace
|
} // end namespace
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue