Typo fixes
This commit is contained in:
committed by
Robert Osfield
parent
307001391f
commit
260cbab518
@@ -210,7 +210,7 @@ void Texture1D::apply(State& state) const
|
||||
|
||||
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();
|
||||
|
||||
_textureObjectBuffer[contextID] = textureObject;
|
||||
|
||||
@@ -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.
|
||||
// (For backwards compatability, if not already configured, set the
|
||||
// (For backwards compatibility, if not already configured, set the
|
||||
// Uniform's _numElements=1)
|
||||
|
||||
bool Uniform::set( float f )
|
||||
|
||||
@@ -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),
|
||||
* 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.
|
||||
* 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
|
||||
* 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),
|
||||
* 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.
|
||||
* 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
|
||||
* is very close to u or w. In particular if we set v->s = 0 and
|
||||
|
||||
@@ -32,7 +32,7 @@ osg::BoundingBox RigComputeBoundingBoxCallback::computeBound(const osg::Drawable
|
||||
return _boundingBox;
|
||||
|
||||
// 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();
|
||||
if (!bb.valid())
|
||||
return bb;
|
||||
@@ -70,8 +70,8 @@ RigGeometry::RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop) :
|
||||
_vertexInfluenceMap(b._vertexInfluenceMap),
|
||||
_needToComputeMatrix(b._needToComputeMatrix)
|
||||
{
|
||||
// we dont 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
|
||||
// we don't copy the RigImplementation yet. because the RigImplementation need to be initialized in a valid graph, with a skeleton ...
|
||||
// don't know yet what to do with a clone of a RigGeometry
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ bool RigTransformHardware::createPalette(int nbVertexes, BoneMap boneMap, const
|
||||
bonesForThisVertex++; // count max number of bones per vertexes
|
||||
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())
|
||||
{
|
||||
|
||||
@@ -1187,7 +1187,7 @@ yyparse ()
|
||||
`yyvs': related to semantic values,
|
||||
`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. */
|
||||
|
||||
/* The state stack. */
|
||||
|
||||
@@ -809,7 +809,7 @@ bool CTextureRenderer::initBuildGraph()
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -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_COMBINE_DATA, (GLU_TESS_CALLBACK) combineCallback);
|
||||
// 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=new prims;
|
||||
prd->settmat(tmat.get());
|
||||
|
||||
@@ -490,7 +490,7 @@ dxfPolyline::drawScene(scene* sc)
|
||||
unsigned int ncount;
|
||||
unsigned int mcount;
|
||||
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;
|
||||
ncount = _ndensity;
|
||||
} else {
|
||||
|
||||
@@ -46,7 +46,7 @@ void UnIndexMeshVisitor::apply(osg::Geometry& geom)
|
||||
return;
|
||||
}
|
||||
|
||||
// we dont manage lines
|
||||
// we don't manage lines
|
||||
|
||||
GeometryArrayList arraySrc(geom);
|
||||
GeometryArrayList arrayList = arraySrc.cloneType();
|
||||
|
||||
@@ -275,7 +275,7 @@ void ReaderWriterOBJ::buildMaterialToStateSetMap(obj::Model& model, MaterialToSt
|
||||
{
|
||||
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 numNotBlack = 0;
|
||||
obj::Model::MaterialMap::iterator itr;
|
||||
|
||||
@@ -393,7 +393,7 @@ protected:
|
||||
|
||||
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 )
|
||||
return false;
|
||||
|
||||
|
||||
@@ -189,7 +189,7 @@ public:
|
||||
virtual bool acceptsExtension(const std::string& extension) const
|
||||
{
|
||||
// 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
|
||||
|
||||
#ifdef QT_HANDLE_IMAGES_ALSO
|
||||
|
||||
@@ -437,7 +437,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterSTL::readNode(const std::string& fil
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -213,7 +213,7 @@ class ReaderWriterTRK : public osgDB::ReaderWriter
|
||||
|
||||
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;
|
||||
if (requiresByteSwap)
|
||||
{
|
||||
|
||||
@@ -289,7 +289,7 @@ public:
|
||||
// return value is 0 - no crossing; 1,2,3 - which edge of the triangle is cut.
|
||||
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 bpt=(*points)[b_];
|
||||
osg::Vec3 cpt=(*points)[c_];
|
||||
@@ -297,7 +297,7 @@ public:
|
||||
}
|
||||
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 bpt=(*points)[c_];
|
||||
osg::Vec3 cpt=(*points)[a_];
|
||||
@@ -305,7 +305,7 @@ public:
|
||||
}
|
||||
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 bpt=(*points)[a_];
|
||||
osg::Vec3 cpt=(*points)[b_];
|
||||
@@ -940,7 +940,7 @@ bool DelaunayTriangulator::triangulate()
|
||||
unsigned int ip2=getindex((*vercon)[prset->index(i)],points_.get());
|
||||
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
|
||||
// 2 points on the constraint
|
||||
bool edgused=false;// first check for exact edge indices are used.
|
||||
|
||||
@@ -3683,13 +3683,13 @@ Optimizer::TextureAtlasBuilder::Atlas::FitsIn Optimizer::TextureAtlasBuilder::At
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -3707,19 +3707,19 @@ Optimizer::TextureAtlasBuilder::Atlas::FitsIn Optimizer::TextureAtlasBuilder::At
|
||||
|
||||
if (_texture->getShadowCompareFunc() != sourceTexture->getShadowCompareFunc())
|
||||
{
|
||||
// shadow functions inconsitent
|
||||
// shadow functions inconsistent
|
||||
return DOES_NOT_FIT_IN_ANY_ROW;
|
||||
}
|
||||
|
||||
if (_texture->getShadowTextureMode() != sourceTexture->getShadowTextureMode())
|
||||
{
|
||||
// shadow texture mode inconsitent
|
||||
// shadow texture mode inconsistent
|
||||
return DOES_NOT_FIT_IN_ANY_ROW;
|
||||
}
|
||||
|
||||
if (_texture->getShadowAmbient() != sourceTexture->getShadowAmbient())
|
||||
{
|
||||
// shadow ambient inconsitent
|
||||
// shadow ambient inconsistent
|
||||
return DOES_NOT_FIT_IN_ANY_ROW;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -168,7 +168,7 @@ bool Animation_readChannel(osgAnimation::Channel* pChannel, Input& fr)
|
||||
}
|
||||
pChannel->setTargetName(target);
|
||||
|
||||
// we dont need this info
|
||||
// we don't need this info
|
||||
float weight = 1.0;
|
||||
if (fr.matchSequence("weight %f"))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user