diff --git a/include/osgGA/UFOManipulator b/include/osgGA/UFOManipulator index dc510e384..9881ef053 100644 --- a/include/osgGA/UFOManipulator +++ b/include/osgGA/UFOManipulator @@ -71,7 +71,7 @@ class OSGGA_EXPORT UFOManipulator : public osgGA::MatrixManipulator virtual void setByMatrix( const osg::Matrixd &matrix ) ; /** Set the current position with the invers matrix - \param invmatrix The inverse of a viewpoint matrix + \param invmat The inverse of a viewpoint matrix */ virtual void setByInverseMatrix( const osg::Matrixd &invmat); @@ -84,7 +84,7 @@ class OSGGA_EXPORT UFOManipulator : public osgGA::MatrixManipulator /** Set the subgraph this manipulator is driving the eye through. \param node root of subgraph */ - virtual void setNode(osg::Node*); + virtual void setNode(osg::Node* node); /** Get the root node of the subgraph this manipulator is driving the eye through (const)*/ virtual const osg::Node* getNode() const; diff --git a/include/osgParticle/ForceOperator b/include/osgParticle/ForceOperator index 666b409f7..5ed776ab9 100644 --- a/include/osgParticle/ForceOperator +++ b/include/osgParticle/ForceOperator @@ -26,9 +26,9 @@ namespace osgParticle { - /** An operator that applies a constant force to the particles. - Remember that if the mass of particles is expressed in kg and the lengths are - expressed in meters, then the force should be expressed in Newtons. + /** An operator that applies a constant force to the particles. + * Remember that if the mass of particles is expressed in kg and the lengths are + * expressed in meters, then the force should be expressed in Newtons. */ class ForceOperator: public Operator { public: diff --git a/include/osgParticle/ParticleProcessor b/include/osgParticle/ParticleProcessor index 806299535..bb6bd6e1a 100644 --- a/include/osgParticle/ParticleProcessor +++ b/include/osgParticle/ParticleProcessor @@ -29,11 +29,11 @@ namespace osgParticle { - /** A common base interface for those classes which need to do something on particles. Such classes - are, for example, Emitter (particle generation) and Program (particle animation). - This class holds some properties, like a reference frame and a reference to a ParticleSystem; - descendant classes should process the particles taking into account the reference frame, computing the right - transformations when needed. + /** A common base interface for those classes which need to do something on particles. Such classes + * are, for example, Emitter (particle generation) and Program (particle animation). + * This class holds some properties, like a reference frame and a reference to a ParticleSystem; + * descendant classes should process the particles taking into account the reference frame, computing the right + * transformations when needed. */ class OSGPARTICLE_EXPORT ParticleProcessor: public osg::Node { public: diff --git a/include/osgParticle/ParticleSystem b/include/osgParticle/ParticleSystem index c31dace6c..1aee1229c 100644 --- a/include/osgParticle/ParticleSystem +++ b/include/osgParticle/ParticleSystem @@ -33,11 +33,11 @@ namespace osgParticle { - /** The heart of this class library; its purpose is to hold a set of particles and manage particle creation, update, rendering and destruction. - You can add this drawable to any Geode as you usually do with other - Drawable classes. Each instance of ParticleSystem is a separate set of - particles; it provides the interface for creating particles and iterating - through them (see the Emitter and Program classes). + /** The heart of this class library; its purpose is to hold a set of particles and manage particle creation, update, rendering and destruction. + * You can add this drawable to any Geode as you usually do with other + * Drawable classes. Each instance of ParticleSystem is a separate set of + * particles; it provides the interface for creating particles and iterating + * through them (see the Emitter and Program classes). */ class OSGPARTICLE_EXPORT ParticleSystem: public osg::Drawable { public: @@ -87,9 +87,9 @@ namespace osgParticle /** Set the double pass rendering flag. Double pass rendering avoids overdraw problems between particle systems - and other opaque objects. If you can render all the particle systems after + and other opaque objects. If you can render all the particle systems after the opaque objects, then double pass is not necessary and can be turned off (best choice). - If you set the default attributes with setDefaultAttributes, then the particle + If you set the default attributes with setDefaultAttributes, then the particle system will fall into a transparent bin. */ inline void setDoublePassRendering(bool v); diff --git a/include/osgParticle/ParticleSystemUpdater b/include/osgParticle/ParticleSystemUpdater index c248e8074..8bf1d78f0 100644 --- a/include/osgParticle/ParticleSystemUpdater +++ b/include/osgParticle/ParticleSystemUpdater @@ -32,9 +32,9 @@ namespace osgParticle { /** A useful node class for updating particle systems automatically. - When a ParticleSystemUpdater is traversed by a cull visitor, it calls the - update() method on the specified particle systems. You should place this updater - AFTER other nodes like emitters and programs. + When a ParticleSystemUpdater is traversed by a cull visitor, it calls the + update() method on the specified particle systems. You should place this updater + AFTER other nodes like emitters and programs. */ class OSGPARTICLE_EXPORT ParticleSystemUpdater: public osg::Node { public: diff --git a/include/osgProducer/OsgCameraGroup b/include/osgProducer/OsgCameraGroup index f2f9761c4..79474b8ca 100644 --- a/include/osgProducer/OsgCameraGroup +++ b/include/osgProducer/OsgCameraGroup @@ -55,7 +55,7 @@ class OSGPRODUCER_EXPORT OsgCameraGroup : public Producer::CameraGroup const osg::ApplicationUsage* getApplicationUsage() const { return _applicationUsage; } - typedef std::vector < Producer::ref_ptr > SceneHandlerList; + typedef std::vector < osg::ref_ptr > SceneHandlerList; SceneHandlerList& getSceneHandlerList() { return _shvec;} diff --git a/include/osgSim/ScalarBar b/include/osgSim/ScalarBar index ac7168b6f..6a847c456 100644 --- a/include/osgSim/ScalarBar +++ b/include/osgSim/ScalarBar @@ -102,12 +102,13 @@ public: Construct a ScalarBar with the supplied parameters. @param numColors Specify the number of colors in the scalar bar. Color interpolation occurs where necessary. + @param numLabels Specify the number of labels in the scalar bar. @param stc The ScalarsToColors defining the range of scalars and the colors they map to. @param title The title to be used when displaying the ScalarBar. Specify "" for no title. @param orientation The orientation of the ScalarBar. @see Orientation. - @param apectRatio The aspect ration (y/x) for the displayed bar. Bear in mind you + @param aspectRatio The aspect ration (y/x) for the displayed bar. Bear in mind you may want to change this if you change the orientation. @param sp A ScalarPrinter object for the ScalarBar. For every displayed ScalarBar label, the scalar value will be passed to the diff --git a/include/osgSim/SphereSegment b/include/osgSim/SphereSegment index 6ce896620..1542c4b45 100644 --- a/include/osgSim/SphereSegment +++ b/include/osgSim/SphereSegment @@ -94,7 +94,7 @@ public: @param centre sphere centre @param radius radius of sphere @param azMin azimuth minimum - @param azMin azimuth maximum + @param azMax azimuth maximum @param elevMin elevation minimum @param elevMax elevation maximum @param density number of units to divide the azimuth and elevation ranges into @@ -155,7 +155,7 @@ public: @param azRange azimuth range in radians (with centre along vec) @param elevRange elevation range in radians (with centre along vec) */ - void setArea(const osg::Vec3& v, float azRange, float elevRange); + void setArea(const osg::Vec3& vec, float azRange, float elevRange); /** Get the area of the sphere segment @@ -164,11 +164,11 @@ public: @param azRange azimuth range in radians (with centre along vec) @param elevRange elevation range in radians (with centre along vec) */ - void getArea(osg::Vec3& v, float& azRange, float& elevRange) const; + void getArea(osg::Vec3& vec, float& azRange, float& elevRange) const; /** Set the area of the sphere segment @param azMin azimuth minimum - @param azMin azimuth maximum + @param azMax azimuth maximum @param elevMin elevation minimum @param elevMax elevation maximum */ @@ -176,7 +176,7 @@ public: /** Get the area of the sphere segment @param azMin azimuth minimum - @param azMin azimuth maximum + @param azMax azimuth maximum @param elevMin elevation minimum @param elevMax elevation maximum */