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

*** empty log message ***

This commit is contained in:
Federico Ponchio 2005-04-14 17:23:08 +00:00
parent a603f100c8
commit f766cf6773
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vcg/math/quaternion.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.11 2005/04/14 11:35:09 ponchio
*** empty log message ***
Revision 1.10 2004/12/15 18:45:50 tommyfranken Revision 1.10 2004/12/15 18:45:50 tommyfranken
*** empty log message *** *** empty log message ***
@ -38,6 +41,9 @@ updated access to matrix44 elements through V() instead simple []
Revision 1.6 2004/03/25 14:57:49 ponchio Revision 1.6 2004/03/25 14:57:49 ponchio
Microerror. ($LOG$ -> $Log: not supported by cvs2svn $ Microerror. ($LOG$ -> $Log: not supported by cvs2svn $
Microerror. ($LOG$ -> Revision 1.11 2005/04/14 11:35:09 ponchio
Microerror. ($LOG$ -> *** empty log message ***
Microerror. ($LOG$ ->
Microerror. ($LOG$ -> Revision 1.10 2004/12/15 18:45:50 tommyfranken Microerror. ($LOG$ -> Revision 1.10 2004/12/15 18:45:50 tommyfranken
Microerror. ($LOG$ -> *** empty log message *** Microerror. ($LOG$ -> *** empty log message ***
Microerror. ($LOG$ -> Microerror. ($LOG$ ->
@ -96,8 +102,8 @@ public:
Point3<S> Rotate(const Point3<S> vec) const; Point3<S> Rotate(const Point3<S> vec) const;
//duplicated ... because of gcc new confoming to ISO template derived classes //duplicated ... because of gcc new confoming to ISO template derived classes
//do no 'see' parent members (unless explicitly specified) //do no 'see' parent members (unless explicitly specified)
const S & V ( const int i ) const { assert(i>=0 && i<4); return Point3<S>::_v[i]; } const S & V ( const int i ) const { assert(i>=0 && i<4); return ((Point3<S> *)this)->V(i); }
S & V ( const int i ) { assert(i>=0 && i<4); return Point3<S>::_v[i]; } S & V ( const int i ) { assert(i>=0 && i<4); return ((Point3<S> *)this)->V(i); }
}; };
template <class S> Quaternion<S> Interpolate(const Quaternion<S> a, const Quaternion<S> b, double t); template <class S> Quaternion<S> Interpolate(const Quaternion<S> a, const Quaternion<S> b, double t);

7
vcg/space/index/grid_static_ptr.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.12 2005/03/15 11:43:18 cignoni
Removed BestDim function from the grid_static_ptr class and moved to a indipendent file (grid_util.h) for sake of generality.
Revision 1.11 2005/01/03 11:21:26 cignoni Revision 1.11 2005/01/03 11:21:26 cignoni
Added some casts Added some casts
@ -226,7 +229,7 @@ class GridStaticPtr
} }
void Grid( const Point3d & p, Cell & first, Cell & last ) void Grid( const Point3d & p, Cell & first, Cell & last )
{ {
Cell* g = Grid(s); Cell* g = Grid(p);
first = *g; first = *g;
last = *(g+1); last = *(g+1);
@ -461,7 +464,7 @@ class GridStaticPtr
int MemUsed() int MemUsed()
{ {
return sizeof(GridStaticObj)+ sizeof(Link)*links.size() + return sizeof(GridStaticPtr)+ sizeof(Link)*links.size() +
sizeof(Cell) * grid.size(); sizeof(Cell) * grid.size();
} }
}; //end class GridStaticObj }; //end class GridStaticObj