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

2
examples/osgterrain/osgterrain.cpp
View File

@@ -263,7 +263,7 @@ int main(int argc, char** argv)
else if (arguments.read(pos, "--cartizian",x,y,w,h))
{
// define the extents.
locator = new osgTerrain::CartizianLocator(x,y,w,h,0);
locator = new osgTerrain::CartesianLocator(x,y,w,h,0);
readParameter = true;
}

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;

4
src/osg/BufferObject.cpp
View File

@@ -526,7 +526,7 @@ void ElementBufferObject::compileBuffer(State& state) const
itr != _bufferEntryDrawElementsPairs.end();
++itr)
{
const BufferEntryDrawElementstPair& bep = *itr;
const BufferEntryDrawElementsPair& bep = *itr;
if (bep.second)
{
totalSizeRequired += bep.second->getTotalDataSize();
@@ -578,7 +578,7 @@ void ElementBufferObject::compileBuffer(State& state) const
itr != _bufferEntryDrawElementsPairs.end();
++itr)
{
const BufferEntryDrawElementstPair& bep = *itr;
const BufferEntryDrawElementsPair& bep = *itr;
const DrawElements* de = bep.second;
if (de)
{

12
src/osg/TexEnvCombine.cpp
View File

@@ -107,13 +107,13 @@ void TexEnvCombine::apply(State& state) const
void TexEnvCombine::setCombine_RGB(GLint cm) { _combine_RGB = cm; }
void TexEnvCombine::setCombine_Alpha(GLint cm) { _combine_Alpha = cm; }
void TexEnvCombine::setSource0_RGB(GLint sp) { _source0_RGB = sp; computeNeedoForTexEnvCombiners(); }
void TexEnvCombine::setSource1_RGB(GLint sp) { _source1_RGB = sp; computeNeedoForTexEnvCombiners(); }
void TexEnvCombine::setSource2_RGB(GLint sp) { _source2_RGB = sp; computeNeedoForTexEnvCombiners(); }
void TexEnvCombine::setSource0_RGB(GLint sp) { _source0_RGB = sp; computeNeedForTexEnvCombiners(); }
void TexEnvCombine::setSource1_RGB(GLint sp) { _source1_RGB = sp; computeNeedForTexEnvCombiners(); }
void TexEnvCombine::setSource2_RGB(GLint sp) { _source2_RGB = sp; computeNeedForTexEnvCombiners(); }
void TexEnvCombine::setSource0_Alpha(GLint sp) { _source0_Alpha = sp; computeNeedoForTexEnvCombiners(); }
void TexEnvCombine::setSource1_Alpha(GLint sp) { _source1_Alpha = sp; computeNeedoForTexEnvCombiners(); }
void TexEnvCombine::setSource2_Alpha(GLint sp) { _source2_Alpha = sp; computeNeedoForTexEnvCombiners(); }
void TexEnvCombine::setSource0_Alpha(GLint sp) { _source0_Alpha = sp; computeNeedForTexEnvCombiners(); }
void TexEnvCombine::setSource1_Alpha(GLint sp) { _source1_Alpha = sp; computeNeedForTexEnvCombiners(); }
void TexEnvCombine::setSource2_Alpha(GLint sp) { _source2_Alpha = sp; computeNeedForTexEnvCombiners(); }
void TexEnvCombine::setOperand0_RGB(GLint op) { _operand0_RGB = op; }
void TexEnvCombine::setOperand1_RGB(GLint op) { _operand1_RGB = op; }

6
src/osgGA/AnimationPathManipulator.cpp
View File

@@ -6,7 +6,7 @@ using namespace osgGA;
AnimationPathManipulator::AnimationPathManipulator(osg::AnimationPath* animationPath)
{
_printOutTiminInfo = true;
_printOutTimingInfo = true;
_animationPath = animationPath;
_timeOffset = 0.0;
@@ -20,7 +20,7 @@ AnimationPathManipulator::AnimationPathManipulator(osg::AnimationPath* animation
AnimationPathManipulator::AnimationPathManipulator( const std::string& filename )
{
_printOutTiminInfo = true;
_printOutTimingInfo = true;
_animationPath = new osg::AnimationPath;
_animationPath->setLoopMode(osg::AnimationPath::LOOP);
@@ -137,7 +137,7 @@ void AnimationPathManipulator::handleFrame( double time )
++_numOfFramesSinceStartOfTimedPeriod;
if (_printOutTiminInfo)
if (_printOutTimingInfo)
{
double delta = (animTime-_animStartOfTimedPeriod);
if (delta>=_animationPath->getPeriod())

4
src/osgParticle/FluidProgram.cpp
View File

@@ -13,7 +13,7 @@ osgParticle::FluidProgram::FluidProgram(const FluidProgram& copy, const osg::Cop
_density(copy._density),
_wind(copy._wind),
_viscosityCoefficient(copy._viscosityCoefficient),
_densityCoefficeint(copy._densityCoefficeint)
_densityCoefficient(copy._densityCoefficient)
{
}
@@ -37,7 +37,7 @@ void osgParticle::FluidProgram::execute(double dt)
// compute force due to friction
osg::Vec3 velBefore = particle->getVelocity();
osg::Vec3 relative_wind = particle->getVelocity()-_wind;
osg::Vec3 wind_force = - relative_wind * Area * (_viscosityCoefficient + _densityCoefficeint*relative_wind.length());
osg::Vec3 wind_force = - relative_wind * Area * (_viscosityCoefficient + _densityCoefficient*relative_wind.length());
osg::Vec3 wind_accel = wind_force * particle->getMassInv();
double critical_dt2 = relative_wind.length2()/wind_accel.length2();

2
src/osgParticle/PrecipitationEffect.cpp
View File

@@ -236,7 +236,7 @@ void PrecipitationEffect::traverse(osg::NodeVisitor& nv)
return;
}
ViewIdenitifier viewIndentifier(cv, nv.getNodePath());
ViewIdentifier viewIndentifier(cv, nv.getNodePath());
{
PrecipitationDrawableSet* precipitationDrawableSet = 0;

2
src/osgPlugins/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
OPTION(BUILD_OSG_COMMON_PLUGINS "Build with Common Plugins" TRUE)
OPTION(BUILD_OSG_IMAGE_PLUGINS "Build with Imagege texture Plugins" TRUE)
OPTION(BUILD_OSG_IMAGE_PLUGINS "Build with Image texture Plugins" TRUE)
OPTION(BUILD_OSG_3D_PLUGINS "Build with 3D formats Plugins" TRUE)
OPTION(BUILD_OSG_OTHER_PLUGINS "Build with other formats Plugins" TRUE)
OPTION(BUILD_OSG_NET_PLUGINS "Build with net Plugin" TRUE)

12
src/osgTerrain/Locator.cpp
View File

@@ -129,15 +129,15 @@ bool EllipsoidLocator::convertModelToLocal(const osg::Vec3d& world, osg::Vec3d&
//////////////////////////////////////////////////////////////////////////////
//
// CartizianLocator
// CartesianLocator
//
CartizianLocator::CartizianLocator(double originX, double originY, double lengthX, double lengthY, double height, double heightScale)
CartesianLocator::CartesianLocator(double originX, double originY, double lengthX, double lengthY, double height, double heightScale)
{
setExtents(originX, originY, lengthY, lengthY, height, heightScale);
}
void CartizianLocator::setExtents(double originX, double originY, double lengthX, double lengthY, double height, double heightScale)
void CartesianLocator::setExtents(double originX, double originY, double lengthX, double lengthY, double height, double heightScale)
{
_originX = originX;
_originY = originY;
@@ -147,12 +147,12 @@ void CartizianLocator::setExtents(double originX, double originY, double lengthX
_heightScale = heightScale;
}
bool CartizianLocator::orientationOpenGL() const
bool CartesianLocator::orientationOpenGL() const
{
return (_lengthX * _lengthY) >= 0.0;
}
bool CartizianLocator::convertLocalToModel(const osg::Vec3d& local, osg::Vec3d& world) const
bool CartesianLocator::convertLocalToModel(const osg::Vec3d& local, osg::Vec3d& world) const
{
world.x() = _originX + local.x() * _lengthX;
world.y() = _originY + local.y() * _lengthY;
@@ -161,7 +161,7 @@ bool CartizianLocator::convertLocalToModel(const osg::Vec3d& local, osg::Vec3d&
return true;
}
bool CartizianLocator::convertModelToLocal(const osg::Vec3d& world, osg::Vec3d& local) const
bool CartesianLocator::convertModelToLocal(const osg::Vec3d& world, osg::Vec3d& local) const
{
local.x() = (world.x() - _originX)/_lengthX;
local.y() = (world.y() - _originY)/_lengthY;

34
src/osgUtil/SceneView.cpp
View File

@@ -372,7 +372,7 @@ osg::Matrixd SceneView::computeLeftEyeProjectionImplementation(const osg::Matrix
double scale_x = 1.0;
double scale_y = 1.0;
if (_displaySettings->getSplitStereoAutoAjustAspectRatio())
if (_displaySettings->getSplitStereoAutoAdjustAspectRatio())
{
switch(_displaySettings->getStereoMode())
{
@@ -437,7 +437,7 @@ osg::Matrixd SceneView::computeRightEyeProjectionImplementation(const osg::Matri
double scale_x = 1.0;
double scale_y = 1.0;
if (_displaySettings->getSplitStereoAutoAjustAspectRatio())
if (_displaySettings->getSplitStereoAutoAdjustAspectRatio())
{
switch(_displaySettings->getStereoMode())
{
@@ -665,42 +665,42 @@ bool SceneView::cullStage(const osg::Matrixd& projection,const osg::Matrixd& mod
//std::cout << "Scene graph contains occluder nodes, searching for them"<<std::endl;
if (!_collectOccludersVisistor) _collectOccludersVisistor = new osg::CollectOccludersVisitor;
if (!_collectOccludersVisitor) _collectOccludersVisitor = new osg::CollectOccludersVisitor;
_collectOccludersVisistor->inheritCullSettings(*this);
_collectOccludersVisitor->inheritCullSettings(*this);
_collectOccludersVisistor->reset();
_collectOccludersVisitor->reset();
_collectOccludersVisistor->setFrameStamp(_frameStamp.get());
_collectOccludersVisitor->setFrameStamp(_frameStamp.get());
// use the frame number for the traversal number.
if (_frameStamp.valid())
{
_collectOccludersVisistor->setTraversalNumber(_frameStamp->getFrameNumber());
_collectOccludersVisitor->setTraversalNumber(_frameStamp->getFrameNumber());
}
_collectOccludersVisistor->pushViewport(getViewport());
_collectOccludersVisistor->pushProjectionMatrix(proj.get());
_collectOccludersVisistor->pushModelViewMatrix(mv.get(),osg::Transform::ABSOLUTE_RF);
_collectOccludersVisitor->pushViewport(getViewport());
_collectOccludersVisitor->pushProjectionMatrix(proj.get());
_collectOccludersVisitor->pushModelViewMatrix(mv.get(),osg::Transform::ABSOLUTE_RF);
// traverse the scene graph to search for occluder in there new positions.
for(unsigned int i=0; i< _camera->getNumChildren(); ++i)
{
_camera->getChild(i)->accept(*_collectOccludersVisistor);
_camera->getChild(i)->accept(*_collectOccludersVisitor);
}
_collectOccludersVisistor->popModelViewMatrix();
_collectOccludersVisistor->popProjectionMatrix();
_collectOccludersVisistor->popViewport();
_collectOccludersVisitor->popModelViewMatrix();
_collectOccludersVisitor->popProjectionMatrix();
_collectOccludersVisitor->popViewport();
// sort the occluder from largest occluder volume to smallest.
_collectOccludersVisistor->removeOccludedOccluders();
_collectOccludersVisitor->removeOccludedOccluders();
osg::notify(osg::DEBUG_INFO) << "finished searching for occluder - found "<<_collectOccludersVisistor->getCollectedOccluderSet().size()<<std::endl;
osg::notify(osg::DEBUG_INFO) << "finished searching for occluder - found "<<_collectOccludersVisitor->getCollectedOccluderSet().size()<<std::endl;
cullVisitor->getOccluderList().clear();
std::copy(_collectOccludersVisistor->getCollectedOccluderSet().begin(),_collectOccludersVisistor->getCollectedOccluderSet().end(), std::back_insert_iterator<CullStack::OccluderList>(cullVisitor->getOccluderList()));
std::copy(_collectOccludersVisitor->getCollectedOccluderSet().begin(),_collectOccludersVisitor->getCollectedOccluderSet().end(), std::back_insert_iterator<CullStack::OccluderList>(cullVisitor->getOccluderList()));
}