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;

4
src/osg/BlendColor.cpp
View File

@@ -72,7 +72,7 @@ void BlendColor::setExtensions(unsigned int contextID,Extensions* extensions)
BlendColor::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
BlendColor::Extensions::Extensions(const Extensions& rhs):
@@ -87,7 +87,7 @@ void BlendColor::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glBlendColor) _glBlendColor = 0;
}
void BlendColor::Extensions::setupGLExtenions(unsigned int contextID)
void BlendColor::Extensions::setupGLExtensions(unsigned int contextID)
{
_isBlendColorSupported = isGLExtensionSupported(contextID,"GL_EXT_blend_color") ||
strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0;

4
src/osg/BlendEquation.cpp
View File

@@ -85,7 +85,7 @@ void BlendEquation::setExtensions(unsigned int contextID,Extensions* extensions)
BlendEquation::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
BlendEquation::Extensions::Extensions(const Extensions& rhs):
@@ -103,7 +103,7 @@ void BlendEquation::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glBlendEquation) _glBlendEquation = 0;
}
void BlendEquation::Extensions::setupGLExtenions(unsigned int contextID)
void BlendEquation::Extensions::setupGLExtensions(unsigned int contextID)
{
_isBlendEquationSupported = isGLExtensionSupported(contextID,"GL_EXT_blend_equation") ||
strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0;

4
src/osg/BufferObject.cpp
View File

@@ -154,7 +154,7 @@ void BufferObject::setExtensions(unsigned int contextID,Extensions* extensions)
BufferObject::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
BufferObject::Extensions::Extensions(const Extensions& rhs):
@@ -189,7 +189,7 @@ void BufferObject::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glGetBufferParameteriv) _glGetBufferPointerv = rhs._glGetBufferPointerv;
}
void BufferObject::Extensions::setupGLExtenions(unsigned int contextID)
void BufferObject::Extensions::setupGLExtensions(unsigned int contextID)
{
_glGenBuffers = ((GenBuffersProc)osg::getGLExtensionFuncPtr("glGenBuffers","glGenBuffersARB"));
_glBindBuffer = ((BindBufferProc)osg::getGLExtensionFuncPtr("glBindBuffer","glBindBufferARB"));

4
src/osg/ClampColor.cpp
View File

@@ -75,7 +75,7 @@ void ClampColor::setExtensions(unsigned int contextID,Extensions* extensions)
ClampColor::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
ClampColor::Extensions::Extensions(const Extensions& rhs):
@@ -91,7 +91,7 @@ void ClampColor::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glClampColor) _glClampColor = 0;
}
void ClampColor::Extensions::setupGLExtenions(unsigned int contextID)
void ClampColor::Extensions::setupGLExtensions(unsigned int contextID)
{
_isClampColorSupported = isGLExtensionSupported(contextID,"GL_ARB_color_buffer_float") ||
strncmp((const char*)glGetString(GL_VERSION),"2.0",3)>=0;

4
src/osg/Drawable.cpp
View File

@@ -819,7 +819,7 @@ void Drawable::setExtensions(unsigned int contextID,Extensions* extensions)
Drawable::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
Drawable::Extensions::Extensions(const Extensions& rhs):
@@ -928,7 +928,7 @@ void Drawable::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._gl_get_query_objectui64v) _gl_get_query_objectui64v = 0;
}
void Drawable::Extensions::setupGLExtenions(unsigned int contextID)
void Drawable::Extensions::setupGLExtensions(unsigned int contextID)
{
_isVertexProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_vertex_program");
_isSecondaryColorSupported = isGLExtensionSupported(contextID,"GL_EXT_secondary_color");

4
src/osg/FragmentProgram.cpp
View File

@@ -219,7 +219,7 @@ void FragmentProgram::setExtensions(unsigned int contextID,Extensions* extension
FragmentProgram::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
FragmentProgram::Extensions::Extensions(const Extensions& rhs):
@@ -246,7 +246,7 @@ void FragmentProgram::Extensions::lowestCommonDenominator(const Extensions& rhs)
}
void FragmentProgram::Extensions::setupGLExtenions(unsigned int contextID)
void FragmentProgram::Extensions::setupGLExtensions(unsigned int contextID)
{
_isFragmentProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_fragment_program");

4
src/osg/Multisample.cpp
View File

@@ -69,7 +69,7 @@ void Multisample::setExtensions(unsigned int contextID,Extensions* extensions)
Multisample::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
Multisample::Extensions::Extensions(const Extensions& rhs):
@@ -86,7 +86,7 @@ void Multisample::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glSampleCoverage) _glSampleCoverage = 0;
}
void Multisample::Extensions::setupGLExtenions(unsigned int contextID)
void Multisample::Extensions::setupGLExtensions(unsigned int contextID)
{
_isMultisampleSupported = isGLExtensionSupported(contextID,"GL_ARB_multisample");
_isMultisampleFilterHintSupported = isGLExtensionSupported(contextID,"GL_NV_multisample_filter_hint");

4
src/osg/Point.cpp
View File

@@ -104,7 +104,7 @@ void Point::setExtensions(unsigned int contextID,Extensions* extensions)
Point::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
Point::Extensions::Extensions(const Extensions& rhs):
@@ -121,7 +121,7 @@ void Point::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glPointParameterfv) _glPointParameterfv = 0;
}
void Point::Extensions::setupGLExtenions(unsigned int contextID)
void Point::Extensions::setupGLExtensions(unsigned int contextID)
{
_isPointParametersSupported = strncmp((const char*)glGetString(GL_VERSION),"1.4",3)>=0 ||
isGLExtensionSupported(contextID,"GL_ARB_point_parameters") ||

2
src/osg/Referenced.cpp
View File

@@ -223,7 +223,7 @@ void Referenced::removeObserver(Observer* observer)
}
}
void Referenced::deletUsingDeleteHandler() const
void Referenced::deleteUsingDeleteHandler() const
{
getDeleteHandler()->requestDelete(this);
}

