From f766cf6773906bbd8c56239050a248d474f258c2 Mon Sep 17 00:00:00 2001 From: ponchio Date: Thu, 14 Apr 2005 17:23:08 +0000 Subject: [PATCH] *** empty log message *** --- vcg/math/quaternion.h | 10 ++++++++-- vcg/space/index/grid_static_ptr.h | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/vcg/math/quaternion.h b/vcg/math/quaternion.h index 5b8803e3..9a55f753 100644 --- a/vcg/math/quaternion.h +++ b/vcg/math/quaternion.h @@ -24,6 +24,9 @@ History $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 *** 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 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$ -> *** empty log message *** Microerror. ($LOG$ -> @@ -96,8 +102,8 @@ public: Point3 Rotate(const Point3 vec) const; //duplicated ... because of gcc new confoming to ISO template derived classes //do no 'see' parent members (unless explicitly specified) - const S & V ( const int i ) const { assert(i>=0 && i<4); return Point3::_v[i]; } - S & V ( const int i ) { assert(i>=0 && i<4); return Point3::_v[i]; } + const S & V ( const int i ) const { assert(i>=0 && i<4); return ((Point3 *)this)->V(i); } + S & V ( const int i ) { assert(i>=0 && i<4); return ((Point3 *)this)->V(i); } }; template Quaternion Interpolate(const Quaternion a, const Quaternion b, double t); diff --git a/vcg/space/index/grid_static_ptr.h b/vcg/space/index/grid_static_ptr.h index 810bddb1..485c102e 100644 --- a/vcg/space/index/grid_static_ptr.h +++ b/vcg/space/index/grid_static_ptr.h @@ -24,6 +24,9 @@ History $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 Added some casts @@ -226,7 +229,7 @@ class GridStaticPtr } void Grid( const Point3d & p, Cell & first, Cell & last ) { - Cell* g = Grid(s); + Cell* g = Grid(p); first = *g; last = *(g+1); @@ -461,7 +464,7 @@ class GridStaticPtr int MemUsed() { - return sizeof(GridStaticObj)+ sizeof(Link)*links.size() + + return sizeof(GridStaticPtr)+ sizeof(Link)*links.size() + sizeof(Cell) * grid.size(); } }; //end class GridStaticObj