FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Chris Hanson, typo and comment clean ups

Browse Source
This commit is contained in:
Robert Osfield
2009-07-24 14:45:44 +00:00
parent 68c459ea30
commit 773ae51a45
14 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osg/ApplicationUsage
View File

@@ -35,9 +35,12 @@ class OSG_EXPORT ApplicationUsage : public osg::Referenced
typedef std::map<std::string,std::string> UsageMap;
/** The ApplicationName is often displayed when logging errors, and frequently incorporated into the Description (below). */
void setApplicationName(const std::string& name) { _applicationName = name; }
const std::string& getApplicationName() const { return _applicationName; }
/** If non-empty, the Description is typically shown by the Help Handler
* as text on the Help display (which also lists keyboard abbreviations. */
void setDescription(const std::string& desc) { _description = desc; }
const std::string& getDescription() const { return _description; }

6
include/osg/Camera
View File

@@ -72,13 +72,13 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
bool getAllowEventFocus() const { return _allowEventFocus; }
/** Set the DsplaySettings object associated with this view.*/
/** Set the DisplaySettings object associated with this view.*/
void setDisplaySettings(osg::DisplaySettings* ds) { _displaySettings = ds; }
/** Set the DsplaySettings object associated with this view.*/
/** Get the DisplaySettings object associated with this view.*/
osg::DisplaySettings* getDisplaySettings() { return _displaySettings.get(); }
/** Set the DsplaySettings object associated with this view.*/
/** Get the const DisplaySettings object associated with this view.*/
const osg::DisplaySettings* getDisplaySettings() const { return _displaySettings.get(); }

4
include/osg/Shape
View File

@@ -505,7 +505,7 @@ class OSG_EXPORT HeightField : public Shape
/** Get the FloatArray height data.*/
osg::FloatArray* getFloatArray() { return _heights.get(); }
/** Get the const sFloatArray height data.*/
/** Get the const FloatArray height data.*/
const osg::FloatArray* getFloatArray() const { return _heights.get(); }
HeightList& getHeightList() { return _heights->asVector(); }
@@ -568,7 +568,7 @@ class OSG_EXPORT HeightField : public Shape
unsigned int _columns,_rows;
osg::Vec3 _origin;
osg::Vec3 _origin; // _origin is the min value of the X and Y coordinates.
float _dx;
float _dy;

1
include/osgAnimation/MorphGeometry
View File

@@ -88,6 +88,7 @@ namespace osgAnimation
* dirty the bounding sphere to force it to be recomputed on the next
* call to \c getBound().
* @param morphTarget The \c MorphTarget to be added to the \c MorphGeometry.
* @param weight The weight to be added to the \c MorphGeometry.
* @return \c true for success; \c false otherwise.
*/
virtual void addMorphTarget( osg::Geometry *morphTarget, float weight = 1.0 ) { _morphTargets.push_back(MorphTarget(morphTarget, weight)); _dirty = true; }

4
include/osgTerrain/Locator
View File

@@ -88,9 +88,9 @@ class OSGTERRAIN_EXPORT Locator : public osg::Object
virtual bool orientationOpenGL() const;
virtual bool convertLocalToModel(const osg::Vec3d& /*local*/, osg::Vec3d& /*world*/) const;
virtual bool convertLocalToModel(const osg::Vec3d& local, osg::Vec3d& world) const;
virtual bool convertModelToLocal(const osg::Vec3d& /*world*/, osg::Vec3d& /*local*/) const;
virtual bool convertModelToLocal(const osg::Vec3d& world, osg::Vec3d& local) const;
static bool convertLocalCoordBetween(const Locator& source, const osg::Vec3d& sourceNDC,
const Locator& destination, osg::Vec3d& destinationNDC)

2
include/osgTerrain/Terrain
View File

@@ -22,7 +22,7 @@
namespace osgTerrain {
/** Terrain provides a framework for loosely coupling height field data with height rendering algorithms.
* This allows TerrainTechnique's to be plugged in at runtime.*/
* This allows TerrainTechniques to be plugged in at runtime.*/
class OSGTERRAIN_EXPORT Terrain : public osg::Group
{
public:

2
include/osgTerrain/TerrainTile
View File

@@ -117,7 +117,7 @@ class OSGTERRAIN_EXPORT TerrainTile : public osg::Group
/** Get the coordinate frame locator of the terrain node.*/
Locator* getLocator() { return _locator.get(); }
/** Get the coordinate frame locator of the terrain node.*/
/** Get the const coordinate frame locator of the terrain node.*/
const Locator* getLocator() const { return _locator.get(); }
/** Set the layer to use to define the elevations of the terrain.*/