4
src/osg/StencilTwoSided.cpp
View File

@@ -119,7 +119,7 @@ void StencilTwoSided::setExtensions(unsigned int contextID,Extensions* extension
StencilTwoSided::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
StencilTwoSided::Extensions::Extensions(const Extensions& rhs):
@@ -138,7 +138,7 @@ void StencilTwoSided::Extensions::lowestCommonDenominator(const Extensions& rhs)
}
void StencilTwoSided::Extensions::setupGLExtenions(unsigned int contextID)
void StencilTwoSided::Extensions::setupGLExtensions(unsigned int contextID)
{
_isStencilTwoSidedSupported = isGLExtensionSupported(contextID,"GL_EXT_stencil_two_side");

4
src/osg/TextureCubeMap.cpp
View File

@@ -379,7 +379,7 @@ void TextureCubeMap::setExtensions(unsigned int contextID,Extensions* extensions
TextureCubeMap::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
TextureCubeMap::Extensions::Extensions(const Extensions& rhs):
@@ -393,7 +393,7 @@ void TextureCubeMap::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._isCubeMapSupported) _isCubeMapSupported = false;
}
void TextureCubeMap::Extensions::setupGLExtenions(unsigned int contextID)
void TextureCubeMap::Extensions::setupGLExtensions(unsigned int contextID)
{
_isCubeMapSupported = isGLExtensionSupported(contextID,"GL_ARB_texture_cube_map") ||
isGLExtensionSupported(contextID,"GL_EXT_texture_cube_map") ||

4
src/osg/VertexProgram.cpp
View File

@@ -219,7 +219,7 @@ void VertexProgram::setExtensions(unsigned int contextID,Extensions* extensions)
VertexProgram::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
VertexProgram::Extensions::Extensions(const Extensions& rhs):
@@ -246,7 +246,7 @@ void VertexProgram::Extensions::lowestCommonDenominator(const Extensions& rhs)
}
void VertexProgram::Extensions::setupGLExtenions(unsigned int contextID)
void VertexProgram::Extensions::setupGLExtensions(unsigned int contextID)
{
_isVertexProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_vertex_program");

2
src/osgDB/DatabasePager.cpp
View File

@@ -843,7 +843,7 @@ void DatabasePager::removeExpiredSubgraphs(double currentFrameTime)
osgDB::Registry::instance()->getSharedStateManager()->prune();
// update the Registry object cache.
osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExtenalReferences(currentFrameTime);
osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExternalReferences(currentFrameTime);
osgDB::Registry::instance()->removeExpiredObjectsInCache(expiryTime);

2
src/osgDB/Input.cpp
View File

@@ -36,7 +36,7 @@ osg::Object* Input::getObjectForUniqueID(const std::string& uniqueID)
}
void Input::regisiterUniqueIDForObject(const std::string& uniqueID,osg::Object* obj)
void Input::registerUniqueIDForObject(const std::string& uniqueID,osg::Object* obj)
{
_uniqueIDToObjectMap[uniqueID] = obj;
}

