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

From Paul Melis, fixes to spelling mistakes/typos.

Browse Source
This commit is contained in:
Robert Osfield
2007-07-11 15:51:17 +00:00
parent 55f3b67dbb
commit 691a49d0fa
17 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/BufferObject
View File

@@ -291,8 +291,8 @@ class OSG_EXPORT ElementBufferObject : public BufferObject
META_Object(osg,ElementBufferObject);
typedef std::pair< BufferEntry, DrawElements* > BufferEntryDrawElementstPair;
typedef std::vector< BufferEntryDrawElementstPair > BufferEntryDrawElementsPairs;
typedef std::pair< BufferEntry, DrawElements* > BufferEntryDrawElementsPair;
typedef std::vector< BufferEntryDrawElementsPair > BufferEntryDrawElementsPairs;
unsigned int addDrawElements(osg::DrawElements* PrimitiveSet);
void removeDrawElements(osg::DrawElements* PrimitiveSet);

4
include/osg/DisplaySettings
View File

@@ -125,8 +125,8 @@ class OSG_EXPORT DisplaySettings : public osg::Referenced
void setSplitStereoVerticalSeparation(int s) { _splitStereoVerticalSeparation = s; }
int getSplitStereoVerticalSeparation() const { return _splitStereoVerticalSeparation; }
void setSplitStereoAutoAjustAspectRatio(bool flag) { _splitStereoAutoAdjustAspectRatio=flag; }
bool getSplitStereoAutoAjustAspectRatio() const { return _splitStereoAutoAdjustAspectRatio; }
void setSplitStereoAutoAdjustAspectRatio(bool flag) { _splitStereoAutoAdjustAspectRatio=flag; }
bool getSplitStereoAutoAdjustAspectRatio() const { return _splitStereoAutoAdjustAspectRatio; }
void setScreenWidth(float width) { _screenWidth = width; }

2
include/osg/TexEnvCombine
View File

@@ -239,7 +239,7 @@ class OSG_EXPORT TexEnvCombine : public StateAttribute
return true;
}
void computeNeedoForTexEnvCombiners()
void computeNeedForTexEnvCombiners()
{
_needsTexEnvCrossbar = (needsTexEnvCombiner(_source0_RGB) ||
needsTexEnvCombiner(_source1_RGB) ||

6
include/osgGA/AnimationPathManipulator
View File

@@ -41,8 +41,8 @@ class OSGGA_EXPORT AnimationPathManipulator : public MatrixManipulator
virtual const char* className() const { return "AnimationPath"; }
void setPrintOutTimingInfo(bool printOutTiminInfo) { _printOutTiminInfo=printOutTiminInfo; }
bool getPrintOutTimingInfo() const { return _printOutTiminInfo; }
void setPrintOutTimingInfo(bool printOutTimingInfo) { _printOutTimingInfo=printOutTimingInfo; }
bool getPrintOutTimingInfo() const { return _printOutTimingInfo; }
/** set the position of the matrix manipulator using a 4x4 Matrix.*/
virtual void setByMatrix(const osg::Matrixd& matrix) { _matrix = matrix; }
@@ -79,7 +79,7 @@ class OSGGA_EXPORT AnimationPathManipulator : public MatrixManipulator
bool _valid;
bool _printOutTiminInfo;
bool _printOutTimingInfo;
void handleFrame( double time );

4
include/osgParticle/FluidProgram
View File

@@ -51,7 +51,7 @@ namespace osgParticle
inline void setFluidDensity(float d)
{
_density = d;
_densityCoefficeint = 0.2f * osg::PI * _density;
_densityCoefficient = 0.2f * osg::PI * _density;
}
/// Get the density of the fluid.
@@ -105,7 +105,7 @@ namespace osgParticle
osg::Vec3 _wind;
float _viscosityCoefficient;
float _densityCoefficeint;
float _densityCoefficient;
};

4
include/osgParticle/PrecipitationEffect
View File

@@ -231,8 +231,8 @@ namespace osgParticle
osg::ref_ptr<osg::Uniform> _particleSizeUniform;
osg::ref_ptr<osg::Uniform> _particleColorUniform;
typedef std::pair< osg::NodeVisitor*, osg::NodePath > ViewIdenitifier;
typedef std::map< ViewIdenitifier, PrecipitationDrawableSet > ViewDrawableMap;
typedef std::pair< osg::NodeVisitor*, osg::NodePath > ViewIdentifier;
typedef std::map< ViewIdentifier, PrecipitationDrawableSet > ViewDrawableMap;
OpenThreads::Mutex _mutex;
ViewDrawableMap _viewDrawableMap;

5
include/osgTerrain/Locator
View File

@@ -93,11 +93,12 @@ class OSGTERRAIN_EXPORT EllipsoidLocator : public osgTerrain::Locator
};
class OSGTERRAIN_EXPORT CartizianLocator : public osgTerrain::Locator
class OSGTERRAIN_EXPORT CartesianLocator : public osgTerrain::Locator
{
public:
CartizianLocator(double originX, double originY, double lengthX, double lengthY, double height = 0.0f, double heightScale = 1.0f);
CartesianLocator(double originX, double originY, double lengthX, double lengthY, double height = 0.0f, double heightScale =
1.0f);
void setExtents(double originX, double originY, double lengthX, double lengthY, double height = 0.0f, double heightScale = 1.0f);

8
include/osgUtil/SceneView
View File

@@ -278,9 +278,9 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
osgUtil::CullVisitor* getCullVisitorRight() { return _cullVisitorRight.get(); }
const osgUtil::CullVisitor* getCullVisitorRight() const { return _cullVisitorRight.get(); }
void setCollectOccludersVisitor(osg::CollectOccludersVisitor* cov) { _collectOccludersVisistor = cov; }
osg::CollectOccludersVisitor* getCollectOccludersVisitor() { return _collectOccludersVisistor.get(); }
const osg::CollectOccludersVisitor* getCollectOccludersVisitor() const { return _collectOccludersVisistor.get(); }
void setCollectOccludersVisitor(osg::CollectOccludersVisitor* cov) { _collectOccludersVisitor = cov; }
osg::CollectOccludersVisitor* getCollectOccludersVisitor() { return _collectOccludersVisitor.get(); }
const osg::CollectOccludersVisitor* getCollectOccludersVisitor() const { return _collectOccludersVisitor.get(); }
void setStateGraph(osgUtil::StateGraph* rg) { _rendergraph = rg; }
@@ -498,7 +498,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
osg::ref_ptr<osgUtil::StateGraph> _rendergraphRight;
osg::ref_ptr<osgUtil::RenderStage> _renderStageRight;
osg::ref_ptr<osg::CollectOccludersVisitor> _collectOccludersVisistor;
osg::ref_ptr<osg::CollectOccludersVisitor> _collectOccludersVisitor;
osg::ref_ptr<osg::FrameStamp> _frameStamp;