Index: /OpenSceneGraph/trunk/include/osgUtil/TangentSpaceGenerator =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/TangentSpaceGenerator (revision 3432) +++ /OpenSceneGraph/trunk/include/osgUtil/TangentSpaceGenerator (revision 3526) @@ -25,45 +25,45 @@ { - /** - This class generates three arrays containing tangent-space basis vectors. It takes - a texture-mapped Geometry object as input, traverses its primitive sets and computes - Tangent, Normal and Binormal vectors for each vertex, storing them into arrays. - The resulting arrays can be used as vertex program varying (per-vertex) parameters, - enabling advanced effects like bump-mapping. - To use this class, simply call the generate() method specifying the Geometry object - you want to process and the texture unit that contains UV mapping for the normal map; - then you can retrieve the TBN arrays by calling getTangentArray(), getNormalArray() - and getBinormalArray() methods. - */ - class OSGUTIL_EXPORT TangentSpaceGenerator: public osg::Referenced { - public: - TangentSpaceGenerator(); - TangentSpaceGenerator(const TangentSpaceGenerator ©, const osg::CopyOp ©op = osg::CopyOp::SHALLOW_COPY); +/** + The TangentSpaceGenerator class generates three arrays containing tangent-space basis vectors. + It takes a texture-mapped Geometry object as input, traverses its primitive sets and computes + Tangent, Normal and Binormal vectors for each vertex, storing them into arrays. + The resulting arrays can be used as vertex program varying (per-vertex) parameters, + enabling advanced effects like bump-mapping. + To use this class, simply call the generate() method specifying the Geometry object + you want to process and the texture unit that contains UV mapping for the normal map; + then you can retrieve the TBN arrays by calling getTangentArray(), getNormalArray() + and getBinormalArray() methods. + */ +class OSGUTIL_EXPORT TangentSpaceGenerator: public osg::Referenced { +public: + TangentSpaceGenerator(); + TangentSpaceGenerator(const TangentSpaceGenerator ©, const osg::CopyOp ©op = osg::CopyOp::SHALLOW_COPY); - void generate(osg::Geometry *geo, int normal_map_tex_unit = 0); + void generate(osg::Geometry *geo, int normal_map_tex_unit = 0); - inline osg::Vec4Array *getTangentArray() { return T_.get(); } - inline const osg::Vec4Array *getTangentArray() const { return T_.get(); } - inline void setTangentArray(osg::Vec4Array *array) { T_ = array; } + inline osg::Vec4Array *getTangentArray() { return T_.get(); } + inline const osg::Vec4Array *getTangentArray() const { return T_.get(); } + inline void setTangentArray(osg::Vec4Array *array) { T_ = array; } - inline osg::Vec4Array *getNormalArray() { return N_.get(); } - inline const osg::Vec4Array *getNormalArray() const { return N_.get(); } - inline void setNormalArray(osg::Vec4Array *array) { N_ = array; } + inline osg::Vec4Array *getNormalArray() { return N_.get(); } + inline const osg::Vec4Array *getNormalArray() const { return N_.get(); } + inline void setNormalArray(osg::Vec4Array *array) { N_ = array; } - inline osg::Vec4Array *getBinormalArray() { return B_.get(); } - inline const osg::Vec4Array *getBinormalArray() const { return B_.get(); } - inline void setBinormalArray(osg::Vec4Array *array) { B_ = array; } + inline osg::Vec4Array *getBinormalArray() { return B_.get(); } + inline const osg::Vec4Array *getBinormalArray() const { return B_.get(); } + inline void setBinormalArray(osg::Vec4Array *array) { B_ = array; } - protected: - virtual ~TangentSpaceGenerator() {} - TangentSpaceGenerator &operator=(const TangentSpaceGenerator &) { return *this; } +protected: + virtual ~TangentSpaceGenerator() {} + TangentSpaceGenerator &operator=(const TangentSpaceGenerator &) { return *this; } - void compute_basis_vectors(osg::PrimitiveSet *pset, const osg::Array *vx, const osg::Array *nx, const osg::Array *tx, int iA, int iB, int iC); + void compute_basis_vectors(osg::PrimitiveSet *pset, const osg::Array *vx, const osg::Array *nx, const osg::Array *tx, int iA, int iB, int iC); - private: - osg::ref_ptr T_; - osg::ref_ptr B_; - osg::ref_ptr N_; - }; +private: + osg::ref_ptr T_; + osg::ref_ptr B_; + osg::ref_ptr N_; +}; } Index: /OpenSceneGraph/trunk/include/osgUtil/Version =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/Version (revision 1529) +++ /OpenSceneGraph/trunk/include/osgUtil/Version (revision 3526) @@ -21,6 +21,6 @@ /** - * getVersion_osgUtil() returns the library version number. - * Numbering convention : osg_src-0.8-31 will return 0.8.31 from getVersion_osgUtil. + * osgUtilGetVersion() returns the library version number. + * Numbering convention : osg_src-0.8-31 will return 0.8.31 from osgUtilGetVersion. * * This C function can be also used to check for the existence of the OpenSceneGraph @@ -39,6 +39,6 @@ /** - * getLibraryName_osgUtil() returns the library name in human friendly form. -*/ + * osgUtilGetLibraryName() returns the library name in human friendly form. + */ extern OSGUTIL_EXPORT const char* osgUtilGetLibraryName(); Index: /OpenSceneGraph/trunk/include/osgUtil/TransformAttributeFunctor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/TransformAttributeFunctor (revision 1984) +++ /OpenSceneGraph/trunk/include/osgUtil/TransformAttributeFunctor (revision 3526) @@ -28,10 +28,10 @@ public: - /** construct a functor to transform a drawable's vertex and normal attributes by specified matrix.*/ + /** Construct a functor to transform a drawable's vertex and normal attributes by specified matrix.*/ TransformAttributeFunctor(const osg::Matrix& m); virtual ~TransformAttributeFunctor(); - /** do the work of transforming vertex and normal attributes. */ + /** Do the work of transforming vertex and normal attributes. */ virtual void apply(osg::Drawable::AttributeType type,unsigned int count,osg::Vec3* begin); Index: /OpenSceneGraph/trunk/include/osgUtil/TriStripVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/TriStripVisitor (revision 3432) +++ /OpenSceneGraph/trunk/include/osgUtil/TriStripVisitor (revision 3526) @@ -26,5 +26,5 @@ /** A tri stripping visitor for converting Geometry surface primitives into tri strips. - * The current implemention is based up Tanguy Fautre's triangulation code. + * The current implemention is based upon Tanguy Fautre's triangulation code. */ class OSGUTIL_EXPORT TriStripVisitor : public osg::NodeVisitor @@ -46,8 +46,8 @@ void stripify(osg::Geometry& drawable); - /** Stripfy the accumulated list of Geometry drawables.*/ + /** Stripify (make into strips of tria or quads) the accumulated list of Geometry drawables.*/ void stripify(); - /// accumulate the Geometry drawables to stripify + /// Accumulate the Geometry drawables to make into strips. virtual void apply(osg::Geode& geode); Index: /OpenSceneGraph/trunk/include/osgUtil/UpdateVisitor =================================================================== --- /OpenSceneGraph/trunk/include/osgUtil/UpdateVisitor (revision 3432) +++ /OpenSceneGraph/trunk/include/osgUtil/UpdateVisitor (revision 3526) @@ -33,5 +33,5 @@ /** * Basic UpdateVisitor implementation for animating a scene. - * This visitor traverses the scene graph, call each nodes appCallback if + * This visitor traverses the scene graph, calling each nodes appCallback if * it exists. */ @@ -45,4 +45,5 @@ virtual void reset(); + /** During traversal each type of node calls its callbacks and its children traversed. */ virtual void apply(osg::Node& node) { handle_callbacks_and_traverse(node); } @@ -63,8 +64,8 @@ protected: -// /** prevent unwanted copy construction.*/ +// /** Prevent unwanted copy construction.*/ // UpdateVisitor(const UpdateVisitor&):osg::NodeVisitor() {} - /** prevent unwanted copy operator.*/ + /** Prevent unwanted copy operator.*/ UpdateVisitor& operator = (const UpdateVisitor&) { return *this; } @@ -80,5 +81,6 @@ osg::NodeCallback* callback = node.getUpdateCallback(); if (callback) (*callback)(&node,this); - /*else if (node.getNumChildrenRequiringUpdateTraversal()>0)*/ traverseGeode(node); + /*else if (node.getNumChildrenRequiringUpdateTraversal()>0)*/ + traverseGeode(node); } @@ -87,5 +89,5 @@ traverse((osg::Node&)geode); - // call the app callbacks on the drawables. + // Call the app callbacks on the drawables. for(unsigned int i=0;i