Changeset 9767

Show
Ignore:
Timestamp:
02/11/09 17:59:08 (5 years ago)
Author:
robert
Message:

Fixes to doyxgen warnings, merged from svn/trunk using:


svn merge -r 9761:9762 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/


Location:
OpenSceneGraph/branches/OpenSceneGraph-2.8/include
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osg/BoundingBox

    r9268 r9767  
    174174        /** Expands this bounding box to include the given bounding box. 
    175175          * If this box is uninitialized, set it equal to bb. */ 
    176         void expandBy(const BoundingBoxImpl& bb); 
     176        void expandBy(const BoundingBoxImpl& bb) 
     177        { 
     178            if (!bb.valid()) return; 
     179 
     180            if(bb._min.x()<_min.x()) _min.x() = bb._min.x(); 
     181            if(bb._max.x()>_max.x()) _max.x() = bb._max.x(); 
     182 
     183            if(bb._min.y()<_min.y()) _min.y() = bb._min.y(); 
     184            if(bb._max.y()>_max.y()) _max.y() = bb._max.y(); 
     185 
     186            if(bb._min.z()<_min.z()) _min.z() = bb._min.z(); 
     187            if(bb._max.z()>_max.z()) _max.z() = bb._max.z(); 
     188        } 
    177189 
    178190        /** Expands this bounding box to include the given sphere. 
    179191          * If this box is uninitialized, set it to include sh. */ 
    180         void expandBy(const BoundingSphereImpl<VT>& sh); 
     192        void expandBy(const BoundingSphereImpl<VT>& sh) 
     193        { 
     194            if (!sh.valid()) return; 
     195 
     196            if(sh._center.x()-sh._radius<_min.x()) _min.x() = sh._center.x()-sh._radius; 
     197            if(sh._center.x()+sh._radius>_max.x()) _max.x() = sh._center.x()+sh._radius; 
     198 
     199            if(sh._center.y()-sh._radius<_min.y()) _min.y() = sh._center.y()-sh._radius; 
     200            if(sh._center.y()+sh._radius>_max.y()) _max.y() = sh._center.y()+sh._radius; 
     201 
     202            if(sh._center.z()-sh._radius<_min.z()) _min.z() = sh._center.z()-sh._radius; 
     203            if(sh._center.z()+sh._radius>_max.z()) _max.z() = sh._center.z()+sh._radius; 
     204        } 
    181205         
    182206 
     
    206230}; 
    207231 
    208 template<typename VT> 
    209 void BoundingBoxImpl<VT>::expandBy(const BoundingBoxImpl<VT>& bb) 
    210 { 
    211     if (!bb.valid()) return; 
    212  
    213     if(bb._min.x()<_min.x()) _min.x() = bb._min.x(); 
    214     if(bb._max.x()>_max.x()) _max.x() = bb._max.x(); 
    215  
    216     if(bb._min.y()<_min.y()) _min.y() = bb._min.y(); 
    217     if(bb._max.y()>_max.y()) _max.y() = bb._max.y(); 
    218  
    219     if(bb._min.z()<_min.z()) _min.z() = bb._min.z(); 
    220     if(bb._max.z()>_max.z()) _max.z() = bb._max.z(); 
    221 } 
    222  
    223 template<typename VT> 
    224 void BoundingBoxImpl<VT>::expandBy(const BoundingSphereImpl<VT>& sh) 
    225 { 
    226     if (!sh.valid()) return; 
    227  
    228     if(sh._center.x()-sh._radius<_min.x()) _min.x() = sh._center.x()-sh._radius; 
    229     if(sh._center.x()+sh._radius>_max.x()) _max.x() = sh._center.x()+sh._radius; 
    230  
    231     if(sh._center.y()-sh._radius<_min.y()) _min.y() = sh._center.y()-sh._radius; 
    232     if(sh._center.y()+sh._radius>_max.y()) _max.y() = sh._center.y()+sh._radius; 
    233  
    234     if(sh._center.z()-sh._radius<_min.z()) _min.z() = sh._center.z()-sh._radius; 
    235     if(sh._center.z()+sh._radius>_max.z()) _max.z() = sh._center.z()+sh._radius; 
    236 } 
    237  
    238232typedef BoundingBoxImpl<Vec3f> BoundingBoxf; 
    239233typedef BoundingBoxImpl<Vec3d> BoundingBoxd; 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osgAnimation/Vec3Packed

    r9094 r9767  
    1010// your option) any later version.                                            // 
    1111//****************************************************************************// 
     12 
    1213/*****************************************************************************/ 
    13 /** Loads a core compressed keyframe instance. 
     14/* Loads a core compressed keyframe instance. 
    1415 * 
    1516 * This function loads a core compressed keyframe instance from a data source. 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osgTerrain/Terrain

    r9497 r9767  
    6565        const TerrainTile* getTile(const TileID& tileID) const; 
    6666         
    67         /** Set the TerrainTechnique prototype from which TerrainTiles can clone the techniques from..*/ 
     67        /** Set the TerrainTechnique prototype from which TerrainTiles can clone the techniques from.*/ 
    6868        void setTerrainTechniquePrototype(TerrainTechnique* technique) { _terrainTechnique = technique; } 
    6969 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osgUtil/DrawElementTypeSimplifier

    r9377 r9767  
    3333    public: 
    3434         
    35         META_NodeVisitor("osgUtil","DrawElementTypeSimplifierVisitor") 
     35        META_NodeVisitor("osgUtil","DrawElementTypeSimplifierVisitor"); 
    3636 
    3737        void apply(osg::Geode& node); 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osgWidget/Browser

    r9458 r9767  
    4343        virtual ~BrowserManager(); 
    4444         
    45         META_Object(osgWidget,BrowserManager) 
     45        META_Object(osgWidget,BrowserManager); 
    4646 
    4747        std::string _application;