missing include added
This commit is contained in:
parent
3cb29c805b
commit
6bda668af8
|
@ -1,284 +1,284 @@
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* 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.11 2007/05/02 13:25:45 zifnab1974
|
Revision 1.11 2007/05/02 13:25:45 zifnab1974
|
||||||
only use typename when necessary
|
only use typename when necessary
|
||||||
|
|
||||||
Revision 1.10 2007/04/10 22:46:57 pietroni
|
Revision 1.10 2007/04/10 22:46:57 pietroni
|
||||||
- line 152 changed call intersection to IntersectionPlaneTriangle because changing in function's name
|
- line 152 changed call intersection to IntersectionPlaneTriangle because changing in function's name
|
||||||
|
|
||||||
Revision 1.9 2007/01/03 15:51:28 pietroni
|
Revision 1.9 2007/01/03 15:51:28 pietroni
|
||||||
added initial define and included missing files
|
added initial define and included missing files
|
||||||
|
|
||||||
Revision 1.8 2006/01/19 14:06:37 spinelli
|
Revision 1.8 2006/01/19 14:06:37 spinelli
|
||||||
add std:: namespace...
|
add std:: namespace...
|
||||||
|
|
||||||
Revision 1.7 2005/10/03 16:18:15 spinelli
|
Revision 1.7 2005/10/03 16:18:15 spinelli
|
||||||
add template parameter for spatialindexing struction
|
add template parameter for spatialindexing struction
|
||||||
|
|
||||||
Revision 1.6 2005/05/30 09:11:20 ganovelli
|
Revision 1.6 2005/05/30 09:11:20 ganovelli
|
||||||
header added, error in include
|
header added, error in include
|
||||||
|
|
||||||
Revision 1.3 2005/05/17 21:19:37 ganovelli
|
Revision 1.3 2005/05/17 21:19:37 ganovelli
|
||||||
some std::and typename missing (CRS4)
|
some std::and typename missing (CRS4)
|
||||||
|
|
||||||
Revision 1.2 2005/03/08 14:42:22 ganovelli
|
Revision 1.2 2005/03/08 14:42:22 ganovelli
|
||||||
added vcg header
|
added vcg header
|
||||||
|
|
||||||
|
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include<vector>
|
#include<vector>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include<vcg/space/point3.h>
|
#include<vcg/space/point3.h>
|
||||||
#include<vcg/space/plane3.h>
|
#include<vcg/space/plane3.h>
|
||||||
#include<vcg/space/segment3.h>
|
#include<vcg/space/segment3.h>
|
||||||
#include<vcg/space/intersection3.h>
|
#include<vcg/space/intersection3.h>
|
||||||
#include<vcg/complex/edgemesh/allocate.h>
|
#include<vcg/complex/edgemesh/allocate.h>
|
||||||
//#include<vcg/space/index/grid_static_ptr.h>
|
#include<vcg/complex/trimesh/subset.h>
|
||||||
#include<algorithm>
|
#include<algorithm>
|
||||||
#include<vcg/complex/trimesh/base.h>
|
#include<vcg/complex/trimesh/base.h>
|
||||||
|
|
||||||
#ifndef __VCGLIB_INTERSECTION_TRI_MESH
|
#ifndef __VCGLIB_INTERSECTION_TRI_MESH
|
||||||
#define __VCGLIB_INTERSECTION_TRI_MESH
|
#define __VCGLIB_INTERSECTION_TRI_MESH
|
||||||
|
|
||||||
namespace vcg{
|
namespace vcg{
|
||||||
|
|
||||||
/** \addtogroup complex */
|
/** \addtogroup complex */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
/**
|
/**
|
||||||
Function computing the intersection between a grid and a plane. It returns all the cells intersected
|
Function computing the intersection between a grid and a plane. It returns all the cells intersected
|
||||||
*/
|
*/
|
||||||
template < typename GridType,typename ScalarType>
|
template < typename GridType,typename ScalarType>
|
||||||
bool Intersect( GridType & grid,Plane3<ScalarType> plane, std::vector<typename GridType::Cell *> &cells){
|
bool Intersect( GridType & grid,Plane3<ScalarType> plane, std::vector<typename GridType::Cell *> &cells){
|
||||||
Point3d p,_d;
|
Point3d p,_d;
|
||||||
Plane3d pl;
|
Plane3d pl;
|
||||||
_d.Import(plane.Direction());
|
_d.Import(plane.Direction());
|
||||||
pl.SetDirection(_d);
|
pl.SetDirection(_d);
|
||||||
pl.SetOffset(plane.Offset());
|
pl.SetOffset(plane.Offset());
|
||||||
for( int ax = 0; ax <3; ++ax)
|
for( int ax = 0; ax <3; ++ax)
|
||||||
{ int axis = ax;
|
{ int axis = ax;
|
||||||
int axis0 = (axis+1)%3;
|
int axis0 = (axis+1)%3;
|
||||||
int axis1 = (axis+2)%3;
|
int axis1 = (axis+2)%3;
|
||||||
int i,j;
|
int i,j;
|
||||||
Point3i pi;
|
Point3i pi;
|
||||||
|
|
||||||
Segment3<double> seg;
|
Segment3<double> seg;
|
||||||
seg.P0().Import(grid.bbox.min);
|
seg.P0().Import(grid.bbox.min);
|
||||||
seg.P1().Import(grid.bbox.min);
|
seg.P1().Import(grid.bbox.min);
|
||||||
seg.P1()[axis] = grid.bbox.max[axis];
|
seg.P1()[axis] = grid.bbox.max[axis];
|
||||||
|
|
||||||
for(i = 0 ; i <= grid.siz[axis0]; ++i){
|
for(i = 0 ; i <= grid.siz[axis0]; ++i){
|
||||||
for(j = 0 ; j <= grid.siz[axis1]; ++j)
|
for(j = 0 ; j <= grid.siz[axis1]; ++j)
|
||||||
{
|
{
|
||||||
seg.P0()[axis0] = grid.bbox.min[axis0]+ (i+0.01) * grid.voxel[axis0] ;
|
seg.P0()[axis0] = grid.bbox.min[axis0]+ (i+0.01) * grid.voxel[axis0] ;
|
||||||
seg.P1()[axis0] = grid.bbox.min[axis0]+ (i+0.01) * grid.voxel[axis0];
|
seg.P1()[axis0] = grid.bbox.min[axis0]+ (i+0.01) * grid.voxel[axis0];
|
||||||
seg.P0()[axis1] = grid.bbox.min[axis1]+ (j+0.01) * grid.voxel[axis1];
|
seg.P0()[axis1] = grid.bbox.min[axis1]+ (j+0.01) * grid.voxel[axis1];
|
||||||
seg.P1()[axis1] = grid.bbox.min[axis1]+ (j+0.01) * grid.voxel[axis1];
|
seg.P1()[axis1] = grid.bbox.min[axis1]+ (j+0.01) * grid.voxel[axis1];
|
||||||
if ( Intersection(pl,seg,p))
|
if ( Intersection(pl,seg,p))
|
||||||
{
|
{
|
||||||
pi[axis] = std::min(std::max(0,(int)floor((p[axis ]-grid.bbox.min[axis])/grid.voxel[axis])),grid.siz[axis]);
|
pi[axis] = std::min(std::max(0,(int)floor((p[axis ]-grid.bbox.min[axis])/grid.voxel[axis])),grid.siz[axis]);
|
||||||
pi[axis0] = i;
|
pi[axis0] = i;
|
||||||
pi[axis1] = j;
|
pi[axis1] = j;
|
||||||
grid.Grid(pi,axis,cells);
|
grid.Grid(pi,axis,cells);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sort(cells.begin(),cells.end());
|
sort(cells.begin(),cells.end());
|
||||||
cells.erase(unique(cells.begin(),cells.end()),cells.end());
|
cells.erase(unique(cells.begin(),cells.end()),cells.end());
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*@}*/
|
/*@}*/
|
||||||
/**
|
/**
|
||||||
Basic Function computing the intersection between a trimesh and a plane, provided a pointer
|
Basic Function computing the intersection between a trimesh and a plane, provided a pointer
|
||||||
to an space indexing data structure (e.g. a grid, an oct-tree..)
|
to an space indexing data structure (e.g. a grid, an oct-tree..)
|
||||||
*/
|
*/
|
||||||
template < typename TriMeshType, typename EdgeMeshType, class ScalarType, class IndexingType >
|
template < typename TriMeshType, typename EdgeMeshType, class ScalarType, class IndexingType >
|
||||||
bool Intersection( /*TriMeshType & m, */
|
bool Intersection( /*TriMeshType & m, */
|
||||||
Plane3<ScalarType> pl,
|
Plane3<ScalarType> pl,
|
||||||
EdgeMeshType & em,
|
EdgeMeshType & em,
|
||||||
double& ave_length,
|
double& ave_length,
|
||||||
IndexingType *grid,
|
IndexingType *grid,
|
||||||
typename std::vector< typename IndexingType::Cell* >& cells)
|
typename std::vector< typename IndexingType::Cell* >& cells)
|
||||||
{
|
{
|
||||||
typedef typename TriMeshType::FaceContainer FaceContainer;
|
typedef typename TriMeshType::FaceContainer FaceContainer;
|
||||||
typedef IndexingType GridType;
|
typedef IndexingType GridType;
|
||||||
typename EdgeMeshType::VertexIterator vi;
|
typename EdgeMeshType::VertexIterator vi;
|
||||||
typename TriMeshType::FaceIterator fi;
|
typename TriMeshType::FaceIterator fi;
|
||||||
std::vector<typename TriMeshType::FaceType*> v;
|
std::vector<typename TriMeshType::FaceType*> v;
|
||||||
v.clear();
|
v.clear();
|
||||||
Intersect(*grid,pl,cells);
|
Intersect(*grid,pl,cells);
|
||||||
Segment3<ScalarType> seg;
|
Segment3<ScalarType> seg;
|
||||||
ave_length = 0.0;
|
ave_length = 0.0;
|
||||||
typename std::vector<typename GridType::Cell*>::iterator ic;
|
typename std::vector<typename GridType::Cell*>::iterator ic;
|
||||||
typename GridType::Cell fs,ls;
|
typename GridType::Cell fs,ls;
|
||||||
for(ic = cells.begin(); ic != cells.end();++ic)
|
for(ic = cells.begin(); ic != cells.end();++ic)
|
||||||
{
|
{
|
||||||
grid->Grid(*ic,fs,ls);
|
grid->Grid(*ic,fs,ls);
|
||||||
typename GridType::Link * lk = fs;
|
typename GridType::Link * lk = fs;
|
||||||
while(lk != ls){
|
while(lk != ls){
|
||||||
typename TriMeshType::FaceType & face = *(lk->Elem());
|
typename TriMeshType::FaceType & face = *(lk->Elem());
|
||||||
if(!face.IsS())
|
if(!face.IsS())
|
||||||
{
|
{
|
||||||
face.SetS();
|
face.SetS();
|
||||||
v.push_back(&face);
|
v.push_back(&face);
|
||||||
if(vcg::IntersectionPlaneTriangle(pl,face,seg))// intersezione piano triangolo
|
if(vcg::IntersectionPlaneTriangle(pl,face,seg))// intersezione piano triangolo
|
||||||
{
|
{
|
||||||
face.SetS();
|
face.SetS();
|
||||||
// add to em
|
// add to em
|
||||||
ave_length+=seg.Length();
|
ave_length+=seg.Length();
|
||||||
vcg::edge::Allocator<EdgeMeshType>::AddEdges(em,1);
|
vcg::edge::Allocator<EdgeMeshType>::AddEdges(em,1);
|
||||||
vi = vcg::edge::Allocator<EdgeMeshType>::AddVertices(em,2);
|
vi = vcg::edge::Allocator<EdgeMeshType>::AddVertices(em,2);
|
||||||
(*vi).P() = seg.P0();
|
(*vi).P() = seg.P0();
|
||||||
em.edges.back().V(0) = &(*vi);
|
em.edges.back().V(0) = &(*vi);
|
||||||
vi++;
|
vi++;
|
||||||
(*vi).P() = seg.P1();
|
(*vi).P() = seg.P1();
|
||||||
em.edges.back().V(1) = &(*vi);
|
em.edges.back().V(1) = &(*vi);
|
||||||
}
|
}
|
||||||
}//endif
|
}//endif
|
||||||
lk++;
|
lk++;
|
||||||
}//end while
|
}//end while
|
||||||
}
|
}
|
||||||
ave_length/=em.en;
|
ave_length/=em.en;
|
||||||
typename std::vector<typename TriMeshType::FaceType*>::iterator v_i;
|
typename std::vector<typename TriMeshType::FaceType*>::iterator v_i;
|
||||||
for(v_i=v.begin(); v_i!=v.end(); ++v_i) (*v_i)->ClearS();
|
for(v_i=v.begin(); v_i!=v.end(); ++v_i) (*v_i)->ClearS();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \addtogroup complex */
|
/** \addtogroup complex */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
/**
|
/**
|
||||||
Basic Function computing the intersection between a trimesh and a plane. It returns an EdgeMesh without needing anything else.
|
Basic Function computing the intersection between a trimesh and a plane. It returns an EdgeMesh without needing anything else.
|
||||||
Note: This version always returns a segment for each triangle of the mesh which intersects with the plane. In other
|
Note: This version always returns a segment for each triangle of the mesh which intersects with the plane. In other
|
||||||
words there are 2*n vertices where n is the number of segments fo the mesh. You can run vcg::edge::Unify to unify
|
words there are 2*n vertices where n is the number of segments fo the mesh. You can run vcg::edge::Unify to unify
|
||||||
the vertices closer that a given value epsilon. Note that, due to subtraction error during triangle plane intersection,
|
the vertices closer that a given value epsilon. Note that, due to subtraction error during triangle plane intersection,
|
||||||
it is not safe to put epsilon to 0.
|
it is not safe to put epsilon to 0.
|
||||||
// TODO si dovrebbe considerare la topologia face-face della trimesh per derivare quella della edge mesh..
|
// TODO si dovrebbe considerare la topologia face-face della trimesh per derivare quella della edge mesh..
|
||||||
*/
|
*/
|
||||||
template < typename TriMeshType, typename EdgeMeshType, class ScalarType >
|
template < typename TriMeshType, typename EdgeMeshType, class ScalarType >
|
||||||
bool Intersection(TriMeshType & m,
|
bool Intersection(TriMeshType & m,
|
||||||
Plane3<ScalarType> pl,
|
Plane3<ScalarType> pl,
|
||||||
EdgeMeshType & em)
|
EdgeMeshType & em)
|
||||||
{
|
{
|
||||||
typename EdgeMeshType::VertexIterator vi;
|
typename EdgeMeshType::VertexIterator vi;
|
||||||
typename TriMeshType::FaceIterator fi;
|
typename TriMeshType::FaceIterator fi;
|
||||||
em.Clear();
|
em.Clear();
|
||||||
Segment3<ScalarType> seg;
|
Segment3<ScalarType> seg;
|
||||||
for(fi=m.face.begin();fi!=m.face.end();++fi)
|
for(fi=m.face.begin();fi!=m.face.end();++fi)
|
||||||
if(!(*fi).IsD())
|
if(!(*fi).IsD())
|
||||||
{
|
{
|
||||||
if(vcg::IntersectionPlaneTriangle(pl,*fi,seg))// intersezione piano triangolo
|
if(vcg::IntersectionPlaneTriangle(pl,*fi,seg))// intersezione piano triangolo
|
||||||
{
|
{
|
||||||
vcg::edge::Allocator<EdgeMeshType>::AddEdges(em,1);
|
vcg::edge::Allocator<EdgeMeshType>::AddEdges(em,1);
|
||||||
vi = vcg::edge::Allocator<EdgeMeshType>::AddVertices(em,2);
|
vi = vcg::edge::Allocator<EdgeMeshType>::AddVertices(em,2);
|
||||||
(*vi).P() = seg.P0();
|
(*vi).P() = seg.P0();
|
||||||
em.edges.back().V(0) = &(*vi);
|
em.edges.back().V(0) = &(*vi);
|
||||||
vi++;
|
vi++;
|
||||||
(*vi).P() = seg.P1();
|
(*vi).P() = seg.P1();
|
||||||
em.edges.back().V(1) = &(*vi);
|
em.edges.back().V(1) = &(*vi);
|
||||||
}
|
}
|
||||||
}//end for
|
}//end for
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \addtogroup complex */
|
/** \addtogroup complex */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
/**
|
/**
|
||||||
Compute the intersection between a trimesh and a plane.
|
Compute the intersection between a trimesh and a plane.
|
||||||
given a plane return the set of faces that are contained
|
given a plane return the set of faces that are contained
|
||||||
into intersected cells.
|
into intersected cells.
|
||||||
*/
|
*/
|
||||||
template < typename TriMeshType, class ScalarType, class IndexingType >
|
template < typename TriMeshType, class ScalarType, class IndexingType >
|
||||||
bool Intersection(Plane3<ScalarType> pl,
|
bool Intersection(Plane3<ScalarType> pl,
|
||||||
IndexingType *grid,
|
IndexingType *grid,
|
||||||
typename std::vector<typename TriMeshType::FaceType*> &v)
|
typename std::vector<typename TriMeshType::FaceType*> &v)
|
||||||
{
|
{
|
||||||
typedef typename TriMeshType::FaceContainer FaceContainer;
|
typedef typename TriMeshType::FaceContainer FaceContainer;
|
||||||
typedef IndexingType GridType;
|
typedef IndexingType GridType;
|
||||||
typename TriMeshType::FaceIterator fi;
|
typename TriMeshType::FaceIterator fi;
|
||||||
v.clear();
|
v.clear();
|
||||||
typename std::vector< typename GridType::Cell* > cells;
|
typename std::vector< typename GridType::Cell* > cells;
|
||||||
Intersect(*grid,pl,cells);
|
Intersect(*grid,pl,cells);
|
||||||
typename std::vector<typename GridType::Cell*>::iterator ic;
|
typename std::vector<typename GridType::Cell*>::iterator ic;
|
||||||
typename GridType::Cell fs,ls;
|
typename GridType::Cell fs,ls;
|
||||||
|
|
||||||
for(ic = cells.begin(); ic != cells.end();++ic)
|
for(ic = cells.begin(); ic != cells.end();++ic)
|
||||||
{
|
{
|
||||||
grid->Grid(*ic,fs,ls);
|
grid->Grid(*ic,fs,ls);
|
||||||
typename GridType::Link * lk = fs;
|
typename GridType::Link * lk = fs;
|
||||||
while(lk != ls){
|
while(lk != ls){
|
||||||
typename TriMeshType::FaceType & face = *(lk->Elem());
|
typename TriMeshType::FaceType & face = *(lk->Elem());
|
||||||
v.push_back(&face);
|
v.push_back(&face);
|
||||||
lk++;
|
lk++;
|
||||||
}//end while
|
}//end while
|
||||||
}//end for
|
}//end for
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Computes the intersection between a Ray and a Mesh. Returns a 3D Pointset.
|
Computes the intersection between a Ray and a Mesh. Returns a 3D Pointset.
|
||||||
*/
|
*/
|
||||||
template < typename TriMeshType, class ScalarType>
|
template < typename TriMeshType, class ScalarType>
|
||||||
bool IntersectionRayMesh(
|
bool IntersectionRayMesh(
|
||||||
/* Input Mesh */ TriMeshType * m,
|
/* Input Mesh */ TriMeshType * m,
|
||||||
/* Ray */ const Line3<ScalarType> & ray,
|
/* Ray */ const Line3<ScalarType> & ray,
|
||||||
/* Intersect Point */ Point3<ScalarType> & hitPoint)
|
/* Intersect Point */ Point3<ScalarType> & hitPoint)
|
||||||
{
|
{
|
||||||
//typedef typename TriMeshType::FaceContainer FaceContainer;
|
//typedef typename TriMeshType::FaceContainer FaceContainer;
|
||||||
typename TriMeshType::FaceIterator fi;
|
typename TriMeshType::FaceIterator fi;
|
||||||
bool hit=false;
|
bool hit=false;
|
||||||
|
|
||||||
if(m==0) return false;
|
if(m==0) return false;
|
||||||
|
|
||||||
//TriMeshType::FaceIterator fi;
|
//TriMeshType::FaceIterator fi;
|
||||||
//std::vector<TriMeshType::FaceType*>::iterator fi;
|
//std::vector<TriMeshType::FaceType*>::iterator fi;
|
||||||
|
|
||||||
ScalarType bar1,bar2,dist;
|
ScalarType bar1,bar2,dist;
|
||||||
Point3<ScalarType> p1;
|
Point3<ScalarType> p1;
|
||||||
Point3<ScalarType> p2;
|
Point3<ScalarType> p2;
|
||||||
Point3<ScalarType> p3;
|
Point3<ScalarType> p3;
|
||||||
for(fi = m->face.begin(); fi != m->face.end(); ++fi)
|
for(fi = m->face.begin(); fi != m->face.end(); ++fi)
|
||||||
{
|
{
|
||||||
p1=vcg::Point3<ScalarType>( (*fi).P(0).X() ,(*fi).P(0).Y(),(*fi).P(0).Z() );
|
p1=vcg::Point3<ScalarType>( (*fi).P(0).X() ,(*fi).P(0).Y(),(*fi).P(0).Z() );
|
||||||
p2=vcg::Point3<ScalarType>( (*fi).P(1).X() ,(*fi).P(1).Y(),(*fi).P(1).Z() );
|
p2=vcg::Point3<ScalarType>( (*fi).P(1).X() ,(*fi).P(1).Y(),(*fi).P(1).Z() );
|
||||||
p3=vcg::Point3<ScalarType>( (*fi).P(2).X() ,(*fi).P(2).Y(),(*fi).P(2).Z() );
|
p3=vcg::Point3<ScalarType>( (*fi).P(2).X() ,(*fi).P(2).Y(),(*fi).P(2).Z() );
|
||||||
if(Intersection<ScalarType>(ray,p1,p2,p3,bar1,bar2,dist))
|
if(Intersection<ScalarType>(ray,p1,p2,p3,bar1,bar2,dist))
|
||||||
{
|
{
|
||||||
hitPoint= p1*(1-bar1-bar2) + p2*bar1 + p3*bar2;
|
hitPoint= p1*(1-bar1-bar2) + p2*bar1 + p3*bar2;
|
||||||
hit=true;
|
hit=true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return hit;
|
return hit;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
Compute the intersection between a mesh and a ball.
|
Compute the intersection between a mesh and a ball.
|
||||||
given a mesh return a new mesh made by a copy of all the faces entirely includeded in the ball plus
|
given a mesh return a new mesh made by a copy of all the faces entirely includeded in the ball plus
|
||||||
|
@ -348,8 +348,8 @@ void IntersectionBallMesh( TriMeshType & m, const vcg::Sphere3<ScalarType> &bal
|
||||||
vcg::tri::Allocator<TriMeshType>::DeleteFace(res,res.face[i]);
|
vcg::tri::Allocator<TriMeshType>::DeleteFace(res,res.face[i]);
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*@}*/
|
/*@}*/
|
||||||
} // end namespace vcg
|
} // end namespace vcg
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue