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

Fixed 69 occurance of 'Seperate' misspelling (should be 'Separate')

Browse Source
This commit is contained in:
Don BURNS
2002-08-29 03:22:27 +00:00
parent b546c63139
commit 2b10b4c3df
17 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/obj/ReaderWriterOBJ.cpp
View File

@@ -210,7 +210,7 @@ osg::Drawable* ReaderWriterOBJ::makeDrawable(GLMmodel* obj,
geom->addPrimitive(new osg::DrawArrays(osg::Primitive::TRIANGLES,0,ntris*3));
// the following code for mapping the coords, normals and texcoords
// is complicated greatly by the need to create seperate out the
// is complicated greatly by the need to create separate out the
// sets of coords etc for each drawable.
bool needNormals = obj->normals && obj->normals>0;

8
src/osgPlugins/osg/LightModel.cpp
View File

@@ -43,9 +43,9 @@ bool LightModel_readLocalData(Object& obj, Input& fr)
if (fr[0].matchWord("colorControl"))
{
if (fr[1].matchWord("SEPERATE_SPECULAR_COLOR"))
if (fr[1].matchWord("SEPARATE_SPECULAR_COLOR"))
{
lightmodel.setColorControl(osg::LightModel::SEPERATE_SPECULAR_COLOR);
lightmodel.setColorControl(osg::LightModel::SEPARATE_SPECULAR_COLOR);
}
else if (fr[1].matchWord("SINGLE_COLOR"))
{
@@ -95,8 +95,8 @@ bool LightModel_writeLocalData(const Object& obj,Output& fw)
fw.indent() << "ambientIntensity " << lightmodel.getAmbientIntensity() << std::endl;
if (lightmodel.getColorControl()==osg::LightModel::SEPERATE_SPECULAR_COLOR)
fw.indent() << "colorControl SEPERATE_SPECULAR_COLOR" << std::endl;
if (lightmodel.getColorControl()==osg::LightModel::SEPARATE_SPECULAR_COLOR)
fw.indent() << "colorControl SEPARATE_SPECULAR_COLOR" << std::endl;
else
fw.indent() << "colorControl SINGLE_COLOR" << std::endl;

2
src/osgPlugins/pfb/ConvertFromPerformer.cpp
View File

@@ -1067,7 +1067,7 @@ osg::Material* ConvertFromPerformer::visitMaterial(osg::StateSet* osgStateSet,pf
material->getColor(PFMTL_SPECULAR,&r,&g,&b);
osgMaterial->setSpecular(osg::Material::FRONT_AND_BACK,osg::Vec4(r,g,b,a));
}
else // seperate materials for front and back.
else // separate materials for front and back.
{
int colorMode = front_mat->getColorMode(front_mat->getSide());

2
src/osgPlugins/txp/trpage_header.cpp
View File

@@ -289,7 +289,7 @@ bool trpgHeader::Read(trpgReadBuffer &buf)
return isValid();
}
// Read the LOD info (seperate token)
// Read the LOD info (separate token)
bool trpgHeader::ReadLodInfo(trpgReadBuffer &buf)
{
float64 range;

10
src/osgPlugins/txp/trpage_rarchive.cpp
View File

@@ -55,7 +55,7 @@ void trpgr_Archive::SetDirectory(const char *in_dir)
bool trpgr_Archive::OpenFile(const char *name)
{
char file[1024];
sprintf(file,"%s" PATHSEPERATOR "%s",dir,name);
sprintf(file,"%s" PATHSEPARATOR "%s",dir,name);
CloseFile();
@@ -161,7 +161,7 @@ bool trpgr_Archive::ReadHeader()
if (tileMode == trpgTileTable::Local) {
if (tileCache) delete tileCache;
char fullBase[1024];
sprintf(fullBase,"%s" PATHSEPERATOR "tileFile",dir);
sprintf(fullBase,"%s" PATHSEPARATOR "tileFile",dir);
tileCache = new trpgrAppFileCache(fullBase,"tpf");
}
@@ -191,7 +191,7 @@ bool trpgr_Archive::ReadTile(uint32 x,uint32 y,uint32 lod,trpgMemReadBuffer &buf
// Figure out the file name
// Note: This assumes External tiles
char filename[1024];
sprintf(filename,"%s" PATHSEPERATOR "tile_%d_%d_%d.tpt",dir,x,y,lod);
sprintf(filename,"%s" PATHSEPARATOR "tile_%d_%d_%d.tpt",dir,x,y,lod);
// Open the file and read the contents
FILE *fp=NULL;
@@ -313,7 +313,7 @@ trpgrImageHelper::trpgrImageHelper(trpgEndian inNess,char *inDir,
// Set up the texture cache
// It doesn't do anything until it's called anyway
char fullBase[1024];
sprintf(fullBase,"%s" PATHSEPERATOR "texFile",dir);
sprintf(fullBase,"%s" PATHSEPARATOR "texFile",dir);
texCache = new trpgrAppFileCache(fullBase,"txf");
}
@@ -481,7 +481,7 @@ bool trpgrImageHelper::GetImagePath(const trpgTexture *tex,char *fullPath,int pa
if (strlen(dir) + nameLen + 2 > static_cast<unsigned int>(pathLen))
return false;
sprintf(fullPath,"%s" PATHSEPERATOR "%s",dir,name);
sprintf(fullPath,"%s" PATHSEPARATOR "%s",dir,name);
return true;
}

12
src/osgPlugins/txp/trpage_warchive.cpp
View File

@@ -193,7 +193,7 @@ bool trpgwArchive::OpenFile(const char *in_dir,const char *name)
strncpy(dir,in_dir,1023);
sprintf(filename,"%s" PATHSEPERATOR "%s",dir,name);
sprintf(filename,"%s" PATHSEPARATOR "%s",dir,name);
if (!(fp = fopen(filename,"wb")))
return false;
@@ -353,7 +353,7 @@ bool trpgwArchive::IncrementTileFile()
// Open the next one
char filename[1024];
sprintf(filename,"%s" PATHSEPERATOR "tileFile_%d.tpf",dir,tileFileCount++);
sprintf(filename,"%s" PATHSEPARATOR "tileFile_%d.tpf",dir,tileFileCount++);
tileFile = new trpgwAppFile(ness,filename);
if (!tileFile->isValid())
return false;
@@ -379,7 +379,7 @@ bool trpgwArchive::DesignateTileFile(int id)
// Open a named on
char filename[1024];
sprintf(filename,"%s" PATHSEPERATOR "tileFile_%d.tpf",dir,id);
sprintf(filename,"%s" PATHSEPARATOR "tileFile_%d.tpf",dir,id);
tileFile = new trpgwAppFile(ness,filename);
if (!tileFile->isValid())
return false;
@@ -409,7 +409,7 @@ bool trpgwArchive::WriteTile(unsigned int x,unsigned int y,unsigned int lod, flo
// Make a new filename
char filename[1024];
// Note: Windows specific
sprintf(filename,"%s" PATHSEPERATOR "tile_%d_%d_%d.tpt",dir,x,y,lod);
sprintf(filename,"%s" PATHSEPARATOR "tile_%d_%d_%d.tpt",dir,x,y,lod);
if (!(tfp = fopen(filename,"wb")))
return false;
@@ -974,7 +974,7 @@ bool trpgwImageHelper::IncrementTextureFile()
// Open the next one
char filename[1024];
sprintf(filename,"%s" PATHSEPERATOR "texFile_%d.txf",dir,texFileIDs.size());
sprintf(filename,"%s" PATHSEPARATOR "texFile_%d.txf",dir,texFileIDs.size());
texFile = new trpgwAppFile(ness,filename);
if (!texFile->isValid())
return false;
@@ -996,7 +996,7 @@ bool trpgwImageHelper::DesignateTextureFile(int id)
// Open one with the given base name
char filename[1024];
sprintf(filename,"%s" PATHSEPERATOR "texFile_%d.txf",dir,id);
sprintf(filename,"%s" PATHSEPARATOR "texFile_%d.txf",dir,id);
texFile = new trpgwAppFile(ness,filename);
if (!texFile->isValid())
return false;