6
src/osgDB/Registry.cpp
View File

@@ -783,7 +783,7 @@ osg::Object* Registry::readObjectOfType(const basic_type_wrapper &btw,Input& fr)
bool iteratorAdvanced = false;
if (fr[0].matchWord("UniqueID") && fr[1].isString())
{
fr.regisiterUniqueIDForObject(fr[1].getStr(),obj);
fr.registerUniqueIDForObject(fr[1].getStr(),obj);
fr += 2;
iteratorAdvanced = true;
}
@@ -905,7 +905,7 @@ osg::Object* Registry::readObject(DotOsgWrapperMap& dowMap,Input& fr)
bool iteratorAdvanced = false;
if (fr[0].matchWord("UniqueID") && fr[1].isString())
{
fr.regisiterUniqueIDForObject(fr[1].getStr(),obj);
fr.registerUniqueIDForObject(fr[1].getStr(),obj);
fr += 2;
iteratorAdvanced = true;
}
@@ -1790,7 +1790,7 @@ osg::Object* Registry::getFromObjectCache(const std::string& fileName)
else return 0;
}
void Registry::updateTimeStampOfObjectsInCacheWithExtenalReferences(double currentTime)
void Registry::updateTimeStampOfObjectsInCacheWithExternalReferences(double currentTime)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);

2
src/osgParticle/FireEffect.cpp
View File

