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

From Paul Melis, "Here is a list of fixes to misspelled APIs. Unfortunately, more than one

Browse Source 
of these are public APIs and therefore will break linkage to existing
shared libraries."

Note from Robert Osfield, updated wrappers.
This commit is contained in:
Robert Osfield
2007-06-27 20:36:16 +00:00
parent 64b8e3062f
commit eac3dc1963
58 changed files with 124 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/BlendColor
View File

@@ -81,7 +81,7 @@ class OSG_EXPORT BlendColor : public StateAttribute
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setBlendColorSupported(bool flag) { _isBlendColorSupported=flag; }
bool isBlendColorSupported() const { return _isBlendColorSupported; }

2
include/osg/BlendEquation
View File

@@ -103,7 +103,7 @@ class OSG_EXPORT BlendEquation : public StateAttribute
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setBlendEquationSupported(bool flag) { _isBlendEquationSupported=flag; }
bool isBlendEquationSupported() const { return _isBlendEquationSupported; }

2
include/osg/BufferObject
View File

@@ -159,7 +159,7 @@ class OSG_EXPORT BufferObject : public Object
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
bool isBufferObjectSupported() const { return _glGenBuffers!=0; }
bool isPBOSupported() const { return _isPBOSupported; }

2
include/osg/ClampColor
View File

@@ -89,7 +89,7 @@ class OSG_EXPORT ClampColor : public StateAttribute
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setClampColorSupported(bool flag) { _isClampColorSupported=flag; }
bool isClampColorSupported() const { return _isClampColorSupported; }

2
include/osg/CollectOccludersVisitor
View File

@@ -62,7 +62,7 @@ class OSG_EXPORT CollectOccludersVisitor : public osg::NodeVisitor, public osg::
void setCreateDrawablesOnOccludeNodes(bool flag) { _createDrawables=flag; }
bool getCreateDrawablesOnOccludeNodes() const { return _createDrawables; }
void setCollectedOcculderSet(const ShadowVolumeOccluderSet& svol) { _occluderSet = svol; }
void setCollectedOccluderSet(const ShadowVolumeOccluderSet& svol) { _occluderSet = svol; }
ShadowVolumeOccluderSet& getCollectedOccluderSet() { return _occluderSet; }
const ShadowVolumeOccluderSet& getCollectedOccluderSet() const { return _occluderSet; }

2
include/osg/Drawable
View File

@@ -575,7 +575,7 @@ class OSG_EXPORT Drawable : public Object
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setVertexProgramSupported(bool flag) { _isVertexProgramSupported=flag; }
bool isVertexProgramSupported() const { return _isVertexProgramSupported; }

2
include/osg/FragmentProgram
View File

@@ -240,7 +240,7 @@ class OSG_EXPORT FragmentProgram : public StateAttribute
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setFragmentProgramSupported(bool flag) { _isFragmentProgramSupported=flag; }
bool isFragmentProgramSupported() const { return _isFragmentProgramSupported; }

2
include/osg/Multisample
View File

@@ -105,7 +105,7 @@ class OSG_EXPORT Multisample : public StateAttribute
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setMultisampleSupported(bool flag) { _isMultisampleSupported=flag; }
void setMultisampleFilterHintSupported(bool flag) { _isMultisampleFilterHintSupported=flag; }

2
include/osg/Point
View File

@@ -89,7 +89,7 @@ class OSG_EXPORT Point : public StateAttribute
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setPointParametersSupported(bool flag) { _isPointParametersSupported=flag; }
bool isPointParametersSupported() const { return _isPointParametersSupported; }

4
include/osg/Referenced
View File

@@ -108,7 +108,7 @@ class OSG_EXPORT Referenced
virtual ~Referenced();
void deletUsingDeleteHandler() const;
void deleteUsingDeleteHandler() const;
mutable OpenThreads::Mutex* _refMutex;
@@ -148,7 +148,7 @@ inline void Referenced::unref() const
if (needDelete)
{
if (getDeleteHandler()) deletUsingDeleteHandler();
if (getDeleteHandler()) deleteUsingDeleteHandler();
else delete this;
}
}

2
include/osg/StencilTwoSided
View File

@@ -148,7 +148,7 @@ class OSG_EXPORT StencilTwoSided : public StateAttribute
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setStencilTwoSidedSupported(bool flag) { _isStencilTwoSidedSupported=flag; }
bool isStencilTwoSidedSupported() const { return _isStencilTwoSidedSupported; }

2
include/osg/TextureCubeMap
View File

@@ -143,7 +143,7 @@ class OSG_EXPORT TextureCubeMap : public Texture
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setCubeMapSupported(bool flag) { _isCubeMapSupported=flag; }
bool isCubeMapSupported() const { return _isCubeMapSupported; }

2
include/osg/VertexProgram
View File

@@ -243,7 +243,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtenions(unsigned int contextID);
void setupGLExtensions(unsigned int contextID);
void setVertexProgramSupported(bool flag) { _isVertexProgramSupported=flag; }
bool isVertexProgramSupported() const { return _isVertexProgramSupported; }

