Typo fixes

This commit is contained in:
Alberto Luaces 2016-05-30 12:30:05 +01:00 committed by Robert Osfield
parent 307001391f
commit 260cbab518
40 changed files with 56 additions and 56 deletions

View File

@ -851,7 +851,7 @@ int main( int argc, char **argv )
if (exportName.empty()) if (exportName.empty())
{ {
// objects for managing the broadcasting and recieving of camera packets. // objects for managing the broadcasting and receiving of camera packets.
CameraPacket cp; CameraPacket cp;
Broadcaster bc; Broadcaster bc;
Receiver rc; Receiver rc;

View File

@ -129,7 +129,7 @@ struct ExampleTimelineUsage : public osgGA::GUIEventHandler
if (_releaseKey) // we hit a key and release it execute an action if (_releaseKey) // we hit a key and release it execute an action
{ {
osgAnimation::Timeline* tml = _manager->getTimeline(); osgAnimation::Timeline* tml = _manager->getTimeline();
// dont play if already playing // don't play if already playing
if (!tml->isActive(_scratchNose.get())) if (!tml->isActive(_scratchNose.get()))
{ {
// add this animation on top of two other // add this animation on top of two other

View File

@ -491,7 +491,7 @@ int main( int argc, char **argv )
// any option left unread are converted into errors to write out later. // any option left unread are converted into errors to write out later.
arguments.reportRemainingOptionsAsUnrecognized(); arguments.reportRemainingOptionsAsUnrecognized();
// report any errors if they have occured when parsing the program aguments. // report any errors if they have occurred when parsing the program aguments.
if (arguments.errors()) if (arguments.errors())
{ {
arguments.writeErrorMessages(std::cout); arguments.writeErrorMessages(std::cout);
@ -541,7 +541,7 @@ int main( int argc, char **argv )
CameraPacket *cp = new CameraPacket; CameraPacket *cp = new CameraPacket;
// objects for managing the broadcasting and recieving of camera packets. // objects for managing the broadcasting and receiving of camera packets.
Broadcaster bc; Broadcaster bc;
Receiver rc; Receiver rc;

View File

@ -46,7 +46,7 @@
#endif #endif
// each instance type may have max 8 LODs ( if you change // each instance type may have max 8 LODs ( if you change
// this value, dont forget to change it in vertex shaders accordingly ) // this value, don't forget to change it in vertex shaders accordingly )
const unsigned int OSGGPUCULL_MAXIMUM_LOD_NUMBER = 8; const unsigned int OSGGPUCULL_MAXIMUM_LOD_NUMBER = 8;
// during culling each instance may be sent to max 4 indirect targets // during culling each instance may be sent to max 4 indirect targets
const unsigned int OSGGPUCULL_MAXIMUM_INDIRECT_TARGET_NUMBER = 4; const unsigned int OSGGPUCULL_MAXIMUM_INDIRECT_TARGET_NUMBER = 4;
@ -673,7 +673,7 @@ osg::Node* createInstanceTree(const std::vector<T>& instances, const osg::Boundi
} }
// Texture buffers holding information about the number of instances to render ( named "indirect command // Texture buffers holding information about the number of instances to render ( named "indirect command
// texture buffers", or simply - indirect commands ) must reset instance number to 0 in the beggining of each frame. // texture buffers", or simply - indirect commands ) must reset instance number to 0 in the beginning of each frame.
// It is done by simple texture reload from osg::Image. // It is done by simple texture reload from osg::Image.
// Moreover - texture buffers that use texture images ( i mean "images" as defined in ARB_shader_image_load_store extension ) // Moreover - texture buffers that use texture images ( i mean "images" as defined in ARB_shader_image_load_store extension )
// should call glBindImageTexture() before every shader that uses imageLoad(), imageStore() and imageAtomic*() GLSL functions. // should call glBindImageTexture() before every shader that uses imageLoad(), imageStore() and imageAtomic*() GLSL functions.
@ -1231,7 +1231,7 @@ struct AnimateObjectsCallback : public osg::DrawableUpdateCallback
} }
void setRotationUsingRotSpeed( unsigned int index, unsigned int boneIndex, const osg::Matrix& zeroMatrix, double currentTime, double rotSpeed ) void setRotationUsingRotSpeed( unsigned int index, unsigned int boneIndex, const osg::Matrix& zeroMatrix, double currentTime, double rotSpeed )
{ {
// setRotationUsingRotSpeed() is a very unoptimally writen ( because it uses osg::Matrix::inverse() ), // setRotationUsingRotSpeed() is a very unoptimally written ( because it uses osg::Matrix::inverse() ),
// and that is done on purpose : in real life scenario functions making updates may take long time // and that is done on purpose : in real life scenario functions making updates may take long time
// to calculate new object positions due to sophisticated physics models, geometry intersections etc. // to calculate new object positions due to sophisticated physics models, geometry intersections etc.
osg::Matrix mRot = osg::Matrix::rotate( fmod( 2.0 * osg::PI * rotSpeed * currentTime,2.0*osg::PI) , osg::Vec3(0.0,0.0,1.0) ); osg::Matrix mRot = osg::Matrix::rotate( fmod( 2.0 * osg::PI * rotSpeed * currentTime,2.0*osg::PI) , osg::Vec3(0.0,0.0,1.0) );

View File

@ -264,7 +264,7 @@ int main( int argc, char **argv )
impostor->setRange(0,0.0f,1e7f); impostor->setRange(0,0.0f,1e7f);
impostor->setCenter(bs.center()); impostor->setCenter(bs.center());
// impostor specfic settings. // impostor specific settings.
impostor->setImpostorThresholdToBound(5.0f); impostor->setImpostorThresholdToBound(5.0f);
model = impostor; model = impostor;

View File

@ -174,7 +174,7 @@ void PhotoArchive::buildArchive(const std::string& filename, const FileNameList&
// open up the archive for writing to // open up the archive for writing to
osgDB::ofstream out(filename.c_str(), std::ios::out | std::ios::binary); osgDB::ofstream out(filename.c_str(), std::ios::out | std::ios::binary);
// write out file indentifier. // write out file identifier.
out.write(FILE_IDENTIFER.c_str(),FILE_IDENTIFER.size()); out.write(FILE_IDENTIFER.c_str(),FILE_IDENTIFER.size());
unsigned int numPhotos = photoIndex.size(); unsigned int numPhotos = photoIndex.size();

View File

@ -193,7 +193,7 @@ Page::Page(Album* album, unsigned int pageNo, const std::string& frontFileName,
osgDB::ReaderWriter* readerWriter = osgDB::Registry::instance()->getReaderWriterForExtension("gdal"); osgDB::ReaderWriter* readerWriter = osgDB::Registry::instance()->getReaderWriterForExtension("gdal");
if (!readerWriter) if (!readerWriter)
{ {
std::cout<<"Error: GDAL plugin not available, cannot preceed with database creation"<<std::endl; std::cout<<"Error: GDAL plugin not available, cannot proceed with database creation"<<std::endl;
} }
_switch = new osg::Switch; _switch = new osg::Switch;

View File

@ -82,8 +82,8 @@ int main( int argc, char **argv )
arguments.getApplicationUsage()->addCommandLineOption("--particleColour <red> <green> <blue> <alpha>",""); arguments.getApplicationUsage()->addCommandLineOption("--particleColour <red> <green> <blue> <alpha>","");
arguments.getApplicationUsage()->addCommandLineOption("--wind <x> <y> <z>","Set the wind speed in model coordinates"); arguments.getApplicationUsage()->addCommandLineOption("--wind <x> <y> <z>","Set the wind speed in model coordinates");
arguments.getApplicationUsage()->addCommandLineOption("--particleSpeed <float>","Set the particle speed"); arguments.getApplicationUsage()->addCommandLineOption("--particleSpeed <float>","Set the particle speed");
arguments.getApplicationUsage()->addCommandLineOption("--nearTransition <distance>","Set the near transistion distance"); arguments.getApplicationUsage()->addCommandLineOption("--nearTransition <distance>","Set the near transition distance");
arguments.getApplicationUsage()->addCommandLineOption("--farTransition <distance>","Set the far transistion distance"); arguments.getApplicationUsage()->addCommandLineOption("--farTransition <distance>","Set the far transition distance");
arguments.getApplicationUsage()->addCommandLineOption("--particleDensity <density>","Set the particle density"); arguments.getApplicationUsage()->addCommandLineOption("--particleDensity <density>","Set the particle density");
arguments.getApplicationUsage()->addCommandLineOption("--cellSize <x> <y> <z>","Set the cell size in model coordinates"); arguments.getApplicationUsage()->addCommandLineOption("--cellSize <x> <y> <z>","Set the cell size in model coordinates");
arguments.getApplicationUsage()->addCommandLineOption("--fogDensity <density>","Set the fog density"); arguments.getApplicationUsage()->addCommandLineOption("--fogDensity <density>","Set the fog density");

View File

@ -299,7 +299,7 @@ int main(int argc, char** argv)
// if (pi.setProperty(presentation.get(), "Matrix", osg::Matrixd::scale(1.0,2.0,2.0))) // if (pi.setProperty(presentation.get(), "Matrix", osg::Matrixd::scale(1.0,2.0,2.0)))
if (pi.setProperty(presentation.get(), "Matrix", osg::Matrixd::scale(2.0,2.0,2.0))) if (pi.setProperty(presentation.get(), "Matrix", osg::Matrixd::scale(2.0,2.0,2.0)))
{ {
OSG_NOTICE<<"setProperty(..,Matrix) succedded."<<std::endl; OSG_NOTICE<<"setProperty(..,Matrix) succeeded."<<std::endl;
} }
else else
{ {

View File

@ -240,7 +240,7 @@ osg::Node* createMirroredScene(osg::Node* model)
// create a Transform which flips the loaded model about the z axis // create a Transform which flips the loaded model about the z axis
// relative to the mirror node, the loadedModel is added to the // relative to the mirror node, the loadedModel is added to the
// Transform so now appears twice in the scene, but is shared so there // Transform so now appears twice in the scene, but is shared so there
// is negligable memory overhead. Also use an osg::StateSet // is negligible memory overhead. Also use an osg::StateSet
// attached to the Transform to override the face culling on the subgraph // attached to the Transform to override the face culling on the subgraph
// to prevert an 'inside' out view of the reflected model. // to prevert an 'inside' out view of the reflected model.
// set up the stencil ops so that only operator on this mirrors stencil value. // set up the stencil ops so that only operator on this mirrors stencil value.

View File

@ -17,7 +17,7 @@
*/ */
/* /*
The code below is to show how a heirarchy of objects can be made within a scenegraph. The code below is to show how a hierarchy of objects can be made within a scenegraph.
In other words, how there can be a parent/child relationship between objects such In other words, how there can be a parent/child relationship between objects such
that when a parent is rotated or translated, the children move is respect to it's that when a parent is rotated or translated, the children move is respect to it's
parent movement. A robotic arm is used in this example because this is what I'm parent movement. A robotic arm is used in this example because this is what I'm

View File

@ -549,7 +549,7 @@ namespace ModelThree
shape = new osg::ShapeDrawable(new osg::Cylinder(osg::Vec3(0.0f, 3.0f, 0.0f), radius, height), hints.get()); shape = new osg::ShapeDrawable(new osg::Cylinder(osg::Vec3(0.0f, 3.0f, 0.0f), radius, height), hints.get());
shape->setColor(osg::Vec4(1.0f, 0.3f, 0.3f, 1.0f)); shape->setColor(osg::Vec4(1.0f, 0.3f, 0.3f, 1.0f));
shape->setName("red cyclinder"); shape->setName("red cylinder");
geode_2->addDrawable(shape.get()); geode_2->addDrawable(shape.get());
shape = new osg::ShapeDrawable(new osg::Box(osg::Vec3(0.0f, 0.0f, 3.0f), 2.0f, 2.0f, 0.1f), hints.get()); shape = new osg::ShapeDrawable(new osg::Box(osg::Vec3(0.0f, 0.0f, 3.0f), 2.0f, 2.0f, 0.1f), hints.get());

View File

@ -157,7 +157,7 @@ int main( int argc, char **argv )
osgUtil::Simplifier simplifier(ratio, maxError); osgUtil::Simplifier simplifier(ratio, maxError);
std::cout<<"Runing osgUtil::Simplifier with SampleRatio="<<ratio<<" maxError="<<maxError<<" ..."; std::cout<<"Running osgUtil::Simplifier with SampleRatio="<<ratio<<" maxError="<<maxError<<" ...";
std::cout.flush(); std::cout.flush();
osg::ref_ptr<osg::Node> root = (osg::Node*)loadedModel->clone(osg::CopyOp::DEEP_COPY_ALL); osg::ref_ptr<osg::Node> root = (osg::Node*)loadedModel->clone(osg::CopyOp::DEEP_COPY_ALL);

View File

@ -395,7 +395,7 @@ int main(int argc, char **argv)
csn->removeChildren(0, csn->getNumChildren()); csn->removeChildren(0, csn->getNumChildren());
csn->addChild(overlayNode.get()); csn->addChild(overlayNode.get());
// tell the overlay node to continously update its overlay texture // tell the overlay node to continuously update its overlay texture
// as we know we'll be tracking a moving target. // as we know we'll be tracking a moving target.
overlayNode->setContinuousUpdate(true); overlayNode->setContinuousUpdate(true);
} }

View File

@ -250,7 +250,7 @@ class Teapot : public osg::Drawable
{ {
osg::BoundingBox bbox; osg::BoundingBox bbox;
// follow is some truely horrible code required to calculate the // follow is some truly horrible code required to calculate the
// bounding box of the teapot. Have used the original code above to do // bounding box of the teapot. Have used the original code above to do
// help compute it. // help compute it.
float p[4][4][3], q[4][4][3], r[4][4][3], s[4][4][3]; float p[4][4][3], q[4][4][3], r[4][4][3], s[4][4][3];

View File

@ -231,7 +231,7 @@ public:
_textList.push_back("Anisotropic filtering\nsetMaxAnisotropy(8.0f)"); _textList.push_back("Anisotropic filtering\nsetMaxAnisotropy(8.0f)");
_maxAnisotropyList.push_back(16.0f); _maxAnisotropyList.push_back(16.0f);
_textList.push_back("Higest quality anisotropic filtering\nsetMaxAnisotropy(16.0f)"); _textList.push_back("Highest quality anisotropic filtering\nsetMaxAnisotropy(16.0f)");
setValues(); setValues();
} }
@ -544,7 +544,7 @@ public:
subImage->setImage(originalImage->s()/2, originalImage->t()/2, originalImage->r(), // half the width and height subImage->setImage(originalImage->s()/2, originalImage->t()/2, originalImage->r(), // half the width and height
originalImage->getInternalTextureFormat(), // same internal texture format originalImage->getInternalTextureFormat(), // same internal texture format
originalImage->getPixelFormat(),originalImage->getDataType(), // same pixel foramt and data type originalImage->getPixelFormat(),originalImage->getDataType(), // same pixel foramt and data type
originalImage->data(originalImage->s()/4,originalImage->t()/4), // offset teh start point to 1/4 into the image originalImage->data(originalImage->s()/4,originalImage->t()/4), // offset the start point to 1/4 into the image
osg::Image::NO_DELETE, // don't attempt to delete the image data, leave this to the originalImage osg::Image::NO_DELETE, // don't attempt to delete the image data, leave this to the originalImage
originalImage->getPacking(), // use the same packing originalImage->getPacking(), // use the same packing
originalImage->s()); // use the width of the original image as the row width originalImage->s()); // use the width of the original image as the row width

View File

@ -81,7 +81,7 @@ osg::StateSet* createState()
// set up the 3d texture itself, // set up the 3d texture itself,
// note, well set the filtering up so that mip mapping is disabled, // note, well set the filtering up so that mip mapping is disabled,
// gluBuild3DMipsmaps doesn't do a very good job of handled the // gluBuild3DMipsmaps doesn't do a very good job of handled the
// inbalanced dimensions of the 256x256x4 texture. // imbalanced dimensions of the 256x256x4 texture.
osg::Texture3D* texture3D = new osg::Texture3D; osg::Texture3D* texture3D = new osg::Texture3D;
texture3D->setFilter(osg::Texture3D::MIN_FILTER,osg::Texture3D::LINEAR); texture3D->setFilter(osg::Texture3D::MIN_FILTER,osg::Texture3D::LINEAR);
texture3D->setFilter(osg::Texture3D::MAG_FILTER,osg::Texture3D::LINEAR); texture3D->setFilter(osg::Texture3D::MAG_FILTER,osg::Texture3D::LINEAR);

View File

@ -45,7 +45,7 @@
#include <iostream> #include <iostream>
float refract = 1.02; // ratio of indicies of refraction float refract = 1.02; // ratio of indices of refraction
float fresnel = 0.2; // Fresnel multiplier float fresnel = 0.2; // Fresnel multiplier

View File

@ -266,7 +266,7 @@ osg::Node * CreateAdvancedHierarchy( osg::Node * model )
PerFragmentDirectionalLightingFragmentShaderSource ); PerFragmentDirectionalLightingFragmentShaderSource );
} }
// Additionaly set bottom left model texture to procedural blue to // Additionally set bottom left model texture to procedural blue to
// better observe smooth speculars done through per pixel lighting // better observe smooth speculars done through per pixel lighting
if( 1 ) if( 1 )
{ {
@ -279,7 +279,7 @@ osg::Node * CreateAdvancedHierarchy( osg::Node * model )
ProceduralBlueTextureFragmentShaderSource ); ProceduralBlueTextureFragmentShaderSource );
} }
// Additionaly change texture mapping to SphereMAp in bottom right model // Additionally change texture mapping to SphereMAp in bottom right model
if( 1 ) if( 1 )
{ {
AddLabel( transformRightBottom, "EnvMap Sphere VP", offset ); AddLabel( transformRightBottom, "EnvMap Sphere VP", offset );

View File

@ -8,7 +8,7 @@
const unsigned int MASK_2D = 0xF0000000; const unsigned int MASK_2D = 0xF0000000;
// This examples demonstrates the use of an osgWidget::Table, which differs from a Box in // This examples demonstrates the use of an osgWidget::Table, which differs from a Box in
// many ways. First and foremost, a Table's size is intially known, whereas a Box can be // many ways. First and foremost, a Table's size is initially known, whereas a Box can be
// dynamically added to. Secondly, a table is matrix Layout, with both vertical and // dynamically added to. Secondly, a table is matrix Layout, with both vertical and
// horizontal placement cells. A Box, on the other hand, can only be vertical or horizontal. // horizontal placement cells. A Box, on the other hand, can only be vertical or horizontal.

View File

@ -39,7 +39,7 @@ inline bool iequals(const std::string& lhs, const std::string& rhs)
} }
/** Unique Indentifier class to help with efficiently comparing /** Unique Identifier class to help with efficiently comparing
* road classification or region via pointers.*/ * road classification or region via pointers.*/
class OSG_EXPORT Identifier : public osg::Referenced, public osg::Observer class OSG_EXPORT Identifier : public osg::Referenced, public osg::Observer
{ {

View File

@ -23,7 +23,7 @@
namespace osgUtil { namespace osgUtil {
/** A class for assisting the building a scene graph that is equivilant to OpenGL 1.0 style calls. /** A class for assisting the building a scene graph that is equivalent to OpenGL 1.0 style calls.
*/ */
class OSGUTIL_EXPORT SceneGraphBuilder class OSGUTIL_EXPORT SceneGraphBuilder
{ {

View File

@ -210,7 +210,7 @@ void Texture1D::apply(State& state) const
textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,1,1,0); textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,1,1,0);
// update the modified count to show that it is upto date. // update the modified count to show that it is up to date.
getModifiedCount(contextID) = _image->getModifiedCount(); getModifiedCount(contextID) = _image->getModifiedCount();
_textureObjectBuffer[contextID] = textureObject; _textureObjectBuffer[contextID] = textureObject;

View File

@ -1301,7 +1301,7 @@ Uniform::Uniform( const char* name, bool b0, bool b1, bool b2, bool b3 ) :
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// Value assignment for single-element (ie: non-array) uniforms. // Value assignment for single-element (ie: non-array) uniforms.
// (For backwards compatability, if not already configured, set the // (For backwards compatibility, if not already configured, set the
// Uniform's _numElements=1) // Uniform's _numElements=1)
bool Uniform::set( float f ) bool Uniform::set( float f )

View File

@ -49,7 +49,7 @@ GLdouble __gl_edgeEval( GLUvertex *u, GLUvertex *v, GLUvertex *w )
/* Given three vertices u,v,w such that VertLeq(u,v) && VertLeq(v,w), /* Given three vertices u,v,w such that VertLeq(u,v) && VertLeq(v,w),
* evaluates the t-coord of the edge uw at the s-coord of the vertex v. * evaluates the t-coord of the edge uw at the s-coord of the vertex v.
* Returns v->t - (uw)(v->s), ie. the signed distance from uw to v. * Returns v->t - (uw)(v->s), ie. the signed distance from uw to v.
* If uw is vertical (and thus passes thru v), the result is zero. * If uw is vertical (and thus passes through v), the result is zero.
* *
* The calculation is extremely accurate and stable, even when v * The calculation is extremely accurate and stable, even when v
* is very close to u or w. In particular if we set v->t = 0 and * is very close to u or w. In particular if we set v->t = 0 and
@ -104,7 +104,7 @@ GLdouble __gl_transEval( GLUvertex *u, GLUvertex *v, GLUvertex *w )
/* Given three vertices u,v,w such that TransLeq(u,v) && TransLeq(v,w), /* Given three vertices u,v,w such that TransLeq(u,v) && TransLeq(v,w),
* evaluates the t-coord of the edge uw at the s-coord of the vertex v. * evaluates the t-coord of the edge uw at the s-coord of the vertex v.
* Returns v->s - (uw)(v->t), ie. the signed distance from uw to v. * Returns v->s - (uw)(v->t), ie. the signed distance from uw to v.
* If uw is vertical (and thus passes thru v), the result is zero. * If uw is vertical (and thus passes through v), the result is zero.
* *
* The calculation is extremely accurate and stable, even when v * The calculation is extremely accurate and stable, even when v
* is very close to u or w. In particular if we set v->s = 0 and * is very close to u or w. In particular if we set v->s = 0 and

View File

@ -32,7 +32,7 @@ osg::BoundingBox RigComputeBoundingBoxCallback::computeBound(const osg::Drawable
return _boundingBox; return _boundingBox;
// if the computing of bb is invalid (like no geometry inside) // if the computing of bb is invalid (like no geometry inside)
// then dont tag the bounding box as computed // then don't tag the bounding box as computed
osg::BoundingBox bb = rig.computeBoundingBox(); osg::BoundingBox bb = rig.computeBoundingBox();
if (!bb.valid()) if (!bb.valid())
return bb; return bb;
@ -70,8 +70,8 @@ RigGeometry::RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop) :
_vertexInfluenceMap(b._vertexInfluenceMap), _vertexInfluenceMap(b._vertexInfluenceMap),
_needToComputeMatrix(b._needToComputeMatrix) _needToComputeMatrix(b._needToComputeMatrix)
{ {
// we dont copy the RigImplementation yet. because the RigImplementation need to be initialized in a valid graph, with a skeleton ... // we don't copy the RigImplementation yet. because the RigImplementation need to be initialized in a valid graph, with a skeleton ...
// dont know yet what to do with a clone of a RigGeometry // don't know yet what to do with a clone of a RigGeometry
} }

View File

@ -90,7 +90,7 @@ bool RigTransformHardware::createPalette(int nbVertexes, BoneMap boneMap, const
bonesForThisVertex++; // count max number of bones per vertexes bonesForThisVertex++; // count max number of bones per vertexes
vertexIndexWeight[vertexIndex].push_back(IndexWeightEntry(bname2palette[bw.getBoneName()],bw.getWeight())); vertexIndexWeight[vertexIndex].push_back(IndexWeightEntry(bname2palette[bw.getBoneName()],bw.getWeight()));
} }
else if (fabs(bw.getWeight()) > 1e-2) // dont use bone with weight too small else if (fabs(bw.getWeight()) > 1e-2) // don't use bone with weight too small
{ {
if (boneMap.find(bw.getBoneName()) == boneMap.end()) if (boneMap.find(bw.getBoneName()) == boneMap.end())
{ {

View File

@ -1187,7 +1187,7 @@ yyparse ()
`yyvs': related to semantic values, `yyvs': related to semantic values,
`yyls': related to locations. `yyls': related to locations.
Refer to the stacks thru separate pointers, to allow yyoverflow Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */ to reallocate them elsewhere. */
/* The state stack. */ /* The state stack. */

View File

@ -809,7 +809,7 @@ bool CTextureRenderer::initBuildGraph()
hr = _graphBuilder->QueryInterface( IID_IBasicAudio, (void **)&_basicAudio); hr = _graphBuilder->QueryInterface( IID_IBasicAudio, (void **)&_basicAudio);
checkError(prefixForMessage, hr); //May be no sound so dont effect return result checkError(prefixForMessage, hr); //May be no sound so don't effect return result
return true; return true;
} }

View File

@ -757,7 +757,7 @@ void _dwobj::buildDrawable(Group *grp, const osgDB::ReaderWriter::Options *optio
gluTessCallback(ts, GLU_TESS_ERROR, (GLU_TESS_CALLBACK) error); gluTessCallback(ts, GLU_TESS_ERROR, (GLU_TESS_CALLBACK) error);
gluTessCallback(ts, GLU_TESS_COMBINE_DATA, (GLU_TESS_CALLBACK) combineCallback); gluTessCallback(ts, GLU_TESS_COMBINE_DATA, (GLU_TESS_CALLBACK) combineCallback);
// for (int nvf=0; nvf<6; nvf++) { // for each length of face // for (int nvf=0; nvf<6; nvf++) { // for each length of face
// for Geometry we dont need to collect prim types individually // for Geometry we don't need to collect prim types individually
// prd.setmode(nvf , nfnvf); // filter out only this type of tessellated face // prd.setmode(nvf , nfnvf); // filter out only this type of tessellated face
prd=new prims; prd=new prims;
prd->settmat(tmat.get()); prd->settmat(tmat.get());

View File

@ -490,7 +490,7 @@ dxfPolyline::drawScene(scene* sc)
unsigned int ncount; unsigned int ncount;
unsigned int mcount; unsigned int mcount;
if (_surfacetype == 6) { if (_surfacetype == 6) {
// I dont have examples of type 5 and 8, but they may be the same as 6 // I don't have examples of type 5 and 8, but they may be the same as 6
mcount = _mdensity; mcount = _mdensity;
ncount = _ndensity; ncount = _ndensity;
} else { } else {

View File

@ -46,7 +46,7 @@ void UnIndexMeshVisitor::apply(osg::Geometry& geom)
return; return;
} }
// we dont manage lines // we don't manage lines
GeometryArrayList arraySrc(geom); GeometryArrayList arraySrc(geom);
GeometryArrayList arrayList = arraySrc.cloneType(); GeometryArrayList arrayList = arraySrc.cloneType();

View File

@ -275,7 +275,7 @@ void ReaderWriterOBJ::buildMaterialToStateSetMap(obj::Model& model, MaterialToSt
{ {
if (localOptions.fixBlackMaterials) if (localOptions.fixBlackMaterials)
{ {
// hack to fix Maya exported models that contian all black materials. // hack to fix Maya exported models that contain all black materials.
int numBlack = 0; int numBlack = 0;
int numNotBlack = 0; int numNotBlack = 0;
obj::Model::MaterialMap::iterator itr; obj::Model::MaterialMap::iterator itr;

View File

@ -393,7 +393,7 @@ protected:
virtual bool processTriangle() virtual bool processTriangle()
{ {
// dont produce trinagle until we have got three vertices // don't produce triangle until we have got three vertices
if( numIndices < 3 ) if( numIndices < 3 )
return false; return false;

View File

@ -189,7 +189,7 @@ public:
virtual bool acceptsExtension(const std::string& extension) const virtual bool acceptsExtension(const std::string& extension) const
{ {
// this should be the only image importer required on the Mac // this should be the only image importer required on the Mac
// dont know what else it supports, but these will do // don't know what else it supports, but these will do
return return
#ifdef QT_HANDLE_IMAGES_ALSO #ifdef QT_HANDLE_IMAGES_ALSO

View File

@ -437,7 +437,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterSTL::readNode(const std::string& fil
if (sizeof(unsigned int) != 4) if (sizeof(unsigned int) != 4)
{ {
OSG_NOTICE<<"Waring: STL reading not supported as unsigned int is not 4 bytes on this system."<<std::endl; OSG_NOTICE<<"Warning: STL reading not supported as unsigned int is not 4 bytes on this system."<<std::endl;
return ReadResult::ERROR_IN_READING_FILE; return ReadResult::ERROR_IN_READING_FILE;
} }

View File

@ -213,7 +213,7 @@ class ReaderWriterTRK : public osgDB::ReaderWriter
if (fin.fail()) return ReadResult::ERROR_IN_READING_FILE; if (fin.fail()) return ReadResult::ERROR_IN_READING_FILE;
OSG_NOTICE<<"Read header successfuly ["<<header.id_string<<"]"<<std::endl; OSG_NOTICE<<"Read header successfully ["<<header.id_string<<"]"<<std::endl;
bool requiresByteSwap = header.hdr_size!=1000; bool requiresByteSwap = header.hdr_size!=1000;
if (requiresByteSwap) if (requiresByteSwap)
{ {

View File

@ -289,7 +289,7 @@ public:
// return value is 0 - no crossing; 1,2,3 - which edge of the triangle is cut. // return value is 0 - no crossing; 1,2,3 - which edge of the triangle is cut.
if (a_==ip1) if (a_==ip1)
{ {
// first vertex is the vertex - test that a_ to p2 lies beteen edges a,b and a,c // first vertex is the vertex - test that a_ to p2 lies between edges a,b and a,c
osg::Vec3 apt=(*points)[a_]; osg::Vec3 apt=(*points)[a_];
osg::Vec3 bpt=(*points)[b_]; osg::Vec3 bpt=(*points)[b_];
osg::Vec3 cpt=(*points)[c_]; osg::Vec3 cpt=(*points)[c_];
@ -297,7 +297,7 @@ public:
} }
else if (b_==ip1) else if (b_==ip1)
{ {
// second vertex is the vertex - test that b_ to p2 lies beteen edges a,b and a,c // second vertex is the vertex - test that b_ to p2 lies between edges a,b and a,c
osg::Vec3 apt=(*points)[b_]; osg::Vec3 apt=(*points)[b_];
osg::Vec3 bpt=(*points)[c_]; osg::Vec3 bpt=(*points)[c_];
osg::Vec3 cpt=(*points)[a_]; osg::Vec3 cpt=(*points)[a_];
@ -305,7 +305,7 @@ public:
} }
else if (c_==ip1) else if (c_==ip1)
{ {
// 3rd vertex is the vertex - test that c_ to p2 lies beteen edges a,b and a,c // 3rd vertex is the vertex - test that c_ to p2 lies between edges a,b and a,c
osg::Vec3 apt=(*points)[c_]; osg::Vec3 apt=(*points)[c_];
osg::Vec3 bpt=(*points)[a_]; osg::Vec3 bpt=(*points)[a_];
osg::Vec3 cpt=(*points)[b_]; osg::Vec3 cpt=(*points)[b_];
@ -940,7 +940,7 @@ bool DelaunayTriangulator::triangulate()
unsigned int ip2=getindex((*vercon)[prset->index(i)],points_.get()); unsigned int ip2=getindex((*vercon)[prset->index(i)],points_.get());
if (i>0 || prset->getMode()==osg::PrimitiveSet::LINE_LOOP) if (i>0 || prset->getMode()==osg::PrimitiveSet::LINE_LOOP)
{ {
// dont check edge from end to start // don't check edge from end to start
// for strips // for strips
// 2 points on the constraint // 2 points on the constraint
bool edgused=false;// first check for exact edge indices are used. bool edgused=false;// first check for exact edge indices are used.

View File

@ -3683,13 +3683,13 @@ Optimizer::TextureAtlasBuilder::Atlas::FitsIn Optimizer::TextureAtlasBuilder::At
if (_texture->getFilter(osg::Texture2D::MIN_FILTER) != sourceTexture->getFilter(osg::Texture2D::MIN_FILTER)) if (_texture->getFilter(osg::Texture2D::MIN_FILTER) != sourceTexture->getFilter(osg::Texture2D::MIN_FILTER))
{ {
// inconsitent min filters // inconsistent min filters
return DOES_NOT_FIT_IN_ANY_ROW; return DOES_NOT_FIT_IN_ANY_ROW;
} }
if (_texture->getFilter(osg::Texture2D::MAG_FILTER) != sourceTexture->getFilter(osg::Texture2D::MAG_FILTER)) if (_texture->getFilter(osg::Texture2D::MAG_FILTER) != sourceTexture->getFilter(osg::Texture2D::MAG_FILTER))
{ {
// inconsitent mag filters // inconsistent mag filters
return DOES_NOT_FIT_IN_ANY_ROW; return DOES_NOT_FIT_IN_ANY_ROW;
} }
@ -3707,19 +3707,19 @@ Optimizer::TextureAtlasBuilder::Atlas::FitsIn Optimizer::TextureAtlasBuilder::At
if (_texture->getShadowCompareFunc() != sourceTexture->getShadowCompareFunc()) if (_texture->getShadowCompareFunc() != sourceTexture->getShadowCompareFunc())
{ {
// shadow functions inconsitent // shadow functions inconsistent
return DOES_NOT_FIT_IN_ANY_ROW; return DOES_NOT_FIT_IN_ANY_ROW;
} }
if (_texture->getShadowTextureMode() != sourceTexture->getShadowTextureMode()) if (_texture->getShadowTextureMode() != sourceTexture->getShadowTextureMode())
{ {
// shadow texture mode inconsitent // shadow texture mode inconsistent
return DOES_NOT_FIT_IN_ANY_ROW; return DOES_NOT_FIT_IN_ANY_ROW;
} }
if (_texture->getShadowAmbient() != sourceTexture->getShadowAmbient()) if (_texture->getShadowAmbient() != sourceTexture->getShadowAmbient())
{ {
// shadow ambient inconsitent // shadow ambient inconsistent
return DOES_NOT_FIT_IN_ANY_ROW; return DOES_NOT_FIT_IN_ANY_ROW;
} }
} }

View File

@ -168,7 +168,7 @@ bool Animation_readChannel(osgAnimation::Channel* pChannel, Input& fr)
} }
pChannel->setTargetName(target); pChannel->setTargetName(target);
// we dont need this info // we don't need this info
float weight = 1.0; float weight = 1.0;
if (fr.matchSequence("weight %f")) if (fr.matchSequence("weight %f"))
{ {