@@ -115,7 +115,7 @@ void FireEffect::setUpEmitterAndProgram()
if (!_emitter)
{
_emitter = new osgParticle::ModularEmitter;
_emitter->setNumParticlesToCreateMovementCompenstationRatio(1.5f);
_emitter->setNumParticlesToCreateMovementCompensationRatio(1.5f);
_emitter->setCounter(new osgParticle::RandomRateCounter);
_emitter->setPlacer(new osgParticle::SectorPlacer);
_emitter->setShooter(new osgParticle::RadialShooter);

2
src/osgParticle/SmokeEffect.cpp
View File

@@ -111,7 +111,7 @@ void SmokeEffect::setUpEmitterAndProgram()
if (!_emitter)
{
_emitter = new osgParticle::ModularEmitter;
_emitter->setNumParticlesToCreateMovementCompenstationRatio(1.5f);
_emitter->setNumParticlesToCreateMovementCompensationRatio(1.5f);
_emitter->setCounter(new osgParticle::RandomRateCounter);
_emitter->setPlacer(new osgParticle::SectorPlacer);
_emitter->setShooter(new osgParticle::RadialShooter);

2
src/osgPlugins/osg/Geometry.cpp
View File

@@ -718,7 +718,7 @@ Array* Array_readLocalData(Input& fr)
if (return_array)
{
if (!uniqueID.empty()) fr.regisiterUniqueIDForObject(uniqueID.c_str(),return_array);
if (!uniqueID.empty()) fr.registerUniqueIDForObject(uniqueID.c_str(),return_array);
}
return return_array;

8
src/osgShadow/OccluderGeometry.cpp
View File

@@ -681,7 +681,7 @@ void OccluderGeometry::buildEdgeMaps()
}
void OccluderGeometry::computeLightDirectionSlihouetteEdges(const osg::Vec3& lightdirection, UIntList& silhouetteIndices) const
void OccluderGeometry::computeLightDirectionSilhouetteEdges(const osg::Vec3& lightdirection, UIntList& silhouetteIndices) const
{
silhouetteIndices.clear();
@@ -709,7 +709,7 @@ void OccluderGeometry::computeLightDirectionSlihouetteEdges(const osg::Vec3& lig
}
}
void OccluderGeometry::computeLightPositionSlihouetteEdges(const osg::Vec3& lightpos, UIntList& silhouetteIndices) const
void OccluderGeometry::computeLightPositionSilhouetteEdges(const osg::Vec3& lightpos, UIntList& silhouetteIndices) const
{
silhouetteIndices.clear();
@@ -783,7 +783,7 @@ void OccluderGeometry::computeShadowVolumeGeometry(const osg::Vec4& lightpos, Sh
// compute the silhouette edge
UIntList silhouetteIndices;
computeLightDirectionSlihouetteEdges(lightdirection, silhouetteIndices);
computeLightDirectionSilhouetteEdges(lightdirection, silhouetteIndices);
osg::Vec3 offset( lightdirection*5.0f );
@@ -825,7 +825,7 @@ void OccluderGeometry::computeShadowVolumeGeometry(const osg::Vec4& lightpos, Sh
// osg::notify(osg::NOTICE)<<"Positional light"<<std::endl;
UIntList silhouetteIndices;
computeLightPositionSlihouetteEdges(lightposition, silhouetteIndices);
computeLightPositionSilhouetteEdges(lightposition, silhouetteIndices);
// osg::notify(osg::NOTICE)<<"basePlane "<<basePlane[0]<<" "<<basePlane[1]<<" "<<basePlane[2]<<" "<<basePlane[3]<<std::endl;
// osg::notify(osg::NOTICE)<<"lightpos = "<<std::endl;

8
src/osgText/Text.cpp
View File

@@ -739,7 +739,7 @@ void Text::computeGlyphRepresentation()
// Also sets avg_width and avg_height to 0.0f if the value is invalid.
// This method is used several times in a loop for the same object which will produce the same values.
// Further optimization may try saving these values instead of recomputing them.
bool Text::computeAverageGlypthWidthAndHeight(float& avg_width, float& avg_height) const
bool Text::computeAverageGlyphWidthAndHeight(float& avg_width, float& avg_height) const
{
float width = 0.0f;
float height = 0.0f;
@@ -792,7 +792,7 @@ void Text::computePositions()
unsigned int size = osg::maximum(osg::DisplaySettings::instance()->getMaxNumberOfGraphicsContexts(),_autoTransformCache.size());
// FIXME: OPTIMIZE: This would be one of the ideal locations to
// call computeAverageGlypthWidthAndHeight(). It is out of the contextID loop
// call computeAverageGlyphWidthAndHeight(). It is out of the contextID loop
// so the value would be computed fewer times. But the code will need changes
// to get the value down to the locations it is needed. (Either pass through parameters
// or member variables, but we would need a system to know if the values are stale.)
@@ -977,7 +977,7 @@ void Text::computeBackdropPositions(unsigned int contextID) const
// FIXME: OPTIMIZE: This function produces the same value regardless of contextID.
// Since we tend to loop over contextID, we should cache this value some how
// instead of recomputing it each time.
is_valid_size = computeAverageGlypthWidthAndHeight(avg_width, avg_height);
is_valid_size = computeAverageGlyphWidthAndHeight(avg_width, avg_height);
// now apply matrix to the glyphs.
for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin();
@@ -1100,7 +1100,7 @@ void Text::computeBackdropBoundingBox() const
// FIXME: OPTIMIZE: It is possible that this value has already been computed before
// from previous calls to this function. This might be worth optimizing.
is_valid_size = computeAverageGlypthWidthAndHeight(avg_width, avg_height);
is_valid_size = computeAverageGlyphWidthAndHeight(avg_width, avg_height);
// Finally, we have one more issue to deal with.
// Now that the text takes more space, we need

4
src/osgWrappers/osg/BlendColor.cpp
View File

@@ -134,9 +134,9 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setBlendColorSupported, IN, bool, flag,

4
src/osgWrappers/osg/BlendEquation.cpp
View File

@@ -140,9 +140,9 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setBlendEquationSupported, IN, bool, flag,

4
src/osgWrappers/osg/BufferObject.cpp
View File

@@ -152,9 +152,9 @@ BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method0(bool, isBufferObjectSupported,

4
src/osgWrappers/osg/ClampColor.cpp
View File

@@ -148,9 +148,9 @@ BEGIN_OBJECT_REFLECTOR(osg::ClampColor::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setClampColorSupported, IN, bool, flag,

13
src/osgWrappers/osg/CollectOccludersVisitor.cpp
View File

@@ -121,9 +121,9 @@ BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor)
__bool__getCreateDrawablesOnOccludeNodes,
"",
"");
I_Method1(void, setCollectedOcculderSet, IN, const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, svol,
I_Method1(void, setCollectedOccluderSet, IN, const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, svol,
Properties::NON_VIRTUAL,
__void__setCollectedOcculderSet__C5_ShadowVolumeOccluderSet_R1,
__void__setCollectedOccluderSet__C5_ShadowVolumeOccluderSet_R1,
"",
"");
I_Method0(osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, getCollectedOccluderSet,
@@ -153,12 +153,9 @@ BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor)
__void__handle_cull_callbacks_and_accept__osg_Node_R1__osg_Node_P1,
"",
"");
I_SimpleProperty(osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, CollectedOccluderSet,
__ShadowVolumeOccluderSet_R1__getCollectedOccluderSet,
0);
I_SimpleProperty(const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, CollectedOcculderSet,
0,
__void__setCollectedOcculderSet__C5_ShadowVolumeOccluderSet_R1);
I_SimpleProperty(const osg::CollectOccludersVisitor::ShadowVolumeOccluderSet &, CollectedOccluderSet,
__C5_ShadowVolumeOccluderSet_R1__getCollectedOccluderSet,
__void__setCollectedOccluderSet__C5_ShadowVolumeOccluderSet_R1);
I_SimpleProperty(bool, CreateDrawablesOnOccludeNodes,
__bool__getCreateDrawablesOnOccludeNodes,
__void__setCreateDrawablesOnOccludeNodes__bool);

4
src/osgWrappers/osg/Drawable.cpp
View File

@@ -836,9 +836,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setVertexProgramSupported, IN, bool, flag,

4
src/osgWrappers/osg/FragmentProgram.cpp
View File

@@ -213,9 +213,9 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setFragmentProgramSupported, IN, bool, flag,

4
src/osgWrappers/osg/Multisample.cpp
View File

@@ -156,9 +156,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Multisample::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setMultisampleSupported, IN, bool, flag,

4
src/osgWrappers/osg/Point.cpp
View File

@@ -176,9 +176,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Point::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setPointParametersSupported, IN, bool, flag,

4
src/osgWrappers/osg/Referenced.cpp
View File

@@ -93,10 +93,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Referenced)
__DeleteHandler_P1__getDeleteHandler_S,
"Get a DeleteHandler. ",
"");
I_ProtectedMethod0(void, deletUsingDeleteHandler,
I_ProtectedMethod0(void, deleteUsingDeleteHandler,
Properties::NON_VIRTUAL,
Properties::CONST,
__void__deletUsingDeleteHandler,
__void__deleteUsingDeleteHandler,
"",
"");
I_SimpleProperty(bool, ThreadSafeRefUnref,

4
src/osgWrappers/osg/StencilTwoSided.cpp
View File

@@ -248,9 +248,9 @@ BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setStencilTwoSidedSupported, IN, bool, flag,

4
src/osgWrappers/osg/TextureCubeMap.cpp
View File

@@ -243,9 +243,9 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setCubeMapSupported, IN, bool, flag,

4
src/osgWrappers/osg/VertexProgram.cpp
View File

@@ -213,9 +213,9 @@ BEGIN_OBJECT_REFLECTOR(osg::VertexProgram::Extensions)
__void__lowestCommonDenominator__C5_Extensions_R1,
"",
"");
I_Method1(void, setupGLExtenions, IN, unsigned int, contextID,
I_Method1(void, setupGLExtensions, IN, unsigned int, contextID,
Properties::NON_VIRTUAL,
__void__setupGLExtenions__unsigned_int,
__void__setupGLExtensions__unsigned_int,
"",
"");
I_Method1(void, setVertexProgramSupported, IN, bool, flag,

4
src/osgWrappers/osgDB/Input.cpp
View File

@@ -104,9 +104,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Input)
__osg_Object_P1__getObjectForUniqueID__C5_std_string_R1,
"",
"");
I_Method2(void, regisiterUniqueIDForObject, IN, const std::string &, uniqueID, IN, osg::Object *, obj,
I_Method2(void, registerUniqueIDForObject, IN, const std::string &, uniqueID, IN, osg::Object *, obj,
Properties::VIRTUAL,
__void__regisiterUniqueIDForObject__C5_std_string_R1__osg_Object_P1,
__void__registerUniqueIDForObject__C5_std_string_R1__osg_Object_P1,
"",
"");
I_SimpleProperty(const osgDB::ReaderWriter::Options *, Options,

6
src/osgWrappers/osgDB/Registry.cpp
View File

@@ -384,16 +384,16 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry)
__C5_FilePathList_R1__getLibraryFilePathList,
"get the const library file path which is used when search for library (dso/dll's) files. ",
"");
I_Method1(void, updateTimeStampOfObjectsInCacheWithExtenalReferences, IN, double, currentTime,
I_Method1(void, updateTimeStampOfObjectsInCacheWithExternalReferences, IN, double, currentTime,
Properties::NON_VIRTUAL,
__void__updateTimeStampOfObjectsInCacheWithExtenalReferences__double,
__void__updateTimeStampOfObjectsInCacheWithExternalReferences__double,
"For each object in the cache which has an reference count greater than 1 (and therefore referenced by elsewhere in the application) set the time stamp for that object in the cache to specified 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. Time value is time in sceonds. ");
I_Method1(void, removeExpiredObjectsInCache, IN, double, expiryTime,
Properties::NON_VIRTUAL,
__void__removeExpiredObjectsInCache__double,
"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). 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. ");
"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 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. ");
I_Method0(void, clearObjectCache,
Properties::NON_VIRTUAL,
__void__clearObjectCache,

14
src/osgWrappers/osgParticle/ModularEmitter.cpp
View File

@@ -81,14 +81,14 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter)
__void__setCounter__Counter_P1,
"Set the Counter object. ",
"");
I_Method0(float, getNumParticlesToCreateMovementCompenstationRatio,
I_Method0(float, getNumParticlesToCreateMovementCompensationRatio,
Properties::NON_VIRTUAL,
__float__getNumParticlesToCreateMovementCompenstationRatio,
"Get the ratio between number of particle to create in compenstation for movement of the emitter. ",
__float__getNumParticlesToCreateMovementCompensationRatio,
"Get the ratio between number of particle to create in compensation for movement of the emitter. ",
"");
I_Method1(void, setNumParticlesToCreateMovementCompenstationRatio, IN, float, r,
I_Method1(void, setNumParticlesToCreateMovementCompensationRatio, IN, float, r,
Properties::NON_VIRTUAL,
__void__setNumParticlesToCreateMovementCompenstationRatio__float,
__void__setNumParticlesToCreateMovementCompensationRatio__float,
"Set the ratio between number of particle to create in compenstation for movement of the emitter. ",
"");
I_Method0(osgParticle::Placer *, getPlacer,
@@ -130,9 +130,9 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter)
I_SimpleProperty(osgParticle::Counter *, Counter,
__Counter_P1__getCounter,
__void__setCounter__Counter_P1);
I_SimpleProperty(float, NumParticlesToCreateMovementCompenstationRatio,
I_SimpleProperty(float, NumParticlesToCreateMovementCompensationRatio,
0,
__void__setNumParticlesToCreateMovementCompenstationRatio__float);
__void__setNumParticlesToCreateMovementCompensationRatio__float);
I_SimpleProperty(osgParticle::Placer *, Placer,
__Placer_P1__getPlacer,
__void__setPlacer__Placer_P1);

8
src/osgWrappers/osgShadow/OccluderGeometry.cpp
View File

@@ -145,16 +145,16 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::OccluderGeometry)
__void__buildEdgeMaps,
"",
"");
I_ProtectedMethod2(void, computeLightDirectionSlihouetteEdges, IN, const osg::Vec3 &, lightdirection, IN, osgShadow::OccluderGeometry::UIntList &, silhouetteIndices,
I_ProtectedMethod2(void, computeLightDirectionSilhouetteEdges, IN, const osg::Vec3 &, lightdirection, IN, osgShadow::OccluderGeometry::UIntList &, silhouetteIndices,
Properties::NON_VIRTUAL,
Properties::CONST,
__void__computeLightDirectionSlihouetteEdges__C5_osg_Vec3_R1__UIntList_R1,
__void__computeLightDirectionSilhouetteEdges__C5_osg_Vec3_R1__UIntList_R1,
"",
"");
I_ProtectedMethod2(void, computeLightPositionSlihouetteEdges, IN, const osg::Vec3 &, lightpos, IN, osgShadow::OccluderGeometry::UIntList &, silhouetteIndices,
I_ProtectedMethod2(void, computeLightPositionSilhouetteEdges, IN, const osg::Vec3 &, lightpos, IN, osgShadow::OccluderGeometry::UIntList &, silhouetteIndices,
Properties::NON_VIRTUAL,
Properties::CONST,
__void__computeLightPositionSlihouetteEdges__C5_osg_Vec3_R1__UIntList_R1,
__void__computeLightPositionSilhouetteEdges__C5_osg_Vec3_R1__UIntList_R1,
"",
"");
I_SimpleProperty(const osg::Polytope &, BoundingPolytope,

15
src/osgWrappers/osgTerrain/GeometryTechnique.cpp
View File

@@ -225,14 +225,14 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainGeometry)
__void__addPrimitiveSet__osg_PrimitiveSet_P1,
"",
"");
I_Method1(osg::PrimitiveSet *, getPrimtitiveSet, IN, unsigned int, i,
I_Method1(osg::PrimitiveSet *, getPrimitiveSet, IN, unsigned int, i,
Properties::NON_VIRTUAL,
__osg_PrimitiveSet_P1__getPrimtitiveSet__unsigned_int,
__osg_PrimitiveSet_P1__getPrimitiveSet__unsigned_int,
"",
"");
I_Method1(const osg::PrimitiveSet *, getPrimtitiveSet, IN, unsigned int, i,
I_Method1(const osg::PrimitiveSet *, getPrimitiveSet, IN, unsigned int, i,
Properties::NON_VIRTUAL,
__C5_osg_PrimitiveSet_P1__getPrimtitiveSet__unsigned_int,
__C5_osg_PrimitiveSet_P1__getPrimitiveSet__unsigned_int,
"",
"");
I_Method0(unsigned int, getNumPrimitiveSets,
@@ -256,6 +256,13 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainGeometry)
I_SimpleProperty(osg::Vec3Array *, Normals,
__osg_Vec3Array_P1__getNormals,
__void__setNormals__osg_Vec3Array_P1);
I_ArrayProperty(osg::PrimitiveSet *, PrimitiveSet,
__osg_PrimitiveSet_P1__getPrimitiveSet__unsigned_int,
0,
__unsigned_int__getNumPrimitiveSets,
__void__addPrimitiveSet__osg_PrimitiveSet_P1,
0,
0);
I_IndexedProperty(osg::Array *, TexCoords,
__osg_Array_P1__getTexCoords__unsigned_int,
__void__setTexCoords__unsigned_int__osg_Array_P1,

4
src/osgWrappers/osgText/Text.cpp
View File

@@ -529,10 +529,10 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text)
__void__computeGlyphRepresentation,
"",
"");
I_ProtectedMethod2(bool, computeAverageGlypthWidthAndHeight, IN, float &, avg_width, IN, float &, avg_height,
I_ProtectedMethod2(bool, computeAverageGlyphWidthAndHeight, IN, float &, avg_width, IN, float &, avg_height,
Properties::NON_VIRTUAL,
Properties::CONST,
__bool__computeAverageGlypthWidthAndHeight__float_R1__float_R1,
__bool__computeAverageGlyphWidthAndHeight__float_R1__float_R1,
"",
"");
I_ProtectedMethod0(void, computePositions,