2
include/osgDB/Input
View File

@@ -55,7 +55,7 @@ class OSGDB_EXPORT Input : public FieldReaderIterator
virtual osg::Node* readNode(const std::string& fileName);
virtual osg::Object* getObjectForUniqueID(const std::string& uniqueID);
virtual void regisiterUniqueIDForObject(const std::string& uniqueID,osg::Object* obj);
virtual void registerUniqueIDForObject(const std::string& uniqueID,osg::Object* obj);
private:

4
include/osgDB/Registry
View File

@@ -330,12 +330,12 @@ class OSGDB_EXPORT Registry : public osg::Referenced
* This would typically be called once per frame by applications which are doing database paging,
* and need to prune objects that are no longer required.
* Time value is time in sceonds.*/
void updateTimeStampOfObjectsInCacheWithExtenalReferences(double currentTime);
void updateTimeStampOfObjectsInCacheWithExternalReferences(double currentTime);
/** Removed object in the cache which have a time stamp at or before the specified expiry time.
* This would typically be called once per frame by applications which are doing database paging,
* and need to prune objects that are no longer required, and called after the a called
* after the call to updateTimeStampOfObjectsInCacheWithExtenalReferences(currentTime).
* after the call to updateTimeStampOfObjectsInCacheWithExternalReferences(currentTime).
* Note, the currentTime is not the expiryTime, one would typically set the expiry time
* to a fixed amount of time before currentTime, such as expiryTime = currentTime-10.0.
* Time value is time in sceonds.*/

10
include/osgParticle/ModularEmitter
View File

@@ -57,11 +57,11 @@ namespace osgParticle
/// Set the Counter object.
inline void setCounter(Counter* c);
/// Get the ratio between number of particle to create in compenstation for movement of the emitter
inline float getNumParticlesToCreateMovementCompenstationRatio() const;
/// Get the ratio between number of particle to create in compensation for movement of the emitter
inline float getNumParticlesToCreateMovementCompensationRatio() const;
/// Set the ratio between number of particle to create in compenstation for movement of the emitter
inline void setNumParticlesToCreateMovementCompenstationRatio(float r);
inline void setNumParticlesToCreateMovementCompensationRatio(float r);
/// Get the Placer object.
@@ -113,12 +113,12 @@ namespace osgParticle
_counter = c;
}
inline float ModularEmitter::getNumParticlesToCreateMovementCompenstationRatio() const
inline float ModularEmitter::getNumParticlesToCreateMovementCompensationRatio() const
{
return _numParticleToCreateMovementCompensationRatio;
}
inline void ModularEmitter::setNumParticlesToCreateMovementCompenstationRatio(float r)
inline void ModularEmitter::setNumParticlesToCreateMovementCompensationRatio(float r)
{
_numParticleToCreateMovementCompensationRatio = r;
}

4
include/osgShadow/OccluderGeometry
View File

@@ -188,8 +188,8 @@ class OSGSHADOW_EXPORT OccluderGeometry : public osg::Drawable
void computeNormals();
void buildEdgeMaps();
void computeLightDirectionSlihouetteEdges(const osg::Vec3& lightdirection, UIntList& silhouetteIndices) const;
void computeLightPositionSlihouetteEdges(const osg::Vec3& lightpos, UIntList& silhouetteIndices) const;
void computeLightDirectionSilhouetteEdges(const osg::Vec3& lightdirection, UIntList& silhouetteIndices) const;
void computeLightPositionSilhouetteEdges(const osg::Vec3& lightpos, UIntList& silhouetteIndices) const;
osg::Polytope _boundingPolytope;

4
include/osgTerrain/GeometryTechnique
View File

@@ -54,8 +54,8 @@ class OSGTERRAIN_EXPORT TerrainGeometry : public osg::Drawable
void addPrimitiveSet(osg::PrimitiveSet* primitiveSet) { _primitiveSets.push_back(primitiveSet); }
osg::PrimitiveSet* getPrimtitiveSet(unsigned int i) { return _primitiveSets[i].get(); }
const osg::PrimitiveSet* getPrimtitiveSet(unsigned int i) const { return _primitiveSets[i].get(); }
osg::PrimitiveSet* getPrimitiveSet(unsigned int i) { return _primitiveSets[i].get(); }
const osg::PrimitiveSet* getPrimitiveSet(unsigned int i) const { return _primitiveSets[i].get(); }
unsigned int getNumPrimitiveSets() const { return _primitiveSets.size(); }

2
include/osgText/Text
View File

@@ -570,7 +570,7 @@ protected:
mutable osg::BoundingBox _textBB;
bool computeAverageGlypthWidthAndHeight(float& avg_width, float& avg_height) const;
bool computeAverageGlyphWidthAndHeight(float& avg_width, float& avg_height) const;
void computePositions();
void computePositions(unsigned int contextID) const;