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

Changed : 

in SolidAngle(vind) :
double da0=DiedralAngle(EV(vind,0));
double da1=DiedralAngle(EV(vind,1));
double da2=DiedralAngle(EV(vind,2));
in
double da0=DiedralAngle(EofV(vind,0));
double da1=DiedralAngle(EofV(vind,1));
double da2=DiedralAngle(EofV(vind,2));

Changed :
in DiedralAngle(edgeind) :
int f1=FE(edgeind,0);
int f2=FE(edgeind,1);
in
int f1=FofE(edgeind,0);
int f2=FofE(edgeind,1);

Changed :
in DiedralAngle(edgeind) :
Point3d p0=FV(f1,0)->P();
Point3d p1=FV(f1,1)->P();
Point3d p2=FV(f1,2)->P();
in
Point3d p0=_v[FofV(f1,0)];
Point3d p1=_v[FofV(f1,1)];
Point3d p2=_v[FofV(f1,2)];

Changed :
in DiedralAngle(edgeind) :
p0=FV(f2,0)->P();
p1=FV(f2,1)->P();
p2=FV(f2,2)->P();
in
p0=_v[FofV(f2,0)];
p1=_v[FofV(f2,1)];
p2=_v[FofV(f2,2)];
This commit is contained in:
Paolo Cignoni 2004-04-28 16:31:17 +00:00
parent f154f17acd
commit a92bdebe76
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
vcg/space/tetra3.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2004/04/28 11:37:15 pietroni
*** empty log message ***
Revision 1.1 2004/04/22 13:19:12 ganovelli Revision 1.1 2004/04/22 13:19:12 ganovelli
first version first version
@ -79,31 +82,30 @@ public:
} }
/// compute and return the solid angle on a vertex /// compute and return the solid angle on a vertex
double SolidAngle(int vind) double SolidAngle(int vind)
{ {
double da0=DiedralAngle(EV(vind,0)); double da0=DiedralAngle(EofV(vind,0));
double da1=DiedralAngle(EV(vind,1)); double da1=DiedralAngle(EofV(vind,1));
double da2=DiedralAngle(EV(vind,2)); double da2=DiedralAngle(EofV(vind,2));
return((da0 + da1 + da2)- M_PI);
return((da0 + da1 + da2)- M_PI);
} }
/// compute and return the diadedral angle on an edge /// compute and return the diadedral angle on an edge
double DiedralAngle(int edgeind) double DiedralAngle(int edgeind)
{ {
int f1=FE(edgeind,0); int f1=FofE(edgeind,0);
int f2=FE(edgeind,1); int f2=FofE(edgeind,1);
Point3d p0=FV(f1,0)->P(); Point3d p0=_v[FofV(f1,0)];
Point3d p1=FV(f1,1)->P(); Point3d p1=_v[FofV(f1,1)];
Point3d p2=FV(f1,2)->P(); Point3d p2=_v[FofV(f1,2)];
Point3d norm1=((p1-p0)^(p2-p0)); Point3d norm1=((p1-p0)^(p2-p0));
p0=FV(f2,0)->P(); p0=_v[FofV(f2,0)];
p1=FV(f2,1)->P(); p1=_v[FofV(f2,1)];
p2=FV(f2,2)->P(); p2=_v[FofV(f2,2)];
Point3d norm2=((p1-p0)^(p2-p0)); Point3d norm2=((p1-p0)^(p2-p0));
norm1.Normalize(); norm1.Normalize();
norm2.Normalize(); norm2.Normalize();
return (M_PI-acos(double(norm1*norm2))); return (M_PI-acos(double(norm1*norm2)));
} }
/// compute and return the aspect ratio of the tetrahedron /// compute and return the aspect ratio of the tetrahedron